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

[toad at freenetproject.org]

Author: toad
Date: 2008-05-01 19:14:20 +0000 (Thu, 01 May 2008)
New Revision: 19659

Modified:
   trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
Log:
Fixed #1942.

Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java	2008-05-01 18:29:22 UTC (rev 19658)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java	2008-05-01 19:14:20 UTC (rev 19659)
@@ -413,6 +413,12 @@
 		}
 		String requestedMimeType = httprequest.getParam("type", null);
 		String override = (requestedMimeType == null) ? "" : "?type="+URLEncoder.encode(requestedMimeType,true);
+		// No point passing ?force= across a redirect, since the key will change.
+		// However, there is every point in passing ?forcedownload.
+		if(httprequest.isParameterSet("forcedownload")) {
+			if(override.length() == 0) override = "?forcedownload";
+			else override = override+"&forcedownload";
+		}
 		try {
 			if(Logger.shouldLog(Logger.MINOR, this))
 				Logger.minor(this, "FProxy fetching "+key+" ("+maxSize+ ')');