Author: toad
Date: 2009-01-07 17:14:05 +0000 (Wed, 07 Jan 2009)
New Revision: 24956

Modified:
   trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
Log:
Bugfix


Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java     
2009-01-07 16:51:22 UTC (rev 24955)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java     
2009-01-07 17:14:05 UTC (rev 24956)
@@ -818,6 +818,7 @@
 
        public String generateSID(String realPath) throws 
URLEncodedFormatException {
                MessageDigest md = SHA256.getMessageDigest();
+               String oldRealPath = realPath;
                realPath = prepareForSID(realPath);
                try {
                        md.update(realPath.getBytes("UTF-8"));
@@ -841,24 +842,24 @@
                String[] split = realPath.split("/");
                boolean first = true;
                for(String component : split) {
+                       if(!first) sb.append('/');
+                       first = false;
                        if(component.indexOf('%') > -1)
                                component = URLDecoder.decode(component, true);
                        component = URLEncoder.minimalEncode(component, "/?");
                        sb.append(component);
-                       if(!first) sb.append('/');
-                       first = false;
                }
                if(query != null) {
                        sb.append('?');
                        split = query.split("&");
                        first = true;
                        for(String component : split) {
+                               if(!first) sb.append('&');
+                               first = false;
                                if(component.indexOf('%') > -1)
                                        component = 
URLDecoder.decode(component, true);
                                component = URLEncoder.minimalEncode(component, 
"&");
                                sb.append(component);
-                               if(!first) sb.append('&');
-                               first = false;
                        }
                }
                return sb.toString();

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to