Author: dbkr
Date: 2006-05-07 14:56:45 +0000 (Sun, 07 May 2006)
New Revision: 8643
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/node/Version.java
Log:
687: Tweak the peer parsing regexp to remove whitespace at the end which was
causing references to be rejected because of whitespace on the end of the port
number.
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-05-07 14:56:25 UTC (rev 8642)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-05-07 14:56:45 UTC (rev 8643)
@@ -260,7 +260,7 @@
} else if (reftext.length() > 0) {
// read from post data or file upload
// 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,\\.]+\\=[^\r\n]+)|(?:End)).*(?:\\r?\\n)*",
"$1\n");
+ ref =
reftext.replaceAll(".*?((?:[\\w,\\.]+\\=[^\r\n]+?)|(?:End))[
\\t]*(?:\\r?\\n)+", "$1\n");
} else {
this.sendErrorPage(ctx, 200, "OK", "Failed to
add node: Could not detect either a node reference or a URL. Please <a
href=\".\">Try again</a>.");
request.freeParts();
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-07 14:56:25 UTC (rev
8642)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-07 14:56:45 UTC (rev
8643)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 686;
+ private static final int buildNumber = 687;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 591;
