[freenet-cvs] r7855 - in trunk/freenet/src/freenet: client node

[t...@freenetproject.org]

Author: toad
Date: 2006-01-14 17:01:33 +0000 (Sat, 14 Jan 2006)
New Revision: 7855

Modified:
   trunk/freenet/src/freenet/client/ClientMetadata.java
   trunk/freenet/src/freenet/client/Metadata.java
   trunk/freenet/src/freenet/node/Version.java
Log:
351:
Fix MIME type clobbering in SSK redirects.

Modified: trunk/freenet/src/freenet/client/ClientMetadata.java
===================================================================
--- trunk/freenet/src/freenet/client/ClientMetadata.java        2006-01-14 
16:57:12 UTC (rev 7854)
+++ trunk/freenet/src/freenet/client/ClientMetadata.java        2006-01-14 
17:01:33 UTC (rev 7855)
@@ -35,6 +35,6 @@
        }

        public boolean isTrivial() {
-               return (mimeType == null || 
mimeType.equals(DefaultMIMETypes.DEFAULT_MIME_TYPE));
+               return (mimeType == null || mimeType.equals(""));
        }
 }

Modified: trunk/freenet/src/freenet/client/Metadata.java
===================================================================
--- trunk/freenet/src/freenet/client/Metadata.java      2006-01-14 16:57:12 UTC 
(rev 7854)
+++ trunk/freenet/src/freenet/client/Metadata.java      2006-01-14 17:01:33 UTC 
(rev 7855)
@@ -385,9 +385,9 @@
                if(docType == SIMPLE_REDIRECT) {
                        documentType = docType;
                        clientMetadata = cm;
-                       if(cm != null)
+                       if(cm != null && !cm.isTrivial()) {
                                setMIMEType(cm.getMIMEType());
-                       else {
+                       } else {
                                setMIMEType(DefaultMIMETypes.DEFAULT_MIME_TYPE);
                                noMIME = true;
                        }

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-14 16:57:12 UTC (rev 
7854)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-14 17:01:33 UTC (rev 
7855)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 350;
+       public static final int buildNumber = 351;

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