echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-12-29 zzz

Browse Source 
* Allow commas in router.trustedUpdateKeys and router.updateURL again
This commit is contained in:
zzz
2007-12-29 23:59:24 +00:00
committed by zzz
parent d6fb979616
commit 7c8f519b35
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java
View File

@ -184,7 +184,7 @@ public class UpdateHandler {
private String selectUpdateURL() { private String selectUpdateURL() {
String URLs = _context.getProperty(ConfigUpdateHandler.PROP_UPDATE_URL, ConfigUpdateHandler.DEFAULT_UPDATE_URL); String URLs = _context.getProperty(ConfigUpdateHandler.PROP_UPDATE_URL, ConfigUpdateHandler.DEFAULT_UPDATE_URL);
StringTokenizer tok = new StringTokenizer(URLs, "\r\n"); StringTokenizer tok = new StringTokenizer(URLs, " ,\r\n");
List URLList = new ArrayList(); List URLList = new ArrayList();
while (tok.hasMoreTokens()) while (tok.hasMoreTokens())
URLList.add(tok.nextToken().trim()); URLList.add(tok.nextToken().trim());

2
core/java/src/net/i2p/crypto/TrustedUpdate.java
View File

@ -98,7 +98,7 @@ jP69nPbh4KLGhF+SD0+0bW4=
String propertyTrustedKeys = context.getProperty(PROP_TRUSTED_KEYS); String propertyTrustedKeys = context.getProperty(PROP_TRUSTED_KEYS);
if ( (propertyTrustedKeys != null) && (propertyTrustedKeys.length() > 0) ) { if ( (propertyTrustedKeys != null) && (propertyTrustedKeys.length() > 0) ) {
StringTokenizer propertyTrustedKeysTokens = new StringTokenizer(propertyTrustedKeys, "\r\n"); StringTokenizer propertyTrustedKeysTokens = new StringTokenizer(propertyTrustedKeys, " ,\r\n");
while (propertyTrustedKeysTokens.hasMoreTokens()) while (propertyTrustedKeysTokens.hasMoreTokens())
_trustedKeys.add(propertyTrustedKeysTokens.nextToken().trim()); _trustedKeys.add(propertyTrustedKeysTokens.nextToken().trim());

3
history.txt
View File

@ -1,6 +1,7 @@
$Id: history.txt,v 1.606 2007-12-29 16:08:31 zzz Exp $ $Id: history.txt,v 1.607 2007-12-29 17:15:14 zzz Exp $
2007-12-29 zzz 2007-12-29 zzz
* Allow commas in router.trustedUpdateKeys and router.updateURL again
* Change default news host from dev.i2p.net to dev.i2p * Change default news host from dev.i2p.net to dev.i2p
* Change jetty timeout from 30 to 60 sec (thanks sponge!) * Change jetty timeout from 30 to 60 sec (thanks sponge!)

4
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
* *
*/ */
public class RouterVersion { public class RouterVersion {
public final static String ID = "$Revision: 1.541 $ $Date: 2007-12-29 16:08:29 $"; public final static String ID = "$Revision: 1.542 $ $Date: 2007-12-29 17:15:11 $";
public final static String VERSION = "0.6.1.30"; public final static String VERSION = "0.6.1.30";
public final static long BUILD = 13; public final static long BUILD = 14;
public static void main(String args[]) { public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID); System.out.println("Router ID: " + RouterVersion.ID);