commit 89057119d7b854776ed04baed9de73d093fb4f97
author David Turner <digit@google.com> Fri Jul 17 17:16:17 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 17 17:16:17 2015 +0000
tree 90e5b2864adcdade4c2dfe4ae2f7d26d02254685
parent 0e01999b0bced7d784b4d617a1ca55c9451333e3
parent 599aa6763471e2816d49b115ad7d60f918e2c5a2

Merge "Copy windows 32-bit e2fsprogs executables into /bin64" into studio-1.4-dev automerge: ccc67f3
automerge: 599aa67

* commit '599aa6763471e2816d49b115ad7d60f918e2c5a2':
  Copy windows 32-bit e2fsprogs executables into $OUT_DIR/bin64

proxy/proxy_http_connector.c

diff --git a/proxy/proxy_http_connector.c b/proxy/proxy_http_connector.c
index 143ffae..5073648 100644
--- a/proxy/proxy_http_connector.c
+++ b/proxy/proxy_http_connector.c
@@ -160,6 +160,7 @@
                         proxy_connection_free( root, 1, PROXY_EVENT_CONNECTED );
                     } else {
                         /* just skip headers */
+                        proxy_connection_rewind(root);
                     }
                 }
             }