[freenet-cvs] r8656 - in trunk/freenet/src/freenet: clients/http node

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-05-11 14:36:36 +0000 (Thu, 11 May 2006)
New Revision: 8656

Modified:
   trunk/freenet/src/freenet/clients/http/FproxyToadlet.java
   trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
   trunk/freenet/src/freenet/node/Version.java
Log:
689:

Hopefully working NIMs : we keep the same url as on .5 for backward 
compatibility

Modified: trunk/freenet/src/freenet/clients/http/FproxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FproxyToadlet.java   2006-05-11 
14:26:29 UTC (rev 8655)
+++ trunk/freenet/src/freenet/clients/http/FproxyToadlet.java   2006-05-11 
14:36:36 UTC (rev 8656)
@@ -56,7 +56,7 @@
        public void handlePost(URI uri, Bucket data, ToadletContext ctx) throws 
ToadletContextClosedException, IOException, RedirectException {
                String ks = uri.getPath();

-               if (ks.equals("/")) {
+               if (ks.equals("/")||ks.startsWith("/servlet/")) {
                        RedirectException re = new RedirectException();
                        try {
                                re.newuri = new URI("/welcome/");

Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2006-05-11 
14:26:29 UTC (rev 8655)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2006-05-11 
14:36:36 UTC (rev 8656)
@@ -165,13 +165,11 @@
                                        writeReply(ctx, 200, "text/html", "OK", 
buf.toString());
                                }
                        }
-               }else if(request.isParameterSet("insert")){
+               }else if(request.isParameterSet("key")){
                        FreenetURI key = new 
FreenetURI(request.getParam("key"));
                        ClientMetadata contentType = new 
ClientMetadata(request.getParam("content-type"));
-                       String value = request.getParam("data");
+                       String value = request.getParam("filename");

-                       
-                       
                        if(key.toString().length()>0 && value.length()>0){
                                InsertBlock block = new InsertBlock(new 
ArrayBucket(value), contentType, key);
                    try {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-11 14:26:29 UTC (rev 
8655)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-11 14:36:36 UTC (rev 
8656)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 688;
+       private static final int buildNumber = 689;

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