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

* I2PTunnelHTTPServer: Don't thread a receiver for GET or HEAD

Browse Source
This commit is contained in:
zzz
2013-09-18 15:39:12 +00:00
parent ce2d0b0e12
commit ab8900f910
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -247,12 +247,16 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
_log.info("request headers: " + _headers); _log.info("request headers: " + _headers);
serverout.write(_headers.getBytes()); serverout.write(_headers.getBytes());
browserin = _browser.getInputStream(); browserin = _browser.getInputStream();
// TODO don't spin off a thread for this except for POSTs // Don't spin off a thread for this except for POSTs
// beware interference with Tahoe-LAFS, Shoutcast, etc.? // beware interference with Shoutcast, etc.?
// if (browserin.available() == 0) ? if ((!(_headers.startsWith("GET ") || _headers.startsWith("HEAD "))) ||
I2PAppThread sender = new I2PAppThread(new Sender(serverout, browserin, "server: browser to server", _log), Thread.currentThread().getName() + "hcs"); browserin.available() > 0) { // just in case
I2PAppThread sender = new I2PAppThread(new Sender(serverout, browserin, "server: browser to server", _log),
Thread.currentThread().getName() + "hcs");
sender.start(); sender.start();
} else {
// todo - half close? reduce MessageInputStream buffer size?
}
browserout = _browser.getOutputStream(); browserout = _browser.getOutputStream();
// NPE seen here in 0.7-7, caused by addition of socket.close() in the // NPE seen here in 0.7-7, caused by addition of socket.close() in the
// catch (IOException ioe) block above in blockingHandle() ??? // catch (IOException ioe) block above in blockingHandle() ???