[freenet-cvs] r8435 - in trunk/freenet/src/freenet: clients/http node

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-04-02 16:18:41 +0000 (Sun, 02 Apr 2006)
New Revision: 8435

Modified:
   trunk/freenet/src/freenet/clients/http/FproxyToadlet.java
   trunk/freenet/src/freenet/node/Version.java
Log:
614:

        favicon is really fixed now

Modified: trunk/freenet/src/freenet/clients/http/FproxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FproxyToadlet.java   2006-04-02 
13:27:00 UTC (rev 8434)
+++ trunk/freenet/src/freenet/clients/http/FproxyToadlet.java   2006-04-02 
16:18:41 UTC (rev 8435)
@@ -96,17 +96,18 @@
                }else if(ks.equals("/favicon.ico")){
                        byte[] buf = new byte[1024];
                        int len;
-                       InputStream strm = 
getClass().getResourceAsStream("/static/favicon.ico");
+                       InputStream strm = 
getClass().getResourceAsStream("staticfiles/favicon.ico");

                        if (strm == null) {
                                this.sendErrorPage(ctx, 404, "Path not found", 
"The specified path does not exist.");
                                return;
                        }
-                       ctx.sendReplyHeaders(200, "OK", null, "image/png", 
strm.available());
+                       ctx.sendReplyHeaders(200, "OK", null, "image/x-icon", 
strm.available());

                        while ( (len = strm.read(buf)) > 0) {
                                ctx.writeData(buf, 0, len);
                        }
+                       return;
                }

                if(ks.startsWith("/"))

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-04-02 13:27:00 UTC (rev 
8434)
+++ trunk/freenet/src/freenet/node/Version.java 2006-04-02 16:18:41 UTC (rev 
8435)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 613;
+       private static final int buildNumber = 614;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 591;