Author: dbkr
Date: 2006-03-20 13:22:33 +0000 (Mon, 20 Mar 2006)
New Revision: 8281
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/node/Version.java
Log:
550: Fix an omission in the reference-parsing regexp that caused hypens in
domain names not to be recongnised.
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-03-18 22:44:09 UTC (rev 8280)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-03-20 13:22:33 UTC (rev 8281)
@@ -208,7 +208,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,\\.]+\\=[\\w,\\.:\\-_]+)|(?:End)).*(?:\\r?\\n)*",
"$1\n");
} else {
this.sendErrorPage(ctx, 200, "Failed to add
node", "Could not detect either a node reference or a URL. Please <a
href=\".\">Try again</a>.");
return;
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-18 22:44:09 UTC (rev
8280)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-20 13:22:33 UTC (rev
8281)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 549;
+ private static final int buildNumber = 550;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 507;
