[freenet-cvs] r11305 - trunk/freenet/src/freenet/clients/http

[t...@freenetproject.org]

Author: toad
Date: 2006-12-08 19:13:54 +0000 (Fri, 08 Dec 2006)
New Revision: 11305

Modified:
   trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
Log:
Pass through the forced type in fproxy when forcing a type causes a filter 
warning. :)

Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2006-12-08 
18:37:20 UTC (rev 11304)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2006-12-08 
19:13:54 UTC (rev 11305)
@@ -84,8 +84,13 @@
        }

        public static void handleDownload(ToadletContext context, Bucket data, 
BucketFactory bucketFactory, String mimeType, String requestedMimeType, String 
forceString, boolean forceDownload, String basePath, FreenetURI key, String 
extras, String referrer) throws ToadletContextClosedException, IOException {
-               if(requestedMimeType != null)
+               if(requestedMimeType != null) {
+                       if(mimeType == null || 
!requestedMimeType.equals(mimeType)) {
+                               if(extras == null) extras = "";
+                               extras = extras + "&type=" + requestedMimeType;
+                       }
                        mimeType = requestedMimeType;
+               }

                long now = System.currentTimeMillis();
                boolean force = false;