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

[d...@freenetproject.org]

Author: dbkr
Date: 2006-03-30 12:13:40 +0000 (Thu, 30 Mar 2006)
New Revision: 8364

Modified:
   trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
   trunk/freenet/src/freenet/node/Version.java
Log:
593: Fix the Darknet Toadlet regexp, hopefully once and for all.


Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2006-03-30 09:32:32 UTC (rev 8363)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2006-03-30 12:13:40 UTC (rev 8364)
@@ -206,7 +206,7 @@
                        } else if (reftext.length() > 0) {
                                // read directly from post data
                                // this slightly scary looking regexp chops any 
extra characters off the beginning or ends of lines and removes extra line 
breaks
-                               ref = 
reftext.replaceAll(".*?((?:[\\w,\\.]+\\=[\\w,\\.:\\-_\\ 
]+)|(?:End)).*(?:\\r?\\n)*", "$1\n");
+                               ref = 
reftext.replaceAll(".*?((?:[\\w,\\.]+\\=[^\r\n]+)|(?:End)).*(?:\\r?\\n)*", 
"$1\n");
                                if (ref.endsWith("\n")) {
                                        ref = ref.substring(0, ref.length() - 
1);
                                }

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-30 09:32:32 UTC (rev 
8363)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-30 12:13:40 UTC (rev 
8364)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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