propagate from branch 'i2p.i2p.zzz.sam' (head 68de14d0053dea374413f9e0419b1c0f7e9ec3af)

to branch 'i2p.i2p' (head 54f5dd288f7c0c5a50f7f63f911aec4008be27e2)
2015-06-03 11:42:54 +00:00
parent 7b711ebba0 b5455cee6e
commit d96ddd1a0e
13 changed files with 349 additions and 162 deletions
--- a/router/java/src/net/i2p/router/client/ClientListenerRunner.java
+++ b/router/java/src/net/i2p/router/client/ClientListenerRunner.java
@@ -93,6 +93,7 @@ class ClientListenerRunner implements Runnable {
                        if (validate(socket)) {
                            if (_log.shouldLog(Log.DEBUG))
                                _log.debug("Connection received");
+                            socket.setKeepAlive(true);
                            runConnection(socket);
                        } else {
                            if (_log.shouldLog(Log.WARN))