I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixup after prop

Browse Source
This commit is contained in:
zzz
2010-12-15 15:19:09 +00:00
parent c7c7731f91
commit 8e709eec2e
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,7 +139,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
if (allowGZIP && useGZIP) { if (allowGZIP && useGZIP) {
I2PAppThread req = new I2PAppThread( I2PAppThread req = new I2PAppThread(
new CompressedRequestor(s, socket, modifiedHeader, getTunnel().getContext()), new CompressedRequestor(s, socket, modifiedHeader, getTunnel().getContext(), _log),
Thread.currentThread().getName()+".hc"); Thread.currentThread().getName()+".hc");
req.start(); req.start();
} else { } else {
@ -179,15 +179,19 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
} }
private static class CompressedRequestor implements Runnable { private static class CompressedRequestor implements Runnable {
private Socket _webserver; private final Socket _webserver;
private I2PSocket _browser; private final I2PSocket _browser;
private String _headers; private final String _headers;
private I2PAppContext _ctx; private final I2PAppContext _ctx;
public CompressedRequestor(Socket webserver, I2PSocket browser, String headers, I2PAppContext ctx) { // shadows _log in super()
private final Log _log;
public CompressedRequestor(Socket webserver, I2PSocket browser, String headers, I2PAppContext ctx, Log log) {
_webserver = webserver; _webserver = webserver;
_browser = browser; _browser = browser;
_headers = headers; _headers = headers;
_ctx = ctx; _ctx = ctx;
_log = log;
} }
public void run() { public void run() {
@ -235,7 +239,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
String modifiedHeaders = formatHeaders(headers, command); String modifiedHeaders = formatHeaders(headers, command);
compressedOut.write(modifiedHeaders.getBytes()); compressedOut.write(modifiedHeaders.getBytes());
Sender s = new Sender(compressedOut, serverin, "server: server to browser"); Sender s = new Sender(compressedOut, serverin, "server: server to browser", _log);
if (_log.shouldLog(Log.INFO)) if (_log.shouldLog(Log.INFO))
_log.info("Before pumping the compressed response"); _log.info("Before pumping the compressed response");
s.run(); // same thread s.run(); // same thread
@ -378,8 +382,8 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
boolean ok = DataHelper.readLine(in, command); boolean ok = DataHelper.readLine(in, command);
if (!ok) throw new IOException("EOF reached while reading the HTTP command [" + command.toString() + "]"); if (!ok) throw new IOException("EOF reached while reading the HTTP command [" + command.toString() + "]");
if (_log.shouldLog(Log.DEBUG)) //if (_log.shouldLog(Log.DEBUG))
_log.debug("Read the http command [" + command.toString() + "]"); // _log.debug("Read the http command [" + command.toString() + "]");
int trimmed = 0; int trimmed = 0;
if (command.length() > 0) { if (command.length() > 0) {
@ -433,8 +437,8 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
} }
headers.setProperty(name, value); headers.setProperty(name, value);
if (_log.shouldLog(Log.DEBUG)) //if (_log.shouldLog(Log.DEBUG))
_log.debug("Read the header [" + name + "] = [" + value + "]"); // _log.debug("Read the header [" + name + "] = [" + value + "]");
} }
} }
} }