Author: nextgens
Date: 2005-10-12 11:40:41 +0000 (Wed, 12 Oct 2005)
New Revision: 7419
Modified:
branches/legacy/unstable/README
branches/legacy/unstable/src/freenet/Version.java
Log:
Reaplying Toad's patch :
Maintenance mode.
Turn compatibility with 5099+ on.
Modified: branches/legacy/unstable/README
===================================================================
--- branches/legacy/unstable/README 2005-10-06 10:46:29 UTC (rev 7418)
+++ branches/legacy/unstable/README 2005-10-12 11:40:41 UTC (rev 7419)
@@ -1,3 +1,7 @@
+Freenet 0.5 is now in maintenance mode. All major development is
+occurring on 0.7. As a result, the previously incompatible 0.5
+and 0.6 branches have been merged.
+
Fred 0.5
========
"It's kind of a mix of Usenet, the Web, and a RAID disk system, all fudged
Modified: branches/legacy/unstable/src/freenet/Version.java
===================================================================
--- branches/legacy/unstable/src/freenet/Version.java 2005-10-06 10:46:29 UTC
(rev 7418)
+++ branches/legacy/unstable/src/freenet/Version.java 2005-10-12 11:40:41 UTC
(rev 7419)
@@ -21,7 +21,7 @@
public static String altProtocolVersion = "1.52";
/** The build number of the current revision */
- public static final int buildNumber = 60273;
+ public static final int buildNumber = 60274;
/** Oldest build of Fred we will talk to */
public static final int lastGoodBuild = 60235;
@@ -74,8 +74,7 @@
*/
private static boolean goodProtocol(String prot) {
if (prot.equals(protocolVersion) ||
prot.equals(altProtocolVersion)
-// uncomment next line to accept stable, see also explainBadVersion() below
-// || prot.equals(stableProtocolVersion)
+ || prot.equals(stableProtocolVersion)
)
return true;
return false;
@@ -155,8 +154,7 @@
if (v.length < 3 || !goodProtocol(v[2])) {
return "Required protocol version is "
+ protocolVersion
-// uncomment next line if accepting stable, see also goodProtocol() above
-// + " or " + stableProtocolVersion
+ + " or " + stableProtocolVersion
;
}
if (sameVersion(v)) {
