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

propagate from branch 'i2p.i2p' (head cbfe85d22c4d0b05c901db3fa751b57889d9b2d6)

Browse Source 
to branch 'i2p.i2p.str4d.cleanup' (head 94fe1764f50b459da18222434034ad46d604c7a1)
This commit is contained in:
str4d
2013-11-28 11:12:41 +00:00
parent ed2feb3ff7 707f616498
commit f112baac48
22 changed files with 35 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
View File

@@ -204,7 +204,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
if (_log.shouldLog(Log.WARN))
_log.warn("Refusing POST since peer is throttled: " + peerHash.toBase64());
try {
// Send a 503, so the user doesn't get an HTTP Proxy error message
// Send a 403, so the user doesn't get an HTTP Proxy error message
// and blame his router or the network.
socket.getOutputStream().write(ERR_DENIED);
} catch (IOException ioe) {}

5
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java
View File

@@ -7,7 +7,6 @@ import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import net.i2p.I2PAppContext;
@@ -137,10 +136,8 @@ public class I2Ping extends I2PTunnelTask implements Runnable {
reportTimes = false;
}
br.close();
for (Iterator<PingHandler> it = pingHandlers.iterator(); it.hasNext();) {
Thread t = (Thread) it.next();
for (Thread t : pingHandlers)
t.join();
}
return;
} else {
Thread t = new PingHandler(cmd);