Author: toad
Date: 2006-04-11 14:34:24 +0000 (Tue, 11 Apr 2006)
New Revision: 8509

Modified:
   trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java
   trunk/freenet/src/freenet/node/Version.java
Log:
630:
Icon files are pretty harmless. Recognize other types for them.

Modified: trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java    
2006-04-11 11:51:15 UTC (rev 8508)
+++ trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java    
2006-04-11 14:34:24 UTC (rev 8509)
@@ -54,10 +54,10 @@
                                false, null, null));

                // ICO - probably safe - FIXME check this out, write filters
-               register(new MIMEType("image/x-icon", "ico", new String[0], new 
String[0],
-                               true, false, null, null, false, false, false, 
false, true, false,
+               register(new MIMEType("image/x-icon", "ico", new String[] { 
"image/vnd.microsoft.icon", "image/ico", "application/ico"}, 
+                               new String[0], true, false, null, null, false, 
false, false, false, false, false,
                                "Icon file - probably not dangerous",
-                               "Icon file - probably not dangerous but you 
should wipe any comments",
+                               "Icon file - probably not dangerous (but can 
contain other data due to offset?)",
                                false, null, null));

                // PDF - very dangerous - FIXME ideally we would have a filter, 
this is such a common format...

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-04-11 11:51:15 UTC (rev 
8508)
+++ trunk/freenet/src/freenet/node/Version.java 2006-04-11 14:34:24 UTC (rev 
8509)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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


Reply via email to