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

propagate from branch 'i2p.i2p.zzz.test' (head 1959049922a17635226170bf3309e281d8e02e43)

Browse Source 
to branch 'i2p.i2p' (head a06bf8c92a0e1195b6f98dbad3e8898339bc6053)
This commit is contained in:
zzz
2012-01-08 13:16:07 +00:00
parent 88cf742895 f6ca6a5e0d
commit 5a4f2069f0
54 changed files with 6932 additions and 3841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/src/net/i2p/CoreVersion.java
View File

@ -16,7 +16,7 @@ package net.i2p;
public class CoreVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = "0.8.11";
public final static String VERSION = "0.8.12";
public static void main(String args[]) {
System.out.println("I2P Core version: " + VERSION);

3
core/java/src/net/i2p/util/EepGet.java
View File

@ -220,7 +220,8 @@ public class EepGet {
if (username != null && password != null)
get.addAuthorization(username, password);
get.addStatusListener(get.new CLIStatusListener(markSize, lineLen));
get.fetch(CONNECT_TIMEOUT, -1, inactivityTimeout);
if (!get.fetch(CONNECT_TIMEOUT, -1, inactivityTimeout))
System.exit(1);
}
public static String suggestName(String url) {

1
core/java/src/net/i2p/util/EepHead.java
View File

@ -92,6 +92,7 @@ public class EepHead extends EepGet {
System.err.println("Etag: " + get.getETag());
} else {
System.err.println("Failed " + url);
System.exit(1);
}
}

1
core/java/src/net/i2p/util/PartialEepGet.java
View File

@ -83,6 +83,7 @@ public class PartialEepGet extends EepGet {
System.err.println("Etag: " + get.getETag());
} else {
System.err.println("Failed " + url);
System.exit(1);
}
}

2
core/java/src/net/i2p/util/ResettableGZIPInputStream.java
View File

@ -26,7 +26,6 @@ public class ResettableGZIPInputStream extends InflaterInputStream {
private final ExtraByteInputStream _extraByteInputStream;
/** keep a typesafe copy of this */
private final LookaheadInputStream _lookaheadStream;
private static final byte[] _oneDummyByte = new byte[1];
private final InputStream _sequenceStream = null;
private final CRC32 _crc32;
private final byte _buf1[] = new byte[1];
@ -312,6 +311,7 @@ public class ResettableGZIPInputStream extends InflaterInputStream {
*
* http://code.google.com/p/google-apps-sso-sample/issues/detail?id=8
*
* @since 0.8.12
*/
private static class ExtraByteInputStream extends FilterInputStream {
private static final byte DUMMY = 0;

3
core/java/src/net/i2p/util/SSLEepGet.java
View File

@ -161,7 +161,8 @@ public class SSLEepGet extends EepGet {
get._saveCerts = true;
get._commandLine = true;
get.addStatusListener(get.new CLIStatusListener(1024, 40));
get.fetch(45*1000, -1, 60*1000);
if(!get.fetch(45*1000, -1, 60*1000))
System.exit(1);
}
private static void usage() {