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

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-10-07 06:41:24 +0000 (Tue, 07 Oct 2008)
New Revision: 22960

Modified:
   trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
Log:
don't use sendReplyHeaders() directly

Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2008-10-07 
06:41:01 UTC (rev 22959)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2008-10-07 
06:41:24 UTC (rev 22960)
@@ -330,8 +330,6 @@

                if (ks.equals("/")) {
                        if (httprequest.isParameterSet("key")) {
-                               MultiValueTable<String, String> headers = new 
MultiValueTable<String, String>();
-                               
                                String k = httprequest.getParam("key");
                                FreenetURI newURI;
                                try {
@@ -344,12 +342,13 @@

                                if(logMINOR) Logger.minor(this, "Redirecting to 
FreenetURI: "+newURI);
                                String type = httprequest.getParam("type");
+                               String location;
                                if ((type != null) && (type.length() > 0)) {
-                                       headers.put("Location", "/"+newURI + 
"?type=" + type);
+                                       location =  "/"+newURI + "?type=" + 
type;
                                } else {
-                                       headers.put("Location", "/"+newURI);
+                                       location =  "/"+newURI;
                                }
-                               ctx.sendReplyHeaders(302, "Found", headers, 
null, 0);
+                               writeTemporaryRedirect(ctx, null, location);
                                return;
                        }

@@ -387,14 +386,10 @@
                        this.writeTextReply(ctx, 200, "Ok", "User-agent: 
*\nDisallow: /");
                        return;
                }else if(ks.startsWith("/darknet/")) { //TODO (pre-build 1045 
url format) remove when obsolete
-                       MultiValueTable<String, String> headers = new 
MultiValueTable<String, String>();
-                       headers.put("Location", "/friends/");
-                       ctx.sendReplyHeaders(301, "Permanent Redirect", 
headers, null, 0);
+                       writePermanentRedirect(ctx, "obsoleted", "/friends/");
                        return;
                }else if(ks.startsWith("/opennet/")) { //TODO (pre-build 1045 
url format) remove when obsolete
-                       MultiValueTable<String, String> headers = new 
MultiValueTable<String, String>();
-                       headers.put("Location", "/strangers/");
-                       ctx.sendReplyHeaders(301, "Permanent Redirect", 
headers, null, 0);
+                       writePermanentRedirect(ctx, "obsoleted", "/strangers/");
                        return;
                }