From 3602f734973b2133e500bd1fe4729e52e223553c Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 29 May 2015 17:37:58 +0000
Subject: [PATCH] HTTP client: Fix occasional truncation of compressed
 responses log tweaks

---
 .../i2ptunnel/HTTPResponseOutputStream.java   | 46 ++++++++++++++++---
 history.txt                                   |  3 ++
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 3 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java
index c41c41a4e3..ede7c61c1b 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java
@@ -46,6 +46,7 @@ class HTTPResponseOutputStream extends FilterOutputStream {
     protected boolean _gzip;
     protected long _dataExpected;
     protected String _contentType;
+    private PipedInputStream _pipedInputStream;
 
     private static final int CACHE_SIZE = 8*1024;
     private static final ByteCache _cache = ByteCache.getInstance(8, CACHE_SIZE);
@@ -155,6 +156,8 @@ class HTTPResponseOutputStream extends FilterOutputStream {
                     responseLine = new String(_headerBuffer.getData(), 0, i+1); // includes NL
                     responseLine = filterResponseLine(responseLine);
                     responseLine = (responseLine.trim() + "\r\n");
+                    if (_log.shouldLog(Log.INFO))
+                        _log.info("Response: " + responseLine.trim());
                     out.write(responseLine.getBytes());
                 } else {
                     for (int j = lastEnd+1; j < i; j++) {
@@ -245,7 +248,30 @@ class HTTPResponseOutputStream extends FilterOutputStream {
     
     @Override
     public void close() throws IOException {
-        out.close();
+        if (_log.shouldLog(Log.INFO))
+            _log.info("Closing " + out + " threaded?? " + shouldCompress(), new Exception("I did it"));
+        PipedInputStream pi;
+        synchronized(this) {
+            // synch with changing out field below
+            super.close();
+            pi = _pipedInputStream;
+        }
+        // Prevent truncation of gunzipped data as
+        // I2PTunnelHTTPClientRunner.close() closes the Socket after this.
+        // Closing pipe only notifies read end, doesn't wait.
+        // TODO switch to Java 6 InflaterOutputStream and get rid of Pusher thread
+        if (pi != null) {
+            for (int i = 0; i < 50; i++) {
+                if (pi.available() <= 0) {
+                    if (i > 0 && _log.shouldWarn())
+                        _log.warn("Waited " + (i*20) + " for read side to close");
+                    break;
+                }
+                try {
+                    Thread.sleep(20);
+                } catch (InterruptedException ie) {}
+            }
+        }
     }
     
     protected void beginProcessing() throws IOException {
@@ -253,7 +279,12 @@ class HTTPResponseOutputStream extends FilterOutputStream {
         PipedInputStream pi = BigPipedInputStream.getInstance();
         PipedOutputStream po = new PipedOutputStream(pi);
         Runnable r = new Pusher(pi, out);
-        out = po;
+        if (_log.shouldLog(Log.INFO))
+            _log.info("Starting threaded decompressing pusher to " + out);
+        synchronized(this) {
+            out = po;
+            _pipedInputStream = pi;
+        }
         // TODO we should be able to do this inline somehow
         TunnelControllerGroup tcg = TunnelControllerGroup.getInstance();
         if (tcg != null) {
@@ -285,6 +316,8 @@ class HTTPResponseOutputStream extends FilterOutputStream {
         }
 
         public void run() {
+            if (_log.shouldLog(Log.INFO))
+                _log.info("Starting pusher from " + _inRaw + " to: " + _out);
             ReusableGZIPInputStream _in = ReusableGZIPInputStream.acquire();
             long written = 0;
             ByteArray ba = null;
@@ -301,11 +334,11 @@ class HTTPResponseOutputStream extends FilterOutputStream {
                     _out.flush();
                     written += read;
                 }
-                if (_log.shouldLog(Log.INFO))
-                    _log.info("Decompressed: " + written + ", " + _in.getTotalRead() + "/" + _in.getTotalExpanded());
             } catch (IOException ioe) {
                 if (_log.shouldLog(Log.WARN))
-                    _log.warn("Error decompressing: " + written + ", " + _in.getTotalRead() + "/" + _in.getTotalExpanded(), ioe);
+                    _log.warn("Error decompressing: " + written + ", " + _in.getTotalRead() +
+                              "/" + _in.getTotalExpanded() +
+                              " from " + _inRaw + " to: " + _out, ioe);
             } catch (OutOfMemoryError oom) {
                 _log.error("OOM in HTTP Decompressor", oom);
             } finally {
@@ -313,7 +346,8 @@ class HTTPResponseOutputStream extends FilterOutputStream {
                     _log.info("After decompression, written=" + written + 
                                 " read=" + _in.getTotalRead() 
                                 + ", expanded=" + _in.getTotalExpanded() + ", remaining=" + _in.getRemaining() 
-                                + ", finished=" + _in.getFinished());
+                                + ", finished=" + _in.getFinished() +
+                                " from " + _inRaw + " to: " + _out);
                 if (ba != null)
                     _cache.release(ba);
                 if (_out != null) try { 
diff --git a/history.txt b/history.txt
index f538cacb35..a8f316f19a 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2015-05-29 zzz
+ * HTTP client: Fix occasional truncation of compressed responses
+
 2015-05-27 zzz
  * Banlist: Ban all-zero hash
  * DataHelper: Add year output to formatDuration()
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a06babd519..98bd96d4ed 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 31;
+    public final static long BUILD = 32;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";