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

[d...@freenetproject.org]

Author: dbkr
Date: 2006-05-14 11:54:07 +0000 (Sun, 14 May 2006)
New Revision: 8699

Modified:
   trunk/freenet/src/freenet/clients/http/HTTPRequest.java
   trunk/freenet/src/freenet/node/Version.java
Log:
707: Revert changes that break multipart/form-data uploads, including the 
ability to add and remove peers.


Modified: trunk/freenet/src/freenet/clients/http/HTTPRequest.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/HTTPRequest.java     2006-05-14 
11:28:21 UTC (rev 8698)
+++ trunk/freenet/src/freenet/clients/http/HTTPRequest.java     2006-05-14 
11:54:07 UTC (rev 8699)
@@ -453,11 +453,11 @@

                                for (int i = 0; i < valueparts.length; i++) {
                                        String[] subparts = 
valueparts[i].split("=");
-                                       if (valueparts.length <= 2) {
+                                       if (subparts.length != 2) {
                                                continue;
                                        }
                                        if 
(hdrname.equalsIgnoreCase("Content-Disposition")) {
-                                               if 
(subparts[0].trim().equalsIgnoreCase("filename")) {
+                                               if 
(subparts[0].trim().equalsIgnoreCase("name")) {
                                                        name = 
subparts[1].trim();
                                                        if (name.charAt(0) == 
'"') name = name.substring(1);
                                                        if 
(name.charAt(name.length() - 1) == '"')
@@ -505,7 +505,6 @@
                return (Bucket)this.parts.get(name);
        }

-       
        public boolean isPartSet(String name) {
                return this.parts.containsKey(name);
        }

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-14 11:28:21 UTC (rev 
8698)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-14 11:54:07 UTC (rev 
8699)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

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

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