Changeset c312fa8


Ignore:
Timestamp:
Jul 21, 2009 3:19:37 PM (11 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
5e498e0b
Parents:
fe394b0b (diff), 6039f39 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '98b80575def2548ebf853a03d8029a40e9546ec8'

and 'e7693976cb5a07bd0477aa2d8fef1ecc9c56c3d8'

Files:
1 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    rfe394b0b rc312fa8  
    178178   Router console:
    179179   Public domain.
    180    Flag icons public domain, courtesy mjames@gmail.com http://www.famfamfam.com/
     180       Flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/
     181
     182       GeoIP Data:
     183       Copyright (c) 2003 Direct Information Pvt. Ltd. All Rights Reserved.
     184       See licenses/LICENSE-GeoIP.txt
    181185
    182186   SAM:
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

    rfe394b0b rc312fa8  
    831831            String filename = null;
    832832            try {
    833                 filename = targetRequest.substring(10, space);
     833                filename = targetRequest.substring(17, space); // "proxy.i2p/themes/".length
    834834            } catch (IndexOutOfBoundsException ioobe) {}
    835835            // theme hack
    836             if (filename.startsWith("themes/console/default/"))
     836            if (filename.startsWith("console/default/"))
    837837                filename = filename.replaceFirst("default", I2PAppContext.getGlobalContext().getProperty("routerconsole.theme", "light"));
    838             File file = new File(_errorDir, filename);
     838            File themesDir = new File(_errorDir, "themes");
     839            File file = new File(themesDir, filename);
    839840            if (file.exists() && !file.isDirectory()) {
    840841                String type;
     
    850851                    out.write(type.getBytes());
    851852                    out.write("\r\nCache-Control: max-age=86400\r\n\r\n".getBytes());
    852                     FileUtil.readFile(filename, _errorDir.getAbsolutePath(), out);
     853                    FileUtil.readFile(filename, themesDir.getAbsolutePath(), out);
    853854                    return;
    854855                } catch (IOException ioe) {}
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java

    rfe394b0b rc312fa8  
    117117                        s.addWebApplication("/"+ app, path.getAbsolutePath()).start();
    118118                        // no passwords... initialize(wac);
    119                         addFormNotice("WebApp <a href=\"/" + app + "/\">" + app + "<a> started");
     119                        addFormNotice("WebApp <a href=\"/" + app + "/\">" + app + "</a> started");
    120120                    } catch (Exception ioe) {
    121121                        addFormError("Failed to start " + app + " " + ioe);
Note: See TracChangeset for help on using the changeset viewer.