From e62122dcb222999de344517a3be9f4c03016f9c9 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 28 Jun 2014 12:34:39 -0700
Subject: [PATCH 001/399] Add new growing smart allocator to consolidate code.
 Refactor 304 responses and cached responses in http response cache.

---
 AndroidAsync/AndroidAsync.iml                 |   3 +
 .../async/AsyncNetworkSocket.java             |  12 +-
 .../async/http/ResponseCacheMiddleware.java   | 133 +++++-------------
 .../koushikdutta/async/util/Allocator.java    |  38 +++++
 AndroidAsyncTest/AndroidAsyncTest.iml         |   3 +
 5 files changed, 88 insertions(+), 101 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/util/Allocator.java

diff --git a/AndroidAsync/AndroidAsync.iml b/AndroidAsync/AndroidAsync.iml
index 8c69f527d..edb7738b9 100644
--- a/AndroidAsync/AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync.iml
@@ -4,6 +4,9 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="LIBRARY_PROJECT" value="true" />
+        <proGuardCfgFiles>
+          <file>file://$APPLICATION_HOME_DIR$/sdk/tools/proguard/proguard-android.txt</file>
+        </proGuardCfgFiles>
         <option name="UPDATE_PROPERTY_FILES" value="true" />
         <notImportedProperties>
           <property>MANIFEST_FILE_PATH</property>
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
index 267796021..06aefdf32 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
@@ -5,6 +5,7 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
+import com.koushikdutta.async.util.Allocator;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -29,7 +30,7 @@ public boolean isChunked() {
     InetSocketAddress socketAddress;
     void attach(SocketChannel channel, InetSocketAddress socketAddress) throws IOException {
         this.socketAddress = socketAddress;
-        maxAlloc = 256 * 1024; // 256K
+        allocator = new Allocator();
         mChannel = new SocketChannelWrapper(channel);
     }
     
@@ -37,7 +38,7 @@ void attach(DatagramChannel channel) throws IOException {
         mChannel = new DatagramChannelWrapper(channel);
         // keep udp at roughly the mtu, which is 1540 or something
         // letting it grow freaks out nio apparently.
-        maxAlloc = 8192;
+        allocator = new Allocator(8192);
     }
     
     ChannelWrapper getChannel() {
@@ -136,8 +137,7 @@ public void run() {
     private ByteBufferList pending = new ByteBufferList();
 //    private ByteBuffer[] buffers = new ByteBuffer[8];
 
-    int maxAlloc;
-    int mToAlloc = 0;
+    Allocator allocator;
     int onReadable() {
         spitPending();
         // even if the socket is paused,
@@ -150,7 +150,7 @@ int onReadable() {
             boolean closed = false;
 
 //            ByteBufferList.obtainArray(buffers, Math.min(Math.max(mToAlloc, 2 << 11), maxAlloc));
-            ByteBuffer b = ByteBufferList.obtain(Math.min(Math.max(mToAlloc, 2 << 11), maxAlloc));
+            ByteBuffer b = allocator.allocate();
             // keep track of the max mount read during this read cycle
             // so we can be quicker about allocations during the next
             // time this socket reads.
@@ -163,7 +163,7 @@ int onReadable() {
                 total += read;
             }
             if (read > 0) {
-                mToAlloc = (int)read * 2;
+                allocator.track(read);
                 b.flip();
 //                for (int i = 0; i < buffers.length; i++) {
 //                    ByteBuffer b = buffers[i];
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
index 4c1d2d000..d89e334cc 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
@@ -20,6 +20,7 @@
 import com.koushikdutta.async.http.libcore.ResponseHeaders;
 import com.koushikdutta.async.http.libcore.ResponseSource;
 import com.koushikdutta.async.http.libcore.StrictLineReader;
+import com.koushikdutta.async.util.Allocator;
 import com.koushikdutta.async.util.FileCache;
 import com.koushikdutta.async.util.StreamUtility;
 
@@ -35,7 +36,6 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.net.CacheResponse;
-import java.net.URI;
 import java.nio.ByteBuffer;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateEncodingException;
@@ -226,8 +226,7 @@ public void onBodyDecoder(OnBodyData data) {
                 data.headers.getHeaders().set(SERVED_FROM, CONDITIONAL_CACHE);
                 conditionalCacheHitCount++;
 
-                BodySpewer bodySpewer = new BodySpewer(cacheData.contentLength);
-                bodySpewer.cacheResponse = cacheData.candidate;
+                CachedBodyEmitter bodySpewer = new CachedBodyEmitter(cacheData.candidate, cacheData.contentLength);
                 bodySpewer.setDataEmitter(data.bodyEmitter);
                 data.bodyEmitter = bodySpewer;
                 bodySpewer.spew();
@@ -385,54 +384,60 @@ public void commit() {
         }
     }
 
-    private static class BodySpewer extends FilteredDataEmitter {
-        long contentLength;
+    private static class CachedBodyEmitter extends FilteredDataEmitter {
         EntryCacheResponse cacheResponse;
-        boolean first = true;
         ByteBufferList pending = new ByteBufferList();
-        boolean paused;
+        private boolean paused;
+        private Allocator allocator = new Allocator();
         boolean allowEnd;
-        public BodySpewer(long contentLength) {
-            this.contentLength = contentLength;
+        public CachedBodyEmitter(EntryCacheResponse cacheResponse, long contentLength) {
+            this.cacheResponse = cacheResponse;
+            allocator.setCurrentAlloc((int)contentLength);
         }
 
+        Runnable spewRunnable = new Runnable() {
+            @Override
+            public void run() {
+                spewInternal();
+            }
+        };
+
         void spewInternal() {
             if (pending.remaining() > 0) {
-                com.koushikdutta.async.Util.emitAllData(BodySpewer.this, pending);
+                com.koushikdutta.async.Util.emitAllData(CachedBodyEmitter.this, pending);
                 if (pending.remaining() > 0)
                     return;
             }
 
             // fill pending
             try {
-                assert first;
-                if (!first)
-                    return;
-                first = false;
-                ByteBuffer buffer = ByteBufferList.obtain((int)contentLength);
+                ByteBuffer buffer = allocator.allocate();
                 assert buffer.position() == 0;
-                DataInputStream din = new DataInputStream(cacheResponse.getBody());
-                din.readFully(buffer.array(), buffer.arrayOffset(), (int)contentLength);
-                buffer.limit((int)contentLength);
+                FileInputStream din = cacheResponse.getBody();
+                int read = din.read(buffer.array(), buffer.arrayOffset(), buffer.capacity());
+                if (read == -1) {
+                    allowEnd = true;
+                    report(null);
+                    return;
+                }
+                buffer.limit(read);
                 pending.add(buffer);
-                com.koushikdutta.async.Util.emitAllData(this, pending);
-                assert din.read() == -1;
-                allowEnd = true;
-                report(null);
             }
             catch (IOException e) {
                 allowEnd = true;
                 report(e);
+                return;
             }
+            com.koushikdutta.async.Util.emitAllData(this, pending);
+            if (pending.remaining() > 0)
+                return;
+            // this limits max throughput to 256k (aka max alloc) * 100 per second...
+            // roughly 25MB/s
+            getServer().postDelayed(spewRunnable, 10);
         }
 
         void spew() {
-            getServer().post(new Runnable() {
-                @Override
-                public void run() {
-                    spewInternal();
-                }
-            });
+            getServer().post(spewRunnable);
         }
 
         @Override
@@ -448,6 +453,8 @@ public boolean isPaused() {
 
         @Override
         protected void report(Exception e) {
+            // a 304 response will immediate call report/end since there is no body.
+            // prevent this from happening by waiting for the actual body to be spit out.
             if (!allowEnd)
                 return;
             StreamUtility.closeQuietly(cacheResponse.getBody());
@@ -677,38 +684,22 @@ public X509Certificate[] getPeerCertificates() {
         }
     }
 
-    private class CachedSocket extends DataEmitterBase implements AsyncSocket {
-        EntryCacheResponse cacheResponse;
-        long contentLength;
-        boolean paused;
+    private class CachedSocket extends CachedBodyEmitter implements AsyncSocket {
         boolean closed;
-        boolean first = true;
-        ByteBufferList pending = new ByteBufferList();
         boolean open;
         CompletedCallback closedCallback;
         public CachedSocket(EntryCacheResponse cacheResponse, long contentLength) {
-            this.cacheResponse = cacheResponse;
-            this.contentLength = contentLength;
+            super(cacheResponse, contentLength);
+            allowEnd = true;
         }
 
         @Override
         public void end() {
         }
 
-        @Override
-        public boolean isChunked() {
-            return false;
-        }
-
-        @Override
-        public void pause() {
-            paused = true;
-        }
-
         @Override
         protected void report(Exception e) {
             super.report(e);
-            StreamUtility.closeQuietly(cacheResponse.getBody());
             if (closed)
                 return;
             closed = true;
@@ -716,54 +707,6 @@ protected void report(Exception e) {
                 closedCallback.onCompleted(e);
         }
 
-        void spewInternal() {
-            if (pending.remaining() > 0) {
-                com.koushikdutta.async.Util.emitAllData(CachedSocket.this, pending);
-                if (pending.remaining() > 0)
-                    return;
-            }
-
-            // fill pending
-            try {
-                assert first;
-                if (!first)
-                    return;
-                first = false;
-                ByteBuffer buffer = ByteBufferList.obtain((int)contentLength);
-                assert buffer.position() == 0;
-                DataInputStream din = new DataInputStream(cacheResponse.getBody());
-                din.readFully(buffer.array(), buffer.arrayOffset(), (int)contentLength);
-                buffer.limit((int)contentLength);
-                pending.add(buffer);
-                com.koushikdutta.async.Util.emitAllData(CachedSocket.this, pending);
-                assert din.read() == -1;
-                report(null);
-            }
-            catch (IOException e) {
-                report(e);
-            }
-        }
-
-        void spew() {
-            getServer().post(new Runnable() {
-                @Override
-                public void run() {
-                    spewInternal();
-                }
-            });
-        }
-
-        @Override
-        public void resume() {
-            paused = false;
-            spew();
-        }
-
-        @Override
-        public boolean isPaused() {
-            return paused;
-        }
-
         @Override
         public void write(ByteBuffer bb) {
             // it's gonna write headers and stuff... whatever
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java b/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java
new file mode 100644
index 000000000..4d56cdae2
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java
@@ -0,0 +1,38 @@
+package com.koushikdutta.async.util;
+
+import com.koushikdutta.async.ByteBufferList;
+
+import java.nio.ByteBuffer;
+
+/**
+ * Created by koush on 6/28/14.
+ */
+public class Allocator {
+    final int maxAlloc;
+    int currentAlloc = 0;
+
+    public Allocator(int maxAlloc) {
+        this.maxAlloc = maxAlloc;
+    }
+
+    public Allocator() {
+        maxAlloc = 256 * 1024;
+    }
+
+    public ByteBuffer allocate() {
+        return ByteBufferList.obtain(Math.min(Math.max(currentAlloc, 2 << 11), maxAlloc));
+    }
+
+    public void track(long read) {
+        currentAlloc = (int)read * 2;
+    }
+
+    public int getMaxAlloc() {
+        return maxAlloc;
+    }
+
+    public void setCurrentAlloc(int currentAlloc) {
+        this.currentAlloc = currentAlloc;
+    }
+}
+
diff --git a/AndroidAsyncTest/AndroidAsyncTest.iml b/AndroidAsyncTest/AndroidAsyncTest.iml
index fb8467faf..15b886e5e 100644
--- a/AndroidAsyncTest/AndroidAsyncTest.iml
+++ b/AndroidAsyncTest/AndroidAsyncTest.iml
@@ -3,6 +3,9 @@
   <component name="FacetManager">
     <facet type="android" name="Android">
       <configuration>
+        <proGuardCfgFiles>
+          <file>file://$APPLICATION_HOME_DIR$/sdk/tools/proguard/proguard-android.txt</file>
+        </proGuardCfgFiles>
         <option name="UPDATE_PROPERTY_FILES" value="true" />
         <notImportedProperties>
           <property>MANIFEST_FILE_PATH</property>

From b7307ff15d18e4023d139fafbaef72e9e05e522c Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 29 Jun 2014 14:10:51 -0700
Subject: [PATCH 002/399] Workarounds the L preview.

---
 AndroidAsync/project.properties               |  2 +
 .../async/AsyncSSLSocketWrapper.java          | 40 ++++++++++++-------
 .../koushikdutta/async/ByteBufferList.java    |  2 +-
 .../koushikdutta/async/util/Allocator.java    | 13 +++++-
 .../async/util/StreamUtility.java             |  5 +++
 .../async/test/HttpClientTests.java           |  1 -
 .../com/koushikdutta/async/test/SSLTests.java |  1 -
 7 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/AndroidAsync/project.properties b/AndroidAsync/project.properties
index 91d2b0246..edc832b2c 100644
--- a/AndroidAsync/project.properties
+++ b/AndroidAsync/project.properties
@@ -13,3 +13,5 @@
 # Project target.
 target=android-19
 android.library=true
+
+
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 40ea67410..410d7743b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -5,6 +5,7 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
+import com.koushikdutta.async.util.Allocator;
 import com.koushikdutta.async.wrapper.AsyncSocketWrapper;
 
 import org.apache.http.conn.ssl.StrictHostnameVerifier;
@@ -32,7 +33,6 @@ public class AsyncSSLSocketWrapper implements AsyncSocketWrapper, AsyncSSLSocket
     AsyncSocket mSocket;
     BufferedDataEmitter mEmitter;
     BufferedDataSink mSink;
-    ByteBuffer mReadTmp = ByteBufferList.obtain(8192);
     boolean mUnwrapping = false;
     HostnameVerifier hostnameVerifier;
 
@@ -230,6 +230,8 @@ public void onWriteable() {
         // aka exhcange.setDatacallback
         mEmitter = new BufferedDataEmitter(socket);
 
+        final Allocator allocator = new Allocator();
+        allocator.setMinAlloc(8192);
         final ByteBufferList transformed = new ByteBufferList();
         mEmitter.setDataCallback(new DataCallback() {
             @Override
@@ -239,8 +241,10 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                 try {
                     mUnwrapping = true;
 
-                    mReadTmp.position(0);
-                    mReadTmp.limit(mReadTmp.capacity());
+                    if (bb.hasRemaining()) {
+                        ByteBuffer all = bb.getAll();
+                        bb.add(all);
+                    }
 
                     ByteBuffer b = ByteBufferList.EMPTY_BYTEBUFFER;
                     while (true) {
@@ -248,11 +252,18 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                             b = bb.remove();
                         }
                         int remaining = b.remaining();
-
-                        SSLEngineResult res = engine.unwrap(b, mReadTmp);
+                        int before = transformed.remaining();
+
+                        SSLEngineResult res;
+                        {
+                            // wrap to prevent access to the readBuf
+                            ByteBuffer readBuf = allocator.allocate();
+                            res = engine.unwrap(b, readBuf);
+                            addToPending(transformed, readBuf);
+                            allocator.track(transformed.remaining() - before);
+                        }
                         if (res.getStatus() == Status.BUFFER_OVERFLOW) {
-                            addToPending(transformed);
-                            mReadTmp = ByteBufferList.obtain(mReadTmp.remaining() * 2);
+                            allocator.setMinAlloc(allocator.getMinAlloc() * 2);
                             remaining = -1;
                         }
                         else if (res.getStatus() == Status.BUFFER_UNDERFLOW) {
@@ -267,13 +278,12 @@ else if (res.getStatus() == Status.BUFFER_UNDERFLOW) {
                             b = ByteBufferList.EMPTY_BYTEBUFFER;
                         }
                         handleResult(res);
-                        if (b.remaining() == remaining) {
+                        if (b.remaining() == remaining && before == transformed.remaining()) {
                             bb.addFirst(b);
                             break;
                         }
                     }
 
-                    addToPending(transformed);
                     Util.emitAllData(AsyncSSLSocketWrapper.this, transformed);
                 }
                 catch (SSLException ex) {
@@ -287,11 +297,13 @@ else if (res.getStatus() == Status.BUFFER_UNDERFLOW) {
         });
     }
 
-    void addToPending(ByteBufferList out) {
-        if (mReadTmp.position() > 0) {
-            mReadTmp.flip();
+    void addToPending(ByteBufferList out, ByteBuffer mReadTmp) {
+        mReadTmp.flip();
+        if (mReadTmp.hasRemaining()) {
             out.add(mReadTmp);
-            mReadTmp = ByteBufferList.obtain(mReadTmp.capacity());
+        }
+        else {
+            ByteBufferList.reclaim(mReadTmp);
         }
     }
 
@@ -477,8 +489,8 @@ public void write(ByteBufferList bb) {
                 }
                 else {
                     mWriteTmp = ByteBufferList.obtain(calculateAlloc(bb.remaining()));
+                    handleResult(res);
                 }
-                handleResult(res);
             }
             catch (SSLException e) {
                 report(e);
diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index 794b74efe..83a4ef2be 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -387,7 +387,7 @@ private static PriorityQueue<ByteBuffer> getReclaimed() {
     }
 
     private static int MAX_SIZE = 1024 * 1024;
-    private static int MAX_ITEM_SIZE = 1024 * 256;
+    public static int MAX_ITEM_SIZE = 1024 * 256;
     static int currentSize = 0;
     static int maxItem = 0;
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java b/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java
index 4d56cdae2..a7d4f44e7 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java
@@ -10,17 +10,18 @@
 public class Allocator {
     final int maxAlloc;
     int currentAlloc = 0;
+    int minAlloc = 2 << 11;
 
     public Allocator(int maxAlloc) {
         this.maxAlloc = maxAlloc;
     }
 
     public Allocator() {
-        maxAlloc = 256 * 1024;
+        maxAlloc = ByteBufferList.MAX_ITEM_SIZE;
     }
 
     public ByteBuffer allocate() {
-        return ByteBufferList.obtain(Math.min(Math.max(currentAlloc, 2 << 11), maxAlloc));
+        return ByteBufferList.obtain(Math.min(Math.max(currentAlloc, minAlloc), maxAlloc));
     }
 
     public void track(long read) {
@@ -34,5 +35,13 @@ public int getMaxAlloc() {
     public void setCurrentAlloc(int currentAlloc) {
         this.currentAlloc = currentAlloc;
     }
+
+    public int getMinAlloc() {
+        return minAlloc;
+    }
+
+    public void setMinAlloc(int minAlloc ) {
+        this.minAlloc = minAlloc;
+    }
 }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/StreamUtility.java b/AndroidAsync/src/com/koushikdutta/async/util/StreamUtility.java
index 95911dd09..4d55e2f17 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/StreamUtility.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/StreamUtility.java
@@ -102,5 +102,10 @@ public static void closeQuietly(Closeable... closeables) {
             }
         }
     }
+
+    public static void eat(InputStream input) throws IOException {
+        byte[] stuff = new byte[1024];
+        while (input.read(stuff) != -1);
+    }
 }
 
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/HttpClientTests.java b/AndroidAsyncTest/src/com/koushikdutta/async/test/HttpClientTests.java
index e238f662e..ef8068334 100644
--- a/AndroidAsyncTest/src/com/koushikdutta/async/test/HttpClientTests.java
+++ b/AndroidAsyncTest/src/com/koushikdutta/async/test/HttpClientTests.java
@@ -30,7 +30,6 @@
 import junit.framework.TestCase;
 
 import java.io.File;
-import java.net.URI;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Semaphore;
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/SSLTests.java b/AndroidAsyncTest/src/com/koushikdutta/async/test/SSLTests.java
index 4e89b376e..fbdc6cf90 100644
--- a/AndroidAsyncTest/src/com/koushikdutta/async/test/SSLTests.java
+++ b/AndroidAsyncTest/src/com/koushikdutta/async/test/SSLTests.java
@@ -3,7 +3,6 @@
 import android.test.AndroidTestCase;
 
 import com.koushikdutta.async.AsyncServer;
-import com.koushikdutta.async.future.FutureCallback;
 import com.koushikdutta.async.http.AsyncHttpClient;
 import com.koushikdutta.async.http.AsyncHttpGet;
 import com.koushikdutta.async.http.server.AsyncHttpServer;

From 96797458883a8596d38bf536f1d32305e6d03f26 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 1 Jul 2014 09:49:08 -0700
Subject: [PATCH 003/399] test issue 189, shuffle UntypedHashTable around.

---
 AndroidAsync/project.properties               |  2 +-
 .../async/http/AsyncHttpClientMiddleware.java | 28 ++-----------------
 .../async/util/UntypedHashtable.java          | 26 +++++++++++++++++
 AndroidAsyncTest/project.properties           |  2 +-
 .../async/test/HttpClientTests.java           | 13 +++++++++
 5 files changed, 44 insertions(+), 27 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/util/UntypedHashtable.java

diff --git a/AndroidAsync/project.properties b/AndroidAsync/project.properties
index edc832b2c..fe357b1dd 100644
--- a/AndroidAsync/project.properties
+++ b/AndroidAsync/project.properties
@@ -11,7 +11,7 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-L
 android.library=true
 
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
index 2f2e4a816..135ec6947 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
@@ -5,33 +5,11 @@
 import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.future.Cancellable;
 import com.koushikdutta.async.http.libcore.ResponseHeaders;
+import com.koushikdutta.async.util.UntypedHashtable;
 
 import java.util.Hashtable;
 
 public interface AsyncHttpClientMiddleware {
-    public static class UntypedHashtable {
-        private Hashtable<String, Object> hash = new Hashtable<String, Object>();
-
-        public void put(String key, Object value) {
-            hash.put(key, value);
-        }
-
-        public void remove(String key) {
-            hash.remove(key);
-        }
-
-        public <T> T get(String key, T defaultValue) {
-            T ret = get(key);
-            if (ret == null)
-                return defaultValue;
-            return ret;
-        }
-
-        public <T> T get(String key) {
-            return (T)hash.get(key);
-        }
-    }
-
     public static class GetSocketData {
         public UntypedHashtable state = new UntypedHashtable();
         public AsyncHttpRequest request;
@@ -50,11 +28,11 @@ public static class OnHeadersReceivedData extends OnSocketData {
     public static class OnBodyData extends OnHeadersReceivedData {
         public DataEmitter bodyEmitter;
     }
-    
+
     public static class OnRequestCompleteData extends OnBodyData {
         public Exception exception;
     }
-    
+
     public Cancellable getSocket(GetSocketData data);
     public void onSocket(OnSocketData data);
     public void onHeadersReceived(OnHeadersReceivedData data);
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/UntypedHashtable.java b/AndroidAsync/src/com/koushikdutta/async/util/UntypedHashtable.java
new file mode 100644
index 000000000..a159d97a9
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/util/UntypedHashtable.java
@@ -0,0 +1,26 @@
+package com.koushikdutta.async.util;
+
+import java.util.Hashtable;
+
+public class UntypedHashtable {
+    private Hashtable<String, Object> hash = new Hashtable<String, Object>();
+
+    public void put(String key, Object value) {
+        hash.put(key, value);
+    }
+
+    public void remove(String key) {
+        hash.remove(key);
+    }
+
+    public <T> T get(String key, T defaultValue) {
+        T ret = get(key);
+        if (ret == null)
+            return defaultValue;
+        return ret;
+    }
+
+    public <T> T get(String key) {
+        return (T)hash.get(key);
+    }
+}
\ No newline at end of file
diff --git a/AndroidAsyncTest/project.properties b/AndroidAsyncTest/project.properties
index 7e931bfb5..0b8f301dc 100644
--- a/AndroidAsyncTest/project.properties
+++ b/AndroidAsyncTest/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-L
 android.library.reference.1=../AndroidAsync
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/HttpClientTests.java b/AndroidAsyncTest/src/com/koushikdutta/async/test/HttpClientTests.java
index ef8068334..33761bf02 100644
--- a/AndroidAsyncTest/src/com/koushikdutta/async/test/HttpClientTests.java
+++ b/AndroidAsyncTest/src/com/koushikdutta/async/test/HttpClientTests.java
@@ -17,9 +17,11 @@
 import com.koushikdutta.async.http.AsyncHttpClient.StringCallback;
 import com.koushikdutta.async.http.AsyncHttpGet;
 import com.koushikdutta.async.http.AsyncHttpHead;
+import com.koushikdutta.async.http.AsyncHttpPost;
 import com.koushikdutta.async.http.AsyncHttpRequest;
 import com.koushikdutta.async.http.AsyncHttpResponse;
 import com.koushikdutta.async.http.ResponseCacheMiddleware;
+import com.koushikdutta.async.http.body.JSONObjectBody;
 import com.koushikdutta.async.http.callback.HttpConnectCallback;
 import com.koushikdutta.async.http.server.AsyncHttpServer;
 import com.koushikdutta.async.http.server.AsyncHttpServerRequest;
@@ -29,6 +31,8 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.json.JSONObject;
+
 import java.io.File;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
@@ -346,4 +350,13 @@ public void testHEAD() throws Exception {
         Future<String> str = AsyncHttpClient.getDefaultInstance().executeString(req, null);
         assertTrue(TextUtils.isEmpty(str.get(TIMEOUT, TimeUnit.MILLISECONDS)));
     }
+
+    public void testPostJsonObject() throws Exception {
+        JSONObject post = new JSONObject();
+        post.put("ping", "pong");
+        AsyncHttpPost p = new AsyncHttpPost("https://koush.clockworkmod.com/test/echo");
+        p.setBody(new JSONObjectBody(post));
+        JSONObject ret = AsyncHttpClient.getDefaultInstance().executeJSONObject(p, null).get();
+        assertEquals("pong", ret.getString("ping"));
+    }
 }

From e2056eb6fe5aa9aadd0ffa3e0b1e66e074705789 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 3 Jul 2014 00:46:17 -0700
Subject: [PATCH 004/399] gradle

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml | 68 ++++++++++++++++++++++
 AndroidAsync/build.gradle                  | 33 +++++------
 2 files changed, 84 insertions(+), 17 deletions(-)
 create mode 100644 AndroidAsync/AndroidAsync-AndroidAsync.iml

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
new file mode 100644
index 000000000..f42d62ea2
--- /dev/null
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="Gradle.AndroidAsync" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":AndroidAsync:AndroidAsync" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+        <option name="LIBRARY_PROJECT" value="true" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 5444c3122..6f91165b5 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -3,36 +3,35 @@ buildscript {
         maven { url 'http://repo1.maven.org/maven2' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.11.+'
+        classpath 'com.android.tools.build:gradle:0.12.+'
     }
 }
-apply plugin: 'android-library'
+apply plugin: 'com.android.library'
 
 dependencies {
-  compile 'com.android.support:support-v4:13.0.0'
 }
 
 android {
-  sourceSets {
-      main {
-          manifest.srcFile 'AndroidManifest.xml'
-      
-          java {
-              srcDir 'src/'
-          }
-      }
-  }
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+
+            java {
+                srcDir 'src/'
+            }
+        }
+    }
 
     compileSdkVersion 19
-    buildToolsVersion "19.1.0"
+    buildToolsVersion "20.0.0"
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 19
+        targetSdkVersion 21
     }
 }
 
 // upload to maven task
-if (System.getenv().I_AM_KOUSH == 'true') {
-  apply from: 'https://raw.github.com/koush/mvn-repo/master/maven.gradle'
-}
+//if (System.getenv().I_AM_KOUSH == 'true') {
+//  apply from: 'https://raw.github.com/koush/mvn-repo/master/maven.gradle'
+//}

From 4b388a13c9c6b333b1a510a1d79cdea25e26b071 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 3 Jul 2014 01:28:27 -0700
Subject: [PATCH 005/399] restructure tests for gradle

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml    |   7 ++-
 AndroidAsync/build.gradle                     |   9 ++--
 .../koushikdutta/async/BufferedDataSink.java  |   9 +---
 .../com/koushikdutta/async/ZipDataSink.java   |   6 +--
 .../async/http/AsyncHttpResponseImpl.java     |   5 --
 .../server/AsyncHttpServerResponseImpl.java   |   6 +--
 .../async/stream/OutputStreamDataSink.java    |  51 +++++-------------
 .../assets}/6691924d7d24237d3b3679310157d640  | Bin
 .../test/assets}/hello.txt                    |   0
 .../test/assets}/test.json                    |   0
 .../test}/res/drawable-hdpi/ic_launcher.png   | Bin
 .../test}/res/drawable-ldpi/ic_launcher.png   | Bin
 .../test}/res/drawable-mdpi/ic_launcher.png   | Bin
 .../test}/res/drawable-xhdpi/ic_launcher.png  | Bin
 .../test}/res/raw/keystore.bks                | Bin
 .../test}/res/values/strings.xml              |   0
 .../koushikdutta/async/test/BodyTests.java    |   0
 .../async/test/ByteUtilTests.java             |   0
 .../koushikdutta/async/test/CacheTests.java   |   0
 .../com/koushikdutta/async/test/DnsTests.java |   0
 .../async/test/FileCacheTests.java            |   0
 .../koushikdutta/async/test/FileTests.java    |   0
 .../koushikdutta/async/test/FutureTests.java  |   0
 .../async/test/HttpClientTests.java           |   0
 .../async/test/HttpServerTests.java           |   0
 .../com/koushikdutta/async/test/Issue59.java  |   0
 .../src/com/koushikdutta/async/test/Md5.java  |   0
 .../async/test/MultipartTests.java            |   0
 .../koushikdutta/async/test/ProxyTests.java   |   0
 .../async/test/RedirectTests.java             |   0
 .../com/koushikdutta/async/test/SSLTests.java |   0
 .../koushikdutta/async/test/SanityChecks.java |   0
 .../async/test/SocketIOTests.java             |   0
 .../koushikdutta/async/test/TimeoutTests.java |   0
 .../async/test/TriggerFuture.java             |   0
 .../async/test/WebSocketTests.java            |   0
 AndroidAsyncTest/.classpath                   |  10 ----
 AndroidAsyncTest/.project                     |  34 ------------
 AndroidAsyncTest/AndroidAsyncTest.iml         |  30 -----------
 AndroidAsyncTest/AndroidManifest.xml          |  25 ---------
 AndroidAsyncTest/proguard-project.txt         |  20 -------
 AndroidAsyncTest/project.properties           |  15 ------
 42 files changed, 27 insertions(+), 200 deletions(-)
 rename {AndroidAsyncTest/testdata => AndroidAsync/test/assets}/6691924d7d24237d3b3679310157d640 (100%)
 rename {AndroidAsyncTest/testdata => AndroidAsync/test/assets}/hello.txt (100%)
 rename {AndroidAsyncTest/testdata => AndroidAsync/test/assets}/test.json (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/res/drawable-hdpi/ic_launcher.png (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/res/drawable-ldpi/ic_launcher.png (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/res/drawable-mdpi/ic_launcher.png (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/res/drawable-xhdpi/ic_launcher.png (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/res/raw/keystore.bks (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/res/values/strings.xml (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/BodyTests.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/ByteUtilTests.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/CacheTests.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/DnsTests.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/FileCacheTests.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/FileTests.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/FutureTests.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/HttpClientTests.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/HttpServerTests.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/Issue59.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/Md5.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/MultipartTests.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/ProxyTests.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/RedirectTests.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/SSLTests.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/SanityChecks.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/SocketIOTests.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/TimeoutTests.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/TriggerFuture.java (100%)
 rename {AndroidAsyncTest => AndroidAsync/test}/src/com/koushikdutta/async/test/WebSocketTests.java (100%)
 delete mode 100644 AndroidAsyncTest/.classpath
 delete mode 100644 AndroidAsyncTest/.project
 delete mode 100644 AndroidAsyncTest/AndroidAsyncTest.iml
 delete mode 100644 AndroidAsyncTest/AndroidManifest.xml
 delete mode 100644 AndroidAsyncTest/proguard-project.txt
 delete mode 100644 AndroidAsyncTest/project.properties

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index f42d62ea2..1cdbd092c 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -46,15 +46,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/test/assets" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/test/src" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 6f91165b5..0d2eacbeb 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -16,10 +16,11 @@ android {
         main {
             manifest.srcFile 'AndroidManifest.xml'
 
-            java {
-                srcDir 'src/'
-            }
+            java.srcDirs=['src/']
         }
+        androidTest.java.srcDirs=['test/src/']
+        androidTest.res.srcDirs=['test/res/']
+        androidTest.assets.srcDirs=['test/assets/']
     }
 
     compileSdkVersion 19
@@ -28,6 +29,8 @@ android {
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 21
+        testInstrumentationRunner "android.test.InstrumentationTestRunner"
+        testFunctionalTest true
     }
 }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
index 096be5b75..ed4f87f11 100644
--- a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
@@ -36,8 +36,6 @@ private void writePending() {
             if (mPendingWrites.remaining() == 0) {
                 if (endPending)
                     mDataSink.end();
-                if (closePending)
-                    mDataSink.close();
             }
         }
         if (!mPendingWrites.hasRemaining() && mWritable != null)
@@ -113,16 +111,11 @@ public void setMaxBuffer(int maxBuffer) {
 
     @Override
     public boolean isOpen() {
-        return !closePending && mDataSink.isOpen();
+        return mDataSink.isOpen();
     }
 
-    boolean closePending;
     @Override
     public void close() {
-        if (mPendingWrites.hasRemaining()) {
-            closePending = true;
-            return;
-        }
         mDataSink.close();
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/ZipDataSink.java b/AndroidAsync/src/com/koushikdutta/async/ZipDataSink.java
index 42cd71a18..4fb6498fa 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ZipDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ZipDataSink.java
@@ -15,7 +15,6 @@ public ZipDataSink(DataSink sink) {
 
     ByteArrayOutputStream bout = new ByteArrayOutputStream();
     ZipOutputStream zop = new ZipOutputStream(bout);
-    boolean first = true;
 
     public void putNextEntry(ZipEntry ze) throws IOException {
         zop.putNextEntry(ze);
@@ -31,7 +30,8 @@ protected void report(Exception e) {
             closed.onCompleted(e);
     }
 
-    public void close() {
+    @Override
+    public void end() {
         try {
             zop.close();
         }
@@ -41,7 +41,7 @@ public void close() {
         }
         setMaxBuffer(Integer.MAX_VALUE);
         write(new ByteBufferList());
-        super.close();
+        super.end();
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index 407b4999f..ce50532f3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -217,11 +217,6 @@ public boolean isOpen() {
         return mSink.isOpen();
     }
 
-    @Override
-    public void close() {
-        mSink.close();
-    }
-
     @Override
     public void setClosedCallback(CompletedCallback handler) {
         mSink.setClosedCallback(handler);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index 4689bec19..bd7211bdb 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -318,11 +318,7 @@ public boolean isOpen() {
 
     @Override
     public void close() {
-        end();
-        if (mSink != null)
-            mSink.close();
-        else
-            mSocket.close();
+        mSocket.close();
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/stream/OutputStreamDataSink.java b/AndroidAsync/src/com/koushikdutta/async/stream/OutputStreamDataSink.java
index d4def383a..13bb419c6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/stream/OutputStreamDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/stream/OutputStreamDataSink.java
@@ -17,7 +17,19 @@ public OutputStreamDataSink(AsyncServer server) {
 
     @Override
     public void end() {
-        close();
+        try {
+            if (mStream != null)
+                mStream.close();
+            reportClose(null);
+        }
+        catch (IOException e) {
+            reportClose(e);
+        }
+    }
+
+    @Override
+    public void close() {
+        end();
     }
 
     AsyncServer server;
@@ -35,31 +47,6 @@ public OutputStream getOutputStream() throws IOException {
         return mStream;
     }
 
-    private boolean doPending() {
-        try {
-            while (pending.size() > 0) {
-                ByteBuffer b;
-                synchronized (pending) {
-                    b = pending.remove();
-                }
-                int rem = b.remaining();
-                getOutputStream().write(b.array(), b.arrayOffset() + b.position(), b.remaining());
-                totalWritten += rem;
-                ByteBufferList.reclaim(b);
-            }
-            return true;
-        }
-        catch (Exception e) {
-            pending.recycle();
-            closeReported = true;
-            closeException = e;
-            return false;
-        }
-    }
-
-    final ByteBufferList pending = new ByteBufferList();
-    int totalWritten;
-
     @Override
     public void write(final ByteBuffer bb) {
         try {
@@ -104,18 +91,6 @@ public WritableCallback getWriteableCallback() {
     public boolean isOpen() {
         return closeReported;
     }
-    
-    @Override
-    public void close() {
-        try {
-            if (mStream != null)
-                mStream.close();
-            reportClose(null);
-        }
-        catch (IOException e) {
-            reportClose(e);
-        }
-    }
 
     boolean closeReported;
     Exception closeException;
diff --git a/AndroidAsyncTest/testdata/6691924d7d24237d3b3679310157d640 b/AndroidAsync/test/assets/6691924d7d24237d3b3679310157d640
similarity index 100%
rename from AndroidAsyncTest/testdata/6691924d7d24237d3b3679310157d640
rename to AndroidAsync/test/assets/6691924d7d24237d3b3679310157d640
diff --git a/AndroidAsyncTest/testdata/hello.txt b/AndroidAsync/test/assets/hello.txt
similarity index 100%
rename from AndroidAsyncTest/testdata/hello.txt
rename to AndroidAsync/test/assets/hello.txt
diff --git a/AndroidAsyncTest/testdata/test.json b/AndroidAsync/test/assets/test.json
similarity index 100%
rename from AndroidAsyncTest/testdata/test.json
rename to AndroidAsync/test/assets/test.json
diff --git a/AndroidAsyncTest/res/drawable-hdpi/ic_launcher.png b/AndroidAsync/test/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from AndroidAsyncTest/res/drawable-hdpi/ic_launcher.png
rename to AndroidAsync/test/res/drawable-hdpi/ic_launcher.png
diff --git a/AndroidAsyncTest/res/drawable-ldpi/ic_launcher.png b/AndroidAsync/test/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from AndroidAsyncTest/res/drawable-ldpi/ic_launcher.png
rename to AndroidAsync/test/res/drawable-ldpi/ic_launcher.png
diff --git a/AndroidAsyncTest/res/drawable-mdpi/ic_launcher.png b/AndroidAsync/test/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from AndroidAsyncTest/res/drawable-mdpi/ic_launcher.png
rename to AndroidAsync/test/res/drawable-mdpi/ic_launcher.png
diff --git a/AndroidAsyncTest/res/drawable-xhdpi/ic_launcher.png b/AndroidAsync/test/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from AndroidAsyncTest/res/drawable-xhdpi/ic_launcher.png
rename to AndroidAsync/test/res/drawable-xhdpi/ic_launcher.png
diff --git a/AndroidAsyncTest/res/raw/keystore.bks b/AndroidAsync/test/res/raw/keystore.bks
similarity index 100%
rename from AndroidAsyncTest/res/raw/keystore.bks
rename to AndroidAsync/test/res/raw/keystore.bks
diff --git a/AndroidAsyncTest/res/values/strings.xml b/AndroidAsync/test/res/values/strings.xml
similarity index 100%
rename from AndroidAsyncTest/res/values/strings.xml
rename to AndroidAsync/test/res/values/strings.xml
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/BodyTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/BodyTests.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/BodyTests.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/BodyTests.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/ByteUtilTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ByteUtilTests.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/ByteUtilTests.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/ByteUtilTests.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/CacheTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/CacheTests.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/DnsTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/DnsTests.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/DnsTests.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/DnsTests.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/FileCacheTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/FileCacheTests.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/FileCacheTests.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/FileCacheTests.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/FileTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/FileTests.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/FutureTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/FutureTests.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/HttpClientTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/HttpClientTests.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/HttpServerTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpServerTests.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/HttpServerTests.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/HttpServerTests.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/Issue59.java b/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/Issue59.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/Md5.java b/AndroidAsync/test/src/com/koushikdutta/async/test/Md5.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/Md5.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/Md5.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/MultipartTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/MultipartTests.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/MultipartTests.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/MultipartTests.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/ProxyTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ProxyTests.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/ProxyTests.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/ProxyTests.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/RedirectTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/RedirectTests.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/RedirectTests.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/RedirectTests.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/SSLTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/SSLTests.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/SSLTests.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/SSLTests.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/SanityChecks.java b/AndroidAsync/test/src/com/koushikdutta/async/test/SanityChecks.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/SanityChecks.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/SanityChecks.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/SocketIOTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/SocketIOTests.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/SocketIOTests.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/SocketIOTests.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/TimeoutTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/TimeoutTests.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/TimeoutTests.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/TimeoutTests.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/TriggerFuture.java b/AndroidAsync/test/src/com/koushikdutta/async/test/TriggerFuture.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/TriggerFuture.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/TriggerFuture.java
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/WebSocketTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
similarity index 100%
rename from AndroidAsyncTest/src/com/koushikdutta/async/test/WebSocketTests.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
diff --git a/AndroidAsyncTest/.classpath b/AndroidAsyncTest/.classpath
deleted file mode 100644
index 6982030be..000000000
--- a/AndroidAsyncTest/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry combineaccessrules="false" kind="src" path="/AndroidAsyncSample"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/AndroidAsyncTest/.project b/AndroidAsyncTest/.project
deleted file mode 100644
index 379c28d69..000000000
--- a/AndroidAsyncTest/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>AndroidAsyncTest</name>
-	<comment></comment>
-	<projects>
-		<project>AndroidAsyncSample</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/AndroidAsyncTest/AndroidAsyncTest.iml b/AndroidAsyncTest/AndroidAsyncTest.iml
deleted file mode 100644
index 15b886e5e..000000000
--- a/AndroidAsyncTest/AndroidAsyncTest.iml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <proGuardCfgFiles>
-          <file>file://$APPLICATION_HOME_DIR$/sdk/tools/proguard/proguard-android.txt</file>
-        </proGuardCfgFiles>
-        <option name="UPDATE_PROPERTY_FILES" value="true" />
-        <notImportedProperties>
-          <property>MANIFEST_FILE_PATH</property>
-          <property>RESOURCES_DIR_PATH</property>
-          <property>ASSETS_DIR_PATH</property>
-          <property>NATIVE_LIBS_DIR_PATH</property>
-        </notImportedProperties>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="AndroidAsync" />
-  </component>
-</module>
-
diff --git a/AndroidAsyncTest/AndroidManifest.xml b/AndroidAsyncTest/AndroidManifest.xml
deleted file mode 100644
index 1c36b1744..000000000
--- a/AndroidAsyncTest/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.koushikdutta.async.test"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="17" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-    <instrumentation
-        android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="com.koushikdutta.async.test" />
-
-    <application
-        android:debuggable="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name" >
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/AndroidAsyncTest/proguard-project.txt b/AndroidAsyncTest/proguard-project.txt
deleted file mode 100644
index f2fe1559a..000000000
--- a/AndroidAsyncTest/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/AndroidAsyncTest/project.properties b/AndroidAsyncTest/project.properties
deleted file mode 100644
index 0b8f301dc..000000000
--- a/AndroidAsyncTest/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-L
-android.library.reference.1=../AndroidAsync

From fb36ed0d5283bfa164b884f8781ac91719a11dee Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 3 Jul 2014 01:32:46 -0700
Subject: [PATCH 006/399] fix paths

---
 .../async/test/HttpClientTests.java           | 24 +------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
index 33761bf02..6809880ec 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
@@ -137,9 +137,8 @@ public void onCompleted(Exception ex) {
 
     // this testdata file was generated using /dev/random. filename is also the md5 of the file.
     final static String dataNameAndHash = "6691924d7d24237d3b3679310157d640";
-    final static String githubPath = "github.com/koush/AndroidAsync/raw/master/AndroidAsyncTest/testdata/";
+    final static String githubPath = "raw.githubusercontent.com/koush/AndroidAsync/master/AndroidAsync/test/assets/";
     final static String github = "https://" + githubPath + dataNameAndHash;
-    final static String githubInsecure = "http://" + githubPath + dataNameAndHash;
     public void testGithubRandomData() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
         final Md5 md5 = Md5.createInstance();
@@ -179,27 +178,6 @@ public void testGithubRandomDataWithFuture() throws Exception {
         assertEquals(md5.digest(), dataNameAndHash);
     }
 
-    public void testInsecureGithubRandomDataWithFuture() throws Exception {
-        final Md5 md5 = Md5.createInstance();
-        Future<ByteBufferList> bb = client.executeByteBufferList(new AsyncHttpGet(githubInsecure), null);
-        md5.update(bb.get(TIMEOUT, TimeUnit.MILLISECONDS));
-        assertEquals(md5.digest(), dataNameAndHash);
-    }
-
-    public void testInsecureGithubRandomDataWithFutureCallback() throws Exception {
-        final Semaphore semaphore = new Semaphore(0);
-        final Md5 md5 = Md5.createInstance();
-        client.executeByteBufferList(new AsyncHttpGet(githubInsecure), null).setCallback(new FutureCallback<ByteBufferList>() {
-            @Override
-            public void onCompleted(Exception e, ByteBufferList bb) {
-                md5.update(bb);
-                semaphore.release();
-            }
-        });
-        assertTrue("timeout", semaphore.tryAcquire(TIMEOUT, TimeUnit.MILLISECONDS));
-        assertEquals(md5.digest(), dataNameAndHash);
-    }
-
     public void testGithubHelloWithFuture() throws Exception {
         Future<String> string = client.executeString(new AsyncHttpGet("https://" + githubPath + "hello.txt"), null);
         assertEquals(string.get(TIMEOUT, TimeUnit.MILLISECONDS), "hello world");

From c589bfbbd2d9425c2580a5717e3f3ef14607fe6a Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@gmail.com>
Date: Thu, 3 Jul 2014 13:38:52 +0200
Subject: [PATCH 007/399] do not count the unknown length in the written count
 (safety first)

---
 .../koushikdutta/async/http/body/MultipartFormDataBody.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
index 1b293016f..c61a9d96b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
@@ -155,7 +155,9 @@ public void onContinue(Continuation continuation, CompletedCallback next) throws
             .add(new ContinuationCallback() {
                 @Override
                 public void onContinue(Continuation continuation, CompletedCallback next) throws Exception {
-                    written += part.length();
+                    long partLength = part.length();
+                    if (partLength >= 0)
+                        written += partLength;
                     part.write(sink, next);
                 }
             })

From 73a901530ab71fa6ab1f98b203c170a354efe3fb Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@gmail.com>
Date: Thu, 3 Jul 2014 13:42:26 +0200
Subject: [PATCH 008/399] setting the content length to -1 should not write a
 header (safety first)

---
 .../com/koushikdutta/async/http/libcore/RequestHeaders.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/libcore/RequestHeaders.java b/AndroidAsync/src/com/koushikdutta/async/http/libcore/RequestHeaders.java
index 3216bd596..b5180b40c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/libcore/RequestHeaders.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/libcore/RequestHeaders.java
@@ -212,7 +212,9 @@ public void setContentLength(int contentLength) {
         if (this.contentLength != -1) {
             headers.removeAll("Content-Length");
         }
-        headers.add("Content-Length", Integer.toString(contentLength));
+        if (contentLength != -1) {
+            headers.add("Content-Length", Integer.toString(contentLength));
+        }
         this.contentLength = contentLength;
     }
 

From 9835052d28fa6fcea2a8051b574670d9335c7a3b Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@gmail.com>
Date: Thu, 3 Jul 2014 13:44:26 +0200
Subject: [PATCH 009/399] a 0-sized Content-Length should not use the chunked
 encoding

---
 .../src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index ce50532f3..902415de4 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -40,7 +40,7 @@ void setSocket(AsyncSocket exchange) {
         if (mWriter != null) {
             if (mRequest.getHeaders().getContentType() == null)
                 mRequest.getHeaders().setContentType(mWriter.getContentType());
-            if (mWriter.length() > 0) {
+            if (mWriter.length() >= 0) {
                 mRequest.getHeaders().setContentLength(mWriter.length());
                 mSink = mSocket;
             }

From 8e83241b35b27b5a3ac0228054e58928dad7f46e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 5 Jul 2014 16:43:56 -0700
Subject: [PATCH 010/399] pass host and port to ssl engine configurator

---
 .../async/http/AsyncSSLEngineConfigurator.java     |  2 +-
 .../async/http/AsyncSSLSocketMiddleware.java       | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLEngineConfigurator.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLEngineConfigurator.java
index 9460f1523..36af9c151 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLEngineConfigurator.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLEngineConfigurator.java
@@ -3,5 +3,5 @@
 import javax.net.ssl.SSLEngine;
 
 public interface AsyncSSLEngineConfigurator {
-    public void configureEngine(SSLEngine engine);
+    public void configureEngine(SSLEngine engine, String host, int port);
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
index dabe13874..4f3fff7df 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
@@ -56,7 +56,7 @@ public void clearEngineConfigurators() {
         engineConfigurators.clear();
     }
 
-    protected SSLEngine createConfiguredSSLEngine() {
+    protected SSLEngine createConfiguredSSLEngine(String host, int port) {
         SSLEngine sslEngine;
         if (sslContext != null)
             sslEngine = sslContext.createSSLEngine();
@@ -64,7 +64,7 @@ protected SSLEngine createConfiguredSSLEngine() {
             sslEngine = AsyncSSLSocketWrapper.createDefaultSSLEngine();
 
         for (AsyncSSLEngineConfigurator configurator : engineConfigurators) {
-            configurator.configureEngine(sslEngine);
+            configurator.configureEngine(sslEngine, host, port);
         }
 
         return sslEngine;
@@ -77,7 +77,10 @@ protected ConnectCallback wrapCallback(final ConnectCallback callback, final Uri
             public void onConnectCompleted(Exception ex, final AsyncSocket socket) {
                 if (ex == null) {
                     if (!proxied) {
-                        callback.onConnectCompleted(null, new AsyncSSLSocketWrapper(socket, uri.getHost(), port, createConfiguredSSLEngine(), trustManagers, hostnameVerifier, true));
+                        callback.onConnectCompleted(null,
+                            new AsyncSSLSocketWrapper(socket, uri.getHost(), port,
+                            createConfiguredSSLEngine(uri.getHost(), port),
+                            trustManagers, hostnameVerifier, true));
                     }
                     else {
                         // this SSL connection is proxied, must issue a CONNECT request to the proxy server
@@ -109,7 +112,10 @@ public void onStringAvailable(String s) {
                                             socket.setDataCallback(null);
                                             socket.setEndCallback(null);
                                             if (TextUtils.isEmpty(s.trim())) {
-                                                callback.onConnectCompleted(null, new AsyncSSLSocketWrapper(socket, uri.getHost(), port, createConfiguredSSLEngine(), trustManagers, hostnameVerifier, true));
+                                                callback.onConnectCompleted(null,
+                                                new AsyncSSLSocketWrapper(socket, uri.getHost(), port,
+                                                createConfiguredSSLEngine(uri.getHost(), port),
+                                                trustManagers, hostnameVerifier, true));
                                             }
                                             else {
                                                 callback.onConnectCompleted(new IOException("unknown second status line"), socket);

From b1364693f91ab664af6e26414d3bdc64e01aed50 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 5 Jul 2014 16:59:27 -0700
Subject: [PATCH 011/399] 128

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 AndroidAsync/build.gradle        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 1400557c8..8f81b6060 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="126"
-    android:versionName="1.2.6" >
+    android:versionCode="128"
+    android:versionName="1.2.8" >
 
     <uses-sdk
         android:minSdkVersion="8"
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 0d2eacbeb..a482d38fc 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -35,6 +35,6 @@ android {
 }
 
 // upload to maven task
-//if (System.getenv().I_AM_KOUSH == 'true') {
-//  apply from: 'https://raw.github.com/koush/mvn-repo/master/maven.gradle'
-//}
+if (System.getenv().I_AM_KOUSH == 'true') {
+  apply from: 'https://raw.github.com/koush/mvn-repo/master/maven.gradle'
+}

From c78a345516c8c89e4c42910a581f5f6e84994a1e Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@gmail.com>
Date: Tue, 8 Jul 2014 15:51:27 +0200
Subject: [PATCH 012/399] Use the system proxy when it's defined. The default
 HttpUrlConnection does that, as well as okhttp. This should only work on API
 v12 and above. Before that the system proxy had to be caught manually by the
 UrlConnection user.

---
 .../async/http/AsyncHttpClient.java           |  1 +
 .../async/http/AsyncHttpRequest.java          | 46 +++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 56dcae5c7..cfc6a10bd 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -278,6 +278,7 @@ public void setDataEmitter(DataEmitter emitter) {
                             newReq.LOGTAG = request.LOGTAG;
                             newReq.proxyHost = request.proxyHost;
                             newReq.proxyPort = request.proxyPort;
+                            newReq.useAndroidProxy = request.useAndroidProxy;
                             copyHeader(request, newReq, "User-Agent");
                             copyHeader(request, newReq, "Range");
                             request.logi("Redirecting");
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
index 35d99026e..dc1ef13c2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
@@ -1,6 +1,8 @@
 package com.koushikdutta.async.http;
 
+import android.annotation.SuppressLint;
 import android.net.Uri;
+import android.os.Build;
 import android.util.Log;
 
 import com.koushikdutta.async.AsyncSSLException;
@@ -16,6 +18,10 @@
 import org.apache.http.message.BasicHeader;
 import org.apache.http.params.HttpParams;
 
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
@@ -318,21 +324,61 @@ public AsyncHttpRequest addHeader(String name, String value) {
 
     String proxyHost;
     int proxyPort = -1;
+    boolean useAndroidProxy = true;
     public void enableProxy(String host, int port) {
         proxyHost = host;
         proxyPort = port;
+        useAndroidProxy = proxyPort == 0;
+    }
+
+    public void enableSystemProxy(boolean enable) {
+        useAndroidProxy = enable;
     }
 
     public void disableProxy() {
         proxyHost = null;
         proxyPort = -1;
+        useAndroidProxy = false;
+    }
+
+    @SuppressLint("NewApi")
+    private void setupAndroidProxy() {
+        List<Proxy> proxies = ProxySelector.getDefault().select(URI.create(getUri().toString()));
+        if (proxies.isEmpty()) {
+            disableProxy();
+        } else {
+            Proxy proxy = proxies.get(0);
+            if (proxy.type() == Proxy.Type.DIRECT) {
+                disableProxy();
+            } else if (proxy.type() == Proxy.Type.HTTP && proxy.address() instanceof InetSocketAddress) {
+                InetSocketAddress proxyAddress = (InetSocketAddress) proxy.address();
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH)
+                    proxyHost = proxyAddress.getHostString();
+                else {
+                    InetAddress address = proxyAddress.getAddress();
+                    if (address!=null)
+                        proxyHost = address.getHostAddress();
+                    else
+                        proxyHost = proxyAddress.getHostName();
+                }
+                proxyPort = proxyAddress.getPort();
+            }
+        }
     }
 
     public String getProxyHost() {
+        if (useAndroidProxy) {
+            setupAndroidProxy();
+            useAndroidProxy = false;
+        }
         return proxyHost;
     }
 
     public int getProxyPort() {
+        if (useAndroidProxy) {
+            setupAndroidProxy();
+            useAndroidProxy = false;
+        }
         return proxyPort;
     }
 

From 7446a19f12e69522e9c7c5a6a05972d3418a9bbc Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 8 Jul 2014 19:01:49 -0700
Subject: [PATCH 013/399] Deprecate socket.io. No longer works on 1.0+.

Remove some derpy permissions from AndroidManifest.xml.
---
 AndroidAsync/AndroidAsync-AndroidAsync.iml                     | 2 ++
 AndroidAsync/AndroidManifest.xml                               | 3 ---
 .../src/com/koushikdutta/async/http/AsyncHttpRequest.java      | 1 -
 .../com/koushikdutta/async/http/socketio/SocketIOClient.java   | 3 +--
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index 1cdbd092c..41a171c73 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -57,7 +57,9 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 8f81b6060..0b6d8cd88 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -7,9 +7,6 @@
         android:minSdkVersion="8"
         android:targetSdkVersion="18" />
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.READ_LOGS"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application>
     </application>
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
index 35d99026e..22316b57f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
@@ -16,7 +16,6 @@
 import org.apache.http.message.BasicHeader;
 import org.apache.http.params.HttpParams;
 
-import java.net.URI;
 import java.util.List;
 import java.util.Map;
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOClient.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOClient.java
index 344aab8d0..af469b6d1 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOClient.java
@@ -1,9 +1,7 @@
 package com.koushikdutta.async.http.socketio;
 
-import android.os.Handler;
 import android.text.TextUtils;
 
-import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.SimpleFuture;
 import com.koushikdutta.async.http.AsyncHttpClient;
@@ -12,6 +10,7 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+@Deprecated
 public class SocketIOClient extends EventEmitter {
     boolean connected;
     boolean disconnected;

From e8a7fe02937261aa43aad2fdef605a6d595b62b2 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 8 Jul 2014 20:40:02 -0700
Subject: [PATCH 014/399] 129

---
 AndroidAsync/AndroidManifest.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 0b6d8cd88..4246b6f0d 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,11 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.koushikdutta.async"
-    android:versionCode="128"
-    android:versionName="1.2.8" >
+    android:versionCode="129"
+    android:versionName="1.2.9" >
 
     <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="18" />
+        tools:node="replace" />
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application>

From 13dd623171182415f25c457f430aff4be36febfc Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 9 Jul 2014 22:58:33 -0700
Subject: [PATCH 015/399] Remove defaultConfig flavor. Was derping up gradle
 inclusion.

---
 .gitignore                | 1 +
 AndroidAsync/build.gradle | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index fad3e2e1b..1b27a2363 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ build
 .idea/
 .DS_Store
 
+okhttp
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index a482d38fc..8b0a4dff8 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -26,11 +26,9 @@ android {
     compileSdkVersion 19
     buildToolsVersion "20.0.0"
 
-    defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 21
-        testInstrumentationRunner "android.test.InstrumentationTestRunner"
-        testFunctionalTest true
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
     }
 }
 

From ae0ddd2386d5cd836bb2ba5326828ec8c2bd28e5 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 9 Jul 2014 23:00:12 -0700
Subject: [PATCH 016/399] 130

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 4246b6f0d..c0a901d68 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.koushikdutta.async"
-    android:versionCode="129"
-    android:versionName="1.2.9" >
+    android:versionCode="130"
+    android:versionName="1.3.0">
 
     <uses-sdk
         tools:node="replace" />

From ced6f25d9b57d9e3d5f661a1dca06209ad27823d Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 10 Jul 2014 17:05:38 -0700
Subject: [PATCH 017/399] 131

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index c0a901d68..9c3c5e445 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.koushikdutta.async"
-    android:versionCode="130"
-    android:versionName="1.3.0">
+    android:versionCode="131"
+    android:versionName="1.3.1">
 
     <uses-sdk
         tools:node="replace" />

From 84df7c6222381ad3301d434163acce3358c1a5bc Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 10 Jul 2014 22:42:24 -0700
Subject: [PATCH 018/399] DataEmitters now have charset hints.

---
 AndroidAsync/build.gradle                     |  4 +-
 .../async/AsyncNetworkSocket.java             |  5 ++
 .../async/AsyncSSLSocketWrapper.java          |  5 ++
 .../async/BufferedDataEmitter.java            |  5 ++
 .../koushikdutta/async/ByteBufferList.java    | 17 +++++--
 .../com/koushikdutta/async/DataEmitter.java   |  1 +
 .../koushikdutta/async/DataEmitterBase.java   |  5 ++
 .../async/http/AsyncHttpResponseImpl.java     | 12 +++++
 .../com/koushikdutta/async/http/Multimap.java |  2 +
 .../async/http/ResponseCacheMiddleware.java   |  4 +-
 .../async/http/WebSocketImpl.java             |  5 ++
 .../async/http/libcore/StrictLineReader.java  |  2 +
 .../async/parser/StringParser.java            |  2 +-
 .../async/stream/InputStreamDataEmitter.java  |  5 ++
 .../{http/libcore => util}/Charsets.java      |  2 +-
 .../koushikdutta/async/test/ParserTests.java  | 51 +++++++++++++++++++
 16 files changed, 116 insertions(+), 11 deletions(-)
 rename AndroidAsync/src/com/koushikdutta/async/{http/libcore => util}/Charsets.java (83%)
 create mode 100644 AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 8b0a4dff8..bca715f93 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url 'http://repo1.maven.org/maven2' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
+        classpath 'com.android.tools.build:gradle:+'
     }
 }
 apply plugin: 'com.android.library'
@@ -34,5 +34,5 @@ android {
 
 // upload to maven task
 if (System.getenv().I_AM_KOUSH == 'true') {
-  apply from: 'https://raw.github.com/koush/mvn-repo/master/maven.gradle'
+  apply from: 'https://raw.githubusercontent.com/koush/mvn-repo/master/maven.gradle'
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
index 06aefdf32..9a15cb287 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
@@ -361,4 +361,9 @@ public int getLocalPort() {
     public Object getSocket() {
         return getChannel().getSocket();
     }
+
+    @Override
+    public String charset() {
+        return null;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 410d7743b..93c2865ad 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -602,4 +602,9 @@ public DataEmitter getDataEmitter() {
     public X509Certificate[] getPeerCertificates() {
         return peerCertificates;
     }
+
+    @Override
+    public String charset() {
+        return null;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java b/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java
index 7d238b445..009f6c6bd 100644
--- a/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java
@@ -96,4 +96,9 @@ public CompletedCallback getEndCallback() {
     public AsyncServer getServer() {
         return mEmitter.getServer();
     }
+
+    @Override
+    public String charset() {
+        return mEmitter.charset();
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index 83a4ef2be..e39ff5a28 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -1,15 +1,18 @@
 package com.koushikdutta.async;
 
+import android.annotation.TargetApi;
+import android.os.Build;
 import android.os.Looper;
 
-import java.nio.Buffer;
+import com.koushikdutta.async.util.Charsets;
+
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.util.ArrayList;
+import java.nio.charset.Charset;
 import java.util.Comparator;
-import java.util.LinkedList;
 import java.util.PriorityQueue;
 
+@TargetApi(Build.VERSION_CODES.GINGERBREAD)
 public class ByteBufferList {
     ArrayDeque<ByteBuffer> mBuffers = new ArrayDeque<ByteBuffer>();
     
@@ -356,10 +359,16 @@ public String peekString() {
     }
 
     public String readString() {
+        return readString(Charsets.US_ASCII);
+    }
+
+    public String readString(Charset charset) {
+        if (charset == null)
+            charset = Charset.defaultCharset();
         StringBuilder builder = new StringBuilder();
         while (mBuffers.size() > 0) {
             ByteBuffer bb = mBuffers.remove();
-            builder.append(new String(bb.array(), bb.arrayOffset() + bb.position(), bb.remaining()));
+            builder.append(new String(bb.array(), bb.arrayOffset() + bb.position(), bb.remaining(), charset));
             reclaim(bb);
         }
         remaining = 0;
diff --git a/AndroidAsync/src/com/koushikdutta/async/DataEmitter.java b/AndroidAsync/src/com/koushikdutta/async/DataEmitter.java
index 257490110..cf8ac2a53 100644
--- a/AndroidAsync/src/com/koushikdutta/async/DataEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/DataEmitter.java
@@ -14,4 +14,5 @@ public interface DataEmitter {
     public void setEndCallback(CompletedCallback callback);
     public CompletedCallback getEndCallback();
     public AsyncServer getServer();
+    public String charset();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/DataEmitterBase.java b/AndroidAsync/src/com/koushikdutta/async/DataEmitterBase.java
index 529ec8dff..90e05c725 100644
--- a/AndroidAsync/src/com/koushikdutta/async/DataEmitterBase.java
+++ b/AndroidAsync/src/com/koushikdutta/async/DataEmitterBase.java
@@ -41,4 +41,9 @@ public void setDataCallback(DataCallback callback) {
     public DataCallback getDataCallback() {
         return mDataCallback;
     }
+
+    @Override
+    public String charset() {
+        return null;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index 902415de4..2b77b568e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -15,8 +15,10 @@
 import com.koushikdutta.async.http.filter.ChunkedOutputFilter;
 import com.koushikdutta.async.http.libcore.RawHeaders;
 import com.koushikdutta.async.http.libcore.ResponseHeaders;
+import com.koushikdutta.async.util.Charsets;
 
 import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
 
 abstract class AsyncHttpResponseImpl extends FilteredDataEmitter implements AsyncHttpResponse {
     private AsyncHttpRequestBody mWriter;
@@ -231,4 +233,14 @@ public CompletedCallback getClosedCallback() {
     public AsyncServer getServer() {
         return mSocket.getServer();
     }
+
+    @Override
+    public String charset() {
+        Multimap mm = Multimap.parseHeader(getHeaders().getHeaders(), "Content-Type");
+        String cs;
+        if (mm != null && null != (cs = mm.getString("charset")) && Charset.isSupported(cs)) {
+            return cs;
+        }
+        return null;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
index 24dfc5a80..628bdd036 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
@@ -50,6 +50,8 @@ public Multimap(List<NameValuePair> pairs) {
     }
 
     public static Multimap parseHeader(String header) {
+        if (header == null)
+            return null;
         Multimap map = new Multimap();
         String[] parts = header.split(";");
         for (String part: parts) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
index d89e334cc..afb4f9ab4 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
@@ -8,14 +8,13 @@
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
-import com.koushikdutta.async.DataEmitterBase;
 import com.koushikdutta.async.FilteredDataEmitter;
 import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.future.Cancellable;
 import com.koushikdutta.async.future.SimpleCancellable;
-import com.koushikdutta.async.http.libcore.Charsets;
+import com.koushikdutta.async.util.Charsets;
 import com.koushikdutta.async.http.libcore.RawHeaders;
 import com.koushikdutta.async.http.libcore.ResponseHeaders;
 import com.koushikdutta.async.http.libcore.ResponseSource;
@@ -26,7 +25,6 @@
 
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
index 96e724aee..8fabcb28b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
@@ -314,4 +314,9 @@ public void resume() {
     public boolean isPaused() {
         return mSocket.isPaused();
     }
+
+    @Override
+    public String charset() {
+        return null;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/libcore/StrictLineReader.java b/AndroidAsync/src/com/koushikdutta/async/http/libcore/StrictLineReader.java
index 6c6308f7a..d1cb5d964 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/libcore/StrictLineReader.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/libcore/StrictLineReader.java
@@ -16,6 +16,8 @@
 
 package com.koushikdutta.async.http.libcore;
 
+import com.koushikdutta.async.util.Charsets;
+
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.EOFException;
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
index 78866620b..19178ccf1 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
@@ -17,7 +17,7 @@ public Future<String> parse(DataEmitter emitter) {
         .then(new TransformFuture<String, ByteBufferList>() {
             @Override
             protected void transform(ByteBufferList result) throws Exception {
-                setComplete(result.readString());
+                setComplete(result.readString(null));
             }
         });
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/stream/InputStreamDataEmitter.java b/AndroidAsync/src/com/koushikdutta/async/stream/InputStreamDataEmitter.java
index bdf799311..c63891c19 100644
--- a/AndroidAsync/src/com/koushikdutta/async/stream/InputStreamDataEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/stream/InputStreamDataEmitter.java
@@ -146,4 +146,9 @@ public void close() {
         catch (Exception e) {
         }
     }
+
+    @Override
+    public String charset() {
+        return null;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/libcore/Charsets.java b/AndroidAsync/src/com/koushikdutta/async/util/Charsets.java
similarity index 83%
rename from AndroidAsync/src/com/koushikdutta/async/http/libcore/Charsets.java
rename to AndroidAsync/src/com/koushikdutta/async/util/Charsets.java
index 575b147e2..c3a1e44ff 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/libcore/Charsets.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/Charsets.java
@@ -1,4 +1,4 @@
-package com.koushikdutta.async.http.libcore;
+package com.koushikdutta.async.util;
 
 import java.nio.charset.Charset;
 
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java
new file mode 100644
index 000000000..468f4c07a
--- /dev/null
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java
@@ -0,0 +1,51 @@
+package com.koushikdutta.async.test;
+
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.FilteredDataEmitter;
+import com.koushikdutta.async.future.Future;
+import com.koushikdutta.async.parser.StringParser;
+import com.koushikdutta.async.util.Charsets;
+
+import junit.framework.TestCase;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+
+/**
+ * Created by koush on 7/10/14.
+ */
+public class ParserTests extends TestCase {
+    public void testString() throws Exception {
+        StringParser p = new StringParser();
+        FilteredDataEmitter f = new FilteredDataEmitter() {
+            @Override
+            public boolean isPaused() {
+                return false;
+            }
+        };
+        Future<String> ret = p.parse(f);
+        ByteBufferList l = new ByteBufferList();
+        l.add(ByteBuffer.wrap("foo".getBytes(Charsets.US_ASCII.name())));
+        f.onDataAvailable(f, l);
+        f.getEndCallback().onCompleted(null);
+        String s = ret.get();
+        assertEquals(s, "foo");
+    }
+
+    public void testUtf8String() throws Exception {
+        StringParser p = new StringParser();
+        FilteredDataEmitter f = new FilteredDataEmitter() {
+            @Override
+            public boolean isPaused() {
+                return false;
+            }
+        };
+        Future<String> ret = p.parse(f);
+        ByteBufferList l = new ByteBufferList();
+        l.add(ByteBuffer.wrap("æææ".getBytes(Charsets.UTF_8.name())));
+        f.onDataAvailable(f, l);
+        f.getEndCallback().onCompleted(null);
+        String s = ret.get();
+        assertEquals(s, "æææ");
+    }
+}

From 4df25933b22d1d7767870326199c1023beb877c1 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 12 Jul 2014 18:55:01 -0700
Subject: [PATCH 019/399] goddamn gradle publishing

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml | 40 +++++++++-------------
 AndroidAsync/AndroidManifest.xml           |  4 +--
 AndroidAsync/build.gradle                  |  9 +++--
 3 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index 41a171c73..1db451dfd 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -8,11 +8,10 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="SELECTED_BUILD_VARIANT" value="release" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseJava" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateReleaseSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
@@ -22,26 +21,21 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/release" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/release" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/release" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/release" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/release" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/release" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/assets" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 9c3c5e445..17f6ffc1d 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.koushikdutta.async"
-    android:versionCode="131"
-    android:versionName="1.3.1">
+    android:versionCode="135"
+    android:versionName="1.3.5">
 
     <uses-sdk
         tools:node="replace" />
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index bca715f93..34e2ebc8c 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -26,10 +26,13 @@ android {
     compileSdkVersion 19
     buildToolsVersion "20.0.0"
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+    android {
+        lintOptions {
+            abortOnError false
+        }
     }
+
+    publishNonDefault true
 }
 
 // upload to maven task

From 75fc6595af0c7a0306999d0638690579b39e4ed1 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 12 Jul 2014 20:03:17 -0700
Subject: [PATCH 020/399] ffs

---
 AndroidAsync.iml                 | 25 +++++++++++++++++++++++++
 AndroidAsync/AndroidManifest.xml |  4 ++--
 AndroidAsync/build.gradle        |  2 +-
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 AndroidAsync.iml

diff --git a/AndroidAsync.iml b/AndroidAsync.iml
new file mode 100644
index 000000000..fb94b7653
--- /dev/null
+++ b/AndroidAsync.iml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Gradle" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":AndroidAsync" />
+      </configuration>
+    </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 17f6ffc1d..0b4c4e0d5 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.koushikdutta.async"
-    android:versionCode="135"
-    android:versionName="1.3.5">
+    android:versionCode="136"
+    android:versionName="1.3.6">
 
     <uses-sdk
         tools:node="replace" />
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 34e2ebc8c..fe2028431 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -32,7 +32,7 @@ android {
         }
     }
 
-    publishNonDefault true
+//    publishNonDefault true
 }
 
 // upload to maven task

From 31d7f509b328ccce3146754740bac5d25a09184d Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 12 Jul 2014 20:32:48 -0700
Subject: [PATCH 021/399] ffs

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 AndroidAsync/build.gradle        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 0b4c4e0d5..6984a72e7 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.koushikdutta.async"
-    android:versionCode="136"
-    android:versionName="1.3.6">
+    android:versionCode="137"
+    android:versionName="1.3.7">
 
     <uses-sdk
         tools:node="replace" />
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index fe2028431..34e2ebc8c 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -32,7 +32,7 @@ android {
         }
     }
 
-//    publishNonDefault true
+    publishNonDefault true
 }
 
 // upload to maven task

From 55e31f27d64aedda740a4c94f6a71214599c46b5 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 12 Jul 2014 22:55:56 -0700
Subject: [PATCH 022/399] remove file

---
 AndroidAsync.iml | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 AndroidAsync.iml

diff --git a/AndroidAsync.iml b/AndroidAsync.iml
deleted file mode 100644
index fb94b7653..000000000
--- a/AndroidAsync.iml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Gradle" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":AndroidAsync" />
-      </configuration>
-    </facet>
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-

From eb633ea9125ec9ddfbe99d04301b61cbbac3a507 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 13 Jul 2014 11:49:05 -0700
Subject: [PATCH 023/399] Refactor proxy implementation. Maybe this should go
 into ion?

Though HttpUrlConnection behaves the same way, uses proxy automatically.
---
 AndroidAsync/AndroidAsync-AndroidAsync.iml    | 42 +++++++++--------
 AndroidAsync/build.gradle                     | 11 -----
 .../async/http/AsyncHttpClient.java           | 42 ++++++++++++++++-
 .../async/http/AsyncHttpRequest.java          | 47 -------------------
 4 files changed, 64 insertions(+), 78 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index 1db451dfd..1cdbd092c 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -8,10 +8,11 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="release" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseJava" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateReleaseSources" />
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
@@ -21,21 +22,26 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/release" />
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/release" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/release" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/release" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/release" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/release" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/assets" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
@@ -51,9 +57,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 34e2ebc8c..1f19ca7c3 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -8,9 +8,6 @@ buildscript {
 }
 apply plugin: 'com.android.library'
 
-dependencies {
-}
-
 android {
     sourceSets {
         main {
@@ -25,14 +22,6 @@ android {
 
     compileSdkVersion 19
     buildToolsVersion "20.0.0"
-
-    android {
-        lintOptions {
-            abortOnError false
-        }
-    }
-
-    publishNonDefault true
 }
 
 // upload to maven task
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index cfc6a10bd..504d5c602 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -1,6 +1,8 @@
 package com.koushikdutta.async.http;
 
+import android.annotation.SuppressLint;
 import android.net.Uri;
+import android.os.Build;
 import android.text.TextUtils;
 
 import com.koushikdutta.async.AsyncSSLException;
@@ -36,9 +38,14 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeoutException;
 
 public class AsyncHttpClient {
@@ -67,6 +74,36 @@ public AsyncHttpClient(AsyncServer server) {
         insertMiddleware(sslSocketMiddleware = new AsyncSSLSocketMiddleware(this));
     }
 
+
+    @SuppressLint("NewApi")
+    private static void setupAndroidProxy(AsyncHttpRequest request) {
+        // using a explicit proxy?
+        if (request.proxyHost != null)
+            return;
+
+        List<Proxy> proxies = ProxySelector.getDefault().select(URI.create(request.getUri().toString()));
+        if (proxies.isEmpty())
+            return;
+        Proxy proxy = proxies.get(0);
+        if (proxy.type() != Proxy.Type.HTTP)
+            return;
+        if (!(proxy.address() instanceof InetSocketAddress))
+            return;
+        InetSocketAddress proxyAddress = (InetSocketAddress) proxy.address();
+        String proxyHost;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+            proxyHost = proxyAddress.getHostString();
+        }
+        else {
+            InetAddress address = proxyAddress.getAddress();
+            if (address!=null)
+                proxyHost = address.getHostAddress();
+            else
+                proxyHost = proxyAddress.getHostName();
+        }
+        request.enableProxy(proxyHost, proxyAddress.getPort());
+    }
+
     public AsyncSocketMiddleware getSocketMiddleware() {
         return socketMiddleware;
     }
@@ -278,7 +315,7 @@ public void setDataEmitter(DataEmitter emitter) {
                             newReq.LOGTAG = request.LOGTAG;
                             newReq.proxyHost = request.proxyHost;
                             newReq.proxyPort = request.proxyPort;
-                            newReq.useAndroidProxy = request.useAndroidProxy;
+                            setupAndroidProxy(newReq);
                             copyHeader(request, newReq, "User-Agent");
                             copyHeader(request, newReq, "Range");
                             request.logi("Redirecting");
@@ -373,6 +410,9 @@ public AsyncSocket detachSocket() {
             }
         };
 
+        // set up the system default proxy and connect
+        setupAndroidProxy(request);
+
         synchronized (mMiddleware) {
             for (AsyncHttpClientMiddleware middleware: mMiddleware) {
                 Cancellable socketCancellable = middleware.getSocket(data);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
index dc1ef13c2..22316b57f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
@@ -1,8 +1,6 @@
 package com.koushikdutta.async.http;
 
-import android.annotation.SuppressLint;
 import android.net.Uri;
-import android.os.Build;
 import android.util.Log;
 
 import com.koushikdutta.async.AsyncSSLException;
@@ -18,11 +16,6 @@
 import org.apache.http.message.BasicHeader;
 import org.apache.http.params.HttpParams;
 
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.ProxySelector;
-import java.net.URI;
 import java.util.List;
 import java.util.Map;
 
@@ -324,61 +317,21 @@ public AsyncHttpRequest addHeader(String name, String value) {
 
     String proxyHost;
     int proxyPort = -1;
-    boolean useAndroidProxy = true;
     public void enableProxy(String host, int port) {
         proxyHost = host;
         proxyPort = port;
-        useAndroidProxy = proxyPort == 0;
-    }
-
-    public void enableSystemProxy(boolean enable) {
-        useAndroidProxy = enable;
     }
 
     public void disableProxy() {
         proxyHost = null;
         proxyPort = -1;
-        useAndroidProxy = false;
-    }
-
-    @SuppressLint("NewApi")
-    private void setupAndroidProxy() {
-        List<Proxy> proxies = ProxySelector.getDefault().select(URI.create(getUri().toString()));
-        if (proxies.isEmpty()) {
-            disableProxy();
-        } else {
-            Proxy proxy = proxies.get(0);
-            if (proxy.type() == Proxy.Type.DIRECT) {
-                disableProxy();
-            } else if (proxy.type() == Proxy.Type.HTTP && proxy.address() instanceof InetSocketAddress) {
-                InetSocketAddress proxyAddress = (InetSocketAddress) proxy.address();
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH)
-                    proxyHost = proxyAddress.getHostString();
-                else {
-                    InetAddress address = proxyAddress.getAddress();
-                    if (address!=null)
-                        proxyHost = address.getHostAddress();
-                    else
-                        proxyHost = proxyAddress.getHostName();
-                }
-                proxyPort = proxyAddress.getPort();
-            }
-        }
     }
 
     public String getProxyHost() {
-        if (useAndroidProxy) {
-            setupAndroidProxy();
-            useAndroidProxy = false;
-        }
         return proxyHost;
     }
 
     public int getProxyPort() {
-        if (useAndroidProxy) {
-            setupAndroidProxy();
-            useAndroidProxy = false;
-        }
         return proxyPort;
     }
 

From d8a5060ca43c7efc5ff7b2b253791805cb928114 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 13 Jul 2014 18:06:22 -0700
Subject: [PATCH 024/399] AsyncSSLSocketWrapper: Perform handshake before
 allowing read/write.

---
 .../async/AsyncSSLSocketWrapper.java          | 207 +++++-------------
 .../async/http/AsyncSSLSocketMiddleware.java  |  22 +-
 .../async/http/server/AsyncHttpServer.java    |  14 +-
 3 files changed, 85 insertions(+), 158 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 93c2865ad..bb6a16731 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -28,129 +28,28 @@
 import javax.net.ssl.X509TrustManager;
 
 public class AsyncSSLSocketWrapper implements AsyncSocketWrapper, AsyncSSLSocket {
+    public interface HandshakeCallback {
+        public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket);
+    }
+
     static SSLContext defaultSSLContext;
 
     AsyncSocket mSocket;
     BufferedDataEmitter mEmitter;
     BufferedDataSink mSink;
-    boolean mUnwrapping = false;
+    boolean mUnwrapping;
+    SSLEngine engine;
+    boolean finishedHandshake;
+    private int mPort;
+    private String mHost;
+    private boolean mWrapping;
     HostnameVerifier hostnameVerifier;
-
-    /*
-    private static void initTLS_1_2() {
-        try {
-            defaultSSLContext = SSLContext.getInstance("TLSv1.2");
-        }
-        catch (NoSuchAlgorithmException e) {
-        }
-    }
-
-    private static void initTLS_1_1() {
-        try {
-            defaultSSLContext = SSLContext.getInstance("TLSv1.1");
-        }
-        catch (NoSuchAlgorithmException e) {
-        }
-    }
-
-    private static void initTLS() {
-        try {
-            defaultSSLContext = SSLContext.getInstance("TLS");
-        }
-        catch (NoSuchAlgorithmException e) {
-        }
-    }
-
-    static {
-        try {
-            initTLS_1_2();
-            if (defaultSSLContext == null)
-                initTLS_1_1();
-            if (defaultSSLContext == null)
-                initTLS();
-            if (defaultSSLContext == null)
-                defaultSSLContext = SSLContext.getInstance("SSL");
-            // critical extension 2.5.29.15 is implemented improperly prior to 4.0.3.
-            // https://code.google.com/p/android/issues/detail?id=9307
-            // https://groups.google.com/forum/?fromgroups=#!topic/netty/UCfqPPk5O4s
-            // certs that use this extension will throw in Cipher.java.
-            // fallback is to use a custom SSLContext, and hack around the x509 extension.
-            TrustManager[] trustManagers = null;
-            if (Build.VERSION.SDK_INT <= 15) {
-                trustManagers = new TrustManager[] { new X509TrustManager() {
-                    public java.security.cert.X509Certificate[] getAcceptedIssuers() {
-                        return new X509Certificate[0];
-                    }
-
-                    public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) {
-                    }
-
-                    public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) {
-                        for (X509Certificate cert : certs) {
-                            if (cert != null && cert.getCriticalExtensionOIDs() != null)
-                                cert.getCriticalExtensionOIDs().remove("2.5.29.15");
-                        }
-                    }
-                } };
-            }
-            defaultSSLContext.init(null, trustManagers, null);
-        }
-        catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    // android SSL cipher suites were downgraded (!!) for some derpy reason.
-    // Paranoid people would be wise to enable the original/secure suites.
-    // http://op-co.de/blog/posts/android_ssl_downgrade/
-    public static final String RECOMMENDED_CIPHERS[] = {
-    "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
-    "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
-    "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
-    "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
-    "TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
-    "TLS_DHE_RSA_WITH_AES_256_CBC_SHA",
-    "TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
-    "TLS_ECDHE_RSA_WITH_RC4_128_SHA",
-    "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
-    "TLS_RSA_WITH_AES_128_CBC_SHA",
-    "TLS_RSA_WITH_AES_256_CBC_SHA",
-    "SSL_RSA_WITH_3DES_EDE_CBC_SHA",
-    "SSL_RSA_WITH_RC4_128_SHA",
-    "SSL_RSA_WITH_RC4_128_MD5",
-    "TLS_RSA_WITH_AES_256_CBC_SHA256",
-    };
-
-    public static final String RECOMMENDED_PROTOCOLS[] = {
-    "TLSv1"
-    };
-
-    public static void setupRecommendedEngineSecurity(SSLEngine engine) {
-        LinkedHashSet<String> ciphers = new LinkedHashSet<String>(Arrays.asList(engine.getSupportedCipherSuites()));
-        ciphers.addAll(Arrays.asList(engine.getSupportedCipherSuites()));
-        LinkedHashSet<String> protocols = new LinkedHashSet<String>();
-        protocols.addAll(Arrays.asList(engine.getSupportedProtocols()));
-
-        ArrayList<String> enabledCiphers = new ArrayList<String>();
-        for (String cipher: RECOMMENDED_CIPHERS) {
-            if (ciphers.contains(cipher))
-                enabledCiphers.add(cipher);
-        }
-
-        ArrayList<String> enabledProtocols = new ArrayList<String>();
-        for (String protocol: RECOMMENDED_PROTOCOLS) {
-            if (protocols.contains(protocol))
-                enabledProtocols.add(protocol);
-        }
-
-        enabledCiphers.addAll(Arrays.asList(engine.getEnabledCipherSuites()));
-        enabledProtocols.addAll(Arrays.asList(engine.getEnabledProtocols()));
-//        engine.setEnabledCipherSuites(enabledCiphers.toArray(new String[enabledCiphers.size()]));
-//        engine.setEnabledProtocols(enabledProtocols.toArray(new String[enabledProtocols.size()]));
-//        engine.setEnabledCipherSuites(RECOMMENDED_CIPHERS);
-        engine.setEnabledProtocols(new String[] {"SSL"});
-    }
-    */
+    HandshakeCallback handshakeCallback;
+    X509Certificate[] peerCertificates;
+    WritableCallback mWriteableCallback;
+    DataCallback mDataCallback;
+    TrustManager[] trustManagers;
+    boolean clientMode;
 
     static {
         // following is the "trust the system" certs setup
@@ -195,19 +94,25 @@ public static SSLEngine createDefaultSSLEngine() {
         return defaultSSLContext.createSSLEngine();
     }
 
-    @Override
-    public void end() {
-        mSocket.end();
-    }
-
-    public AsyncSSLSocketWrapper(AsyncSocket socket, String host, int port) {
-        this(socket, host, port, createDefaultSSLEngine(), null, null, true);
+    public static void handshake(AsyncSocket socket,
+                                 String host, int port,
+                                 SSLEngine sslEngine,
+                                 TrustManager[] trustManagers, HostnameVerifier verifier, boolean clientMode,
+                                 HandshakeCallback callback) {
+        AsyncSSLSocketWrapper wrapper = new AsyncSSLSocketWrapper(socket, host, port, sslEngine, trustManagers, verifier, clientMode);
+        wrapper.handshakeCallback = callback;
+        try {
+            wrapper.engine.beginHandshake();
+            wrapper.handleHandshakeStatus(wrapper.engine.getHandshakeStatus());
+        } catch (SSLException e) {
+            wrapper.report(e);
+        }
     }
 
-    TrustManager[] trustManagers;
-    boolean clientMode;
-
-    public AsyncSSLSocketWrapper(AsyncSocket socket, String host, int port, SSLEngine sslEngine, TrustManager[] trustManagers, HostnameVerifier verifier, boolean clientMode) {
+    private AsyncSSLSocketWrapper(AsyncSocket socket,
+                                  String host, int port,
+                                  SSLEngine sslEngine,
+                                  TrustManager[] trustManagers, HostnameVerifier verifier, boolean clientMode) {
         mSocket = socket;
         hostnameVerifier = verifier;
         this.clientMode = clientMode;
@@ -277,7 +182,7 @@ else if (res.getStatus() == Status.BUFFER_UNDERFLOW) {
                             bb.addFirst(b);
                             b = ByteBufferList.EMPTY_BYTEBUFFER;
                         }
-                        handleResult(res);
+                        handleHandshakeStatus(res.getHandshakeStatus());
                         if (b.remaining() == remaining && before == transformed.remaining()) {
                             bb.addFirst(b);
                             break;
@@ -308,32 +213,30 @@ void addToPending(ByteBufferList out, ByteBuffer mReadTmp) {
     }
 
 
-    SSLEngine engine;
-    boolean finishedHandshake = false;
-
-    private String mHost;
+    @Override
+    public void end() {
+        mSocket.end();
+    }
 
     public String getHost() {
         return mHost;
     }
 
-    private int mPort;
-
     public int getPort() {
         return mPort;
     }
 
-    private void handleResult(SSLEngineResult res) {
-        if (res.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
+    private void handleHandshakeStatus(HandshakeStatus status) {
+        if (status == HandshakeStatus.NEED_TASK) {
             final Runnable task = engine.getDelegatedTask();
             task.run();
         }
 
-        if (res.getHandshakeStatus() == HandshakeStatus.NEED_WRAP) {
+        if (status == HandshakeStatus.NEED_WRAP) {
             write(ByteBufferList.EMPTY_BYTEBUFFER);
         }
 
-        if (res.getHandshakeStatus() == HandshakeStatus.NEED_UNWRAP) {
+        if (status == HandshakeStatus.NEED_UNWRAP) {
             mEmitter.onDataAvailable();
         }
 
@@ -380,6 +283,11 @@ private void handleResult(SSLEngineResult res) {
                             throw e;
                     }
                 }
+                else {
+                    finishedHandshake = true;
+                }
+                handshakeCallback.onHandshakeCompleted(null, this);
+                handshakeCallback = null;
                 if (mWriteableCallback != null)
                     mWriteableCallback.onWriteable();
                 mEmitter.onDataAvailable();
@@ -403,7 +311,6 @@ private void writeTmp(ByteBuffer mWriteTmp) {
         assert !mWriteTmp.hasRemaining();
     }
 
-    private boolean mWrapping = false;
 
     int calculateAlloc(int remaining) {
         // alloc 50% more than we need for writing
@@ -445,7 +352,7 @@ public void write(ByteBuffer bb) {
                 else {
                     mWriteTmp = ByteBufferList.obtain(calculateAlloc(bb.remaining()));
                 }
-                handleResult(res);
+                handleHandshakeStatus(res.getHandshakeStatus());
             }
             catch (SSLException e) {
                 report(e);
@@ -489,7 +396,7 @@ public void write(ByteBufferList bb) {
                 }
                 else {
                     mWriteTmp = ByteBufferList.obtain(calculateAlloc(bb.remaining()));
-                    handleResult(res);
+                    handleHandshakeStatus(res.getHandshakeStatus());
                 }
             }
             catch (SSLException e) {
@@ -501,8 +408,6 @@ public void write(ByteBufferList bb) {
         mWrapping = false;
     }
 
-    WritableCallback mWriteableCallback;
-
     @Override
     public void setWriteableCallback(WritableCallback handler) {
         mWriteableCallback = handler;
@@ -514,13 +419,21 @@ public WritableCallback getWriteableCallback() {
     }
 
     private void report(Exception e) {
+        final HandshakeCallback hs = handshakeCallback;
+        if (hs != null) {
+            handshakeCallback = null;
+            mSocket.setDataCallback(new NullDataCallback());
+            mSocket.end();
+            mSocket.close();
+            hs.onHandshakeCompleted(e, null);
+            return;
+        }
+
         CompletedCallback cb = getEndCallback();
         if (cb != null)
             cb.onCompleted(e);
     }
 
-    DataCallback mDataCallback;
-
     @Override
     public void setDataCallback(DataCallback callback) {
         mDataCallback = callback;
@@ -596,8 +509,6 @@ public DataEmitter getDataEmitter() {
         return mSocket;
     }
 
-    X509Certificate[] peerCertificates;
-
     @Override
     public X509Certificate[] getPeerCertificates() {
         return peerCertificates;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
index 4f3fff7df..868afc6fe 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
@@ -4,6 +4,7 @@
 import android.os.Build;
 import android.text.TextUtils;
 
+import com.koushikdutta.async.AsyncSSLSocket;
 import com.koushikdutta.async.AsyncSSLSocketWrapper;
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.LineEmitter;
@@ -70,6 +71,17 @@ protected SSLEngine createConfiguredSSLEngine(String host, int port) {
         return sslEngine;
     }
 
+    protected void tryHandshake(final ConnectCallback callback, AsyncSocket socket, final Uri uri, final int port) {
+        AsyncSSLSocketWrapper.handshake(socket, uri.getHost(), port,
+        createConfiguredSSLEngine(uri.getHost(), port),
+        trustManagers, hostnameVerifier, true, new AsyncSSLSocketWrapper.HandshakeCallback() {
+            @Override
+            public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
+                callback.onConnectCompleted(e, socket);
+            }
+        });
+    }
+
     @Override
     protected ConnectCallback wrapCallback(final ConnectCallback callback, final Uri uri, final int port, final boolean proxied) {
         return new ConnectCallback() {
@@ -77,10 +89,7 @@ protected ConnectCallback wrapCallback(final ConnectCallback callback, final Uri
             public void onConnectCompleted(Exception ex, final AsyncSocket socket) {
                 if (ex == null) {
                     if (!proxied) {
-                        callback.onConnectCompleted(null,
-                            new AsyncSSLSocketWrapper(socket, uri.getHost(), port,
-                            createConfiguredSSLEngine(uri.getHost(), port),
-                            trustManagers, hostnameVerifier, true));
+                        tryHandshake(callback, socket, uri, port);
                     }
                     else {
                         // this SSL connection is proxied, must issue a CONNECT request to the proxy server
@@ -112,10 +121,7 @@ public void onStringAvailable(String s) {
                                             socket.setDataCallback(null);
                                             socket.setEndCallback(null);
                                             if (TextUtils.isEmpty(s.trim())) {
-                                                callback.onConnectCompleted(null,
-                                                new AsyncSSLSocketWrapper(socket, uri.getHost(), port,
-                                                createConfiguredSSLEngine(uri.getHost(), port),
-                                                trustManagers, hostnameVerifier, true));
+                                                tryHandshake(callback, socket, uri, port);
                                             }
                                             else {
                                                 callback.onConnectCompleted(new IOException("unknown second status line"), socket);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 8d139ef4a..b1b393d64 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -1,9 +1,12 @@
 package com.koushikdutta.async.http.server;
 
+import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.AssetManager;
+import android.os.Build;
 import android.text.TextUtils;
 
+import com.koushikdutta.async.AsyncSSLSocket;
 import com.koushikdutta.async.AsyncSSLSocketWrapper;
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.AsyncServerSocket;
@@ -39,6 +42,7 @@
 
 import javax.net.ssl.SSLContext;
 
+@TargetApi(Build.VERSION_CODES.ECLAIR)
 public class AsyncHttpServer {
     ArrayList<AsyncServerSocket> mListeners = new ArrayList<AsyncServerSocket>();
     public void stop() {
@@ -223,8 +227,14 @@ public void listenSecure(final int port, final SSLContext sslContext) {
         AsyncServer.getDefault().listen(null, port, new ListenCallback() {
             @Override
             public void onAccepted(AsyncSocket socket) {
-                AsyncSSLSocketWrapper sslSocket = new AsyncSSLSocketWrapper(socket, null, port, sslContext.createSSLEngine(), null, null, false);
-                mListenCallback.onAccepted(sslSocket);
+                AsyncSSLSocketWrapper.handshake(socket, null, port, sslContext.createSSLEngine(), null, null, false,
+                new AsyncSSLSocketWrapper.HandshakeCallback() {
+                    @Override
+                    public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
+                        if (socket != null)
+                            mListenCallback.onAccepted(socket);
+                    }
+                });
             }
 
             @Override

From 9473c0e25904c1dc2034d835ed770dd9c46639fd Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 16 Jul 2014 21:33:55 -0700
Subject: [PATCH 025/399] ByteBuffer List fixes:

Stop assuming everything is array backed.
readString/peekString refactor.
Default charset is ascii.

SSL:

Conscrypt an SPDY prep.
---
 .gitignore                                    |   1 +
 AndroidAsync/AndroidAsync-AndroidAsync.iml    |   6 +
 AndroidAsync/build.gradle                     |  21 +++-
 .../koushikdutta/async/AsyncSSLSocket.java    |   3 +
 .../async/AsyncSSLSocketWrapper.java          |  17 ++-
 .../koushikdutta/async/ByteBufferList.java    | 109 +++++++++---------
 .../com/koushikdutta/async/ZipDataSink.java   |   2 +-
 .../async/http/AsyncSSLSocketMiddleware.java  |  31 ++---
 .../async/http/ResponseCacheMiddleware.java   |   9 +-
 .../async/parser/StringParser.java            |   5 +-
 .../koushikdutta/async/util/Allocator.java    |   3 +-
 .../koushikdutta/async/test/ParserTests.java  |   5 +
 12 files changed, 134 insertions(+), 78 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1b27a2363..b9a860d79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ build
 .DS_Store
 
 okhttp
+okio
diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index 1cdbd092c..f88736b56 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -60,6 +60,12 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
+    <content url="file://$MODULE_DIR$/../compat">
+      <sourceFolder url="file://$MODULE_DIR$/../compat" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../conscrypt">
+      <sourceFolder url="file://$MODULE_DIR$/../conscrypt" isTestSource="false" />
+    </content>
     <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 1f19ca7c3..38c3f67e6 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -9,17 +9,36 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
+    dependencies {
+//        compile 'com.squareup.okio:okio:+'
+//        androidTestCompile 'com.squareup.okhttp:okhttp:1.+'
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
 
-            java.srcDirs=['src/']
+            jniLibs.srcDirs = ['libs/']
+
+            java.srcDirs=['src/'
+//                          , 'okhttp/'
+//                          , 'okhttp-shim/'
+//                          , '../okio/okio/src/main/java/'
+                          , '../conscrypt/'
+                          , '../compat/'
+//                          , '../okhttp/okhttp/src/main/java/'
+            ]
         }
         androidTest.java.srcDirs=['test/src/']
         androidTest.res.srcDirs=['test/res/']
         androidTest.assets.srcDirs=['test/assets/']
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
     compileSdkVersion 19
     buildToolsVersion "20.0.0"
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocket.java
index e45d9c0a8..ba52642b5 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocket.java
@@ -2,6 +2,9 @@
 
 import java.security.cert.X509Certificate;
 
+import javax.net.ssl.SSLEngine;
+
 public interface AsyncSSLSocket extends AsyncSocket {
     public X509Certificate[] getPeerCertificates();
+    public SSLEngine getSSLEngine();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index bb6a16731..36d087c51 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -90,17 +90,23 @@ public void checkServerTrusted(java.security.cert.X509Certificate[] certs, Strin
         }
     }
 
-    public static SSLEngine createDefaultSSLEngine() {
-        return defaultSSLContext.createSSLEngine();
+    public static SSLContext getDefaultSSLContext() {
+        return defaultSSLContext;
     }
 
     public static void handshake(AsyncSocket socket,
                                  String host, int port,
                                  SSLEngine sslEngine,
                                  TrustManager[] trustManagers, HostnameVerifier verifier, boolean clientMode,
-                                 HandshakeCallback callback) {
+                                 final HandshakeCallback callback) {
         AsyncSSLSocketWrapper wrapper = new AsyncSSLSocketWrapper(socket, host, port, sslEngine, trustManagers, verifier, clientMode);
         wrapper.handshakeCallback = callback;
+        socket.setClosedCallback(new CompletedCallback() {
+            @Override
+            public void onCompleted(Exception ex) {
+                callback.onHandshakeCompleted(new SSLException(ex), null);
+            }
+        });
         try {
             wrapper.engine.beginHandshake();
             wrapper.handleHandshakeStatus(wrapper.engine.getHandshakeStatus());
@@ -202,6 +208,11 @@ else if (res.getStatus() == Status.BUFFER_UNDERFLOW) {
         });
     }
 
+    @Override
+    public SSLEngine getSSLEngine() {
+        return engine;
+    }
+
     void addToPending(ByteBufferList out, ByteBuffer mReadTmp) {
         mReadTmp.flip();
         if (mReadTmp.hasRemaining()) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index e39ff5a28..c036bdf84 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -6,6 +6,8 @@
 
 import com.koushikdutta.async.util.Charsets;
 
+import java.io.IOException;
+import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.Charset;
@@ -47,9 +49,12 @@ public void addAll(ByteBuffer... bb) {
     public byte[] getAllByteArray() {
         // fast path to return the contents of the first and only byte buffer,
         // if that's what we're looking for. avoids allocation.
-        if (mBuffers.size() == 1 && mBuffers.peek().capacity() == remaining()) {
-            remaining = 0;
-            return mBuffers.remove().array();
+        if (mBuffers.size() == 1) {
+            ByteBuffer peek = mBuffers.peek();
+            if (peek.capacity() == remaining() && peek.isDirect()) {
+                remaining = 0;
+                return mBuffers.remove().array();
+            }
         }
 
         byte[] ret = new byte[remaining()];
@@ -206,46 +211,7 @@ private ByteBuffer read(int count) {
             return first.order(order);
         }
 
-        ByteBuffer ret = null;
-        int retOffset = 0;
-        int allocSize = 0;
-
-        // attempt to find a buffer that can fit this, and the necessary
-        // alloc size to not leave anything leftover in the final buffer.
-        for (ByteBuffer b: mBuffers) {
-            if (allocSize >= count)
-                break;
-            // see if this fits...
-            if ((ret == null || b.capacity() > ret.capacity()) && b.capacity() >= count) {
-                ret = b;
-                retOffset = allocSize;
-            }
-            allocSize += b.remaining();
-        }
-
-        if (ret != null && ret.capacity() > allocSize) {
-            // move the current contents of the target bytebuffer around to its final position
-            System.arraycopy(ret.array(), ret.arrayOffset() + ret.position(), ret.array(), ret.arrayOffset() + retOffset, ret.remaining());
-            int retRemaining = ret.remaining();
-            ret.position(0);
-            ret.limit(allocSize);
-            allocSize = 0;
-            while (allocSize < count) {
-                ByteBuffer b = mBuffers.remove();
-                if (b != ret) {
-                    System.arraycopy(b.array(), b.arrayOffset() + b.position(), ret.array(), ret.arrayOffset() + allocSize, b.remaining());
-                    allocSize += b.remaining();
-                    reclaim(b);
-                }
-                else {
-                    allocSize += retRemaining;
-                }
-            }
-            mBuffers.addFirst(ret);
-            return ret.order(order);
-        }
-
-        ret = obtain(count);
+        ByteBuffer ret = obtain(count);
         ret.limit(count);
         byte[] bytes = ret.array();
         int offset = 0;
@@ -349,30 +315,43 @@ public void spewString() {
         System.out.println(peekString());
     }
 
-    // not doing toString as this is really nasty in the debugger...
     public String peekString() {
+        return peekString(null);
+    }
+
+    // not doing toString as this is really nasty in the debugger...
+    public String peekString(Charset charset) {
+        if (charset == null)
+            charset = Charsets.US_ASCII;
         StringBuilder builder = new StringBuilder();
         for (ByteBuffer bb: mBuffers) {
-            builder.append(new String(bb.array(), bb.arrayOffset() + bb.position(), bb.remaining()));
+            byte[] bytes;
+            int offset;
+            int length;
+            if (bb.isDirect()) {
+                bytes = new byte[bb.remaining()];
+                offset = 0;
+                length = bb.remaining();
+                bb.get(bytes);
+            }
+            else {
+                bytes = bb.array();
+                offset = bb.arrayOffset() + bb.position();
+                length = bb.remaining();
+            }
+            builder.append(new String(bytes, offset, length, charset));
         }
         return builder.toString();
     }
 
     public String readString() {
-        return readString(Charsets.US_ASCII);
+        return readString(null);
     }
 
     public String readString(Charset charset) {
-        if (charset == null)
-            charset = Charset.defaultCharset();
-        StringBuilder builder = new StringBuilder();
-        while (mBuffers.size() > 0) {
-            ByteBuffer bb = mBuffers.remove();
-            builder.append(new String(bb.array(), bb.arrayOffset() + bb.position(), bb.remaining(), charset));
-            reclaim(bb);
-        }
-        remaining = 0;
-        return builder.toString();
+        String ret = peekString(charset);
+        recycle();
+        return ret;
     }
 
     static class Reclaimer implements Comparator<ByteBuffer> {
@@ -512,4 +491,22 @@ public static void obtainArray(ByteBuffer[] arr, int size) {
     }
 
     public static final ByteBuffer EMPTY_BYTEBUFFER = ByteBuffer.allocate(0);
+
+    public static void writeOutputStream(OutputStream out, ByteBuffer b) throws IOException {
+        byte[] bytes;
+        int offset;
+        int length;
+        if (b.isDirect()) {
+            bytes = new byte[b.remaining()];
+            offset = 0;
+            length = b.remaining();
+            b.get(bytes);
+        }
+        else {
+            bytes = b.array();
+            offset = b.arrayOffset() + b.position();
+            length = b.remaining();
+        }
+        out.write(bytes, offset, length);
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/ZipDataSink.java b/AndroidAsync/src/com/koushikdutta/async/ZipDataSink.java
index 4fb6498fa..6838590f2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ZipDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ZipDataSink.java
@@ -50,7 +50,7 @@ public ByteBufferList filter(ByteBufferList bb) {
             if (bb != null) {
                 while (bb.size() > 0) {
                     ByteBuffer b = bb.remove();
-                    zop.write(b.array(), b.arrayOffset() + b.position(), b.remaining());
+                    ByteBufferList.writeOutputStream(zop, b);
                     ByteBufferList.reclaim(b);
                 }
             }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
index 868afc6fe..b339c935e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
@@ -1,7 +1,6 @@
 package com.koushikdutta.async.http;
 
 import android.net.Uri;
-import android.os.Build;
 import android.text.TextUtils;
 
 import com.koushikdutta.async.AsyncSSLSocket;
@@ -14,7 +13,6 @@
 import com.koushikdutta.async.http.libcore.RawHeaders;
 
 import java.io.IOException;
-import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,7 +20,6 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
 
 public class AsyncSSLSocketMiddleware extends AsyncSocketMiddleware {
     public AsyncSSLSocketMiddleware(AsyncHttpClient client) {
@@ -35,6 +32,10 @@ public void setSSLContext(SSLContext sslContext) {
         this.sslContext = sslContext;
     }
 
+    public SSLContext getSSLContext() {
+        return sslContext != null ? sslContext : AsyncSSLSocketWrapper.getDefaultSSLContext();
+    }
+
     TrustManager[] trustManagers;
 
     public void setTrustManagers(TrustManager[] trustManagers) {
@@ -47,7 +48,7 @@ public void setHostnameVerifier(HostnameVerifier hostnameVerifier) {
         this.hostnameVerifier = hostnameVerifier;
     }
 
-    List<AsyncSSLEngineConfigurator> engineConfigurators = new ArrayList<AsyncSSLEngineConfigurator>();
+    protected List<AsyncSSLEngineConfigurator> engineConfigurators = new ArrayList<AsyncSSLEngineConfigurator>();
 
     public void addEngineConfigurator(AsyncSSLEngineConfigurator engineConfigurator) {
         engineConfigurators.add(engineConfigurator);
@@ -58,11 +59,8 @@ public void clearEngineConfigurators() {
     }
 
     protected SSLEngine createConfiguredSSLEngine(String host, int port) {
-        SSLEngine sslEngine;
-        if (sslContext != null)
-            sslEngine = sslContext.createSSLEngine();
-        else
-            sslEngine = AsyncSSLSocketWrapper.createDefaultSSLEngine();
+        SSLContext sslContext = getSSLContext();
+        SSLEngine sslEngine = sslContext.createSSLEngine();
 
         for (AsyncSSLEngineConfigurator configurator : engineConfigurators) {
             configurator.configureEngine(sslEngine, host, port);
@@ -71,15 +69,20 @@ protected SSLEngine createConfiguredSSLEngine(String host, int port) {
         return sslEngine;
     }
 
-    protected void tryHandshake(final ConnectCallback callback, AsyncSocket socket, final Uri uri, final int port) {
-        AsyncSSLSocketWrapper.handshake(socket, uri.getHost(), port,
-        createConfiguredSSLEngine(uri.getHost(), port),
-        trustManagers, hostnameVerifier, true, new AsyncSSLSocketWrapper.HandshakeCallback() {
+    protected AsyncSSLSocketWrapper.HandshakeCallback createHandshakeCallback(final ConnectCallback callback) {
+        return new AsyncSSLSocketWrapper.HandshakeCallback() {
             @Override
             public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
                 callback.onConnectCompleted(e, socket);
             }
-        });
+        };
+    }
+
+    protected void tryHandshake(final ConnectCallback callback, AsyncSocket socket, final Uri uri, final int port) {
+        AsyncSSLSocketWrapper.handshake(socket, uri.getHost(), port,
+        createConfiguredSSLEngine(uri.getHost(), port),
+        trustManagers, hostnameVerifier, true,
+        createHandshakeCallback(callback));
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
index afb4f9ab4..851d77dd8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
@@ -43,6 +43,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.net.ssl.SSLEngine;
+
 public class ResponseCacheMiddleware extends SimpleMiddleware {
     public static final int ENTRY_METADATA = 0;
     public static final int ENTRY_BODY = 1;
@@ -339,7 +341,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                         while (!bb.isEmpty()) {
                             ByteBuffer b = bb.remove();
                             try {
-                                outputStream.write(b.array(), b.arrayOffset() + b.position(), b.remaining());
+                                ByteBufferList.writeOutputStream(outputStream, b);
                             }
                             finally {
                                 copy.add(b);
@@ -676,6 +678,11 @@ public CachedSSLSocket(EntryCacheResponse cacheResponse, long contentLength) {
             super(cacheResponse, contentLength);
         }
 
+        @Override
+        public SSLEngine getSSLEngine() {
+            return null;
+        }
+
         @Override
         public X509Certificate[] getPeerCertificates() {
             return null;
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
index 19178ccf1..397b62580 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
@@ -7,17 +7,20 @@
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.TransformFuture;
 
+import java.nio.charset.Charset;
+
 /**
  * Created by koush on 5/27/13.
  */
 public class StringParser implements AsyncParser<String> {
     @Override
     public Future<String> parse(DataEmitter emitter) {
+        final String charset = emitter.charset();
         return new ByteBufferListParser().parse(emitter)
         .then(new TransformFuture<String, ByteBufferList>() {
             @Override
             protected void transform(ByteBufferList result) throws Exception {
-                setComplete(result.readString(null));
+                setComplete(result.readString(Charset.forName(charset)));
             }
         });
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java b/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java
index a7d4f44e7..608026dc2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java
@@ -40,8 +40,9 @@ public int getMinAlloc() {
         return minAlloc;
     }
 
-    public void setMinAlloc(int minAlloc ) {
+    public Allocator setMinAlloc(int minAlloc ) {
         this.minAlloc = minAlloc;
+        return this;
     }
 }
 
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java
index 468f4c07a..3374eff90 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java
@@ -35,6 +35,11 @@ public boolean isPaused() {
     public void testUtf8String() throws Exception {
         StringParser p = new StringParser();
         FilteredDataEmitter f = new FilteredDataEmitter() {
+            @Override
+            public String charset() {
+                return Charsets.UTF_8.name();
+            }
+
             @Override
             public boolean isPaused() {
                 return false;

From c39cfbe0789d91ccc20fede0f1b31dd87bf58ba2 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 17 Jul 2014 00:58:52 -0700
Subject: [PATCH 026/399] derp.

---
 AndroidAsync/build.gradle                     |  2 +-
 .../koushikdutta/async/ByteBufferList.java    | 20 ++++++++++++++++++-
 .../async/parser/StringParser.java            |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 38c3f67e6..81b428fb3 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -18,7 +18,7 @@ android {
         main {
             manifest.srcFile 'AndroidManifest.xml'
 
-            jniLibs.srcDirs = ['libs/']
+//            jniLibs.srcDirs = ['libs/']
 
             java.srcDirs=['src/'
 //                          , 'okhttp/'
diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index c036bdf84..fe5b50d1c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -83,7 +83,25 @@ public int remaining() {
     public boolean hasRemaining() {
         return remaining() > 0;
     }
-    
+
+    public short peekShort() {
+        return read(2).duplicate().getShort();
+    }
+
+    public int peekInt() {
+        return read(4).duplicate().getInt();
+    }
+
+    public long peekLong() {
+        return read(8).duplicate().getLong();
+    }
+
+    public byte[] peekBytes(int size) {
+        byte[] ret = new byte[size];
+        read(size).duplicate().get(ret);
+        return ret;
+    }
+
     public int getInt() {
         int ret = read(4).getInt();
         remaining -= 4;
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
index 397b62580..89a611c3c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
@@ -20,7 +20,7 @@ public Future<String> parse(DataEmitter emitter) {
         .then(new TransformFuture<String, ByteBufferList>() {
             @Override
             protected void transform(ByteBufferList result) throws Exception {
-                setComplete(result.readString(Charset.forName(charset)));
+                setComplete(result.readString(charset != null ? Charset.forName(charset) : null));
             }
         });
     }

From 8485b8dd2673f46a69a8f4a7d6174cf5d610bb1f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 18 Jul 2014 13:25:20 -0700
Subject: [PATCH 027/399] spdy-work

---
 .gitignore                                    |   1 +
 AndroidAsync/.classpath                       |   2 +-
 AndroidAsync/build.gradle                     |   9 +
 AndroidAsync/project.properties               |   2 +-
 .../koushikdutta/async/ByteBufferList.java    |   4 +-
 .../async/http/spdy/AsyncSpdyConnection.java  | 402 ++++++++++++++++++
 .../async/http/spdy/ByteBufferListSource.java | 174 ++++++++
 .../async/http/spdy/SpdyMiddleware.java       | 158 +++++++
 .../async/test/ConscryptTests.java            | 266 ++++++++++++
 .../koushikdutta/async/test/OkHttpTest.java   |  90 ++++
 10 files changed, 1104 insertions(+), 4 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSource.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
 create mode 100644 AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
 create mode 100644 AndroidAsync/test/src/com/koushikdutta/async/test/OkHttpTest.java

diff --git a/.gitignore b/.gitignore
index b9a860d79..30c8bb1d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ build
 
 okhttp
 okio
+libs
diff --git a/AndroidAsync/.classpath b/AndroidAsync/.classpath
index c06dfcb8e..51769745b 100644
--- a/AndroidAsync/.classpath
+++ b/AndroidAsync/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 81b428fb3..908138bd5 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -39,6 +39,15 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 19
+    }
+
     compileSdkVersion 19
     buildToolsVersion "20.0.0"
 }
diff --git a/AndroidAsync/project.properties b/AndroidAsync/project.properties
index fe357b1dd..edc832b2c 100644
--- a/AndroidAsync/project.properties
+++ b/AndroidAsync/project.properties
@@ -11,7 +11,7 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-L
+target=android-19
 android.library=true
 
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index fe5b50d1c..a27f47100 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -114,8 +114,8 @@ public char getByteChar() {
         return ret;
     }
     
-    public int getShort() {
-        int ret = read(2).getShort();
+    public short getShort() {
+        short ret = read(2).getShort();
         remaining -= 2;
         return ret;
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
new file mode 100644
index 000000000..c92f51ce6
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
@@ -0,0 +1,402 @@
+package com.koushikdutta.async.http.spdy;
+
+import android.text.TextUtils;
+
+import com.koushikdutta.async.AsyncServer;
+import com.koushikdutta.async.AsyncSocket;
+import com.koushikdutta.async.BufferedDataEmitter;
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.DataEmitter;
+import com.koushikdutta.async.Util;
+import com.koushikdutta.async.callback.CompletedCallback;
+import com.koushikdutta.async.callback.DataCallback;
+import com.koushikdutta.async.callback.WritableCallback;
+import com.koushikdutta.async.http.spdy.okhttp.Protocol;
+import com.koushikdutta.async.http.spdy.okhttp.internal.NamedRunnable;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.ErrorCode;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.FrameReader;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.FrameWriter;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Header;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.HeadersMode;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Http20Draft13;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Ping;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Settings;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Spdy3;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.SpdyConnection;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.SpdyStream;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Variant;
+import com.koushikdutta.async.http.spdy.okio.BufferedSource;
+import com.koushikdutta.async.http.spdy.okio.ByteString;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import static com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Settings.DEFAULT_INITIAL_WINDOW_SIZE;
+
+/**
+ * Created by koush on 7/16/14.
+ */
+public class AsyncSpdyConnection implements FrameReader.Handler {
+    BufferedDataEmitter emitter;
+    AsyncSocket socket;
+    FrameReader reader;
+    FrameWriter writer;
+    Variant variant;
+    ByteBufferListSource source = new ByteBufferListSource();
+    Hashtable<Integer, SpdySocket> sockets = new Hashtable<Integer, SpdySocket>();
+    Protocol protocol;
+    boolean client = true;
+
+    private class SpdySocket implements AsyncSocket {
+        long bytesLeftInWriteWindow;
+        WritableCallback writable;
+        final int id;
+        CompletedCallback closedCallback;
+        CompletedCallback endCallback;
+        DataCallback dataCallback;
+        ByteBufferList pending = new ByteBufferList();
+
+        public SpdySocket(int id, boolean outFinished, boolean inFinished, List<Header> headerBlock) {
+            this.id = id;
+        }
+
+        private void report(Exception e) {
+            if (endCallback != null)
+                endCallback.onCompleted(e);
+        }
+
+        public boolean isLocallyInitiated() {
+            boolean streamIsClient = ((id & 1) == 1);
+            return client == streamIsClient;
+        }
+
+        public void addBytesToWriteWindow(long delta) {
+            long prev = bytesLeftInWriteWindow;
+            bytesLeftInWriteWindow += delta;
+            if (writable != null && bytesLeftInWriteWindow > 0 && prev <= 0)
+                writable.onWriteable();
+        }
+
+        @Override
+        public AsyncServer getServer() {
+            return socket.getServer();
+        }
+
+        @Override
+        public void setDataCallback(DataCallback callback) {
+            dataCallback = callback;
+        }
+
+        @Override
+        public DataCallback getDataCallback() {
+            return dataCallback;
+        }
+
+        @Override
+        public boolean isChunked() {
+            return false;
+        }
+
+        boolean paused;
+        @Override
+        public void pause() {
+            paused = true;
+        }
+
+        @Override
+        public void resume() {
+            paused = false;
+        }
+
+        @Override
+        public void close() {
+
+        }
+
+        @Override
+        public boolean isPaused() {
+            return paused;
+        }
+
+        @Override
+        public void setEndCallback(CompletedCallback callback) {
+            endCallback = callback;
+        }
+
+        @Override
+        public CompletedCallback getEndCallback() {
+            return endCallback;
+        }
+
+        @Override
+        public String charset() {
+            return null;
+        }
+
+        @Override
+        public void write(ByteBuffer bb) {
+
+        }
+
+        @Override
+        public void write(ByteBufferList bb) {
+
+        }
+
+        @Override
+        public void setWriteableCallback(WritableCallback handler) {
+            writable = handler;
+        }
+
+        @Override
+        public WritableCallback getWriteableCallback() {
+            return writable;
+        }
+
+        @Override
+        public boolean isOpen() {
+            return true;
+        }
+
+        @Override
+        public void end() {
+        }
+
+        @Override
+        public void setClosedCallback(CompletedCallback handler) {
+            closedCallback = handler;
+        }
+
+        @Override
+        public CompletedCallback getClosedCallback() {
+            return closedCallback;
+        }
+    }
+
+    public AsyncSpdyConnection(AsyncSocket socket, Protocol protocol) {
+        this.protocol = protocol;
+        this.socket = socket;
+        emitter = new BufferedDataEmitter(socket);
+        emitter.setDataCallback(callback);
+
+        if (protocol == Protocol.SPDY_3) {
+            variant = new Spdy3();
+        }
+        else if (protocol == Protocol.HTTP_2) {
+            variant = new Http20Draft13();
+        }
+        reader = variant.newReader(source, true);
+    }
+
+    DataCallback callback = new DataCallback() {
+        @Override
+        public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+            bb.get(source);
+            if (!reader.canProcessFrame(source))
+                return;
+            try {
+                reader.nextFrame(AsyncSpdyConnection.this);
+            }
+            catch (IOException e) {
+                throw new AssertionError(e);
+            }
+        }
+    };
+
+    /** Even, positive numbered streams are pushed streams in HTTP/2. */
+    private boolean pushedStream(int streamId) {
+        return protocol == Protocol.HTTP_2 && streamId != 0 && (streamId & 1) == 0;
+    }
+
+    @Override
+    public void data(boolean inFinished, int streamId, BufferedSource source, int length) throws IOException {
+        if (pushedStream(streamId)) {
+            throw new AssertionError("push");
+//            pushDataLater(streamId, source, length, inFinished);
+//            return;
+        }
+        SpdySocket socket = sockets.get(streamId);
+        if (socket == null) {
+            writer.rstStream(streamId, ErrorCode.INVALID_STREAM);
+            source.skip(length);
+            return;
+        }
+        if (source != this.source)
+            throw new AssertionError();
+        this.source.get(socket.pending, length);
+        Util.emitAllData(socket, socket.pending);
+        if (inFinished) {
+            socket.report(null);
+        }
+    }
+
+    private int lastGoodStreamId;
+    private int nextStreamId;
+    @Override
+    public void headers(boolean outFinished, boolean inFinished, int streamId, int associatedStreamId, List<Header> headerBlock, HeadersMode headersMode) {
+        if (pushedStream(streamId)) {
+            throw new AssertionError("push");
+//            pushHeadersLater(streamId, headerBlock, inFinished);
+//            return;
+        }
+
+        // If we're shutdown, don't bother with this stream.
+        if (shutdown) return;
+
+        SpdySocket socket = sockets.get(streamId);
+
+        if (socket == null) {
+            // The headers claim to be for an existing stream, but we don't have one.
+            if (headersMode.failIfStreamAbsent()) {
+                try {
+                    writer.rstStream(streamId, ErrorCode.INVALID_STREAM);
+                    return;
+                }
+                catch (IOException e) {
+                    throw new AssertionError(e);
+                }
+            }
+
+            // If the stream ID is less than the last created ID, assume it's already closed.
+            if (streamId <= lastGoodStreamId) return;
+
+            // If the stream ID is in the client's namespace, assume it's already closed.
+            if (streamId % 2 == nextStreamId % 2) return;
+
+            // Create a stream.
+            socket = new SpdySocket(streamId, outFinished, inFinished, headerBlock);
+            lastGoodStreamId = streamId;
+            sockets.put(streamId, socket);
+            handler.receive(newStream);
+            return;
+        }
+
+        // The headers claim to be for a new stream, but we already have one.
+        if (headersMode.failIfStreamPresent()) {
+            stream.closeLater(ErrorCode.PROTOCOL_ERROR);
+            removeStream(streamId);
+            return;
+        }
+
+        // Update an existing stream.
+        stream.receiveHeaders(headerBlock, headersMode);
+        if (inFinished) stream.receiveFin();
+    }
+
+    @Override
+    public void rstStream(int streamId, ErrorCode errorCode) {
+        if (pushedStream(streamId)) {
+            throw new AssertionError("push");
+//            pushResetLater(streamId, errorCode);
+//            return;
+        }
+        SpdySocket rstStream = sockets.remove(streamId);
+        if (rstStream != null) {
+            rstStream.report(new IOException(errorCode.toString()));
+        }
+    }
+
+    Settings peerSettings = new Settings();
+    private boolean receivedInitialPeerSettings = false;
+    @Override
+    public void settings(boolean clearPrevious, Settings settings) {
+        long delta = 0;
+        int priorWriteWindowSize = peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE);
+        if (clearPrevious)
+            peerSettings.clear();
+        peerSettings.merge(settings);
+        try {
+            writer.ackSettings();
+        } catch (IOException e) {
+            throw new AssertionError(e);
+        }
+        int peerInitialWindowSize = peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE);
+        if (peerInitialWindowSize != -1 && peerInitialWindowSize != priorWriteWindowSize) {
+            delta = peerInitialWindowSize - priorWriteWindowSize;
+            if (!receivedInitialPeerSettings) {
+                addBytesToWriteWindow(delta);
+                receivedInitialPeerSettings = true;
+            }
+        }
+        for (SpdySocket socket: sockets.values()) {
+            socket.addBytesToWriteWindow(delta);
+        }
+    }
+
+    @Override
+    public void ackSettings() {
+    }
+
+    private Map<Integer, Ping> pings;
+    private void writePing(boolean reply, int payload1, int payload2, Ping ping) throws IOException {
+        if (ping != null) ping.send();
+        writer.ping(reply, payload1, payload2);
+    }
+
+    private synchronized Ping removePing(int id) {
+        return pings != null ? pings.remove(id) : null;
+    }
+
+    @Override
+    public void ping(boolean ack, int payload1, int payload2) {
+        if (ack) {
+            Ping ping = removePing(payload1);
+            if (ping != null) {
+                ping.receive();
+            }
+        } else {
+            // Send a reply to a client ping if this is a server and vice versa.
+            try {
+                writePing(true, payload1, payload2, null);
+            }
+            catch (IOException e) {
+                throw new AssertionError(e);
+            }
+        }
+    }
+
+    boolean shutdown;
+    @Override
+    public void goAway(int lastGoodStreamId, ErrorCode errorCode, ByteString debugData) {
+        shutdown = true;
+
+        // Fail all streams created after the last good stream ID.
+        for (Iterator<Map.Entry<Integer, SpdySocket>> i = sockets.entrySet().iterator();
+             i.hasNext(); ) {
+            Map.Entry<Integer, SpdySocket> entry = i.next();
+            int streamId = entry.getKey();
+            if (streamId > lastGoodStreamId && entry.getValue().isLocallyInitiated()) {
+                entry.getValue().report(new IOException(ErrorCode.REFUSED_STREAM.toString()));
+                i.remove();
+            }
+        }
+    }
+
+    @Override
+    public void windowUpdate(int streamId, long windowSizeIncrement) {
+        System.out.println("fff");
+
+    }
+
+    @Override
+    public void priority(int streamId, int streamDependency, int weight, boolean exclusive) {
+        System.out.println("fff");
+
+    }
+
+    @Override
+    public void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders) throws IOException {
+        System.out.println("fff");
+
+    }
+
+    @Override
+    public void alternateService(int streamId, String origin, ByteString protocol, String host, int port, long maxAge) {
+        System.out.println("fff");
+
+    }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSource.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSource.java
new file mode 100644
index 000000000..5d57c772d
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSource.java
@@ -0,0 +1,174 @@
+package com.koushikdutta.async.http.spdy;
+
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.http.spdy.okio.Buffer;
+import com.koushikdutta.async.http.spdy.okio.BufferedSource;
+import com.koushikdutta.async.http.spdy.okio.ByteString;
+import com.koushikdutta.async.http.spdy.okio.Sink;
+import com.koushikdutta.async.http.spdy.okio.Timeout;
+import com.koushikdutta.async.util.Charsets;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteOrder;
+import java.nio.charset.Charset;
+
+/**
+ * Created by koush on 7/17/14.
+ */
+public class ByteBufferListSource extends ByteBufferList implements BufferedSource {
+    @Override
+    public Buffer buffer() {
+        return null;
+    }
+
+    @Override
+    public boolean exhausted() throws IOException {
+        return !hasRemaining();
+    }
+
+    @Override
+    public void require(long byteCount) throws IOException {
+        if (remaining() < byteCount)
+            throw new AssertionError("out of data");
+    }
+
+    @Override
+    public byte readByte() throws IOException {
+        return order(ByteOrder.BIG_ENDIAN).get();
+    }
+
+    @Override
+    public short readShort() throws IOException {
+        return order(ByteOrder.BIG_ENDIAN).getShort();
+    }
+
+    @Override
+    public short readShortLe() throws IOException {
+        return order(ByteOrder.LITTLE_ENDIAN).getShort();
+    }
+
+    @Override
+    public int readInt() throws IOException {
+        return order(ByteOrder.BIG_ENDIAN).getInt();
+    }
+
+    @Override
+    public int readIntLe() throws IOException {
+        return order(ByteOrder.LITTLE_ENDIAN).getInt();
+    }
+
+    @Override
+    public long readLong() throws IOException {
+        return order(ByteOrder.BIG_ENDIAN).getLong();
+    }
+
+    @Override
+    public long readLongLe() throws IOException {
+        return order(ByteOrder.LITTLE_ENDIAN).getLong();
+    }
+
+    @Override
+    public void skip(long byteCount) throws IOException {
+        if (byteCount > Integer.MAX_VALUE)
+            throw new AssertionError("too much skippy, use less peanut butter");
+        read(new byte[(int)byteCount]);
+    }
+
+    @Override
+    public ByteString readByteString() throws IOException {
+        return readByteString(remaining());
+    }
+
+    @Override
+    public ByteString readByteString(long byteCount) throws IOException {
+        return ByteString.of(readByteArray(byteCount));
+    }
+
+    @Override
+    public byte[] readByteArray() throws IOException {
+        return getAllByteArray();
+    }
+
+    @Override
+    public byte[] readByteArray(long byteCount) throws IOException {
+        byte[] ret = new byte[(int)byteCount];
+        get(ret);
+        return ret;
+    }
+
+    @Override
+    public int read(byte[] sink) throws IOException {
+        return read(sink, 0, sink.length);
+    }
+
+    @Override
+    public void readFully(byte[] sink) throws IOException {
+        read(sink, 0, sink.length);
+    }
+
+    @Override
+    public int read(byte[] sink, int offset, int byteCount) throws IOException {
+        get(sink, offset, byteCount);
+        return byteCount;
+    }
+
+    @Override
+    public void readFully(Buffer sink, long byteCount) throws IOException {
+        throw new AssertionError("not implemented");
+    }
+
+    @Override
+    public long readAll(Sink sink) throws IOException {
+        throw new AssertionError("not implemented");
+    }
+
+    @Override
+    public String readUtf8() throws IOException {
+        return readUtf8(remaining());
+    }
+
+    @Override
+    public String readUtf8(long byteCount) throws IOException {
+        return new String(readByteArray(byteCount), Charsets.UTF_8);
+    }
+
+    @Override
+    public String readUtf8Line() throws IOException {
+        throw new AssertionError("not implemented");
+    }
+
+    @Override
+    public String readUtf8LineStrict() throws IOException {
+        throw new AssertionError("not implemented");
+    }
+
+    @Override
+    public String readString(long byteCount, Charset charset) throws IOException {
+        return new String(readByteArray(byteCount), charset);
+    }
+
+    @Override
+    public long indexOf(byte b) throws IOException {
+        throw new AssertionError("not implemented");
+    }
+
+    @Override
+    public InputStream inputStream() {
+        throw new AssertionError("not implemented");
+    }
+
+    @Override
+    public long read(Buffer sink, long byteCount) throws IOException {
+        throw new AssertionError("not implemented");
+    }
+
+    @Override
+    public Timeout timeout() {
+        return null;
+    }
+
+    @Override
+    public void close() throws IOException {
+    }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
new file mode 100644
index 000000000..bddf203c0
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -0,0 +1,158 @@
+package com.koushikdutta.async.http.spdy;
+
+import com.koushikdutta.async.AsyncSSLSocket;
+import com.koushikdutta.async.AsyncSSLSocketWrapper;
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.callback.ConnectCallback;
+import com.koushikdutta.async.future.Cancellable;
+import com.koushikdutta.async.http.AsyncHttpClient;
+import com.koushikdutta.async.http.AsyncSSLEngineConfigurator;
+import com.koushikdutta.async.http.AsyncSSLSocketMiddleware;
+import com.koushikdutta.async.http.spdy.okhttp.Protocol;
+import com.koushikdutta.async.util.Charsets;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.nio.ByteBuffer;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+
+public class SpdyMiddleware extends AsyncSSLSocketMiddleware {
+    public SpdyMiddleware(AsyncHttpClient client) {
+        super(client);
+        addEngineConfigurator(new AsyncSSLEngineConfigurator() {
+            @Override
+            public void configureEngine(SSLEngine engine, String host, int port) {
+                configure(engine, host, port);
+            }
+        });
+    }
+
+    static byte[] concatLengthPrefixed(Protocol... protocols) {
+        ByteBuffer result = ByteBuffer.allocate(8192);
+        for (Protocol protocol: protocols) {
+            if (protocol == Protocol.HTTP_1_0) continue; // No HTTP/1.0 for NPN.
+            result.put((byte) protocol.toString().length());
+            result.put(protocol.toString().getBytes(Charsets.UTF_8));
+        }
+        result.flip();
+        byte[] ret = new ByteBufferList(result).getAllByteArray();
+        return ret;
+    }
+
+    @Override
+    protected AsyncSSLSocketWrapper.HandshakeCallback createHandshakeCallback(final ConnectCallback callback) {
+        return new AsyncSSLSocketWrapper.HandshakeCallback() {
+            @Override
+            public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
+                if (e != null || nativeGetAlpnNegotiatedProtocol == null) {
+                    callback.onConnectCompleted(e, socket);
+                    return;
+                }
+                try {
+                    long ptr = (long)sslNativePointer.get(socket.getSSLEngine());
+                    byte[] proto = (byte[])nativeGetAlpnNegotiatedProtocol.invoke(null, ptr);
+                    String protoString = new String(proto);
+                    AsyncSpdyConnection connection = new AsyncSpdyConnection(socket, Protocol.get(protoString));
+                }
+                catch (Exception ex) {
+                    socket.close();
+                    callback.onConnectCompleted(ex, null);
+                }
+            }
+        };
+    }
+
+    private void configure(SSLEngine engine, String host, int port) {
+        if (!initialized) {
+            initialized = true;
+            try {
+                peerHost = engine.getClass().getSuperclass().getDeclaredField("peerHost");
+                peerPort = engine.getClass().getSuperclass().getDeclaredField("peerPort");
+                sslParameters = engine.getClass().getDeclaredField("sslParameters");
+                npnProtocols = sslParameters.getType().getDeclaredField("npnProtocols");
+                alpnProtocols = sslParameters.getType().getDeclaredField("alpnProtocols");
+                useSni = sslParameters.getType().getDeclaredField("useSni");
+                sslNativePointer = engine.getClass().getDeclaredField("sslNativePointer");
+                String nativeCryptoName = sslParameters.getType().getPackage().getName() + ".NativeCrypto";
+                nativeGetNpnNegotiatedProtocol = Class.forName(nativeCryptoName, true, sslParameters.getType().getClassLoader())
+                .getDeclaredMethod("SSL_get_npn_negotiated_protocol", long.class);
+                nativeGetAlpnNegotiatedProtocol = Class.forName(nativeCryptoName, true, sslParameters.getType().getClassLoader())
+                .getDeclaredMethod("SSL_get0_alpn_selected", long.class);
+
+                peerHost.setAccessible(true);
+                peerPort.setAccessible(true);
+                sslParameters.setAccessible(true);
+                npnProtocols.setAccessible(true);
+                alpnProtocols.setAccessible(true);
+                useSni.setAccessible(true);
+                sslNativePointer.setAccessible(true);
+                nativeGetNpnNegotiatedProtocol.setAccessible(true);
+                nativeGetAlpnNegotiatedProtocol.setAccessible(true);
+            }
+            catch (Exception e) {
+                sslParameters = null;
+                npnProtocols = null;
+                alpnProtocols = null;
+                useSni = null;
+                sslNativePointer = null;
+                nativeGetNpnNegotiatedProtocol = null;
+                nativeGetAlpnNegotiatedProtocol = null;
+            }
+        }
+
+        if (sslParameters != null) {
+            try {
+                byte[] protocols = concatLengthPrefixed(
+                Protocol.HTTP_1_1,
+                Protocol.SPDY_3
+                );
+
+                peerHost.set(engine, host);
+                peerPort.set(engine, port);
+                Object sslp = sslParameters.get(engine);
+//                npnProtocols.set(sslp, protocols);
+                alpnProtocols.set(sslp, protocols);
+                useSni.set(sslp, true);
+            }
+            catch (Exception e ) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    @Override
+    protected SSLEngine createConfiguredSSLEngine(String host, int port) {
+        SSLContext sslContext = getSSLContext();
+        SSLEngine sslEngine = sslContext.createSSLEngine();
+
+        for (AsyncSSLEngineConfigurator configurator : engineConfigurators) {
+            configurator.configureEngine(sslEngine, host, port);
+        }
+
+        return sslEngine;
+    }
+
+    boolean initialized;
+    Field peerHost;
+    Field peerPort;
+    Field sslParameters;
+    Field npnProtocols;
+    Field alpnProtocols;
+    Field sslNativePointer;
+    Field useSni;
+    Method nativeGetNpnNegotiatedProtocol;
+    Method nativeGetAlpnNegotiatedProtocol;
+
+    @Override
+    public void setSSLContext(SSLContext sslContext) {
+        super.setSSLContext(sslContext);
+        initialized = false;
+    }
+
+    @Override
+    public Cancellable getSocket(GetSocketData data) {
+        return super.getSocket(data);
+    }
+}
\ No newline at end of file
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
new file mode 100644
index 000000000..1322e0390
--- /dev/null
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
@@ -0,0 +1,266 @@
+/*
+ * Copyright 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.koushikdutta.async.test;
+
+
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.ErrorCode;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.FrameReader;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Header;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.HeadersMode;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Settings;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Spdy3;
+import com.koushikdutta.async.http.spdy.okio.BufferedSource;
+import com.koushikdutta.async.http.spdy.okio.ByteString;
+import com.koushikdutta.async.http.spdy.okio.Okio;
+
+import junit.framework.TestCase;
+
+import org.conscrypt.OpenSSLEngineImpl;
+import org.conscrypt.OpenSSLProvider;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.security.Security;
+import java.util.List;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLEngineResult;
+
+/**
+ * Created by koush on 7/15/14.
+ */
+public class ConscryptTests extends TestCase {
+    boolean initialized;
+    Field peerHost;
+    Field peerPort;
+    Field sslParameters;
+    Field npnProtocols;
+    Field alpnProtocols;
+    Field sslNativePointer;
+    Field useSni;
+    Method nativeGetNpnNegotiatedProtocol;
+    Method nativeGetAlpnNegotiatedProtocol;
+
+    private void configure(SSLEngine engine, String host, int port) throws Exception {
+        if (!initialized) {
+            initialized = true;
+            peerHost = engine.getClass().getSuperclass().getDeclaredField("peerHost");
+            peerPort = engine.getClass().getSuperclass().getDeclaredField("peerPort");
+            sslParameters = engine.getClass().getDeclaredField("sslParameters");
+            npnProtocols = sslParameters.getType().getDeclaredField("npnProtocols");
+            alpnProtocols = sslParameters.getType().getDeclaredField("alpnProtocols");
+            useSni = sslParameters.getType().getDeclaredField("useSni");
+            sslNativePointer = engine.getClass().getDeclaredField("sslNativePointer");
+            String nativeCryptoName = sslParameters.getType().getPackage().getName() + ".NativeCrypto";
+            nativeGetNpnNegotiatedProtocol = Class.forName(nativeCryptoName, true, sslParameters.getType().getClassLoader())
+            .getDeclaredMethod("SSL_get_npn_negotiated_protocol", long.class);
+            nativeGetAlpnNegotiatedProtocol = Class.forName(nativeCryptoName, true, sslParameters.getType().getClassLoader())
+            .getDeclaredMethod("SSL_get0_alpn_selected", long.class);
+
+            peerHost.setAccessible(true);
+            peerPort.setAccessible(true);
+            sslParameters.setAccessible(true);
+            npnProtocols.setAccessible(true);
+            alpnProtocols.setAccessible(true);
+            useSni.setAccessible(true);
+            sslNativePointer.setAccessible(true);
+            nativeGetNpnNegotiatedProtocol.setAccessible(true);
+            nativeGetAlpnNegotiatedProtocol.setAccessible(true);
+        }
+
+        byte[] protocols = concatLengthPrefixed(
+        "http/1.1",
+        "spdy/3.1"
+        );
+
+        peerHost.set(engine, host);
+        peerPort.set(engine, port);
+        Object sslp = sslParameters.get(engine);
+//        npnProtocols.set(sslp, protocols);
+        alpnProtocols.set(sslp, protocols);
+        useSni.set(sslp, true);
+    }
+
+    static byte[] concatLengthPrefixed(String... protocols) {
+        ByteBuffer result = ByteBuffer.allocate(8192);
+        for (String protocol: protocols) {
+            result.put((byte) protocol.toString().length());
+            result.put(protocol.toString().getBytes(Charset.forName("UTF-8")));
+        }
+        result.flip();
+        byte[] ret = new byte[result.remaining()];
+        result.get(ret);
+        return ret;
+    }
+
+    public void testConscryptSSLEngineNPNHandshakeBug() throws Exception {
+        Security.insertProviderAt(new OpenSSLProvider("MyNameBlah"), 1);
+        SSLContext ctx = SSLContext.getInstance("TLS");
+        ctx.init(null, null, null);
+
+        OpenSSLEngineImpl engine = (OpenSSLEngineImpl)ctx.createSSLEngine();
+        configure(engine, "www.google.com", 443);
+        engine.setUseClientMode(true);
+        engine.beginHandshake();
+
+        Socket socket = new Socket();
+        socket.connect(new InetSocketAddress("www.google.com", 443));
+
+        InputStream is = socket.getInputStream();
+        OutputStream os = socket.getOutputStream();
+
+        byte[] buf = new byte[65536];
+        ByteBuffer unwrap = null;
+        ByteBuffer dummy = ByteBuffer.allocate(65536);
+
+        SSLEngineResult.HandshakeStatus handshakeStatus = engine.getHandshakeStatus();
+
+        while (handshakeStatus != SSLEngineResult.HandshakeStatus.FINISHED
+            && handshakeStatus != SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING) {
+            if (handshakeStatus == SSLEngineResult.HandshakeStatus.NEED_UNWRAP) {
+                System.out.println("waiting for read... " + engine.getHandshakeStatus());
+                int read = is.read(buf);
+                System.out.println("read: " + read);
+                if (read <= 0)
+                    throw new Exception("closed!");
+
+                if (unwrap != null) {
+                    int bufLen = unwrap.remaining() + read;
+                    ByteBuffer b = ByteBuffer.allocate(bufLen);
+                    b.put(unwrap);
+                    b.put(buf, 0, read);
+                    b.flip();
+                    unwrap = b;
+                }
+                else {
+                    unwrap = ByteBuffer.wrap(buf, 0, read);
+                }
+
+                if (!unwrap.hasRemaining()) {
+                    unwrap = null;
+                }
+
+                dummy.clear();
+                SSLEngineResult res = engine.unwrap(unwrap, dummy);
+                System.out.println("data remaining after unwrap: " + unwrap.remaining());
+                handshakeStatus = res.getHandshakeStatus();
+            }
+
+            if (handshakeStatus == SSLEngineResult.HandshakeStatus.NEED_WRAP) {
+                dummy.clear();
+                SSLEngineResult res = engine.wrap(ByteBuffer.allocate(0), dummy);
+                handshakeStatus = res.getHandshakeStatus();
+                dummy.flip();
+                if (dummy.hasRemaining()) {
+                    os.write(dummy.array(), 0, dummy.remaining());
+                }
+            }
+            else if (handshakeStatus == SSLEngineResult.HandshakeStatus.NEED_TASK) {
+                engine.getDelegatedTask().run();
+            }
+        }
+
+
+        System.out.println("Done handshaking! Thank you come again.");
+        long ptr = (long)sslNativePointer.get(engine);
+        byte[] proto = (byte[]) nativeGetAlpnNegotiatedProtocol.invoke(null, ptr);
+//        byte[] proto = (byte[]) nativeGetNpnNegotiatedProtocol.invoke(null, ptr);
+        String protoString = new String(proto);
+        System.out.println("negotiated protocol was: " + protoString);
+        assertEquals(protoString, "spdy/3.1");
+
+        dummy.clear();
+        SSLEngineResult res = engine.unwrap(unwrap, dummy);
+        dummy.flip();
+        byte[] frame = new byte[dummy.remaining()];
+        dummy.get(frame );
+        Spdy3 spdy3 = new Spdy3();
+        BufferedSource source = Okio.buffer(Okio.source(new ByteArrayInputStream(frame)));
+        FrameReader frameReader = spdy3.newReader(source, true);
+        ByteBufferList bb = new ByteBufferList(ByteBuffer.wrap(frame));
+        assertTrue(frameReader.canProcessFrame(bb));
+
+        frameReader.nextFrame(new FrameReader.Handler() {
+            @Override
+            public void data(boolean inFinished, int streamId, BufferedSource source, int length) throws IOException {
+
+            }
+
+            @Override
+            public void headers(boolean outFinished, boolean inFinished, int streamId, int associatedStreamId, List<Header> headerBlock, HeadersMode headersMode) {
+
+            }
+
+            @Override
+            public void rstStream(int streamId, ErrorCode errorCode) {
+
+            }
+
+            @Override
+            public void settings(boolean clearPrevious, Settings settings) {
+
+            }
+
+            @Override
+            public void ackSettings() {
+
+            }
+
+            @Override
+            public void ping(boolean ack, int payload1, int payload2) {
+
+            }
+
+            @Override
+            public void goAway(int lastGoodStreamId, ErrorCode errorCode, ByteString debugData) {
+
+            }
+
+            @Override
+            public void windowUpdate(int streamId, long windowSizeIncrement) {
+
+            }
+
+            @Override
+            public void priority(int streamId, int streamDependency, int weight, boolean exclusive) {
+
+            }
+
+            @Override
+            public void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders) throws IOException {
+
+            }
+
+            @Override
+            public void alternateService(int streamId, String origin, ByteString protocol, String host, int port, long maxAge) {
+
+            }
+        });
+
+
+    }
+}
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/OkHttpTest.java b/AndroidAsync/test/src/com/koushikdutta/async/test/OkHttpTest.java
new file mode 100644
index 000000000..d63494b63
--- /dev/null
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/OkHttpTest.java
@@ -0,0 +1,90 @@
+package com.koushikdutta.async.test;
+
+
+import android.test.AndroidTestCase;
+
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.http.spdy.okhttp.Handshake;
+import com.koushikdutta.async.http.spdy.okhttp.Protocol;
+import com.koushikdutta.async.util.Charsets;
+
+import org.conscrypt.OpenSSLProvider;
+
+import java.lang.reflect.Method;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.nio.ByteBuffer;
+import java.security.Security;
+
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocket;
+
+public class OkHttpTest extends AndroidTestCase {
+    public void testOkHttp() throws Exception {
+//        Context context = getContext().getApplicationContext();
+//        Context gms = context.createPackageContext("com.google.android.gms", Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY);
+//        gms
+//        .getClassLoader()
+//        .loadClass("com.google.android.gms.common.security.ProviderInstallerImpl")
+//        .getMethod("insertProvider", Context.class)
+//        .invoke(null, context);
+        Security.insertProviderAt(new OpenSSLProvider("MyNameBlah"), 1);
+
+        Class<?> openSslSocketClass;
+        Method setUseSessionTickets;
+        Method setHostname;
+        openSslSocketClass = Class.forName("org.conscrypt.OpenSSLSocketImpl");
+        setUseSessionTickets = openSslSocketClass.getMethod("setUseSessionTickets", boolean.class);
+        setHostname = openSslSocketClass.getMethod("setHostname", String.class);
+        Method trafficStatsTagSocket = null;
+        Method trafficStatsUntagSocket = null;
+        Class<?> trafficStats = Class.forName("android.net.TrafficStats");
+        trafficStatsTagSocket = trafficStats.getMethod("tagSocket", Socket.class);
+        trafficStatsUntagSocket = trafficStats.getMethod("untagSocket", Socket.class);
+
+        // Attempt to find Android 4.1+ APIs.
+        Method setNpnProtocols = null;
+        Method getNpnSelectedProtocol = null;
+        setNpnProtocols = openSslSocketClass.getMethod("setNpnProtocols", byte[].class);
+        getNpnSelectedProtocol = openSslSocketClass.getMethod("getNpnSelectedProtocol");
+
+
+//            Platform p = Platform.get();
+
+        SSLContext ctx = SSLContext.getInstance("TLS");
+        ctx.init(null, null, null);
+        Socket socket = SocketFactory.getDefault().createSocket();
+        socket.connect(new InetSocketAddress("www.google.com", 443));
+        socket = ctx.getSocketFactory().createSocket(socket, "www.google.com", 443, true);
+        SSLSocket sslSocket = (SSLSocket) socket;
+
+        setUseSessionTickets.invoke(sslSocket, true);
+        setHostname.invoke(sslSocket, "www.google.com");
+        setNpnProtocols.invoke(sslSocket, new Object[] { concatLengthPrefixed(Protocol.HTTP_1_1, Protocol.SPDY_3) });
+
+
+        sslSocket.startHandshake();
+        Handshake handshake = Handshake.get(sslSocket.getSession());
+
+        String proto = new String((byte[])getNpnSelectedProtocol.invoke(sslSocket));
+
+//        InputStream is = sslSocket.getInputStream();
+//        StreamUtility.eat(is);
+
+        System.out.println(proto);
+    }
+
+    static byte[] concatLengthPrefixed(Protocol... protocols) {
+        ByteBuffer result = ByteBuffer.allocate(8192);
+        for (Protocol protocol: protocols) {
+            if (protocol == Protocol.HTTP_1_0) continue; // No HTTP/1.0 for NPN.
+            result.put((byte) protocol.toString().length());
+            result.put(protocol.toString().getBytes(Charsets.UTF_8));
+        }
+        result.flip();
+        byte[] ret = new ByteBufferList(result).getAllByteArray();
+        return ret;
+    }
+
+}
\ No newline at end of file

From 5864287147d01d51bf7948fb05f60bc3ad275775 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 18 Jul 2014 13:31:25 -0700
Subject: [PATCH 028/399] fixes for eclipse

---
 .gitignore                                 |  1 +
 AndroidAsync/AndroidAsync-AndroidAsync.iml |  6 ------
 AndroidAsync/build.gradle                  | 25 +++++++++-------------
 AndroidAsync/project.properties            |  2 +-
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index b9a860d79..30c8bb1d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ build
 
 okhttp
 okio
+libs
diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index f88736b56..1cdbd092c 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -60,12 +60,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <content url="file://$MODULE_DIR$/../compat">
-      <sourceFolder url="file://$MODULE_DIR$/../compat" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../conscrypt">
-      <sourceFolder url="file://$MODULE_DIR$/../conscrypt" isTestSource="false" />
-    </content>
     <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 81b428fb3..0a1985d0b 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -9,24 +9,15 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-    dependencies {
-//        compile 'com.squareup.okio:okio:+'
-//        androidTestCompile 'com.squareup.okhttp:okhttp:1.+'
-    }
-
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
 
-//            jniLibs.srcDirs = ['libs/']
+            jniLibs.srcDirs = ['libs/']
 
             java.srcDirs=['src/'
-//                          , 'okhttp/'
-//                          , 'okhttp-shim/'
-//                          , '../okio/okio/src/main/java/'
-                          , '../conscrypt/'
-                          , '../compat/'
-//                          , '../okhttp/okhttp/src/main/java/'
+//                          , '../conscrypt/'
+//                          , '../compat/'
             ]
         }
         androidTest.java.srcDirs=['test/src/']
@@ -34,9 +25,13 @@ android {
         androidTest.assets.srcDirs=['test/assets/']
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+    lintOptions {
+        abortOnError false
+    }
+
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 19
     }
 
     compileSdkVersion 19
diff --git a/AndroidAsync/project.properties b/AndroidAsync/project.properties
index fe357b1dd..edc832b2c 100644
--- a/AndroidAsync/project.properties
+++ b/AndroidAsync/project.properties
@@ -11,7 +11,7 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-L
+target=android-19
 android.library=true
 
 

From 499d2772c638e91a6a27b3394efc7e9193b498f6 Mon Sep 17 00:00:00 2001
From: Sean Stuckless <sean.stuckless@gmail.com>
Date: Fri, 18 Jul 2014 18:57:31 -0400
Subject: [PATCH 029/399] removed package protected on some fields so that
 subclasses could access the fields

---
 .../koushikdutta/async/http/AsyncSSLSocketMiddleware.java   | 6 +++---
 .../com/koushikdutta/async/http/AsyncSocketMiddleware.java  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
index b339c935e..82cc3eadb 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
@@ -26,7 +26,7 @@ public AsyncSSLSocketMiddleware(AsyncHttpClient client) {
         super(client, "https", 443);
     }
 
-    SSLContext sslContext;
+    protected SSLContext sslContext;
 
     public void setSSLContext(SSLContext sslContext) {
         this.sslContext = sslContext;
@@ -36,13 +36,13 @@ public SSLContext getSSLContext() {
         return sslContext != null ? sslContext : AsyncSSLSocketWrapper.getDefaultSSLContext();
     }
 
-    TrustManager[] trustManagers;
+    protected TrustManager[] trustManagers;
 
     public void setTrustManagers(TrustManager[] trustManagers) {
         this.trustManagers = trustManagers;
     }
 
-    HostnameVerifier hostnameVerifier;
+    protected HostnameVerifier hostnameVerifier;
 
     public void setHostnameVerifier(HostnameVerifier hostnameVerifier) {
         this.hostnameVerifier = hostnameVerifier;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index 8e8a36e0e..e293d23a0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -50,7 +50,7 @@ public AsyncSocketMiddleware(AsyncHttpClient client) {
         this(client, "http", 80);
     }
 
-    AsyncHttpClient mClient;
+    protected AsyncHttpClient mClient;
 
     protected ConnectCallback wrapCallback(ConnectCallback callback, Uri uri, int port, boolean proxied) {
         return callback;

From 1d43efe595480565fce5389ebe90a6e961509c73 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 19 Jul 2014 00:05:40 -0700
Subject: [PATCH 030/399] remove datasink.write(ByteBuffer).

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml    |  6 ++
 AndroidAsync/build.gradle                     | 18 +----
 .../async/AsyncNetworkSocket.java             | 32 --------
 .../async/AsyncSSLSocketWrapper.java          | 76 ++++---------------
 .../koushikdutta/async/BufferedDataSink.java  | 26 -------
 .../src/com/koushikdutta/async/DataSink.java  |  4 -
 .../koushikdutta/async/FilteredDataSink.java  | 17 -----
 .../src/com/koushikdutta/async/Util.java      | 24 +++---
 .../src/com/koushikdutta/async/dns/Dns.java   |  2 +-
 .../async/http/AsyncHttpResponse.java         |  2 +-
 .../async/http/AsyncHttpResponseImpl.java     | 14 +---
 .../async/http/ResponseCacheMiddleware.java   |  6 --
 .../async/http/WebSocketImpl.java             | 17 +----
 .../http/filter/ChunkedOutputFilter.java      |  9 +++
 .../server/AsyncHttpServerResponseImpl.java   | 21 -----
 .../async/http/spdy/AsyncSpdyConnection.java  | 10 +--
 .../async/http/spdy/SpdyMiddleware.java       |  2 +-
 .../async/stream/OutputStreamDataSink.java    | 17 -----
 .../koushikdutta/async/util/Allocator.java    |  4 +
 .../async/test/ConscryptTests.java            |  2 +-
 .../com/koushikdutta/async/test/Issue59.java  |  2 +-
 21 files changed, 63 insertions(+), 248 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index 1cdbd092c..f88736b56 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -60,6 +60,12 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
+    <content url="file://$MODULE_DIR$/../compat">
+      <sourceFolder url="file://$MODULE_DIR$/../compat" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../conscrypt">
+      <sourceFolder url="file://$MODULE_DIR$/../conscrypt" isTestSource="false" />
+    </content>
     <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 5f19dba18..e193153d7 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -16,8 +16,8 @@ android {
             jniLibs.srcDirs = ['libs/']
 
             java.srcDirs=['src/'
-//                          , '../conscrypt/'
-//                          , '../compat/'
+                          , '../conscrypt/'
+                          , '../compat/'
             ]
         }
         androidTest.java.srcDirs=['test/src/']
@@ -29,20 +29,6 @@ android {
         abortOnError false
     }
 
-    defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 19
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-
-    defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 19
-    }
-
     compileSdkVersion 19
     buildToolsVersion "20.0.0"
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
index 9a15cb287..3eb5a3cd1 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
@@ -102,38 +102,6 @@ private void handleRemaining(int remaining) {
             mKey.interestOps(SelectionKey.OP_READ);
         }
     }
-
-    @Override
-    public void write(final ByteBuffer b) {
-        if (mServer.getAffinity() != Thread.currentThread()) {
-            mServer.run(new Runnable() {
-                @Override
-                public void run() {
-                    write(b);
-                }
-            });
-            return;
-        }
-        try {
-            if (!mChannel.isConnected()) {
-                assert !mChannel.isChunked();
-                return;
-            }
-
-            // keep writing until the the socket can't write any more, or the
-            // data is exhausted.
-            int before = b.remaining();
-            mChannel.write(b);
-            handleRemaining(b.remaining());
-            mServer.onDataSent(before - b.remaining());
-        }
-        catch (IOException ex) {
-            closeInternal();
-            reportEndPending(ex);
-            reportClose(ex);
-        }
-    }
-
     private ByteBufferList pending = new ByteBufferList();
 //    private ByteBuffer[] buffers = new ByteBuffer[8];
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 36d087c51..7f609994a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -244,7 +244,7 @@ private void handleHandshakeStatus(HandshakeStatus status) {
         }
 
         if (status == HandshakeStatus.NEED_WRAP) {
-            write(ByteBufferList.EMPTY_BYTEBUFFER);
+            write(writeList);
         }
 
         if (status == HandshakeStatus.NEED_UNWRAP) {
@@ -315,65 +315,15 @@ private void handleHandshakeStatus(HandshakeStatus status) {
         }
     }
 
-    private void writeTmp(ByteBuffer mWriteTmp) {
-        mWriteTmp.flip();
-        if (mWriteTmp.remaining() > 0)
-            mSink.write(mWriteTmp);
-        assert !mWriteTmp.hasRemaining();
-    }
-
-
     int calculateAlloc(int remaining) {
         // alloc 50% more than we need for writing
         int alloc = remaining * 3 / 2;
         if (alloc == 0)
-            alloc = 8182;
+            alloc = 8192;
         return alloc;
     }
 
-    @Override
-    public void write(ByteBuffer bb) {
-        if (mWrapping)
-            return;
-        if (mSink.remaining() > 0)
-            return;
-        mWrapping = true;
-        int remaining;
-        SSLEngineResult res = null;
-        ByteBuffer mWriteTmp = ByteBufferList.obtain(calculateAlloc(bb.remaining()));
-        do {
-            // if the handshake is finished, don't send
-            // 0 bytes of data, since that makes the ssl connection die.
-            // it wraps a 0 byte package, and craps out.
-            if (finishedHandshake && bb.remaining() == 0) {
-                mWrapping = false;
-                return;
-            }
-            remaining = bb.remaining();
-            try {
-                res = engine.wrap(bb, mWriteTmp);
-                writeTmp(mWriteTmp);
-                int previousCapacity = mWriteTmp.capacity();
-                ByteBufferList.reclaim(mWriteTmp);
-                mWriteTmp = null;
-                if (res.getStatus() == Status.BUFFER_OVERFLOW) {
-                    mWriteTmp = ByteBufferList.obtain(previousCapacity * 2);
-                    remaining = -1;
-                }
-                else {
-                    mWriteTmp = ByteBufferList.obtain(calculateAlloc(bb.remaining()));
-                }
-                handleHandshakeStatus(res.getHandshakeStatus());
-            }
-            catch (SSLException e) {
-                report(e);
-            }
-        }
-        while ((remaining != bb.remaining() || (res != null && res.getHandshakeStatus() == HandshakeStatus.NEED_WRAP)) && mSink.remaining() == 0);
-        ByteBufferList.reclaim(mWriteTmp);
-        mWrapping = false;
-    }
-
+    ByteBufferList writeList = new ByteBufferList();
     @Override
     public void write(ByteBufferList bb) {
         if (mWrapping)
@@ -383,7 +333,7 @@ public void write(ByteBufferList bb) {
         mWrapping = true;
         int remaining;
         SSLEngineResult res = null;
-        ByteBuffer mWriteTmp = ByteBufferList.obtain(calculateAlloc(bb.remaining()));
+        ByteBuffer writeBuf = ByteBufferList.obtain(calculateAlloc(bb.remaining()));
         do {
             // if the handshake is finished, don't send
             // 0 bytes of data, since that makes the ssl connection die.
@@ -395,18 +345,21 @@ public void write(ByteBufferList bb) {
             remaining = bb.remaining();
             try {
                 ByteBuffer[] arr = bb.getAllArray();
-                res = engine.wrap(arr, mWriteTmp);
+                res = engine.wrap(arr, writeBuf);
                 bb.addAll(arr);
-                writeTmp(mWriteTmp);
-                int previousCapacity = mWriteTmp.capacity();
-                ByteBufferList.reclaim(mWriteTmp);
-                mWriteTmp = null;
+                writeBuf.flip();
+                writeList.add(writeBuf);
+                assert !writeList.hasRemaining();
+                if (writeList.remaining() > 0)
+                    mSink.write(writeList);
+                int previousCapacity = writeBuf.capacity();
+                writeBuf = null;
                 if (res.getStatus() == Status.BUFFER_OVERFLOW) {
-                    mWriteTmp = ByteBufferList.obtain(previousCapacity * 2);
+                    writeBuf = ByteBufferList.obtain(previousCapacity * 2);
                     remaining = -1;
                 }
                 else {
-                    mWriteTmp = ByteBufferList.obtain(calculateAlloc(bb.remaining()));
+                    writeBuf = ByteBufferList.obtain(calculateAlloc(bb.remaining()));
                     handleHandshakeStatus(res.getHandshakeStatus());
                 }
             }
@@ -415,7 +368,6 @@ public void write(ByteBufferList bb) {
             }
         }
         while ((remaining != bb.remaining() || (res != null && res.getHandshakeStatus() == HandshakeStatus.NEED_WRAP)) && mSink.remaining() == 0);
-        ByteBufferList.reclaim(mWriteTmp);
         mWrapping = false;
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
index ed4f87f11..8daa83637 100644
--- a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
@@ -44,27 +44,6 @@ private void writePending() {
     
     ByteBufferList mPendingWrites = new ByteBufferList();
 
-    @Override
-    public void write(ByteBuffer bb) {
-        if (remaining() >= getMaxBuffer())
-            return;
-
-        boolean needsWrite = true;
-        if (!mPendingWrites.hasRemaining()) {
-            needsWrite = false;
-            mDataSink.write(bb);
-        }
-
-        if (bb.hasRemaining()) {
-            ByteBuffer dup = ByteBufferList.obtain(bb.remaining());
-            dup.put(bb);
-            dup.flip();
-            mPendingWrites.add(dup);
-            if (needsWrite)
-                mDataSink.write(mPendingWrites);
-        }
-    }
-
     @Override
     public void write(ByteBufferList bb) {
         write(bb, false);
@@ -114,11 +93,6 @@ public boolean isOpen() {
         return mDataSink.isOpen();
     }
 
-    @Override
-    public void close() {
-        mDataSink.close();
-    }
-
     boolean endPending;
     @Override
     public void end() {
diff --git a/AndroidAsync/src/com/koushikdutta/async/DataSink.java b/AndroidAsync/src/com/koushikdutta/async/DataSink.java
index 1866be18a..7c6905cb3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/DataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/DataSink.java
@@ -1,18 +1,14 @@
 package com.koushikdutta.async;
 
-import java.nio.ByteBuffer;
-
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.WritableCallback;
 
 public interface DataSink {
-    public void write(ByteBuffer bb);
     public void write(ByteBufferList bb);
     public void setWriteableCallback(WritableCallback handler);
     public WritableCallback getWriteableCallback();
     
     public boolean isOpen();
-    public void close();
     public void end();
     public void setClosedCallback(CompletedCallback handler);
     public CompletedCallback getClosedCallback();
diff --git a/AndroidAsync/src/com/koushikdutta/async/FilteredDataSink.java b/AndroidAsync/src/com/koushikdutta/async/FilteredDataSink.java
index 448eb3b93..8aa1806c2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/FilteredDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/FilteredDataSink.java
@@ -1,7 +1,5 @@
 package com.koushikdutta.async;
 
-import java.nio.ByteBuffer;
-
 public class FilteredDataSink extends BufferedDataSink {
     public FilteredDataSink(DataSink sink) {
         super(sink);
@@ -12,21 +10,6 @@ public ByteBufferList filter(ByteBufferList bb) {
         return bb;
     }
 
-    @Override
-    public final void write(ByteBuffer bb) {
-        // don't filter and write if currently buffering, unless we know
-        // that the buffer can fit the entirety of the filtered result
-        if (isBuffering() && getMaxBuffer() != Integer.MAX_VALUE)
-            return;
-        ByteBufferList list = new ByteBufferList();
-        byte[] bytes = new byte[bb.remaining()];
-        bb.get(bytes);
-        assert bb.remaining() == 0;
-        list.add(ByteBuffer.wrap(bytes));
-        ByteBufferList filtered = filter(list);
-        super.write(filtered, true);
-    }
-
     @Override
     public final void write(ByteBufferList bb) {
         // don't filter and write if currently buffering, unless we know
diff --git a/AndroidAsync/src/com/koushikdutta/async/Util.java b/AndroidAsync/src/com/koushikdutta/async/Util.java
index c065b5201..18c3736cc 100644
--- a/AndroidAsync/src/com/koushikdutta/async/Util.java
+++ b/AndroidAsync/src/com/koushikdutta/async/Util.java
@@ -3,6 +3,7 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
+import com.koushikdutta.async.util.Allocator;
 import com.koushikdutta.async.wrapper.AsyncSocketWrapper;
 import com.koushikdutta.async.wrapper.DataEmitterWrapper;
 
@@ -67,7 +68,7 @@ public void onCompleted(Exception ex) {
             private void cleanup() {
                 ds.setClosedCallback(null);
                 ds.setWriteableCallback(null);
-                ByteBufferList.reclaim(pending);
+                pending.recycle();
                 pending = null;
                 try {
                     is.close();
@@ -76,29 +77,28 @@ private void cleanup() {
                     e.printStackTrace();
                 }
             }
-            ByteBuffer pending;
-            int mToAlloc = 0;
-            int maxAlloc = 256 * 1024;
+            ByteBufferList pending = new ByteBufferList();
+            Allocator allocator = new Allocator();
 
             @Override
             public void onWriteable() {
                 try {
                     do {
-                        if (pending == null || pending.remaining() == 0) {
-                            ByteBufferList.reclaim(pending);
-                            pending = ByteBufferList.obtain(Math.min(Math.max(mToAlloc, 2 << 11), maxAlloc));
+                        if (!pending.hasRemaining()) {
+                            ByteBuffer b = allocator.allocate();
 
-                            long toRead = Math.min(max - totalRead, pending.capacity());
-                            int read = is.read(pending.array(), 0, (int)toRead);
+                            long toRead = Math.min(max - totalRead, b.capacity());
+                            int read = is.read(b.array(), 0, (int)toRead);
                             if (read == -1 || totalRead == max) {
                                 cleanup();
                                 wrapper.onCompleted(null);
                                 return;
                             }
-                            mToAlloc = read * 2;
+                            allocator.track(read);
                             totalRead += read;
-                            pending.position(0);
-                            pending.limit(read);
+                            b.position(0);
+                            b.limit(read);
+                            pending.add(b);
                         }
                         
                         ds.write(pending);
diff --git a/AndroidAsync/src/com/koushikdutta/async/dns/Dns.java b/AndroidAsync/src/com/koushikdutta/async/dns/Dns.java
index bd1e11b48..bc276d668 100644
--- a/AndroidAsync/src/com/koushikdutta/async/dns/Dns.java
+++ b/AndroidAsync/src/com/koushikdutta/async/dns/Dns.java
@@ -143,7 +143,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                 }
             });
             if (!multicast)
-                dgram.write(packet);
+                dgram.write(new ByteBufferList(packet));
             else
                 dgram.send(new InetSocketAddress("224.0.0.251", 5353), packet);
             return ret;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
index 109769a94..fcf0dd8a3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
@@ -6,7 +6,7 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.http.libcore.ResponseHeaders;
 
-public interface AsyncHttpResponse extends AsyncSocket {
+public interface AsyncHttpResponse extends DataEmitter {
     public void setEndCallback(CompletedCallback handler);
     public CompletedCallback getEndCallback();
     public ResponseHeaders getHeaders();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index 2b77b568e..1bbf46cb6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -20,7 +20,7 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
-abstract class AsyncHttpResponseImpl extends FilteredDataEmitter implements AsyncHttpResponse {
+abstract class AsyncHttpResponseImpl extends FilteredDataEmitter implements AsyncSocket, AsyncHttpResponse {
     private AsyncHttpRequestBody mWriter;
     
     public AsyncSocket getSocket() {
@@ -183,13 +183,6 @@ private void assertContent() {
     }
 
     DataSink mSink;
-
-    @Override
-    public void write(ByteBuffer bb) {
-        assertContent();
-        mSink.write(bb);
-    }
-
     @Override
     public void write(ByteBufferList bb) {
         assertContent();
@@ -198,11 +191,10 @@ public void write(ByteBufferList bb) {
 
     @Override
     public void end() {
-
-        write(ByteBuffer.wrap(new byte[0]));
+        if (mSink instanceof ChunkedOutputFilter)
+            mSink.end();
     }
 
-
     @Override
     public void setWriteableCallback(WritableCallback handler) {
         mSink.setWriteableCallback(handler);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
index 851d77dd8..b20099bf0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
@@ -712,12 +712,6 @@ protected void report(Exception e) {
                 closedCallback.onCompleted(e);
         }
 
-        @Override
-        public void write(ByteBuffer bb) {
-            // it's gonna write headers and stuff... whatever
-            bb.limit(bb.position());
-        }
-
         @Override
         public void write(ByteBufferList bb) {
             // it's gonna write headers and stuff... whatever
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
index 8fabcb28b..eda555615 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
@@ -96,7 +96,7 @@ protected void onDisconnect(int code, String reason) {
             }
             @Override
             protected void sendFrame(byte[] frame) {
-                mSink.write(ByteBuffer.wrap(frame));
+                mSink.write(new ByteBufferList(frame));
             }
         };
         mParser.setMasking(masking);
@@ -215,17 +215,17 @@ public CompletedCallback getEndCallback() {
 
     @Override
     public void send(byte[] bytes) {
-        mSink.write(ByteBuffer.wrap(mParser.frame(bytes)));
+        mSink.write(new ByteBufferList((mParser.frame(bytes))));
     }
     
     @Override
     public void send(byte[] bytes, int offset, int len) {
-    	mSink.write(ByteBuffer.wrap(mParser.frame(bytes, offset, len)));
+    	mSink.write(new ByteBufferList(mParser.frame(bytes, offset, len)));
     }
 
     @Override
     public void send(String string) {
-        mSink.write(ByteBuffer.wrap(mParser.frame(string)));
+        mSink.write(new ByteBufferList((mParser.frame(string))));
     }
 
     private StringCallback mStringCallback;
@@ -260,15 +260,6 @@ public boolean isBuffering() {
         return mSink.remaining() > 0;
     }
 
-    @Override
-    public void write(ByteBuffer bb) {
-        byte[] buf = new byte[bb.remaining()];
-        bb.get(buf);
-        bb.position(0);
-        bb.limit(0);
-        send(buf);
-    }
-
     @Override
     public void write(ByteBufferList bb) {
         byte[] buf = bb.getAllByteArray();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedOutputFilter.java b/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedOutputFilter.java
index bec28c09b..f0f18d3b3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedOutputFilter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedOutputFilter.java
@@ -18,4 +18,13 @@ public ByteBufferList filter(ByteBufferList bb) {
         bb.add(ByteBuffer.wrap("\r\n".getBytes()));
         return bb;
     }
+
+    @Override
+    public void end() {
+        setMaxBuffer(Integer.MAX_VALUE);
+        ByteBufferList fin = new ByteBufferList();
+        write(fin);
+        setMaxBuffer(0);
+        super.end();
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index bd7211bdb..d1cb9527f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -48,13 +48,6 @@ public AsyncSocket getSocket() {
         if (HttpUtil.isKeepAlive(req.getHeaders().getHeaders()))
             mRawHeaders.set("Connection", "Keep-Alive");
     }
-    
-    @Override
-    public void write(ByteBuffer bb) {
-        if (bb.remaining() == 0)
-            return;
-        writeInternal(bb);
-    }
 
     @Override
     public void write(ByteBufferList bb) {
@@ -63,15 +56,6 @@ public void write(ByteBufferList bb) {
         writeInternal(bb);
     }
 
-    private void writeInternal(ByteBuffer bb) {
-        assert !mEnded;
-        if (!mHasWritten) {
-            initFirstWrite();
-            return;
-        }
-        mSink.write(bb);
-    }
-
     private void writeInternal(ByteBufferList bb) {
         assert !mEnded;
         if (!mHasWritten) {
@@ -316,11 +300,6 @@ public boolean isOpen() {
         return mSocket.isOpen();
     }
 
-    @Override
-    public void close() {
-        mSocket.close();
-    }
-
     @Override
     public void setClosedCallback(CompletedCallback handler) {
         mSink.setClosedCallback(handler);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
index c92f51ce6..484b6d4e7 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
@@ -46,6 +46,7 @@ public class AsyncSpdyConnection implements FrameReader.Handler {
     FrameReader reader;
     FrameWriter writer;
     Variant variant;
+    SpdySocket zero = new SpdySocket(0, false, false, null);
     ByteBufferListSource source = new ByteBufferListSource();
     Hashtable<Integer, SpdySocket> sockets = new Hashtable<Integer, SpdySocket>();
     Protocol protocol;
@@ -137,11 +138,6 @@ public String charset() {
             return null;
         }
 
-        @Override
-        public void write(ByteBuffer bb) {
-
-        }
-
         @Override
         public void write(ByteBufferList bb) {
 
@@ -238,6 +234,7 @@ public void data(boolean inFinished, int streamId, BufferedSource source, int le
     private int nextStreamId;
     @Override
     public void headers(boolean outFinished, boolean inFinished, int streamId, int associatedStreamId, List<Header> headerBlock, HeadersMode headersMode) {
+        /*
         if (pushedStream(streamId)) {
             throw new AssertionError("push");
 //            pushHeadersLater(streamId, headerBlock, inFinished);
@@ -285,6 +282,7 @@ public void headers(boolean outFinished, boolean inFinished, int streamId, int a
         // Update an existing stream.
         stream.receiveHeaders(headerBlock, headersMode);
         if (inFinished) stream.receiveFin();
+        */
     }
 
     @Override
@@ -318,7 +316,7 @@ public void settings(boolean clearPrevious, Settings settings) {
         if (peerInitialWindowSize != -1 && peerInitialWindowSize != priorWriteWindowSize) {
             delta = peerInitialWindowSize - priorWriteWindowSize;
             if (!receivedInitialPeerSettings) {
-                addBytesToWriteWindow(delta);
+                zero.addBytesToWriteWindow(delta);
                 receivedInitialPeerSettings = true;
             }
         }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index bddf203c0..837a12666 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -51,7 +51,7 @@ public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
                     return;
                 }
                 try {
-                    long ptr = (long)sslNativePointer.get(socket.getSSLEngine());
+                    long ptr = (Long)sslNativePointer.get(socket.getSSLEngine());
                     byte[] proto = (byte[])nativeGetAlpnNegotiatedProtocol.invoke(null, ptr);
                     String protoString = new String(proto);
                     AsyncSpdyConnection connection = new AsyncSpdyConnection(socket, Protocol.get(protoString));
diff --git a/AndroidAsync/src/com/koushikdutta/async/stream/OutputStreamDataSink.java b/AndroidAsync/src/com/koushikdutta/async/stream/OutputStreamDataSink.java
index 13bb419c6..185a8b77e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/stream/OutputStreamDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/stream/OutputStreamDataSink.java
@@ -27,11 +27,6 @@ public void end() {
         }
     }
 
-    @Override
-    public void close() {
-        end();
-    }
-
     AsyncServer server;
     public OutputStreamDataSink(AsyncServer server, OutputStream stream) {
         this.server = server;
@@ -47,18 +42,6 @@ public OutputStream getOutputStream() throws IOException {
         return mStream;
     }
 
-    @Override
-    public void write(final ByteBuffer bb) {
-        try {
-            getOutputStream().write(bb.array(), bb.arrayOffset() + bb.position(), bb.remaining());
-        }
-        catch (IOException e) {
-            reportClose(e);
-        }
-        bb.position(0);
-        bb.limit(0);
-    }
-
     @Override
     public void write(final ByteBufferList bb) {
         try {
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java b/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java
index 608026dc2..c25c1a1d7 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java
@@ -21,6 +21,10 @@ public Allocator() {
     }
 
     public ByteBuffer allocate() {
+        return allocate(currentAlloc);
+    }
+
+    public ByteBuffer allocate(int currentAlloc) {
         return ByteBufferList.obtain(Math.min(Math.max(currentAlloc, minAlloc), maxAlloc));
     }
 
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
index 1322e0390..a50d910f7 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
@@ -186,7 +186,7 @@ else if (handshakeStatus == SSLEngineResult.HandshakeStatus.NEED_TASK) {
 
 
         System.out.println("Done handshaking! Thank you come again.");
-        long ptr = (long)sslNativePointer.get(engine);
+        long ptr = (Long)sslNativePointer.get(engine);
         byte[] proto = (byte[]) nativeGetAlpnNegotiatedProtocol.invoke(null, ptr);
 //        byte[] proto = (byte[]) nativeGetNpnNegotiatedProtocol.invoke(null, ptr);
         String protoString = new String(proto);
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java b/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
index 44b44fc77..ebaae9ddd 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
@@ -33,7 +33,7 @@ public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerRespo
                     Util.writeAll(response, "foobarbeepboop".getBytes(), new CompletedCallback() {
                         @Override
                         public void onCompleted(Exception ex) {
-                            response.close();
+                            response.end();
                         }
                     });
                 }

From 6a34fcd2137274579e9a1206839727a3b757bdde Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 21 Jul 2014 14:31:46 -0700
Subject: [PATCH 031/399] refactor our libcore cruft. as much as possible at
 least.

---
 .../async/http/AsyncHttpClient.java           | 21 +++++-----
 .../async/http/AsyncHttpClientMiddleware.java | 19 +++++----
 .../async/http/AsyncHttpRequest.java          | 38 +++++++++---------
 .../async/http/AsyncHttpResponse.java         |  9 +++--
 .../async/http/AsyncHttpResponseImpl.java     | 35 +++++++++++-----
 .../async/http/AsyncSocketMiddleware.java     |  6 +--
 .../com/koushikdutta/async/http/HttpUtil.java | 40 ++++++++++++++++++-
 .../async/http/ResponseCacheMiddleware.java   | 29 ++++++++------
 .../async/http/SimpleMiddleware.java          |  8 ++--
 .../async/http/WebSocketImpl.java             | 12 +++---
 .../async/http/callback/HeadersCallback.java  | 10 +++++
 .../async/http/libcore/HeaderParser.java      |  2 +
 .../async/http/libcore/HttpDate.java          |  2 +
 .../async/http/spdy/HttpTransport.java        | 15 +++++++
 .../async/test/HttpClientTests.java           |  2 +-
 .../com/koushikdutta/async/test/Issue59.java  |  4 +-
 16 files changed, 171 insertions(+), 81 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/callback/HeadersCallback.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/HttpTransport.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 504d5c602..7f66deb0b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -191,9 +191,9 @@ private static long getTimeoutRemaining(AsyncHttpRequest request) {
     }
 
     private static void copyHeader(AsyncHttpRequest from, AsyncHttpRequest to, String header) {
-        String value = from.getHeaders().getHeaders().get(header);
+        String value = from.getHeaders().get(header);
         if (!TextUtils.isEmpty(value))
-            to.getHeaders().getHeaders().set(header, value);
+            to.getHeaders().set(header, value);
     }
 
     private void executeAffinity(final AsyncHttpRequest request, final int redirectCount, final FutureAsyncHttpResponse cancel, final HttpConnectCallback callback) {
@@ -283,6 +283,7 @@ protected void onRequestCompleted(Exception ex) {
 
                     @Override
                     public void setDataEmitter(DataEmitter emitter) {
+                        data.response = this;
                         data.bodyEmitter = emitter;
                         synchronized (mMiddleware) {
                             for (AsyncHttpClientMiddleware middleware: mMiddleware) {
@@ -293,8 +294,8 @@ public void setDataEmitter(DataEmitter emitter) {
 
                         super.setDataEmitter(data.bodyEmitter);
 
-                        RawHeaders headers = mHeaders.getHeaders();
-                        int responseCode = headers.getResponseCode();
+                        RawHeaders headers = mHeaders;
+                        int responseCode = code();
                         if ((responseCode == HttpURLConnection.HTTP_MOVED_PERM || responseCode == HttpURLConnection.HTTP_MOVED_TEMP || responseCode == 307) && request.getFollowRedirect()) {
                             String location = headers.get("Location");
                             Uri redirect;
@@ -326,7 +327,7 @@ public void setDataEmitter(DataEmitter emitter) {
                             return;
                         }
 
-                        request.logv("Final (post cache response) headers:\n" + mHeaders.getHeaders().toHeaderString());
+                        request.logv("Final (post cache response) headers:\n" + mHeaders.toHeaderString());
 
                         // at this point the headers are done being modified
                         reportConnectedCompleted(cancel, null, this, request, callback);
@@ -342,7 +343,7 @@ protected void onHeadersReceived() {
                                 mServer.removeAllCallbacks(cancel.scheduled);
 
                             // allow the middleware to massage the headers before the body is decoded
-                            request.logv("Received headers:\n" + mHeaders.getHeaders().toHeaderString());
+                            request.logv("Received headers:\n" + mHeaders.toHeaderString());
 
                             data.headers = mHeaders;
                             synchronized (mMiddleware) {
@@ -378,7 +379,7 @@ protected void report(Exception ex) {
                             return;
                         super.report(ex);
                         if (!socket.isOpen() || ex != null) {
-                            if (getHeaders() == null && ex != null)
+                            if (headers() == null && ex != null)
                                 reportConnectedCompleted(cancel, ex, null, request, callback);
                         }
 
@@ -546,7 +547,7 @@ public void onConnectCompleted(Exception ex, final AsyncHttpResponse response) {
                 }
                 invokeConnect(callback, response);
 
-                final long contentLength = response.getHeaders().getContentLength();
+                final long contentLength = HttpUtil.contentLength(response.headers());
 
                 response.setDataCallback(new OutputStreamDataCallback(fout) {
                     @Override
@@ -591,8 +592,6 @@ public void onConnectCompleted(Exception ex, final AsyncHttpResponse response) {
                 }
                 invokeConnect(callback, response);
 
-                final long contentLength = response.getHeaders().getContentLength();
-
                 Future<T> parsed = parser.parse(response)
                 .setCallback(new FutureCallback<T>() {
                     @Override
@@ -626,7 +625,7 @@ public void onConnectCompleted(Exception ex, AsyncHttpResponse response) {
                     }
                     return;
                 }
-                WebSocket ws = WebSocketImpl.finishHandshake(req.getHeaders().getHeaders(), response);
+                WebSocket ws = WebSocketImpl.finishHandshake(req.getHeaders(), response);
                 if (ws == null) {
                     if (!ret.setComplete(new WebSocketHandshakeException("Unable to complete websocket handshake")))
                         return;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
index 135ec6947..79deb4c7b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
@@ -2,13 +2,12 @@
 
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.DataEmitter;
+import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.future.Cancellable;
-import com.koushikdutta.async.http.libcore.ResponseHeaders;
+import com.koushikdutta.async.http.libcore.RawHeaders;
 import com.koushikdutta.async.util.UntypedHashtable;
 
-import java.util.Hashtable;
-
 public interface AsyncHttpClientMiddleware {
     public static class GetSocketData {
         public UntypedHashtable state = new UntypedHashtable();
@@ -20,12 +19,17 @@ public static class GetSocketData {
     public static class OnSocketData extends GetSocketData {
         public AsyncSocket socket;
     }
-    
-    public static class OnHeadersReceivedData extends OnSocketData {
-        public ResponseHeaders headers;
+
+    public static class SendHeaderData extends OnSocketData {
+        CompletedCallback sendHeadersCallback;
     }
-    
+
+    public static class OnHeadersReceivedData extends SendHeaderData {
+        public RawHeaders headers;
+    }
+
     public static class OnBodyData extends OnHeadersReceivedData {
+        public AsyncHttpResponse response;
         public DataEmitter bodyEmitter;
     }
 
@@ -35,6 +39,7 @@ public static class OnRequestCompleteData extends OnBodyData {
 
     public Cancellable getSocket(GetSocketData data);
     public void onSocket(OnSocketData data);
+    public boolean sendHeaders(SendHeaderData data);
     public void onHeadersReceived(OnHeadersReceivedData data);
     public void onBodyDecoder(OnBodyData data);
     public void onRequestComplete(OnRequestCompleteData data);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
index 22316b57f..b3eb45b52 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
@@ -114,25 +114,25 @@ public static void setDefaultHeaders(RawHeaders ret, Uri uri) {
     public AsyncHttpRequest(Uri uri, String method, RawHeaders headers) {
         assert uri != null;
         mMethod = method;
+        this.uri = uri;
         if (headers == null)
             mRawHeaders = new RawHeaders();
         else
             mRawHeaders = headers;
         if (headers == null)
             setDefaultHeaders(mRawHeaders, uri);
-        mHeaders = new RequestHeaders(uri, mRawHeaders);
         mRawHeaders.setStatusLine(getRequestLine().toString());
     }
 
+    Uri uri;
     public Uri getUri() {
-        return mHeaders.getUri();
+        return uri;
     }
     
     private RawHeaders mRawHeaders = new RawHeaders();
-    private RequestHeaders mHeaders;
 
-    public RequestHeaders getHeaders() {
-        return mHeaders;
+    public RawHeaders getHeaders() {
+        return mRawHeaders;
     }
 
     public String getRequestString() {
@@ -174,7 +174,7 @@ public AsyncHttpRequest setTimeout(int timeout) {
     public static AsyncHttpRequest create(HttpRequest request) {
         AsyncHttpRequest ret = new AsyncHttpRequest(Uri.parse(request.getRequestLine().getUri()), request.getRequestLine().getMethod());
         for (Header header: request.getAllHeaders()) {
-            ret.getHeaders().getHeaders().add(header.getName(), header.getValue());
+            ret.getHeaders().add(header.getName(), header.getValue());
         }
         return ret;
     }
@@ -194,25 +194,25 @@ public HttpRequestWrapper(AsyncHttpRequest request) {
 
         @Override
         public void addHeader(Header header) {
-            request.getHeaders().getHeaders().add(header.getName(), header.getValue());
+            request.getHeaders().add(header.getName(), header.getValue());
         }
 
         @Override
         public void addHeader(String name, String value) {
-            request.getHeaders().getHeaders().add(name, value);
+            request.getHeaders().add(name, value);
         }
 
         @Override
         public boolean containsHeader(String name) {
-            return request.getHeaders().getHeaders().get(name) != null;
+            return request.getHeaders().get(name) != null;
         }
 
         @Override
         public Header[] getAllHeaders() {
-            Header[] ret = new Header[request.getHeaders().getHeaders().length()];
+            Header[] ret = new Header[request.getHeaders().length()];
             for (int i = 0; i < ret.length; i++) {
-                String name = request.getHeaders().getHeaders().getFieldName(i);
-                String value = request.getHeaders().getHeaders().getValue(i);
+                String name = request.getHeaders().getFieldName(i);
+                String value = request.getHeaders().getValue(i);
                 ret[i] = new BasicHeader(name, value);
             }
             return ret;
@@ -220,7 +220,7 @@ public Header[] getAllHeaders() {
 
         @Override
         public Header getFirstHeader(String name) {
-            String value = request.getHeaders().getHeaders().get(name);
+            String value = request.getHeaders().get(name);
             if (value == null)
                 return null;
             return new BasicHeader(name, value);
@@ -228,7 +228,7 @@ public Header getFirstHeader(String name) {
 
         @Override
         public Header[] getHeaders(String name) {
-            Map<String, List<String>> map = request.getHeaders().getHeaders().toMultimap();
+            Map<String, List<String>> map = request.getHeaders().toMultimap();
             List<String> vals = map.get(name);
             if (vals == null)
                 return new Header[0];
@@ -271,12 +271,12 @@ public HeaderIterator headerIterator(String name) {
 
         @Override
         public void removeHeader(Header header) {
-            request.getHeaders().getHeaders().removeAll(header.getName());
+            request.getHeaders().removeAll(header.getName());
         }
 
         @Override
         public void removeHeaders(String name) {
-            request.getHeaders().getHeaders().removeAll(name);
+            request.getHeaders().removeAll(name);
         }
 
         @Override
@@ -286,7 +286,7 @@ public void setHeader(Header header) {
 
         @Override
         public void setHeader(String name, String value) {
-            request.getHeaders().getHeaders().set(name, value);
+            request.getHeaders().set(name, value);
         }
 
         @Override
@@ -306,12 +306,12 @@ public HttpRequest asHttpRequest() {
     }
 
     public AsyncHttpRequest setHeader(String name, String value) {
-        getHeaders().getHeaders().set(name, value);
+        getHeaders().set(name, value);
         return this;
     }
 
     public AsyncHttpRequest addHeader(String name, String value) {
-        getHeaders().getHeaders().add(name, value);
+        getHeaders().add(name, value);
         return this;
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
index fcf0dd8a3..631879c99 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
@@ -2,14 +2,15 @@
 
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.DataEmitter;
-import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.callback.CompletedCallback;
-import com.koushikdutta.async.http.libcore.ResponseHeaders;
+import com.koushikdutta.async.http.libcore.RawHeaders;
 
 public interface AsyncHttpResponse extends DataEmitter {
     public void setEndCallback(CompletedCallback handler);
-    public CompletedCallback getEndCallback();
-    public ResponseHeaders getHeaders();
+    public String protocol();
+    public String message();
+    public int code();
+    public RawHeaders headers();
     public void end();
     public AsyncSocket detachSocket();
     public AsyncHttpRequest getRequest();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index 1bbf46cb6..a3e4189c6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -40,14 +40,14 @@ void setSocket(AsyncSocket exchange) {
 
         mWriter = mRequest.getBody();
         if (mWriter != null) {
-            if (mRequest.getHeaders().getContentType() == null)
-                mRequest.getHeaders().setContentType(mWriter.getContentType());
+            if (mRequest.getHeaders().get("Content-Type") == null)
+                mRequest.getHeaders().set("Content-Type", mWriter.getContentType());
             if (mWriter.length() >= 0) {
-                mRequest.getHeaders().setContentLength(mWriter.length());
+                mRequest.getHeaders().set("Content-Length", String.valueOf(mWriter.length()));
                 mSink = mSocket;
             }
             else {
-                mRequest.getHeaders().getHeaders().set("Transfer-Encoding", "Chunked");
+                mRequest.getHeaders().set("Transfer-Encoding", "Chunked");
                 mSink = new ChunkedOutputFilter(mSocket);
             }
         }
@@ -116,7 +116,7 @@ else if (!"\r".equals(s)) {
                     mRawHeaders.addLine(s);
                 }
                 else {
-                    mHeaders = new ResponseHeaders(mRequest.getUri(), mRawHeaders);
+                    mHeaders = mRawHeaders;
                     onHeadersReceived();
                     // socket may get detached after headers (websocket)
                     if (mSocket == null)
@@ -161,7 +161,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
     
     private AsyncHttpRequest mRequest;
     private AsyncSocket mSocket;
-    ResponseHeaders mHeaders;
+    protected RawHeaders mHeaders;
     public AsyncHttpResponseImpl(AsyncHttpRequest request) {
         mRequest = request;
     }
@@ -169,17 +169,32 @@ public AsyncHttpResponseImpl(AsyncHttpRequest request) {
     boolean mCompleted = false;
 
     @Override
-    public ResponseHeaders getHeaders() {
+    public RawHeaders headers() {
         return mHeaders;
     }
 
+    @Override
+    public int code() {
+        return headers().getResponseCode();
+    }
+
+    @Override
+    public String protocol() {
+        return "HTTP/1." + headers().getHttpMinorVersion();
+    }
+
+    @Override
+    public String message() {
+        return headers().getResponseMessage();
+    }
+
     private boolean mFirstWrite = true;
     private void assertContent() {
         if (!mFirstWrite)
             return;
         mFirstWrite = false;
-        assert null != mRequest.getHeaders().getHeaders().get("Content-Type");
-        assert mRequest.getHeaders().getHeaders().get("Transfer-Encoding") != null || mRequest.getHeaders().getContentLength() != -1;
+        assert null != mRequest.getHeaders().get("Content-Type");
+        assert mRequest.getHeaders().get("Transfer-Encoding") != null || HttpUtil.contentLength(mRequest.getHeaders()) != -1;
     }
 
     DataSink mSink;
@@ -228,7 +243,7 @@ public AsyncServer getServer() {
 
     @Override
     public String charset() {
-        Multimap mm = Multimap.parseHeader(getHeaders().getHeaders(), "Content-Type");
+        Multimap mm = Multimap.parseHeader(headers(), "Content-Type");
         String cs;
         if (mm != null && null != (cs = mm.getString("charset")) && Charset.isSupported(cs)) {
             return cs;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index 8e8a36e0e..a50ff9afe 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -171,14 +171,14 @@ public Cancellable getSocket(final GetSocketData data) {
                 unresolvedHost = data.request.getProxyHost();
                 unresolvedPort = data.request.getProxyPort();
                 // set the host and port explicitly for proxied connections
-                data.request.getHeaders().getHeaders().setStatusLine(data.request.getProxyRequestLine().toString());
+                data.request.getHeaders().setStatusLine(data.request.getProxyRequestLine().toString());
                 proxied = true;
             }
             else if (proxyHost != null) {
                 unresolvedHost = proxyHost;
                 unresolvedPort = proxyPort;
                 // set the host and port explicitly for proxied connections
-                data.request.getHeaders().getHeaders().setStatusLine(data.request.getProxyRequestLine().toString());
+                data.request.getHeaders().setStatusLine(data.request.getProxyRequestLine().toString());
                 proxied = true;
             }
             else {
@@ -360,7 +360,7 @@ public void onRequestComplete(final OnRequestCompleteData data) {
                 data.socket.close();
                 return;
             }
-            if (!HttpUtil.isKeepAlive(data.headers.getHeaders()) || !HttpUtil.isKeepAlive(data.request.getHeaders().getHeaders())) {
+            if (!HttpUtil.isKeepAlive(data.headers) || !HttpUtil.isKeepAlive(data.request.getHeaders())) {
                 data.request.logv("closing out socket (not keep alive)");
                 data.socket.close();
                 return;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
index 9b0824127..c30e42b0d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
@@ -14,7 +14,13 @@
 import com.koushikdutta.async.http.filter.GZIPInputFilter;
 import com.koushikdutta.async.http.filter.InflaterInputFilter;
 import com.koushikdutta.async.http.libcore.RawHeaders;
-import com.koushikdutta.async.http.server.UnknownRequestBody;
+import com.koushikdutta.async.http.libcore.RequestHeaders;
+import com.koushikdutta.async.http.libcore.ResponseHeaders;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 public class HttpUtil {
     public static AsyncHttpRequestBody getBody(DataEmitter emitter, CompletedCallback reporter, RawHeaders headers) {
@@ -130,4 +136,36 @@ public static boolean isKeepAlive(RawHeaders headers) {
 
         return keepAlive;
     }
+
+    public static int contentLength(RawHeaders headers) {
+        String cl = headers.get("Content-Length");
+        if (cl == null)
+            return -1;
+        try {
+            return Integer.parseInt(cl);
+        }
+        catch (NumberFormatException e) {
+            return -1;
+        }
+    }
+
+    public static Set<String> varyFields(RawHeaders headers) {
+        HashSet<String> ret = new HashSet<String>();
+        String value = headers.get("Vary");
+        if (value == null)
+            return ret;
+        for (String varyField : value.split(",")) {
+            ret.add(varyField.trim());
+        }
+        return ret;
+    }
+
+    public static boolean isCacheable(RawHeaders requestHeaders, RawHeaders responseHeaders) {
+        ResponseHeaders r = new ResponseHeaders(null, responseHeaders);
+        return r.isCacheable(new RequestHeaders(null, requestHeaders));
+    }
+
+    public static boolean isNoCache(RawHeaders headers) {
+        return new RequestHeaders(null, headers).isNoCache();
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
index b20099bf0..a81167905 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
@@ -14,6 +14,7 @@
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.future.Cancellable;
 import com.koushikdutta.async.future.SimpleCancellable;
+import com.koushikdutta.async.http.libcore.RequestHeaders;
 import com.koushikdutta.async.util.Charsets;
 import com.koushikdutta.async.http.libcore.RawHeaders;
 import com.koushikdutta.async.http.libcore.ResponseHeaders;
@@ -94,7 +95,7 @@ public void setCaching(boolean caching) {
     // also see if this can be turned into a conditional cache request.
     @Override
     public Cancellable getSocket(final GetSocketData data) {
-        if (cache == null || !caching || data.request.getHeaders().isNoCache()) {
+        if (cache == null || !caching || HttpUtil.isNoCache(data.request.getHeaders())) {
             networkCount++;
             return null;
         }
@@ -120,7 +121,7 @@ public Cancellable getSocket(final GetSocketData data) {
         }
 
         // verify the entry matches
-        if (!entry.matches(data.request.getUri(), data.request.getMethod(), data.request.getHeaders().getHeaders().toMultimap())) {
+        if (!entry.matches(data.request.getUri(), data.request.getMethod(), data.request.getHeaders().toMultimap())) {
             networkCount++;
             StreamUtility.closeQuietly(snapshot);
             return null;
@@ -153,7 +154,8 @@ public Cancellable getSocket(final GetSocketData data) {
         cachedResponseHeaders.setLocalTimestamps(System.currentTimeMillis(), System.currentTimeMillis());
 
         long now = System.currentTimeMillis();
-        ResponseSource responseSource = cachedResponseHeaders.chooseResponseSource(now, data.request.getHeaders());
+        RequestHeaders requestHeaders = new RequestHeaders(null, data.request.getHeaders());
+        ResponseSource responseSource = cachedResponseHeaders.chooseResponseSource(now, requestHeaders);
 
         if (responseSource == ResponseSource.CACHE) {
             data.request.logi("Response retrieved from cache");
@@ -211,19 +213,20 @@ public int getCacheStoreCount() {
     public void onBodyDecoder(OnBodyData data) {
         CachedSocket cached = com.koushikdutta.async.Util.getWrappedSocket(data.socket, CachedSocket.class);
         if (cached != null) {
-            data.headers.getHeaders().set(SERVED_FROM, CACHE);
+            data.headers.set(SERVED_FROM, CACHE);
             return;
         }
 
         CacheData cacheData = data.state.get("cache-data");
         if (cacheData != null) {
-            if (cacheData.cachedResponseHeaders.validate(data.headers)) {
+            ResponseHeaders networkResponse = new ResponseHeaders(null, data.headers);
+            if (cacheData.cachedResponseHeaders.validate(networkResponse)) {
                 data.request.logi("Serving response from conditional cache");
-                data.headers.getHeaders().removeAll("Content-Length");
-                data.headers = cacheData.cachedResponseHeaders.combine(data.headers);
-                data.headers.getHeaders().setStatusLine(cacheData.cachedResponseHeaders.getHeaders().getStatusLine());
+                data.headers.removeAll("Content-Length");
+                data.headers = cacheData.cachedResponseHeaders.combine(networkResponse).getHeaders();
+                data.headers.setStatusLine(cacheData.cachedResponseHeaders.getHeaders().getStatusLine());
 
-                data.headers.getHeaders().set(SERVED_FROM, CONDITIONAL_CACHE);
+                data.headers.set(SERVED_FROM, CONDITIONAL_CACHE);
                 conditionalCacheHitCount++;
 
                 CachedBodyEmitter bodySpewer = new CachedBodyEmitter(cacheData.candidate, cacheData.contentLength);
@@ -241,7 +244,7 @@ public void onBodyDecoder(OnBodyData data) {
         if (!caching)
             return;
 
-        if (!data.headers.isCacheable(data.request.getHeaders()) || !data.request.getMethod().equals(AsyncHttpGet.METHOD)) {
+        if (!HttpUtil.isCacheable(data.request.getHeaders(), data.headers) || !data.request.getMethod().equals(AsyncHttpGet.METHOD)) {
             /*
              * Don't cache non-GET responses. We're technically allowed to cache
              * HEAD requests and some POST requests, but the complexity of doing
@@ -253,7 +256,7 @@ public void onBodyDecoder(OnBodyData data) {
         }
 
         String key = FileCache.toKeyString(data.request.getUri());
-        RawHeaders varyHeaders = data.request.getHeaders().getHeaders().getAll(data.headers.getVaryFields());
+        RawHeaders varyHeaders = data.request.getHeaders().getAll(HttpUtil.varyFields(data.headers));
         Entry entry = new Entry(data.request.getUri(), varyHeaders, data.request, data.headers);
         BodyCacher cacher = new BodyCacher();
         EntryEditor editor = new EntryEditor(key);
@@ -554,11 +557,11 @@ public Entry(InputStream in) throws IOException {
             }
         }
 
-        public Entry(Uri uri, RawHeaders varyHeaders, AsyncHttpRequest request, ResponseHeaders responseHeaders) {
+        public Entry(Uri uri, RawHeaders varyHeaders, AsyncHttpRequest request, RawHeaders responseHeaders) {
             this.uri = uri.toString();
             this.varyHeaders = varyHeaders;
             this.requestMethod = request.getMethod();
-            this.responseHeaders = responseHeaders.getHeaders();
+            this.responseHeaders = responseHeaders;
 
 //            if (isHttps()) {
 //                HttpsURLConnection httpsConnection = (HttpsURLConnection) httpConnection;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java
index 7e0770690..dba645a02 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java
@@ -11,22 +11,22 @@ public Cancellable getSocket(GetSocketData data) {
 
     @Override
     public void onSocket(OnSocketData data) {
-        
     }
 
     @Override
     public void onHeadersReceived(OnHeadersReceivedData data) {
-        
     }
 
     @Override
     public void onBodyDecoder(OnBodyData data) {
-        
     }
 
     @Override
     public void onRequestComplete(OnRequestCompleteData data) {
-        
     }
 
+    @Override
+    public boolean sendHeaders(SendHeaderData data) {
+        return false;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
index eda555615..dd38e5ec7 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
@@ -131,7 +131,7 @@ public WebSocketImpl(AsyncHttpServerRequest request, AsyncHttpServerResponse res
     }
     
     public static void addWebSocketUpgradeHeaders(AsyncHttpRequest req, String protocol) {
-        RawHeaders headers = req.getHeaders().getHeaders();
+        RawHeaders headers = req.getHeaders();
         final String key = Base64.encodeToString(toByteArray(UUID.randomUUID()),Base64.NO_WRAP);
         headers.set("Sec-WebSocket-Version", "13");
         headers.set("Sec-WebSocket-Key", key);
@@ -142,8 +142,8 @@ public static void addWebSocketUpgradeHeaders(AsyncHttpRequest req, String proto
             headers.set("Sec-WebSocket-Protocol", protocol);
         headers.set("Pragma", "no-cache");
         headers.set("Cache-Control", "no-cache");
-        if (TextUtils.isEmpty(req.getHeaders().getUserAgent()))
-            req.getHeaders().setUserAgent("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.15 Safari/537.36");
+        if (TextUtils.isEmpty(req.getHeaders().get("User-Agent")))
+            req.getHeaders().set("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.15 Safari/537.36");
     }
     
     public WebSocketImpl(AsyncSocket socket) {
@@ -154,12 +154,12 @@ public WebSocketImpl(AsyncSocket socket) {
     public static WebSocket finishHandshake(RawHeaders requestHeaders, AsyncHttpResponse response) {
         if (response == null)
             return null;
-        if (response.getHeaders().getHeaders().getResponseCode() != 101)
+        if (response.headers().getResponseCode() != 101)
             return null;
-        if (!"websocket".equalsIgnoreCase(response.getHeaders().getHeaders().get("Upgrade")))
+        if (!"websocket".equalsIgnoreCase(response.headers().get("Upgrade")))
             return null;
         
-        String sha1 = response.getHeaders().getHeaders().get("Sec-WebSocket-Accept");
+        String sha1 = response.headers().get("Sec-WebSocket-Accept");
         if (sha1 == null)
             return null;
         String key = requestHeaders.get("Sec-WebSocket-Key");
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/callback/HeadersCallback.java b/AndroidAsync/src/com/koushikdutta/async/http/callback/HeadersCallback.java
new file mode 100644
index 000000000..80f1be67e
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/callback/HeadersCallback.java
@@ -0,0 +1,10 @@
+package com.koushikdutta.async.http.callback;
+
+import com.koushikdutta.async.http.libcore.RawHeaders;
+
+/**
+ * Created by koush on 6/30/13.
+ */
+public interface HeadersCallback {
+    public void onHeaders(RawHeaders headers);
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/libcore/HeaderParser.java b/AndroidAsync/src/com/koushikdutta/async/http/libcore/HeaderParser.java
index a91be67b2..4b9c9eac0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/libcore/HeaderParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/libcore/HeaderParser.java
@@ -26,6 +26,8 @@ public interface CacheControlHandler {
      * Parse a comma-separated list of cache control header values.
      */
     public static void parseCacheControl(String value, CacheControlHandler handler) {
+        if (value == null)
+            return;
         int pos = 0;
         while (pos < value.length()) {
             int tokenStart = pos;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/libcore/HttpDate.java b/AndroidAsync/src/com/koushikdutta/async/http/libcore/HttpDate.java
index 59e492925..3ac9da1a2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/libcore/HttpDate.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/libcore/HttpDate.java
@@ -69,6 +69,8 @@ public final class HttpDate {
      * parsed.
      */
     public static Date parse(String value) {
+        if (value == null)
+            return null;
         try {
             return STANDARD_DATE_FORMAT.get().parse(value);
         } catch (ParseException ignore) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/HttpTransport.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/HttpTransport.java
new file mode 100644
index 000000000..0d017bba6
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/HttpTransport.java
@@ -0,0 +1,15 @@
+package com.koushikdutta.async.http.spdy;
+
+import com.koushikdutta.async.http.AsyncHttpClientMiddleware;
+import com.koushikdutta.async.http.SimpleMiddleware;
+
+/**
+ * Created by koush on 7/19/14.
+ */
+public class HttpTransport extends SimpleMiddleware {
+    @Override
+    public boolean sendHeaders(SendHeaderData data) {
+        return super.sendHeaders(data);
+    }
+
+}
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
index 6809880ec..ea9832951 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
@@ -115,7 +115,7 @@ public void testClockworkMod() throws Exception {
             @Override
             public void onConnectCompleted(Exception ex, AsyncHttpResponse response) {
                 // make sure gzip decoding works, as that is generally what github sends.
-                Assert.assertEquals("gzip", response.getHeaders().getContentEncoding());
+                Assert.assertEquals("gzip", response.headers().get("Content-Encoding"));
                 response.setDataCallback(new DataCallback() {
                     @Override
                     public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java b/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
index ebaae9ddd..ac4471316 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
@@ -43,8 +43,8 @@ public void onCompleted(Exception ex) {
 
             AsyncHttpGet get = new AsyncHttpGet("http://localhost:5959/");
             get.setLogging("issue59", Log.VERBOSE);
-            get.getHeaders().getHeaders().removeAll("Connection");
-            get.getHeaders().getHeaders().removeAll("Accept-Encoding");
+            get.getHeaders().removeAll("Connection");
+            get.getHeaders().removeAll("Accept-Encoding");
 
             assertEquals("foobarbeepboop", AsyncHttpClient.getDefaultInstance().executeString(get, null).get(1000, TimeUnit.MILLISECONDS));
         }

From 5b950f69eda8e7a7c7d611fbe06cc3aed2c0bae7 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 21 Jul 2014 14:37:01 -0700
Subject: [PATCH 032/399] more libcore removal

---
 .../koushikdutta/async/http/WebSocketImpl.java  |  6 +++---
 .../async/http/server/AsyncHttpServer.java      | 12 ++++++------
 .../http/server/AsyncHttpServerRequest.java     |  6 +++---
 .../http/server/AsyncHttpServerRequestImpl.java | 17 +++++------------
 .../server/AsyncHttpServerResponseImpl.java     |  4 ++--
 5 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
index dd38e5ec7..bfcbab6b9 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
@@ -110,16 +110,16 @@ protected void sendFrame(byte[] frame) {
     public WebSocketImpl(AsyncHttpServerRequest request, AsyncHttpServerResponse response) {
         this(request.getSocket());
         
-        String key = request.getHeaders().getHeaders().get("Sec-WebSocket-Key");
+        String key = request.getHeaders().get("Sec-WebSocket-Key");
         String concat = key + MAGIC;
         String sha1 = SHA1(concat);
-        String origin = request.getHeaders().getHeaders().get("Origin");
+        String origin = request.getHeaders().get("Origin");
         
         response.responseCode(101);
         response.getHeaders().getHeaders().set("Upgrade", "WebSocket");
         response.getHeaders().getHeaders().set("Connection", "Upgrade");
         response.getHeaders().getHeaders().set("Sec-WebSocket-Accept", sha1);
-        String protocol = request.getHeaders().getHeaders().get("Sec-WebSocket-Protocol");
+        String protocol = request.getHeaders().get("Sec-WebSocket-Protocol");
         // match the protocol (sanity checking and enforcement is done in the caller)
         if (!TextUtils.isEmpty(protocol))
             response.getHeaders().getHeaders().set("Sec-WebSocket-Protocol", protocol);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index b1b393d64..b5d69e695 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -79,7 +79,7 @@ protected AsyncHttpRequestBody onUnknownBody(RawHeaders headers) {
 
                 @Override
                 protected void onHeadersReceived() {
-                    RawHeaders headers = getRawHeaders();
+                    RawHeaders headers = getHeaders();
 
                     // should the negotiation of 100 continue be here, or in the request impl?
                     // probably here, so AsyncResponse can negotiate a 100 continue.
@@ -173,7 +173,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                 
                 private void handleOnCompleted() {
                     if (requestComplete && responseComplete) {
-                        if (HttpUtil.isKeepAlive(getHeaders().getHeaders())) {
+                        if (HttpUtil.isKeepAlive(getHeaders())) {
                             onAccepted(socket);
                         }
                         else {
@@ -285,7 +285,7 @@ public void addAction(String action, String regex, HttpServerRequestCallback cal
     }
 
     public static interface WebSocketRequestCallback {
-        public void onConnected(WebSocket webSocket, RequestHeaders headers);
+        public void onConnected(WebSocket webSocket, RawHeaders headers);
     }
 
     public void websocket(String regex, final WebSocketRequestCallback callback) {
@@ -297,7 +297,7 @@ public void websocket(String regex, final String protocol, final WebSocketReques
             @Override
             public void onRequest(final AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
                 boolean hasUpgrade = false;
-                String connection = request.getHeaders().getHeaders().get("Connection");
+                String connection = request.getHeaders().get("Connection");
                 if (connection != null) {
                     String[] connections = connection.split(",");
                     for (String c: connections) {
@@ -307,12 +307,12 @@ public void onRequest(final AsyncHttpServerRequest request, final AsyncHttpServe
                         }
                     }
                 }
-                if (!"websocket".equalsIgnoreCase(request.getHeaders().getHeaders().get("Upgrade")) || !hasUpgrade) {
+                if (!"websocket".equalsIgnoreCase(request.getHeaders().get("Upgrade")) || !hasUpgrade) {
                     response.responseCode(404);
                     response.end();
                     return;
                 }
-                String peerProtocol = request.getHeaders().getHeaders().get("Sec-WebSocket-Protocol");
+                String peerProtocol = request.getHeaders().get("Sec-WebSocket-Protocol");
                 if (!TextUtils.equals(protocol, peerProtocol)) {
                     response.responseCode(404);
                     response.end();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
index be7d8884b..9af204e6a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
@@ -2,14 +2,14 @@
 
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.DataEmitter;
-import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 import com.koushikdutta.async.http.Multimap;
-import com.koushikdutta.async.http.libcore.RequestHeaders;
+import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
+import com.koushikdutta.async.http.libcore.RawHeaders;
 
 import java.util.regex.Matcher;
 
 public interface AsyncHttpServerRequest extends DataEmitter {
-    public RequestHeaders getHeaders();
+    public RawHeaders getHeaders();
     public Matcher getMatcher();
     public AsyncHttpRequestBody getBody();
     public AsyncSocket getSocket();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
index c2e2c1323..3e82bd3f2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
@@ -1,7 +1,5 @@
 package com.koushikdutta.async.http.server;
 
-import java.util.regex.Matcher;
-
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.FilteredDataEmitter;
@@ -9,10 +7,11 @@
 import com.koushikdutta.async.LineEmitter.StringCallback;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
-import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 import com.koushikdutta.async.http.HttpUtil;
+import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 import com.koushikdutta.async.http.libcore.RawHeaders;
-import com.koushikdutta.async.http.libcore.RequestHeaders;
+
+import java.util.regex.Matcher;
 
 public abstract class AsyncHttpServerRequestImpl extends FilteredDataEmitter implements AsyncHttpServerRequest, CompletedCallback {
     private RawHeaders mRawHeaders = new RawHeaders();
@@ -68,7 +67,6 @@ else if (!"\r".equals(s)){
                             mBody = new UnknownRequestBody(mRawHeaders.get("Content-Type"));
                     }
                     mBody.parse(emitter, mReporter);
-                    mHeaders = new RequestHeaders(null, mRawHeaders);
                     onHeadersReceived();
                 }
             }
@@ -78,10 +76,6 @@ else if (!"\r".equals(s)){
         }
     };
 
-    RawHeaders getRawHeaders() {
-        return mRawHeaders;
-    }
-
     String method;
     @Override
     public String getMethod() {
@@ -101,10 +95,9 @@ public AsyncSocket getSocket() {
         return mSocket;
     }
 
-    private RequestHeaders mHeaders;
     @Override
-    public RequestHeaders getHeaders() {
-        return mHeaders;
+    public RawHeaders getHeaders() {
+        return mRawHeaders;
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index d1cb9527f..08d3af9cc 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -45,7 +45,7 @@ public AsyncSocket getSocket() {
     AsyncHttpServerResponseImpl(AsyncSocket socket, AsyncHttpServerRequestImpl req) {
         mSocket = socket;
         mRequest = req;
-        if (HttpUtil.isKeepAlive(req.getHeaders().getHeaders()))
+        if (HttpUtil.isKeepAlive(req.getHeaders()))
             mRawHeaders.set("Connection", "Keep-Alive");
     }
 
@@ -204,7 +204,7 @@ public void sendStream(final InputStream inputStream, long totalLength) {
         long start = 0;
         long end = totalLength - 1;
 
-        String range = mRequest.getHeaders().getHeaders().get("Range");
+        String range = mRequest.getHeaders().get("Range");
         if (range != null) {
             String[] parts = range.split("=");
             if (parts.length != 2 || !"bytes".equals(parts[0])) {

From 54ef12d411c1d251b02fd9deed8d175c8c97679e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 21 Jul 2014 20:17:31 -0700
Subject: [PATCH 033/399] Move all cache related stuff into subpackage. Contain
 libcore.

---
 .../async/http/AsyncHttpClient.java           |   2 +-
 .../async/http/AsyncHttpClientMiddleware.java |   2 +-
 .../async/http/AsyncHttpRequest.java          |   3 +-
 .../async/http/AsyncHttpResponse.java         |   2 +-
 .../async/http/AsyncHttpResponseImpl.java     |   5 +-
 .../async/http/AsyncSSLSocketMiddleware.java  |   2 +-
 .../async/http/{libcore => }/HttpDate.java    |   2 +-
 .../com/koushikdutta/async/http/HttpUtil.java |  29 +---
 .../com/koushikdutta/async/http/Multimap.java |   2 +-
 .../async/http/WebSocketImpl.java             |  22 +--
 .../http/body/MultipartFormDataBody.java      |   2 +-
 .../koushikdutta/async/http/body/Part.java    |   3 +-
 .../async/http/cache/CacheUtil.java           |  35 +++++
 .../http/{libcore => cache}/HeaderParser.java |   2 +-
 .../http/{libcore => cache}/Objects.java      |   4 +-
 .../http/{libcore => cache}/RawHeaders.java   |   2 +-
 .../{libcore => cache}/RequestHeaders.java    |   6 +-
 .../{ => cache}/ResponseCacheMiddleware.java  |  20 +--
 .../{libcore => cache}/ResponseHeaders.java   |   7 +-
 .../{libcore => cache}/ResponseSource.java    |   4 +-
 .../{libcore => cache}/StrictLineReader.java  |   4 +-
 .../async/http/callback/HeadersCallback.java  |   2 +-
 .../async/http/filter/GZIPInputFilter.java    |  22 ++-
 .../async/http/libcore/Memory.java            | 126 ------------------
 .../async/http/server/AsyncHttpServer.java    |  13 +-
 .../http/server/AsyncHttpServerRequest.java   |   2 +-
 .../server/AsyncHttpServerRequestImpl.java    |   2 +-
 .../http/server/AsyncHttpServerResponse.java  |  14 +-
 .../server/AsyncHttpServerResponseImpl.java   |  15 +--
 .../koushikdutta/async/test/CacheTests.java   |   8 +-
 .../async/test/HttpClientTests.java           |   2 +-
 .../async/test/HttpServerTests.java           |   4 +-
 .../com/koushikdutta/async/test/Issue59.java  |   2 +-
 .../async/test/WebSocketTests.java            |   4 +-
 34 files changed, 131 insertions(+), 245 deletions(-)
 rename AndroidAsync/src/com/koushikdutta/async/http/{libcore => }/HttpDate.java (98%)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/cache/CacheUtil.java
 rename AndroidAsync/src/com/koushikdutta/async/http/{libcore => cache}/HeaderParser.java (98%)
 rename AndroidAsync/src/com/koushikdutta/async/http/{libcore => cache}/Objects.java (92%)
 rename AndroidAsync/src/com/koushikdutta/async/http/{libcore => cache}/RawHeaders.java (99%)
 rename AndroidAsync/src/com/koushikdutta/async/http/{libcore => cache}/RequestHeaders.java (98%)
 rename AndroidAsync/src/com/koushikdutta/async/http/{ => cache}/ResponseCacheMiddleware.java (97%)
 rename AndroidAsync/src/com/koushikdutta/async/http/{libcore => cache}/ResponseHeaders.java (99%)
 rename AndroidAsync/src/com/koushikdutta/async/http/{libcore => cache}/ResponseSource.java (93%)
 rename AndroidAsync/src/com/koushikdutta/async/http/{libcore => cache}/StrictLineReader.java (98%)
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/libcore/Memory.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 7f66deb0b..b6654a9a6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -20,7 +20,7 @@
 import com.koushikdutta.async.http.AsyncHttpClientMiddleware.OnRequestCompleteData;
 import com.koushikdutta.async.http.callback.HttpConnectCallback;
 import com.koushikdutta.async.http.callback.RequestCallback;
-import com.koushikdutta.async.http.libcore.RawHeaders;
+import com.koushikdutta.async.http.cache.RawHeaders;
 import com.koushikdutta.async.parser.AsyncParser;
 import com.koushikdutta.async.parser.ByteBufferListParser;
 import com.koushikdutta.async.parser.JSONArrayParser;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
index 79deb4c7b..240448276 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
@@ -5,7 +5,7 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.future.Cancellable;
-import com.koushikdutta.async.http.libcore.RawHeaders;
+import com.koushikdutta.async.http.cache.RawHeaders;
 import com.koushikdutta.async.util.UntypedHashtable;
 
 public interface AsyncHttpClientMiddleware {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
index b3eb45b52..fa50c20f7 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
@@ -5,8 +5,7 @@
 
 import com.koushikdutta.async.AsyncSSLException;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
-import com.koushikdutta.async.http.libcore.RawHeaders;
-import com.koushikdutta.async.http.libcore.RequestHeaders;
+import com.koushikdutta.async.http.cache.RawHeaders;
 
 import org.apache.http.Header;
 import org.apache.http.HeaderIterator;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
index 631879c99..f44ba8eea 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
@@ -3,7 +3,7 @@
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.callback.CompletedCallback;
-import com.koushikdutta.async.http.libcore.RawHeaders;
+import com.koushikdutta.async.http.cache.RawHeaders;
 
 public interface AsyncHttpResponse extends DataEmitter {
     public void setEndCallback(CompletedCallback handler);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index a3e4189c6..e1b23998f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -13,11 +13,8 @@
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 import com.koushikdutta.async.http.filter.ChunkedOutputFilter;
-import com.koushikdutta.async.http.libcore.RawHeaders;
-import com.koushikdutta.async.http.libcore.ResponseHeaders;
-import com.koushikdutta.async.util.Charsets;
+import com.koushikdutta.async.http.cache.RawHeaders;
 
-import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
 abstract class AsyncHttpResponseImpl extends FilteredDataEmitter implements AsyncSocket, AsyncHttpResponse {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
index b339c935e..9e03461c6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
@@ -10,7 +10,7 @@
 import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ConnectCallback;
-import com.koushikdutta.async.http.libcore.RawHeaders;
+import com.koushikdutta.async.http.cache.RawHeaders;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/libcore/HttpDate.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpDate.java
similarity index 98%
rename from AndroidAsync/src/com/koushikdutta/async/http/libcore/HttpDate.java
rename to AndroidAsync/src/com/koushikdutta/async/http/HttpDate.java
index 3ac9da1a2..f4e79c311 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/libcore/HttpDate.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpDate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.koushikdutta.async.http.libcore;
+package com.koushikdutta.async.http;
 
 import java.text.DateFormat;
 import java.text.ParseException;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
index c30e42b0d..bbcdf8fc6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
@@ -9,18 +9,11 @@
 import com.koushikdutta.async.http.body.MultipartFormDataBody;
 import com.koushikdutta.async.http.body.StringBody;
 import com.koushikdutta.async.http.body.UrlEncodedFormBody;
+import com.koushikdutta.async.http.cache.RawHeaders;
 import com.koushikdutta.async.http.filter.ChunkedInputFilter;
 import com.koushikdutta.async.http.filter.ContentLengthFilter;
 import com.koushikdutta.async.http.filter.GZIPInputFilter;
 import com.koushikdutta.async.http.filter.InflaterInputFilter;
-import com.koushikdutta.async.http.libcore.RawHeaders;
-import com.koushikdutta.async.http.libcore.RequestHeaders;
-import com.koushikdutta.async.http.libcore.ResponseHeaders;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
 
 public class HttpUtil {
     public static AsyncHttpRequestBody getBody(DataEmitter emitter, CompletedCallback reporter, RawHeaders headers) {
@@ -148,24 +141,4 @@ public static int contentLength(RawHeaders headers) {
             return -1;
         }
     }
-
-    public static Set<String> varyFields(RawHeaders headers) {
-        HashSet<String> ret = new HashSet<String>();
-        String value = headers.get("Vary");
-        if (value == null)
-            return ret;
-        for (String varyField : value.split(",")) {
-            ret.add(varyField.trim());
-        }
-        return ret;
-    }
-
-    public static boolean isCacheable(RawHeaders requestHeaders, RawHeaders responseHeaders) {
-        ResponseHeaders r = new ResponseHeaders(null, responseHeaders);
-        return r.isCacheable(new RequestHeaders(null, requestHeaders));
-    }
-
-    public static boolean isNoCache(RawHeaders headers) {
-        return new RequestHeaders(null, headers).isNoCache();
-    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
index 628bdd036..efc16a850 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
@@ -1,7 +1,7 @@
 package com.koushikdutta.async.http;
 
 import android.net.Uri;
-import com.koushikdutta.async.http.libcore.RawHeaders;
+import com.koushikdutta.async.http.cache.RawHeaders;
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
index bfcbab6b9..4af0b9961 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
@@ -1,11 +1,5 @@
 package com.koushikdutta.async.http;
 
-import java.nio.ByteBuffer;
-import java.nio.LongBuffer;
-import java.security.MessageDigest;
-import java.util.LinkedList;
-import java.util.UUID;
-
 import android.text.TextUtils;
 import android.util.Base64;
 
@@ -17,10 +11,16 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
-import com.koushikdutta.async.http.libcore.RawHeaders;
+import com.koushikdutta.async.http.cache.RawHeaders;
 import com.koushikdutta.async.http.server.AsyncHttpServerRequest;
 import com.koushikdutta.async.http.server.AsyncHttpServerResponse;
 
+import java.nio.ByteBuffer;
+import java.nio.LongBuffer;
+import java.security.MessageDigest;
+import java.util.LinkedList;
+import java.util.UUID;
+
 public class WebSocketImpl implements WebSocket {
     @Override
     public void end() {
@@ -116,13 +116,13 @@ public WebSocketImpl(AsyncHttpServerRequest request, AsyncHttpServerResponse res
         String origin = request.getHeaders().get("Origin");
         
         response.responseCode(101);
-        response.getHeaders().getHeaders().set("Upgrade", "WebSocket");
-        response.getHeaders().getHeaders().set("Connection", "Upgrade");
-        response.getHeaders().getHeaders().set("Sec-WebSocket-Accept", sha1);
+        response.getHeaders().set("Upgrade", "WebSocket");
+        response.getHeaders().set("Connection", "Upgrade");
+        response.getHeaders().set("Sec-WebSocket-Accept", sha1);
         String protocol = request.getHeaders().get("Sec-WebSocket-Protocol");
         // match the protocol (sanity checking and enforcement is done in the caller)
         if (!TextUtils.isEmpty(protocol))
-            response.getHeaders().getHeaders().set("Sec-WebSocket-Protocol", protocol);
+            response.getHeaders().set("Sec-WebSocket-Protocol", protocol);
 //        if (origin != null)
 //            response.getHeaders().getHeaders().set("Access-Control-Allow-Origin", "http://" + origin);
         response.writeHead();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
index c61a9d96b..1872e19c8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
@@ -12,7 +12,7 @@
 import com.koushikdutta.async.future.Continuation;
 import com.koushikdutta.async.http.AsyncHttpRequest;
 import com.koushikdutta.async.http.Multimap;
-import com.koushikdutta.async.http.libcore.RawHeaders;
+import com.koushikdutta.async.http.cache.RawHeaders;
 import com.koushikdutta.async.http.server.BoundaryEmitter;
 
 import java.io.File;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java b/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java
index cfe499361..56fcecb58 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java
@@ -3,12 +3,11 @@
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.http.Multimap;
-import com.koushikdutta.async.http.libcore.RawHeaders;
+import com.koushikdutta.async.http.cache.RawHeaders;
 import org.apache.http.NameValuePair;
 
 import java.io.File;
 import java.util.List;
-import java.util.Map;
 
 public class Part {
     public static final String CONTENT_DISPOSITION = "Content-Disposition";
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/CacheUtil.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/CacheUtil.java
new file mode 100644
index 000000000..caadf8f30
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/CacheUtil.java
@@ -0,0 +1,35 @@
+package com.koushikdutta.async.http.cache;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Created by koush on 7/21/14.
+ */
+class CacheUtil {
+    static Set<String> varyFields(RawHeaders headers) {
+        HashSet<String> ret = new HashSet<String>();
+        String value = headers.get("Vary");
+        if (value == null)
+            return ret;
+        for (String varyField : value.split(",")) {
+            ret.add(varyField.trim());
+        }
+        return ret;
+    }
+
+    static boolean isCacheable(RawHeaders requestHeaders, RawHeaders responseHeaders) {
+        ResponseHeaders r = new ResponseHeaders(null, responseHeaders);
+        return r.isCacheable(new RequestHeaders(null, requestHeaders));
+    }
+
+    static boolean isNoCache(RawHeaders headers) {
+        return new RequestHeaders(null, headers).isNoCache();
+    }
+
+    ResponseSource chooseResponseSource(long nowMillis, RawHeaders request, RawHeaders response) {
+        RequestHeaders requestHeaders = new RequestHeaders(null, request);
+        ResponseHeaders responseHeaders = new ResponseHeaders(null, response);
+        return responseHeaders.chooseResponseSource(nowMillis, requestHeaders);
+    }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/libcore/HeaderParser.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/HeaderParser.java
similarity index 98%
rename from AndroidAsync/src/com/koushikdutta/async/http/libcore/HeaderParser.java
rename to AndroidAsync/src/com/koushikdutta/async/http/cache/HeaderParser.java
index 4b9c9eac0..4c0a8f1aa 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/libcore/HeaderParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/HeaderParser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.koushikdutta.async.http.libcore;
+package com.koushikdutta.async.http.cache;
 
 final class HeaderParser {
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/libcore/Objects.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/Objects.java
similarity index 92%
rename from AndroidAsync/src/com/koushikdutta/async/http/libcore/Objects.java
rename to AndroidAsync/src/com/koushikdutta/async/http/cache/Objects.java
index a0bfbad3e..23e5afd94 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/libcore/Objects.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/Objects.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.koushikdutta.async.http.libcore;
+package com.koushikdutta.async.http.cache;
 
-public final class Objects {
+final class Objects {
     private Objects() {}
 
     /**
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/libcore/RawHeaders.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/RawHeaders.java
similarity index 99%
rename from AndroidAsync/src/com/koushikdutta/async/http/libcore/RawHeaders.java
rename to AndroidAsync/src/com/koushikdutta/async/http/cache/RawHeaders.java
index cb446be86..53be34091 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/libcore/RawHeaders.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/RawHeaders.java
@@ -1,4 +1,4 @@
-package com.koushikdutta.async.http.libcore;
+package com.koushikdutta.async.http.cache;
 
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/libcore/RequestHeaders.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/RequestHeaders.java
similarity index 98%
rename from AndroidAsync/src/com/koushikdutta/async/http/libcore/RequestHeaders.java
rename to AndroidAsync/src/com/koushikdutta/async/http/cache/RequestHeaders.java
index b5180b40c..15768605c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/libcore/RequestHeaders.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/RequestHeaders.java
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-package com.koushikdutta.async.http.libcore;
+package com.koushikdutta.async.http.cache;
 
 import android.net.Uri;
 
+import com.koushikdutta.async.http.HttpDate;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -25,7 +27,7 @@
 /**
  * Parsed HTTP request headers.
  */
-public final class RequestHeaders {
+final class RequestHeaders {
     private final Uri uri;
     private final RawHeaders headers;
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
similarity index 97%
rename from AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
rename to AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index a81167905..22f0ac2a3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -1,4 +1,4 @@
-package com.koushikdutta.async.http;
+package com.koushikdutta.async.http.cache;
 
 import android.net.Uri;
 import android.util.Base64;
@@ -14,13 +14,13 @@
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.future.Cancellable;
 import com.koushikdutta.async.future.SimpleCancellable;
-import com.koushikdutta.async.http.libcore.RequestHeaders;
-import com.koushikdutta.async.util.Charsets;
-import com.koushikdutta.async.http.libcore.RawHeaders;
-import com.koushikdutta.async.http.libcore.ResponseHeaders;
-import com.koushikdutta.async.http.libcore.ResponseSource;
-import com.koushikdutta.async.http.libcore.StrictLineReader;
+import com.koushikdutta.async.http.AsyncHttpClient;
+import com.koushikdutta.async.http.AsyncHttpClientMiddleware;
+import com.koushikdutta.async.http.AsyncHttpGet;
+import com.koushikdutta.async.http.AsyncHttpRequest;
+import com.koushikdutta.async.http.SimpleMiddleware;
 import com.koushikdutta.async.util.Allocator;
+import com.koushikdutta.async.util.Charsets;
 import com.koushikdutta.async.util.FileCache;
 import com.koushikdutta.async.util.StreamUtility;
 
@@ -95,7 +95,7 @@ public void setCaching(boolean caching) {
     // also see if this can be turned into a conditional cache request.
     @Override
     public Cancellable getSocket(final GetSocketData data) {
-        if (cache == null || !caching || HttpUtil.isNoCache(data.request.getHeaders())) {
+        if (cache == null || !caching || CacheUtil.isNoCache(data.request.getHeaders())) {
             networkCount++;
             return null;
         }
@@ -244,7 +244,7 @@ public void onBodyDecoder(OnBodyData data) {
         if (!caching)
             return;
 
-        if (!HttpUtil.isCacheable(data.request.getHeaders(), data.headers) || !data.request.getMethod().equals(AsyncHttpGet.METHOD)) {
+        if (!CacheUtil.isCacheable(data.request.getHeaders(), data.headers) || !data.request.getMethod().equals(AsyncHttpGet.METHOD)) {
             /*
              * Don't cache non-GET responses. We're technically allowed to cache
              * HEAD requests and some POST requests, but the complexity of doing
@@ -256,7 +256,7 @@ public void onBodyDecoder(OnBodyData data) {
         }
 
         String key = FileCache.toKeyString(data.request.getUri());
-        RawHeaders varyHeaders = data.request.getHeaders().getAll(HttpUtil.varyFields(data.headers));
+        RawHeaders varyHeaders = data.request.getHeaders().getAll(CacheUtil.varyFields(data.headers));
         Entry entry = new Entry(data.request.getUri(), varyHeaders, data.request, data.headers);
         BodyCacher cacher = new BodyCacher();
         EntryEditor editor = new EntryEditor(key);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/libcore/ResponseHeaders.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseHeaders.java
similarity index 99%
rename from AndroidAsync/src/com/koushikdutta/async/http/libcore/ResponseHeaders.java
rename to AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseHeaders.java
index 3cc128ecf..327564714 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/libcore/ResponseHeaders.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseHeaders.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package com.koushikdutta.async.http.libcore;
+package com.koushikdutta.async.http.cache;
 
 import android.net.Uri;
 
+import com.koushikdutta.async.http.HttpDate;
+
 import java.net.HttpURLConnection;
-import java.net.URI;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -31,7 +32,7 @@
 /**
  * Parsed HTTP response headers.
  */
-public final class ResponseHeaders {
+final class ResponseHeaders {
 
     /** HTTP header name for the local time when the request was sent. */
     private static final String SENT_MILLIS = "X-Android-Sent-Millis";
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/libcore/ResponseSource.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseSource.java
similarity index 93%
rename from AndroidAsync/src/com/koushikdutta/async/http/libcore/ResponseSource.java
rename to AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseSource.java
index 3501b0ff5..a4046c710 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/libcore/ResponseSource.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseSource.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.koushikdutta.async.http.libcore;
+package com.koushikdutta.async.http.cache;
 
-public enum ResponseSource {
+enum ResponseSource {
 
     /**
      * Return the response from the cache immediately.
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/libcore/StrictLineReader.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/StrictLineReader.java
similarity index 98%
rename from AndroidAsync/src/com/koushikdutta/async/http/libcore/StrictLineReader.java
rename to AndroidAsync/src/com/koushikdutta/async/http/cache/StrictLineReader.java
index d1cb5d964..35b8306f0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/libcore/StrictLineReader.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/StrictLineReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.koushikdutta.async.http.libcore;
+package com.koushikdutta.async.http.cache;
 
 import com.koushikdutta.async.util.Charsets;
 
@@ -43,7 +43,7 @@
  * We currently check in constructor that the charset is one of US-ASCII, UTF-8 and ISO-8859-1.
  * The default charset is US_ASCII.
  */
-public class StrictLineReader implements Closeable {
+class StrictLineReader implements Closeable {
     private static final byte CR = (byte)'\r';
     private static final byte LF = (byte)'\n';
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/callback/HeadersCallback.java b/AndroidAsync/src/com/koushikdutta/async/http/callback/HeadersCallback.java
index 80f1be67e..68db69f2a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/callback/HeadersCallback.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/callback/HeadersCallback.java
@@ -1,6 +1,6 @@
 package com.koushikdutta.async.http.callback;
 
-import com.koushikdutta.async.http.libcore.RawHeaders;
+import com.koushikdutta.async.http.cache.RawHeaders;
 
 /**
  * Created by koush on 6/30/13.
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java b/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java
index e1a23d014..83beef7f7 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java
@@ -1,9 +1,11 @@
 package com.koushikdutta.async.http.filter;
 
-import com.koushikdutta.async.*;
-import com.koushikdutta.async.callback.DataCallback;
-import com.koushikdutta.async.http.libcore.Memory;
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.DataEmitter;
+import com.koushikdutta.async.NullDataCallback;
+import com.koushikdutta.async.PushParser;
 import com.koushikdutta.async.PushParser.ParseCallback;
+import com.koushikdutta.async.callback.DataCallback;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -13,6 +15,14 @@
 import java.util.zip.Inflater;
 
 public class GZIPInputFilter extends InflaterInputFilter {
+    static short peekShort(byte[] src, int offset, ByteOrder order) {
+        if (order == ByteOrder.BIG_ENDIAN) {
+            return (short) ((src[offset] << 8) | (src[offset + 1] & 0xff));
+        } else {
+            return (short) ((src[offset + 1] << 8) | (src[offset] & 0xff));
+        }
+    }
+
     private static final int FCOMMENT = 16;
 
     private static final int FEXTRA = 4;
@@ -44,7 +54,7 @@ public void onDataAvailable(final DataEmitter emitter, ByteBufferList bb) {
                 boolean hcrc;
 
                 public void parsed(byte[] header) {
-                    short magic = Memory.peekShort(header, 0, ByteOrder.LITTLE_ENDIAN);
+                    short magic = peekShort(header, 0, ByteOrder.LITTLE_ENDIAN);
                     if (magic != (short) GZIPInputStream.GZIP_MAGIC) {
                         report(new IOException(String.format("unknown format (magic number %x)", magic)));
                         emitter.setDataCallback(new NullDataCallback());
@@ -61,7 +71,7 @@ public void parsed(byte[] header) {
                                 if (hcrc) {
                                     crc.update(header, 0, 2);
                                 }
-                                int length = Memory.peekShort(header, 0, ByteOrder.LITTLE_ENDIAN) & 0xffff;
+                                int length = peekShort(header, 0, ByteOrder.LITTLE_ENDIAN) & 0xffff;
                                 parser.readByteArray(length, new ParseCallback<byte[]>() {
                                     public void parsed(byte[] buf) {
                                         if (hcrc) {
@@ -100,7 +110,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                     if (hcrc) {
                         parser.readByteArray(2, new ParseCallback<byte[]>() {
                             public void parsed(byte[] header) {
-                                short crc16 = Memory.peekShort(header, 0, ByteOrder.LITTLE_ENDIAN);
+                                short crc16 = peekShort(header, 0, ByteOrder.LITTLE_ENDIAN);
                                 if ((short) crc.getValue() != crc16) {
                                     report(new IOException("CRC mismatch"));
                                     return;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/libcore/Memory.java b/AndroidAsync/src/com/koushikdutta/async/http/libcore/Memory.java
deleted file mode 100644
index 8b3b2811d..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/libcore/Memory.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package com.koushikdutta.async.http.libcore;
-
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-/**
- * Unsafe access to memory.
- */
-public final class Memory {
-    private Memory() { }
-
-    public static int peekInt(byte[] src, int offset, ByteOrder order) {
-        if (order == ByteOrder.BIG_ENDIAN) {
-            return (((src[offset++] & 0xff) << 24) |
-                    ((src[offset++] & 0xff) << 16) |
-                    ((src[offset++] & 0xff) <<  8) |
-                    ((src[offset  ] & 0xff) <<  0));
-        } else {
-            return (((src[offset++] & 0xff) <<  0) |
-                    ((src[offset++] & 0xff) <<  8) |
-                    ((src[offset++] & 0xff) << 16) |
-                    ((src[offset  ] & 0xff) << 24));
-        }
-    }
-
-    public static long peekLong(byte[] src, int offset, ByteOrder order) {
-        if (order == ByteOrder.BIG_ENDIAN) {
-            int h = ((src[offset++] & 0xff) << 24) |
-                    ((src[offset++] & 0xff) << 16) |
-                    ((src[offset++] & 0xff) <<  8) |
-                    ((src[offset++] & 0xff) <<  0);
-            int l = ((src[offset++] & 0xff) << 24) |
-                    ((src[offset++] & 0xff) << 16) |
-                    ((src[offset++] & 0xff) <<  8) |
-                    ((src[offset  ] & 0xff) <<  0);
-            return (((long) h) << 32L) | ((long) l) & 0xffffffffL;
-        } else {
-            int l = ((src[offset++] & 0xff) <<  0) |
-                    ((src[offset++] & 0xff) <<  8) |
-                    ((src[offset++] & 0xff) << 16) |
-                    ((src[offset++] & 0xff) << 24);
-            int h = ((src[offset++] & 0xff) <<  0) |
-                    ((src[offset++] & 0xff) <<  8) |
-                    ((src[offset++] & 0xff) << 16) |
-                    ((src[offset  ] & 0xff) << 24);
-            return (((long) h) << 32L) | ((long) l) & 0xffffffffL;
-        }
-    }
-
-    public static short peekShort(byte[] src, int offset, ByteOrder order) {
-        if (order == ByteOrder.BIG_ENDIAN) {
-            return (short) ((src[offset] << 8) | (src[offset + 1] & 0xff));
-        } else {
-            return (short) ((src[offset + 1] << 8) | (src[offset] & 0xff));
-        }
-    }
-
-    public static void pokeInt(byte[] dst, int offset, int value, ByteOrder order) {
-        if (order == ByteOrder.BIG_ENDIAN) {
-            dst[offset++] = (byte) ((value >> 24) & 0xff);
-            dst[offset++] = (byte) ((value >> 16) & 0xff);
-            dst[offset++] = (byte) ((value >>  8) & 0xff);
-            dst[offset  ] = (byte) ((value >>  0) & 0xff);
-        } else {
-            dst[offset++] = (byte) ((value >>  0) & 0xff);
-            dst[offset++] = (byte) ((value >>  8) & 0xff);
-            dst[offset++] = (byte) ((value >> 16) & 0xff);
-            dst[offset  ] = (byte) ((value >> 24) & 0xff);
-        }
-    }
-
-    public static void pokeLong(byte[] dst, int offset, long value, ByteOrder order) {
-        if (order == ByteOrder.BIG_ENDIAN) {
-            int i = (int) (value >> 32);
-            dst[offset++] = (byte) ((i >> 24) & 0xff);
-            dst[offset++] = (byte) ((i >> 16) & 0xff);
-            dst[offset++] = (byte) ((i >>  8) & 0xff);
-            dst[offset++] = (byte) ((i >>  0) & 0xff);
-            i = (int) value;
-            dst[offset++] = (byte) ((i >> 24) & 0xff);
-            dst[offset++] = (byte) ((i >> 16) & 0xff);
-            dst[offset++] = (byte) ((i >>  8) & 0xff);
-            dst[offset  ] = (byte) ((i >>  0) & 0xff);
-        } else {
-            int i = (int) value;
-            dst[offset++] = (byte) ((i >>  0) & 0xff);
-            dst[offset++] = (byte) ((i >>  8) & 0xff);
-            dst[offset++] = (byte) ((i >> 16) & 0xff);
-            dst[offset++] = (byte) ((i >> 24) & 0xff);
-            i = (int) (value >> 32);
-            dst[offset++] = (byte) ((i >>  0) & 0xff);
-            dst[offset++] = (byte) ((i >>  8) & 0xff);
-            dst[offset++] = (byte) ((i >> 16) & 0xff);
-            dst[offset  ] = (byte) ((i >> 24) & 0xff);
-        }
-    }
-
-    public static void pokeShort(byte[] dst, int offset, short value, ByteOrder order) {
-        if (order == ByteOrder.BIG_ENDIAN) {
-            dst[offset++] = (byte) ((value >> 8) & 0xff);
-            dst[offset  ] = (byte) ((value >> 0) & 0xff);
-        } else {
-            dst[offset++] = (byte) ((value >> 0) & 0xff);
-            dst[offset  ] = (byte) ((value >> 8) & 0xff);
-        }
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index b5d69e695..1c981b796 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -25,8 +25,7 @@
 import com.koushikdutta.async.http.WebSocket;
 import com.koushikdutta.async.http.WebSocketImpl;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
-import com.koushikdutta.async.http.libcore.RawHeaders;
-import com.koushikdutta.async.http.libcore.RequestHeaders;
+import com.koushikdutta.async.http.cache.RawHeaders;
 import com.koushikdutta.async.util.StreamUtility;
 
 import java.io.File;
@@ -150,7 +149,7 @@ else if (requestComplete) {
                 @Override
                 public void onCompleted(Exception e) {
                     // if the protocol was switched off http, ignore this request/response.
-                    if (res.getHeaders().getHeaders().getResponseCode() == 101)
+                    if (res.getHeaders().getResponseCode() == 101)
                         return;
                     requestComplete = true;
                     super.onCompleted(e);
@@ -381,14 +380,14 @@ public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerRespo
                 String path = request.getMatcher().replaceAll("");
                 android.util.Pair<Integer, InputStream> pair = getAssetStream(_context, assetPath + path);
                 final InputStream is = pair.second;
-                response.getHeaders().getHeaders().set("Content-Length", String.valueOf(pair.first));
+                response.getHeaders().set("Content-Length", String.valueOf(pair.first));
                 if (is == null) {
                     response.responseCode(404);
                     response.end();
                     return;
                 }
                 response.responseCode(200);
-                response.getHeaders().getHeaders().add("Content-Type", getContentType(assetPath + path));
+                response.getHeaders().add("Content-Type", getContentType(assetPath + path));
                 Util.pump(is, response, new CompletedCallback() {
                     @Override
                     public void onCompleted(Exception ex) {
@@ -405,14 +404,14 @@ public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerRespo
                 android.util.Pair<Integer, InputStream> pair = getAssetStream(_context, assetPath + path);
                 final InputStream is = pair.second;
                 StreamUtility.closeQuietly(is);
-                response.getHeaders().getHeaders().set("Content-Length", String.valueOf(pair.first));
+                response.getHeaders().set("Content-Length", String.valueOf(pair.first));
                 if (is == null) {
                     response.responseCode(404);
                     response.end();
                     return;
                 }
                 response.responseCode(200);
-                response.getHeaders().getHeaders().add("Content-Type", getContentType(assetPath + path));
+                response.getHeaders().add("Content-Type", getContentType(assetPath + path));
                 response.writeHead();
                 response.end();
             }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
index 9af204e6a..77ce87545 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
@@ -4,7 +4,7 @@
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.http.Multimap;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
-import com.koushikdutta.async.http.libcore.RawHeaders;
+import com.koushikdutta.async.http.cache.RawHeaders;
 
 import java.util.regex.Matcher;
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
index 3e82bd3f2..ba0576fd3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
@@ -9,7 +9,7 @@
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.http.HttpUtil;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
-import com.koushikdutta.async.http.libcore.RawHeaders;
+import com.koushikdutta.async.http.cache.RawHeaders;
 
 import java.util.regex.Matcher;
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
index 07d8a92d8..87fbc5e2e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
@@ -1,14 +1,14 @@
 package com.koushikdutta.async.http.server;
 
-import java.io.File;
-import java.io.InputStream;
-
-import org.json.JSONObject;
-
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.callback.CompletedCallback;
-import com.koushikdutta.async.http.libcore.ResponseHeaders;
+import com.koushikdutta.async.http.cache.RawHeaders;
+
+import org.json.JSONObject;
+
+import java.io.File;
+import java.io.InputStream;
 
 public interface AsyncHttpServerResponse extends DataSink, CompletedCallback {
     public void end();
@@ -18,7 +18,7 @@ public interface AsyncHttpServerResponse extends DataSink, CompletedCallback {
     public void sendFile(File file);
     public void sendStream(InputStream inputStream, long totalLength);
     public void responseCode(int code);
-    public ResponseHeaders getHeaders();
+    public RawHeaders getHeaders();
     public void writeHead();
     public void setContentType(String contentType);
     public void redirect(String location);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index 08d3af9cc..0fe4e1001 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -12,9 +12,8 @@
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.http.AsyncHttpHead;
 import com.koushikdutta.async.http.HttpUtil;
+import com.koushikdutta.async.http.cache.RawHeaders;
 import com.koushikdutta.async.http.filter.ChunkedOutputFilter;
-import com.koushikdutta.async.http.libcore.RawHeaders;
-import com.koushikdutta.async.http.libcore.ResponseHeaders;
 import com.koushikdutta.async.util.StreamUtility;
 
 import org.json.JSONObject;
@@ -24,16 +23,14 @@
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
 
 public class AsyncHttpServerResponseImpl implements AsyncHttpServerResponse {
     private RawHeaders mRawHeaders = new RawHeaders();
     private long mContentLength = -1;
-    private ResponseHeaders mHeaders = new ResponseHeaders(null, mRawHeaders);
-    
+
     @Override
-    public ResponseHeaders getHeaders() {
-        return mHeaders;
+    public RawHeaders getHeaders() {
+        return mRawHeaders;
     }
     
     public AsyncSocket getSocket() {
@@ -226,7 +223,7 @@ public void sendStream(final InputStream inputStream, long totalLength) {
                     end = totalLength - 1;
 
                 responseCode(206);
-                getHeaders().getHeaders().set("Content-Range", String.format("bytes %d-%d/%d", start, end, totalLength));
+                getHeaders().set("Content-Range", String.format("bytes %d-%d/%d", start, end, totalLength));
             }
             catch (Exception e) {
                 responseCode(416);
@@ -240,7 +237,7 @@ public void sendStream(final InputStream inputStream, long totalLength) {
             mContentLength = end - start + 1;
             mRawHeaders.set("Content-Length", String.valueOf(mContentLength));
             mRawHeaders.set("Accept-Ranges", "bytes");
-            if (getHeaders().getHeaders().getStatusLine() == null)
+            if (getHeaders().getStatusLine() == null)
                 responseCode(200);
             if (mRequest.getMethod().equals(AsyncHttpHead.METHOD)) {
                 writeHead();
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
index bffc34cb6..78f330126 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
@@ -6,8 +6,8 @@
 import com.koushikdutta.async.AsyncServerSocket;
 import com.koushikdutta.async.http.AsyncHttpClient;
 import com.koushikdutta.async.http.AsyncHttpGet;
-import com.koushikdutta.async.http.ResponseCacheMiddleware;
-import com.koushikdutta.async.http.libcore.HttpDate;
+import com.koushikdutta.async.http.HttpDate;
+import com.koushikdutta.async.http.cache.ResponseCacheMiddleware;
 import com.koushikdutta.async.http.server.AsyncHttpServer;
 import com.koushikdutta.async.http.server.AsyncHttpServerRequest;
 import com.koushikdutta.async.http.server.AsyncHttpServerResponse;
@@ -30,8 +30,8 @@ public void testMaxAgePrivate() throws Exception {
             httpServer.get("/uname/(.*)", new HttpServerRequestCallback() {
                 @Override
                 public void onRequest(AsyncHttpServerRequest request, AsyncHttpServerResponse response) {
-                    response.getHeaders().getHeaders().set("Date", HttpDate.format(new Date()));
-                    response.getHeaders().getHeaders().set("Cache-Control", "private, max-age=10000");
+                    response.getHeaders().set("Date", HttpDate.format(new Date()));
+                    response.getHeaders().set("Cache-Control", "private, max-age=10000");
                     response.send(request.getMatcher().group(1));
                 }
             });
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
index ea9832951..b9645e407 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
@@ -20,7 +20,7 @@
 import com.koushikdutta.async.http.AsyncHttpPost;
 import com.koushikdutta.async.http.AsyncHttpRequest;
 import com.koushikdutta.async.http.AsyncHttpResponse;
-import com.koushikdutta.async.http.ResponseCacheMiddleware;
+import com.koushikdutta.async.http.cache.ResponseCacheMiddleware;
 import com.koushikdutta.async.http.body.JSONObjectBody;
 import com.koushikdutta.async.http.callback.HttpConnectCallback;
 import com.koushikdutta.async.http.server.AsyncHttpServer;
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpServerTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpServerTests.java
index df117e64f..7139cafce 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpServerTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpServerTests.java
@@ -49,7 +49,7 @@ public void onCompleted(Exception ex) {
         httpServer.get("/hello", new HttpServerRequestCallback() {
             @Override
             public void onRequest(AsyncHttpServerRequest request, AsyncHttpServerResponse response) {
-                assertNotNull(request.getHeaders().getHost());
+                assertNotNull(request.getHeaders().get("Host"));
                 response.send("hello");
             }
         });
@@ -58,7 +58,7 @@ public void onRequest(AsyncHttpServerRequest request, AsyncHttpServerResponse re
             @Override
             public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
                 try {
-                    assertNotNull(request.getHeaders().getHost());
+                    assertNotNull(request.getHeaders().get("Host"));
                     JSONObject json = new JSONObject();
                     if (request.getBody() instanceof UrlEncodedFormBody) {
                         UrlEncodedFormBody body = (UrlEncodedFormBody)request.getBody();
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java b/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
index ac4471316..a72f306c3 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
@@ -28,7 +28,7 @@ public void testIssue() throws Exception {
                 public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
                     // setting this to empty is a hacky way of telling the framework not to use
                     // transfer-encoding. It will get removed.
-                    response.getHeaders().getHeaders().set("Transfer-Encoding", "");
+                    response.getHeaders().set("Transfer-Encoding", "");
                     response.responseCode(200);
                     Util.writeAll(response, "foobarbeepboop".getBytes(), new CompletedCallback() {
                         @Override
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
index a5a7f92b0..dcbe6c810 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
@@ -6,7 +6,7 @@
 import com.koushikdutta.async.http.AsyncHttpClient.WebSocketConnectCallback;
 import com.koushikdutta.async.http.WebSocket;
 import com.koushikdutta.async.http.WebSocket.StringCallback;
-import com.koushikdutta.async.http.libcore.RequestHeaders;
+import com.koushikdutta.async.http.cache.RawHeaders;
 import com.koushikdutta.async.http.server.AsyncHttpServer;
 import com.koushikdutta.async.http.server.AsyncHttpServer.WebSocketRequestCallback;
 
@@ -34,7 +34,7 @@ public void onCompleted(Exception ex) {
     
         httpServer.websocket("/ws", new WebSocketRequestCallback() {
             @Override
-            public void onConnected(final WebSocket webSocket, RequestHeaders headers) {
+            public void onConnected(final WebSocket webSocket, RawHeaders headers) {
                 webSocket.setStringCallback(new StringCallback() {
                     @Override
                     public void onStringAvailable(String s) {

From 68c948e0748fca9b8a9caff76953cb6b3d26db7f Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robUx4@gmail.com>
Date: Tue, 22 Jul 2014 08:04:32 +0200
Subject: [PATCH 034/399] Crash fix for a case where the EndCallback is not set
 and used

---
 .../src/com/koushikdutta/async/BufferedDataEmitter.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java b/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java
index 009f6c6bd..5c88b310f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java
@@ -32,7 +32,7 @@ public void onDataAvailable() {
         if (mDataCallback != null && !mPaused && mBuffers.remaining() > 0)
             mDataCallback.onDataAvailable(this, mBuffers);
         
-        if (mEnded && mBuffers.remaining() == 0)
+        if (mEnded && mBuffers.remaining() == 0 && mEndCallback != null)
             mEndCallback.onCompleted(mEndException);
     }
     

From 11b629da6c967fe6b3c588c0d77dbc0fdc53b4c5 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 21 Jul 2014 23:32:53 -0700
Subject: [PATCH 035/399] wip header rewrite

---
 .../com/koushikdutta/async/http/Headers.java  | 61 +++++++++++++++++++
 .../com/koushikdutta/async/http/Multimap.java |  5 +-
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/Headers.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
new file mode 100644
index 000000000..8a2146b24
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
@@ -0,0 +1,61 @@
+package com.koushikdutta.async.http;
+
+import java.util.List;
+
+/**
+ * Created by koush on 7/21/14.
+ */
+public class Headers {
+    Multimap map = new Multimap();
+    public Multimap getMultiMap() {
+        return map;
+    }
+
+    public List<String> getAll(String header) {
+        return map.get(header);
+    }
+
+    public String get(String header) {
+        return map.getString(header);
+    }
+
+    public Headers set(String header, String value) {
+        map.put(header, value);
+        return this;
+    }
+
+    public Headers add(String header, String value) {
+        map.add(header, value);
+        return this;
+    }
+
+    public List<String> remove(String header) {
+        return map.remove(header);
+    }
+
+    int responseCode;
+    public int getResponseCode() {
+        return responseCode;
+    }
+    public void setResponseCode(int responseCode) {
+        this.responseCode = responseCode;
+    }
+
+    String protocol;
+    public String getProtocol() {
+        return protocol;
+    }
+    public void setProtocol(String protocol) {
+        this.protocol = protocol;
+    }
+
+    String responseMessage;
+
+    public String getResponseMessage() {
+        return responseMessage;
+    }
+
+    public void setResponseMessage(String responseMessage) {
+        this.responseMessage = responseMessage;
+    }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
index efc16a850..5223fc850 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
@@ -1,7 +1,9 @@
 package com.koushikdutta.async.http;
 
 import android.net.Uri;
+
 import com.koushikdutta.async.http.cache.RawHeaders;
+
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
 
@@ -9,12 +11,13 @@
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 
 /**
  * Created by koush on 5/27/13.
  */
-public class Multimap extends Hashtable<String, List<String>> implements Iterable<NameValuePair> {
+public class Multimap extends LinkedHashMap<String, List<String>> implements Iterable<NameValuePair> {
     public Multimap() {
     }
 

From 1b08bd6375fca37e5bd41169c2e80b55f0c1f0b3 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 23 Jul 2014 01:06:25 -0700
Subject: [PATCH 036/399] All libcore usage hidden. Fix obscure
 buffering/replay bugs in SSL.

---
 AndroidAsync/AndroidManifest.xml              |   4 +-
 .../async/AsyncSSLSocketWrapper.java          |  33 +++++-
 .../com/koushikdutta/async/AsyncServer.java   |   7 +-
 .../koushikdutta/async/DataEmitterBase.java   |   3 -
 .../async/FilteredDataEmitter.java            |   6 +-
 .../src/com/koushikdutta/async/Util.java      |   1 -
 .../async/http/AsyncHttpClient.java           |  19 ++-
 .../async/http/AsyncHttpClientMiddleware.java |  55 +++++++--
 .../async/http/AsyncHttpRequest.java          |  40 +++----
 .../async/http/AsyncHttpResponse.java         |   8 +-
 .../async/http/AsyncHttpResponseImpl.java     |  67 ++++++++---
 .../async/http/AsyncSSLSocketMiddleware.java  | 111 ++++++++----------
 .../async/http/AsyncSocketMiddleware.java     |  17 ++-
 .../com/koushikdutta/async/http/Headers.java  | 111 +++++++++++++++---
 .../com/koushikdutta/async/http/HttpUtil.java |  30 ++---
 .../com/koushikdutta/async/http/Multimap.java |  79 ++++++-------
 .../com/koushikdutta/async/http/Protocol.java |  89 ++++++++++++++
 .../async/http/SimpleMiddleware.java          |   7 +-
 .../async/http/WebSocketImpl.java             |   9 +-
 .../http/body/MultipartFormDataBody.java      |  17 ++-
 .../koushikdutta/async/http/body/Part.java    |  15 +--
 .../async/http/cache/CacheUtil.java           |  35 ------
 .../async/http/cache/RawHeaders.java          |   2 +-
 .../http/cache/ResponseCacheMiddleware.java   |  27 +++--
 .../async/http/callback/HeadersCallback.java  |  10 --
 .../http/filter/ContentLengthFilter.java      |   2 +-
 .../async/http/server/AsyncHttpServer.java    |  82 +++++++------
 .../http/server/AsyncHttpServerRequest.java   |   4 +-
 .../server/AsyncHttpServerRequestImpl.java    |  32 +++--
 .../http/server/AsyncHttpServerResponse.java  |   7 +-
 .../server/AsyncHttpServerResponseImpl.java   |  55 +++++----
 .../async/http/server/AsyncProxyServer.java   |  81 +++++++++++++
 .../async/http/spdy/AsyncSpdyConnection.java  |   8 +-
 .../async/http/spdy/SpdyMiddleware.java       |   2 +-
 .../async/test/HttpClientTests.java           |  19 +--
 .../com/koushikdutta/async/test/Issue59.java  |   2 +-
 .../koushikdutta/async/test/OkHttpTest.java   |   2 +-
 .../async/test/WebSocketTests.java            |   4 +-
 38 files changed, 706 insertions(+), 396 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/Protocol.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/cache/CacheUtil.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/callback/HeadersCallback.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/server/AsyncProxyServer.java

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 6984a72e7..bd080cd06 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.koushikdutta.async"
-    android:versionCode="137"
-    android:versionName="1.3.7">
+    android:versionCode="200"
+    android:versionName="2.0.0">
 
     <uses-sdk
         tools:node="replace" />
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 7f609994a..84d7da1c1 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -115,6 +115,10 @@ public void onCompleted(Exception ex) {
         }
     }
 
+    boolean mEnded;
+    Exception mEndException;
+    final ByteBufferList transformed = new ByteBufferList();
+
     private AsyncSSLSocketWrapper(AsyncSocket socket,
                                   String host, int port,
                                   SSLEngine sslEngine,
@@ -140,10 +144,20 @@ public void onWriteable() {
         // SSL needs buffering of data written during handshake.
         // aka exhcange.setDatacallback
         mEmitter = new BufferedDataEmitter(socket);
+        mEmitter.setEndCallback(new CompletedCallback() {
+            @Override
+            public void onCompleted(Exception ex) {
+                if (mEnded)
+                    return;
+                mEnded = true;
+                mEndException = ex;
+                if (!transformed.hasRemaining() && mEndCallback != null)
+                    mEndCallback.onCompleted(ex);
+            }
+        });
 
         final Allocator allocator = new Allocator();
         allocator.setMinAlloc(8192);
-        final ByteBufferList transformed = new ByteBufferList();
         mEmitter.setDataCallback(new DataCallback() {
             @Override
             public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
@@ -195,7 +209,7 @@ else if (res.getStatus() == Status.BUFFER_UNDERFLOW) {
                         }
                     }
 
-                    Util.emitAllData(AsyncSSLSocketWrapper.this, transformed);
+                    AsyncSSLSocketWrapper.this.onDataAvailable();
                 }
                 catch (SSLException ex) {
                     ex.printStackTrace();
@@ -208,6 +222,14 @@ else if (res.getStatus() == Status.BUFFER_UNDERFLOW) {
         });
     }
 
+    public void onDataAvailable() {
+        Util.emitAllData(this, transformed);
+
+        if (mEnded && !transformed.hasRemaining())
+            mEndCallback.onCompleted(mEndException);
+    }
+
+
     @Override
     public SSLEngine getSSLEngine() {
         return engine;
@@ -432,14 +454,15 @@ public CompletedCallback getClosedCallback() {
         return mSocket.getClosedCallback();
     }
 
+    CompletedCallback mEndCallback;
     @Override
     public void setEndCallback(CompletedCallback callback) {
-        mSocket.setEndCallback(callback);
+        mEndCallback = callback;
     }
 
     @Override
     public CompletedCallback getEndCallback() {
-        return mSocket.getEndCallback();
+        return mEndCallback;
     }
 
     @Override
@@ -449,6 +472,8 @@ public void pause() {
 
     @Override
     public void resume() {
+        onDataAvailable();
+        mEmitter.onDataAvailable();
         mSocket.resume();
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index a1c7a476a..b399362ca 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -126,7 +126,12 @@ private static void wakeup(final SelectorWrapper selector) {
         synchronousWorkers.execute(new Runnable() {
             @Override
             public void run() {
-                selector.wakeupOnce();
+                try {
+                    selector.wakeupOnce();
+                }
+                catch (Exception e) {
+                    Log.i(LOGTAG, "Selector shit the bed.");
+                }
             }
         });
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/DataEmitterBase.java b/AndroidAsync/src/com/koushikdutta/async/DataEmitterBase.java
index 90e05c725..1c05617a4 100644
--- a/AndroidAsync/src/com/koushikdutta/async/DataEmitterBase.java
+++ b/AndroidAsync/src/com/koushikdutta/async/DataEmitterBase.java
@@ -8,9 +8,6 @@
  */
 public abstract class DataEmitterBase implements DataEmitter {
     private boolean ended;
-    protected void resetEnded() {
-        ended = false;
-    }
     protected void report(Exception e) {
         if (ended)
             return;
diff --git a/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java b/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java
index 71bcfa940..6c59def72 100644
--- a/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java
@@ -5,7 +5,7 @@
 import com.koushikdutta.async.wrapper.DataEmitterWrapper;
 
 public class FilteredDataEmitter extends DataEmitterBase implements DataEmitter, DataCallback, DataEmitterWrapper, DataTrackingEmitter {
-    DataEmitter mEmitter;
+    private DataEmitter mEmitter;
     @Override
     public DataEmitter getDataEmitter() {
         return mEmitter;
@@ -41,8 +41,8 @@ public void setDataTracker(DataTracker tracker) {
         this.tracker = tracker;
     }
 
-    DataTracker tracker;
-    int totalRead;
+    private DataTracker tracker;
+    private int totalRead;
     @Override
     public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
         if (bb != null)
diff --git a/AndroidAsync/src/com/koushikdutta/async/Util.java b/AndroidAsync/src/com/koushikdutta/async/Util.java
index 18c3736cc..c8df5b77f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/Util.java
+++ b/AndroidAsync/src/com/koushikdutta/async/Util.java
@@ -131,7 +131,6 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
         sink.setWriteableCallback(new WritableCallback() {
             @Override
             public void onWriteable() {
-                dataCallback.onDataAvailable(emitter, new ByteBufferList());
                 emitter.resume();
             }
         });
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index b6654a9a6..313a9fa10 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -20,7 +20,6 @@
 import com.koushikdutta.async.http.AsyncHttpClientMiddleware.OnRequestCompleteData;
 import com.koushikdutta.async.http.callback.HttpConnectCallback;
 import com.koushikdutta.async.http.callback.RequestCallback;
-import com.koushikdutta.async.http.cache.RawHeaders;
 import com.koushikdutta.async.parser.AsyncParser;
 import com.koushikdutta.async.parser.ByteBufferListParser;
 import com.koushikdutta.async.parser.JSONArrayParser;
@@ -209,6 +208,12 @@ private void executeAffinity(final AsyncHttpRequest request, final int redirectC
 
         request.logd("Executing request.");
 
+        synchronized (mMiddleware) {
+            for (AsyncHttpClientMiddleware middleware: mMiddleware) {
+                middleware.onRequest(data);
+            }
+        }
+
         // flow:
         // 1) set a connect timeout
         // 2) wait for connect
@@ -252,12 +257,6 @@ public void onConnectCompleted(Exception ex, AsyncSocket socket) {
                     mServer.removeAllCallbacks(cancel.scheduled);
 
                 data.socket = socket;
-                synchronized (mMiddleware) {
-                    for (AsyncHttpClientMiddleware middleware: mMiddleware) {
-                        middleware.onSocket(data);
-                    }
-                }
-
                 cancel.socket = socket;
 
                 if (ex != null) {
@@ -294,7 +293,7 @@ public void setDataEmitter(DataEmitter emitter) {
 
                         super.setDataEmitter(data.bodyEmitter);
 
-                        RawHeaders headers = mHeaders;
+                        Headers headers = mHeaders;
                         int responseCode = code();
                         if ((responseCode == HttpURLConnection.HTTP_MOVED_PERM || responseCode == HttpURLConnection.HTTP_MOVED_TEMP || responseCode == 307) && request.getFollowRedirect()) {
                             String location = headers.get("Location");
@@ -327,7 +326,7 @@ public void setDataEmitter(DataEmitter emitter) {
                             return;
                         }
 
-                        request.logv("Final (post cache response) headers:\n" + mHeaders.toHeaderString());
+                        request.logv("Final (post cache response) headers:\n" + toString());
 
                         // at this point the headers are done being modified
                         reportConnectedCompleted(cancel, null, this, request, callback);
@@ -343,7 +342,7 @@ protected void onHeadersReceived() {
                                 mServer.removeAllCallbacks(cancel.scheduled);
 
                             // allow the middleware to massage the headers before the body is decoded
-                            request.logv("Received headers:\n" + mHeaders.toHeaderString());
+                            request.logv("Received headers:\n" + toString());
 
                             data.headers = mHeaders;
                             synchronized (mMiddleware) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
index 240448276..c706e536f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
@@ -5,27 +5,31 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.future.Cancellable;
-import com.koushikdutta.async.http.cache.RawHeaders;
 import com.koushikdutta.async.util.UntypedHashtable;
 
+/**
+ * AsyncHttpClientMiddleware is used by AsyncHttpClient to
+ * inspect, manipulate, and handle http requests.
+ */
 public interface AsyncHttpClientMiddleware {
-    public static class GetSocketData {
+    public static class OnRequestData {
         public UntypedHashtable state = new UntypedHashtable();
         public AsyncHttpRequest request;
+    }
+
+    public static class GetSocketData extends OnRequestData {
         public ConnectCallback connectCallback;
         public Cancellable socketCancellable;
-    }
-    
-    public static class OnSocketData extends GetSocketData {
-        public AsyncSocket socket;
+        public String protocol;
     }
 
-    public static class SendHeaderData extends OnSocketData {
-        CompletedCallback sendHeadersCallback;
+    public static class SendHeaderData extends GetSocketData {
+        public AsyncSocket socket;
+        public CompletedCallback sendHeadersCallback;
     }
 
     public static class OnHeadersReceivedData extends SendHeaderData {
-        public RawHeaders headers;
+        public Headers headers;
     }
 
     public static class OnBodyData extends OnHeadersReceivedData {
@@ -37,10 +41,41 @@ public static class OnRequestCompleteData extends OnBodyData {
         public Exception exception;
     }
 
+    /**
+     * Called immediately upon request execution
+     * @param data
+     */
+    public void onRequest(OnRequestData data);
+
+    /**
+     * Called to retrieve the socket that will fulfill this request
+     * @param data
+     * @return
+     */
     public Cancellable getSocket(GetSocketData data);
-    public void onSocket(OnSocketData data);
+
+    /**
+     * Called before the headers are sent via the socket
+     * @param data
+     * @return
+     */
     public boolean sendHeaders(SendHeaderData data);
+
+    /**
+     * Called once the headers have been received via the socket
+     * @param data
+     */
     public void onHeadersReceived(OnHeadersReceivedData data);
+
+    /**
+     * Called before the body is decoded
+     * @param data
+     */
     public void onBodyDecoder(OnBodyData data);
+
+    /**
+     * Called once the request is complete
+     * @param data
+     */
     public void onRequestComplete(OnRequestCompleteData data);
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
index fa50c20f7..95dd21d1a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
@@ -5,7 +5,6 @@
 
 import com.koushikdutta.async.AsyncSSLException;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
-import com.koushikdutta.async.http.cache.RawHeaders;
 
 import org.apache.http.Header;
 import org.apache.http.HeaderIterator;
@@ -35,7 +34,7 @@ public ProtocolVersion getProtocolVersion() {
             public String getMethod() {
                 return mMethod;
             }
-            
+
             @Override
             public String toString() {
                 String path = AsyncHttpRequest.this.getUri().getEncodedPath();
@@ -88,7 +87,6 @@ public AsyncHttpRequest setMethod(String method) {
         if (getClass() != AsyncHttpRequest.class)
             throw new UnsupportedOperationException("can't change method on a subclass of AsyncHttpRequest");
         mMethod = method;
-        mRawHeaders.setStatusLine(getRequestLine().toString());
         return this;
     }
 
@@ -96,7 +94,7 @@ public AsyncHttpRequest(Uri uri, String method) {
         this(uri, method, null);
     }
 
-    public static void setDefaultHeaders(RawHeaders ret, Uri uri) {
+    public static void setDefaultHeaders(Headers ret, Uri uri) {
         if (uri != null) {
             String host = uri.getHost();
             if (uri.getPort() != -1)
@@ -110,17 +108,16 @@ public static void setDefaultHeaders(RawHeaders ret, Uri uri) {
         ret.set("Accept", "*/*");
     }
 
-    public AsyncHttpRequest(Uri uri, String method, RawHeaders headers) {
+    public AsyncHttpRequest(Uri uri, String method, Headers headers) {
         assert uri != null;
         mMethod = method;
         this.uri = uri;
         if (headers == null)
-            mRawHeaders = new RawHeaders();
+            mRawHeaders = new Headers();
         else
             mRawHeaders = headers;
         if (headers == null)
             setDefaultHeaders(mRawHeaders, uri);
-        mRawHeaders.setStatusLine(getRequestLine().toString());
     }
 
     Uri uri;
@@ -128,16 +125,12 @@ public Uri getUri() {
         return uri;
     }
     
-    private RawHeaders mRawHeaders = new RawHeaders();
+    private Headers mRawHeaders = new Headers();
 
-    public RawHeaders getHeaders() {
+    public Headers getHeaders() {
         return mRawHeaders;
     }
 
-    public String getRequestString() {
-        return mRawHeaders.toHeaderString();
-    }
-    
     private boolean mFollowRedirect = true;
     public boolean getFollowRedirect() {
         return mFollowRedirect;
@@ -208,13 +201,7 @@ public boolean containsHeader(String name) {
 
         @Override
         public Header[] getAllHeaders() {
-            Header[] ret = new Header[request.getHeaders().length()];
-            for (int i = 0; i < ret.length; i++) {
-                String name = request.getHeaders().getFieldName(i);
-                String value = request.getHeaders().getValue(i);
-                ret[i] = new BasicHeader(name, value);
-            }
-            return ret;
+            return request.getHeaders().toHeaderArray();
         }
 
         @Override
@@ -227,7 +214,7 @@ public Header getFirstHeader(String name) {
 
         @Override
         public Header[] getHeaders(String name) {
-            Map<String, List<String>> map = request.getHeaders().toMultimap();
+            Map<String, List<String>> map = request.getHeaders().getMultiMap();
             List<String> vals = map.get(name);
             if (vals == null)
                 return new Header[0];
@@ -270,12 +257,12 @@ public HeaderIterator headerIterator(String name) {
 
         @Override
         public void removeHeader(Header header) {
-            request.getHeaders().removeAll(header.getName());
+            request.getHeaders().remove(header.getName());
         }
 
         @Override
         public void removeHeaders(String name) {
-            request.getHeaders().removeAll(name);
+            request.getHeaders().remove(name);
         }
 
         @Override
@@ -334,6 +321,13 @@ public int getProxyPort() {
         return proxyPort;
     }
 
+    @Override
+    public String toString() {
+        if (mRawHeaders == null)
+            return super.toString();
+        return mRawHeaders.toPrefixString(uri.toString());
+    }
+
     public void setLogging(String tag, int level) {
         LOGTAG = tag;
         logLevel = level;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
index f44ba8eea..e7713952c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
@@ -3,15 +3,15 @@
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.callback.CompletedCallback;
-import com.koushikdutta.async.http.cache.RawHeaders;
 
 public interface AsyncHttpResponse extends DataEmitter {
-    public void setEndCallback(CompletedCallback handler);
     public String protocol();
     public String message();
     public int code();
-    public RawHeaders headers();
-    public void end();
+    public AsyncHttpResponse protocol(String protocol);
+    public AsyncHttpResponse message(String message);
+    public AsyncHttpResponse code(int code);
+    public Headers headers();
     public AsyncSocket detachSocket();
     public AsyncHttpRequest getRequest();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index e1b23998f..fca047354 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -9,12 +9,13 @@
 import com.koushikdutta.async.LineEmitter;
 import com.koushikdutta.async.LineEmitter.StringCallback;
 import com.koushikdutta.async.NullDataCallback;
+import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 import com.koushikdutta.async.http.filter.ChunkedOutputFilter;
-import com.koushikdutta.async.http.cache.RawHeaders;
 
+import java.io.IOException;
 import java.nio.charset.Charset;
 
 abstract class AsyncHttpResponseImpl extends FilteredDataEmitter implements AsyncSocket, AsyncHttpResponse {
@@ -60,9 +61,10 @@ public void onCompleted(Exception ex) {
             }
         });
 
-        String rs = mRequest.getRequestString();
+        String rl = mRequest.getRequestLine().toString();
+        String rs = mRequest.getHeaders().toPrefixString(rl);
         mRequest.logv("\n" + rs);
-        com.koushikdutta.async.Util.writeAll(exchange, rs.getBytes(), new CompletedCallback() {
+        Util.writeAll(exchange, rs.getBytes(), new CompletedCallback() {
             @Override
             public void onCompleted(Exception ex) {
                 if (mWriter != null) {
@@ -72,8 +74,7 @@ public void onCompleted(Exception ex) {
                             onRequestCompleted(ex);
                         }
                     });
-                }
-                else {
+                } else {
                     onRequestCompleted(null);
                 }
             }
@@ -102,17 +103,25 @@ public void onCompleted(Exception error) {
     protected abstract void onHeadersReceived();
 
     StringCallback mHeaderCallback = new StringCallback() {
-        private RawHeaders mRawHeaders = new RawHeaders();
+        private Headers mRawHeaders = new Headers();
+        private String statusLine;
         @Override
         public void onStringAvailable(String s) {
             try {
-                if (mRawHeaders.getStatusLine() == null) {
-                    mRawHeaders.setStatusLine(s);
+                if (statusLine == null) {
+                    statusLine = s;
                 }
                 else if (!"\r".equals(s)) {
                     mRawHeaders.addLine(s);
                 }
                 else {
+                    String[] parts = statusLine.split(" ", 3);
+                    if (parts.length != 3)
+                        throw new Exception(new IOException("Not HTTP"));
+
+                    protocol = parts[0];
+                    code = Integer.parseInt(parts[1]);
+                    message = parts[2];
                     mHeaders = mRawHeaders;
                     onHeadersReceived();
                     // socket may get detached after headers (websocket)
@@ -125,7 +134,7 @@ else if (!"\r".equals(s)) {
                         emitter = HttpUtil.EndEmitter.create(getServer(), null);
                     }
                     else {
-                        emitter = HttpUtil.getBodyDecoder(mSocket, mRawHeaders, false);
+                        emitter = HttpUtil.getBodyDecoder(mSocket, Protocol.get(protocol), mHeaders, false);
                     }
                     setDataEmitter(emitter);
                 }
@@ -158,7 +167,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
     
     private AsyncHttpRequest mRequest;
     private AsyncSocket mSocket;
-    protected RawHeaders mHeaders;
+    protected Headers mHeaders;
     public AsyncHttpResponseImpl(AsyncHttpRequest request) {
         mRequest = request;
     }
@@ -166,23 +175,51 @@ public AsyncHttpResponseImpl(AsyncHttpRequest request) {
     boolean mCompleted = false;
 
     @Override
-    public RawHeaders headers() {
+    public Headers headers() {
         return mHeaders;
     }
 
+    int code;
     @Override
     public int code() {
-        return headers().getResponseCode();
+        return code;
+    }
+
+    @Override
+    public AsyncHttpResponse code(int code) {
+        this.code = code;
+        return this;
     }
 
+    @Override
+    public AsyncHttpResponse protocol(String protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    @Override
+    public AsyncHttpResponse message(String message) {
+        this.message = message;
+        return this;
+    }
+
+    String protocol;
     @Override
     public String protocol() {
-        return "HTTP/1." + headers().getHttpMinorVersion();
+        return protocol;
     }
 
+    String message;
     @Override
     public String message() {
-        return headers().getResponseMessage();
+        return message;
+    }
+
+    @Override
+    public String toString() {
+        if (mHeaders == null)
+            return super.toString();
+        return mHeaders.toPrefixString(protocol + " " + code + " " + message);
     }
 
     private boolean mFirstWrite = true;
@@ -240,7 +277,7 @@ public AsyncServer getServer() {
 
     @Override
     public String charset() {
-        Multimap mm = Multimap.parseHeader(headers(), "Content-Type");
+        Multimap mm = Multimap.parseSemicolonDelimited(headers().get("Content-Type"));
         String cs;
         if (mm != null && null != (cs = mm.getString("charset")) && Charset.isSupported(cs)) {
             return cs;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
index 4ec7d804b..59fa0f7c6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
@@ -10,7 +10,6 @@
 import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ConnectCallback;
-import com.koushikdutta.async.http.cache.RawHeaders;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -86,75 +85,69 @@ protected void tryHandshake(final ConnectCallback callback, AsyncSocket socket,
     }
 
     @Override
-    protected ConnectCallback wrapCallback(final ConnectCallback callback, final Uri uri, final int port, final boolean proxied) {
+    protected ConnectCallback wrapCallback(GetSocketData data, final Uri uri, final int port, final boolean proxied, final ConnectCallback callback) {
         return new ConnectCallback() {
             @Override
             public void onConnectCompleted(Exception ex, final AsyncSocket socket) {
-                if (ex == null) {
-                    if (!proxied) {
-                        tryHandshake(callback, socket, uri, port);
-                    }
-                    else {
-                        // this SSL connection is proxied, must issue a CONNECT request to the proxy server
-                        // http://stackoverflow.com/a/6594880/704837
-                        RawHeaders connect = new RawHeaders();
-                        connect.setStatusLine(String.format("CONNECT %s:%s HTTP/1.1", uri.getHost(), port));
-                        Util.writeAll(socket, connect.toHeaderString().getBytes(), new CompletedCallback() {
+                if (ex != null) {
+                    callback.onConnectCompleted(ex, socket);
+                    return;
+                }
+
+                if (!proxied) {
+                    tryHandshake(callback, socket, uri, port);
+                    return;
+                }
+
+                // this SSL connection is proxied, must issue a CONNECT request to the proxy server
+                // http://stackoverflow.com/a/6594880/704837
+                String connect = String.format("CONNECT %s:%s HTTP/1.1\r\n\r\n", uri.getHost(), port);
+                Util.writeAll(socket, connect.getBytes(), new CompletedCallback() {
+                    @Override
+                    public void onCompleted(Exception ex) {
+                        if (ex != null) {
+                            callback.onConnectCompleted(ex, socket);
+                            return;
+                        }
+
+                        LineEmitter liner = new LineEmitter();
+                        liner.setLineCallback(new LineEmitter.StringCallback() {
+                            String statusLine;
                             @Override
-                            public void onCompleted(Exception ex) {
-                                if (ex != null) {
-                                    callback.onConnectCompleted(ex, socket);
-                                    return;
+                            public void onStringAvailable(String s) {
+                                if (statusLine == null) {
+                                    statusLine = s;
+                                    if (statusLine.length() > 128 || !statusLine.contains("200")) {
+                                        socket.setDataCallback(null);
+                                        socket.setEndCallback(null);
+                                        callback.onConnectCompleted(new IOException("non 200 status line"), socket);
+                                    }
                                 }
-
-                                LineEmitter liner = new LineEmitter();
-                                liner.setLineCallback(new LineEmitter.StringCallback() {
-                                    String statusLine;
-                                    @Override
-                                    public void onStringAvailable(String s) {
-                                        if (statusLine == null) {
-                                            statusLine = s;
-                                            if (statusLine.length() > 128 || !statusLine.contains("200")) {
-                                                socket.setDataCallback(null);
-                                                socket.setEndCallback(null);
-                                                callback.onConnectCompleted(new IOException("non 200 status line"), socket);
-                                            }
-                                        }
-                                        else {
-                                            socket.setDataCallback(null);
-                                            socket.setEndCallback(null);
-                                            if (TextUtils.isEmpty(s.trim())) {
-                                                tryHandshake(callback, socket, uri, port);
-                                            }
-                                            else {
-                                                callback.onConnectCompleted(new IOException("unknown second status line"), socket);
-                                            }
-                                        }
+                                else {
+                                    socket.setDataCallback(null);
+                                    socket.setEndCallback(null);
+                                    if (TextUtils.isEmpty(s.trim())) {
+                                        tryHandshake(callback, socket, uri, port);
                                     }
-                                });
-
-                                socket.setDataCallback(liner);
-
-                                socket.setEndCallback(new CompletedCallback() {
-                                    @Override
-                                    public void onCompleted(Exception ex) {
-                                        if (!socket.isOpen() && ex == null)
-                                            ex = new IOException("socket closed before proxy connect response");
-                                        callback.onConnectCompleted(ex, socket);
+                                    else {
+                                        callback.onConnectCompleted(new IOException("unknown second status line"), socket);
                                     }
-                                });
+                                }
+                            }
+                        });
+
+                        socket.setDataCallback(liner);
 
-//                                AsyncSocket wrapper = socket;
-//                                if (ex == null)
-//                                    wrapper = new AsyncSSLSocketWrapper(socket, uri.getHost(), port, sslContext, trustManagers, hostnameVerifier, true);
-//                                callback.onConnectCompleted(ex, wrapper);
+                        socket.setEndCallback(new CompletedCallback() {
+                            @Override
+                            public void onCompleted(Exception ex) {
+                                if (!socket.isOpen() && ex == null)
+                                    ex = new IOException("socket closed before proxy connect response");
+                                callback.onConnectCompleted(ex, socket);
                             }
                         });
                     }
-                }
-                else {
-                    callback.onConnectCompleted(ex, socket);
-                }
+                });
             }
         };
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index 6e7d6927a..37ffe5cc6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -52,7 +52,7 @@ public AsyncSocketMiddleware(AsyncHttpClient client) {
 
     protected AsyncHttpClient mClient;
 
-    protected ConnectCallback wrapCallback(ConnectCallback callback, Uri uri, int port, boolean proxied) {
+    protected ConnectCallback wrapCallback(GetSocketData data, Uri uri, int port, boolean proxied, ConnectCallback callback) {
         return callback;
     }
 
@@ -170,22 +170,19 @@ public Cancellable getSocket(final GetSocketData data) {
             if (data.request.getProxyHost() != null) {
                 unresolvedHost = data.request.getProxyHost();
                 unresolvedPort = data.request.getProxyPort();
-                // set the host and port explicitly for proxied connections
-                data.request.getHeaders().setStatusLine(data.request.getProxyRequestLine().toString());
                 proxied = true;
             }
             else if (proxyHost != null) {
                 unresolvedHost = proxyHost;
                 unresolvedPort = proxyPort;
-                // set the host and port explicitly for proxied connections
-                data.request.getHeaders().setStatusLine(data.request.getProxyRequestLine().toString());
                 proxied = true;
             }
             else {
                 unresolvedHost = uri.getHost();
                 unresolvedPort = port;
             }
-            return mClient.getServer().connectSocket(unresolvedHost, unresolvedPort, wrapCallback(data.connectCallback, uri, port, proxied));
+            return mClient.getServer().connectSocket(unresolvedHost, unresolvedPort,
+                wrapCallback(data, uri, port, proxied, data.connectCallback));
         }
 
         // try to connect to everything...
@@ -216,7 +213,8 @@ public void onCompleted(Exception ex) {
                     keepTrying.add(new ContinuationCallback() {
                         @Override
                         public void onContinue(Continuation continuation, final CompletedCallback next) throws Exception {
-                            mClient.getServer().connectSocket(new InetSocketAddress(address, port), wrapCallback(new ConnectCallback() {
+                            mClient.getServer().connectSocket(new InetSocketAddress(address, port),
+                                wrapCallback(data, uri, port, false, new ConnectCallback() {
                                 @Override
                                 public void onConnectCompleted(Exception ex, AsyncSocket socket) {
                                     if (isDone()) {
@@ -244,7 +242,7 @@ public void onConnectCompleted(Exception ex, AsyncSocket socket) {
                                         data.connectCallback.onConnectCompleted(ex, socket);
                                     }
                                 }
-                            }, uri, port, false));
+                            }));
                         }
                     });
                 }
@@ -360,7 +358,8 @@ public void onRequestComplete(final OnRequestCompleteData data) {
                 data.socket.close();
                 return;
             }
-            if (!HttpUtil.isKeepAlive(data.headers) || !HttpUtil.isKeepAlive(data.request.getHeaders())) {
+            if (!HttpUtil.isKeepAlive(data.response.protocol(), data.headers)
+                || !HttpUtil.isKeepAlive(Protocol.HTTP_1_1, data.request.getHeaders())) {
                 data.request.logv("closing out socket (not keep alive)");
                 data.socket.close();
                 return;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
index 8a2146b24..8fb70253e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
@@ -1,11 +1,28 @@
 package com.koushikdutta.async.http;
 
+
+import android.text.TextUtils;
+
+import com.koushikdutta.async.http.server.AsyncHttpServer;
+
+import org.apache.http.Header;
+import org.apache.http.message.BasicHeader;
+
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by koush on 7/21/14.
  */
 public class Headers {
+    public Headers() {
+    }
+
+    public Headers(Map<String, List<String>> mm) {
+        map.putAll(mm);
+    }
+
     Multimap map = new Multimap();
     public Multimap getMultiMap() {
         return map;
@@ -29,33 +46,93 @@ public Headers add(String header, String value) {
         return this;
     }
 
-    public List<String> remove(String header) {
-        return map.remove(header);
+    public Headers addLine(String line) {
+        if (line != null) {
+            line = line.trim();
+            String[] parts = line.split(":", 2);
+            if (parts.length == 2)
+                add(parts[0].trim(), parts[1].trim());
+            else
+                add(parts[0].trim(), "");
+        }
+        return this;
     }
 
-    int responseCode;
-    public int getResponseCode() {
-        return responseCode;
+    public Headers addAll(String header, List<String> values) {
+        for (String v: values) {
+            add(header, v);
+        }
+        return this;
     }
-    public void setResponseCode(int responseCode) {
-        this.responseCode = responseCode;
+
+    public Headers addAll(Map<String, List<String>> m) {
+        map.putAll(m);
+        return this;
     }
 
-    String protocol;
-    public String getProtocol() {
-        return protocol;
+    public Headers addAll(Headers headers) {
+        map.putAll(headers.map);
+        return this;
+    }
+
+    public List<String> removeAll(String header) {
+        return map.remove(header);
+    }
+
+    public String remove(String header) {
+        List<String> r = removeAll(header);
+        if (r == null || r.size() == 0)
+            return null;
+        return r.get(0);
     }
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
+
+    public Header[] toHeaderArray() {
+        ArrayList<Header> ret = new ArrayList<Header>();
+        for (String key: map.keySet()) {
+            for (String v: map.get(key)) {
+                ret.add(new BasicHeader(key, v));
+            }
+        }
+        return ret.toArray(new Header[ret.size()]);
+    }
+
+    public StringBuilder toStringBuilder() {
+        StringBuilder result = new StringBuilder(256);
+        for (String key: map.keySet()) {
+            for (String v: map.get(key)) {
+                result.append(key)
+                .append(": ")
+                .append(v)
+                .append("\r\n");
+            }
+        }
+        result.append("\r\n");
+        return result;
     }
 
-    String responseMessage;
+    @Override
+    public String toString() {
+        return toStringBuilder().toString();
+    }
 
-    public String getResponseMessage() {
-        return responseMessage;
+    public String toPrefixString(String prefix) {
+        return
+        toStringBuilder()
+        .insert(0, prefix + "\r\n")
+        .toString();
     }
 
-    public void setResponseMessage(String responseMessage) {
-        this.responseMessage = responseMessage;
+    public static Headers parse(String payload) {
+        String[] lines = payload.split("\n");
+
+        Headers headers = new Headers();
+        for (String line: lines) {
+            line = line.trim();
+            if (TextUtils.isEmpty(line))
+                continue;
+
+            headers.addLine(line);
+        }
+        return headers;
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
index bbcdf8fc6..b7178ee6c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
@@ -9,14 +9,13 @@
 import com.koushikdutta.async.http.body.MultipartFormDataBody;
 import com.koushikdutta.async.http.body.StringBody;
 import com.koushikdutta.async.http.body.UrlEncodedFormBody;
-import com.koushikdutta.async.http.cache.RawHeaders;
 import com.koushikdutta.async.http.filter.ChunkedInputFilter;
 import com.koushikdutta.async.http.filter.ContentLengthFilter;
 import com.koushikdutta.async.http.filter.GZIPInputFilter;
 import com.koushikdutta.async.http.filter.InflaterInputFilter;
 
 public class HttpUtil {
-    public static AsyncHttpRequestBody getBody(DataEmitter emitter, CompletedCallback reporter, RawHeaders headers) {
+    public static AsyncHttpRequestBody getBody(DataEmitter emitter, CompletedCallback reporter, Headers headers) {
         String contentType = headers.get("Content-Type");
         if (contentType != null) {
             String[] values = contentType.split(";");
@@ -60,7 +59,7 @@ public void run() {
         }
     }
     
-    public static DataEmitter getBodyDecoder(DataEmitter emitter, RawHeaders headers, boolean server) {
+    public static DataEmitter getBodyDecoder(DataEmitter emitter, Protocol protocol, Headers headers, boolean server) {
         long _contentLength;
         try {
             _contentLength = Long.parseLong(headers.get("Content-Length"));
@@ -92,7 +91,7 @@ else if ("chunked".equalsIgnoreCase(headers.get("Transfer-Encoding"))) {
             emitter = chunker;
         }
         else {
-            if ((server || headers.getStatusLine().contains("HTTP/1.1")) && !"close".equalsIgnoreCase(headers.get("Connection"))) {
+            if ((server || protocol == Protocol.HTTP_1_1) && !"close".equalsIgnoreCase(headers.get("Connection"))) {
                 // if this is the server, and the client has not indicated a request body, the client is done
                 EndEmitter ender = EndEmitter.create(emitter.getServer(), null);
                 ender.setDataEmitter(emitter);
@@ -117,20 +116,23 @@ else if ("deflate".equals(headers.get("Content-Encoding"))) {
         return emitter;
     }
 
-    public static boolean isKeepAlive(RawHeaders headers) {
-        boolean keepAlive;
+    public static boolean isKeepAlive(Protocol protocol, Headers headers) {
+        // connection is always keep alive as this is an http/1.1 client
         String connection = headers.get("Connection");
-        if (connection != null) {
-            keepAlive = "keep-alive".equalsIgnoreCase(connection);
-        }
-        else {
-            keepAlive = headers.getHttpMinorVersion() >= 1;
-        }
+        if (connection == null)
+            return protocol == Protocol.HTTP_1_1;
+        return "keep-alive".equalsIgnoreCase(connection);
+    }
 
-        return keepAlive;
+    public static boolean isKeepAlive(String protocol, Headers headers) {
+        // connection is always keep alive as this is an http/1.1 client
+        String connection = headers.get("Connection");
+        if (connection == null)
+            return Protocol.get(protocol) == Protocol.HTTP_1_1;
+        return "keep-alive".equalsIgnoreCase(connection);
     }
 
-    public static int contentLength(RawHeaders headers) {
+    public static int contentLength(Headers headers) {
         String cl = headers.get("Content-Length");
         if (cl == null)
             return -1;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
index 5223fc850..913532e50 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
@@ -2,14 +2,11 @@
 
 import android.net.Uri;
 
-import com.koushikdutta.async.http.cache.RawHeaders;
-
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
 
 import java.net.URLDecoder;
 import java.util.ArrayList;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -43,67 +40,69 @@ public void put(String name, String value) {
         put(name, ret);
     }
 
-    public Multimap(RawHeaders headers) {
-        headers.toMultimap().putAll(this);
-    }
-
     public Multimap(List<NameValuePair> pairs) {
         for (NameValuePair pair: pairs)
             add(pair.getName(), pair.getValue());
     }
 
-    public static Multimap parseHeader(String header) {
-        if (header == null)
-            return null;
+    public Multimap(Multimap m) {
+        putAll(m);
+    }
+
+    public interface StringDecoder {
+        public String decode(String s);
+    }
+
+    public static Multimap parse(String value, String delimiter, boolean unquote, StringDecoder decoder) {
         Multimap map = new Multimap();
-        String[] parts = header.split(";");
+        if (value == null)
+            return map;
+        String[] parts = value.split(delimiter);
         for (String part: parts) {
             String[] pair = part.split("=", 2);
             String key = pair[0].trim();
             String v = null;
             if (pair.length > 1)
                 v = pair[1];
-            if (v != null && v.endsWith("\"") && v.startsWith("\""))
+            if (unquote && v != null && v.endsWith("\"") && v.startsWith("\""))
                 v = v.substring(1, v.length() - 1);
+            if (decoder != null) {
+                key = decoder.decode(key);
+                v = decoder.decode(v);
+            }
             map.add(key, v);
         }
         return map;
     }
 
-    public static Multimap parseHeader(RawHeaders headers, String header) {
-        return parseHeader(headers.get(header));
+    public static Multimap parseSemicolonDelimited(String header) {
+        return parse(header, ";", true, null);
     }
 
-    public static Multimap parseQuery(String query) {
-        Multimap map = new Multimap();
-        String[] pairs = query.split("&");
-        for (String p : pairs) {
-            String[] pair = p.split("=", 2);
-            if (pair.length == 0)
-                continue;
-            String name = Uri.decode(pair[0]);
-            String value = null;
-            if (pair.length == 2)
-                value = Uri.decode(pair[1]);
-            map.add(name, value);
+    public static Multimap parseCommaDelimited(String header) {
+        return parse(header, ",", true, null);
+    }
+
+    private static final StringDecoder QUERY_DECODER = new StringDecoder() {
+        @Override
+        public String decode(String s) {
+            return Uri.decode(s);
         }
-        return map;
+    };
+
+    public static Multimap parseQuery(String query) {
+        return parse(query, "&", false, QUERY_DECODER);
     }
 
-    public static Multimap parseUrlEncoded(String query) {
-        Multimap map = new Multimap();
-        String[] pairs = query.split("&");
-        for (String p : pairs) {
-            String[] pair = p.split("=", 2);
-            if (pair.length == 0)
-                continue;
-            String name = URLDecoder.decode(pair[0]);
-            String value = null;
-            if (pair.length == 2)
-                value = URLDecoder.decode(pair[1]);
-            map.add(name, value);
+    private static final StringDecoder URL_DECODER = new StringDecoder() {
+        @Override
+        public String decode(String s) {
+            return URLDecoder.decode(s);
         }
-        return map;
+    };
+
+    public static Multimap parseUrlEncoded(String query) {
+        return parse(query, "&", false, URL_DECODER);
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Protocol.java b/AndroidAsync/src/com/koushikdutta/async/http/Protocol.java
new file mode 100644
index 000000000..8e5a46c46
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Protocol.java
@@ -0,0 +1,89 @@
+package com.koushikdutta.async.http;
+
+import java.util.Hashtable;
+
+/**
+ * Protocols that OkHttp implements for <a
+ * href="http://tools.ietf.org/html/draft-agl-tls-nextprotoneg-04">NPN</a> and
+ * <a href="http://tools.ietf.org/html/draft-ietf-tls-applayerprotoneg">ALPN</a>
+ * selection.
+ * <p/>
+ * <h3>Protocol vs Scheme</h3>
+ * Despite its name, {@link java.net.URL#getProtocol()} returns the
+ * {@linkplain java.net.URI#getScheme() scheme} (http, https, etc.) of the URL, not
+ * the protocol (http/1.1, spdy/3.1, etc.). OkHttp uses the word <i>protocol</i>
+ * to identify how HTTP messages are framed.
+ */
+public enum Protocol {
+    /**
+     * An obsolete plaintext framing that does not use persistent sockets by
+     * default.
+     */
+    HTTP_1_0("http/1.0"),
+
+    /**
+     * A plaintext framing that includes persistent connections.
+     * <p/>
+     * <p>This version of OkHttp implements <a
+     * href="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616</a>, and tracks
+     * revisions to that spec.
+     */
+    HTTP_1_1("http/1.1"),
+
+    /**
+     * Chromium's binary-framed protocol that includes header compression,
+     * multiplexing multiple requests on the same socket, and server-push.
+     * HTTP/1.1 semantics are layered on SPDY/3.
+     * <p/>
+     * <p>This version of OkHttp implements SPDY 3 <a
+     * href="http://dev.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3-1">draft
+     * 3.1</a>. Future releases of OkHttp may use this identifier for a newer draft
+     * of the SPDY spec.
+     */
+    SPDY_3("spdy/3.1"),
+
+    /**
+     * The IETF's binary-framed protocol that includes header compression,
+     * multiplexing multiple requests on the same socket, and server-push.
+     * HTTP/1.1 semantics are layered on HTTP/2.
+     * <p/>
+     * <p>This version of OkHttp implements HTTP/2 <a
+     * href="http://tools.ietf.org/html/draft-ietf-httpbis-http2-13">draft 12</a>
+     * with HPACK <a
+     * href="http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08">draft
+     * 6</a>. Future releases of OkHttp may use this identifier for a newer draft
+     * of these specs.
+     */
+    HTTP_2("h2-13");
+
+    private final String protocol;
+    private static final Hashtable<String, Protocol> protocols = new Hashtable<String, Protocol>();
+
+    static {
+        protocols.put(HTTP_1_0.toString(), HTTP_1_0);
+        protocols.put(HTTP_1_1.toString(), HTTP_1_1);
+        protocols.put(SPDY_3.toString(), SPDY_3);
+        protocols.put(HTTP_2.toString(), HTTP_2);
+    }
+
+
+    Protocol(String protocol) {
+        this.protocol = protocol;
+    }
+
+    /**
+     * Returns the protocol identified by {@code protocol}.
+     */
+    public static Protocol get(String protocol) {
+        return protocols.get(protocol.toLowerCase());
+    }
+
+    /**
+     * Returns the string used to identify this protocol for ALPN and NPN, like
+     * "http/1.1", "spdy/3.1" or "h2-13".
+     */
+    @Override
+    public String toString() {
+        return protocol;
+    }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java
index dba645a02..7fe545d86 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java
@@ -3,14 +3,13 @@
 import com.koushikdutta.async.future.Cancellable;
 
 public class SimpleMiddleware implements AsyncHttpClientMiddleware {
-
     @Override
-    public Cancellable getSocket(GetSocketData data) {
-        return null;
+    public void onRequest(OnRequestData data) {
     }
 
     @Override
-    public void onSocket(OnSocketData data) {
+    public Cancellable getSocket(GetSocketData data) {
+        return null;
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
index 4af0b9961..ddbd62c66 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
@@ -11,7 +11,6 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
-import com.koushikdutta.async.http.cache.RawHeaders;
 import com.koushikdutta.async.http.server.AsyncHttpServerRequest;
 import com.koushikdutta.async.http.server.AsyncHttpServerResponse;
 
@@ -115,7 +114,7 @@ public WebSocketImpl(AsyncHttpServerRequest request, AsyncHttpServerResponse res
         String sha1 = SHA1(concat);
         String origin = request.getHeaders().get("Origin");
         
-        response.responseCode(101);
+        response.code(101);
         response.getHeaders().set("Upgrade", "WebSocket");
         response.getHeaders().set("Connection", "Upgrade");
         response.getHeaders().set("Sec-WebSocket-Accept", sha1);
@@ -131,7 +130,7 @@ public WebSocketImpl(AsyncHttpServerRequest request, AsyncHttpServerResponse res
     }
     
     public static void addWebSocketUpgradeHeaders(AsyncHttpRequest req, String protocol) {
-        RawHeaders headers = req.getHeaders();
+        Headers headers = req.getHeaders();
         final String key = Base64.encodeToString(toByteArray(UUID.randomUUID()),Base64.NO_WRAP);
         headers.set("Sec-WebSocket-Version", "13");
         headers.set("Sec-WebSocket-Key", key);
@@ -151,10 +150,10 @@ public WebSocketImpl(AsyncSocket socket) {
         mSink = new BufferedDataSink(mSocket);
     }
     
-    public static WebSocket finishHandshake(RawHeaders requestHeaders, AsyncHttpResponse response) {
+    public static WebSocket finishHandshake(Headers requestHeaders, AsyncHttpResponse response) {
         if (response == null)
             return null;
-        if (response.headers().getResponseCode() != 101)
+        if (response.code() != 101)
             return null;
         if (!"websocket".equalsIgnoreCase(response.headers().get("Upgrade")))
             return null;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
index 1872e19c8..309d9c33e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
@@ -11,8 +11,8 @@
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.future.Continuation;
 import com.koushikdutta.async.http.AsyncHttpRequest;
+import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.Multimap;
-import com.koushikdutta.async.http.cache.RawHeaders;
 import com.koushikdutta.async.http.server.BoundaryEmitter;
 
 import java.io.File;
@@ -21,7 +21,7 @@
 
 public class MultipartFormDataBody extends BoundaryEmitter implements AsyncHttpRequestBody<Multimap> {
     LineEmitter liner;
-    RawHeaders formData;
+    Headers formData;
     ByteBufferList last;
     String lastName;
 
@@ -40,7 +40,7 @@ void handleLast() {
             return;
         
         if (formData == null)
-            formData = new RawHeaders();
+            formData = new Headers();
         
         formData.add(lastName, last.peekString());
         
@@ -62,7 +62,7 @@ protected void onBoundaryEnd() {
     
     @Override
     protected void onBoundaryStart() {
-        final RawHeaders headers = new RawHeaders();
+        final Headers headers = new Headers();
         liner = new LineEmitter();
         liner.setLineCallback(new StringCallback() {
             @Override
@@ -146,8 +146,7 @@ public void onCompleted(Exception ex) {
             c.add(new ContinuationCallback() {
                 @Override
                 public void onContinue(Continuation continuation, CompletedCallback next) throws Exception {
-                    part.getRawHeaders().setStatusLine(getBoundaryStart());
-                    byte[] bytes = part.getRawHeaders().toHeaderString().getBytes();
+                    byte[] bytes = part.getRawHeaders().toPrefixString(getBoundaryStart()).getBytes();
                     com.koushikdutta.async.Util.writeAll(sink, bytes, next);
                     written += bytes.length;
                 }
@@ -205,10 +204,10 @@ public int length() {
 
         int length = 0;
         for (final Part part: mParts) {
-            part.getRawHeaders().setStatusLine(getBoundaryStart());
+            String partHeader = part.getRawHeaders().toPrefixString(getBoundaryStart());
             if (part.length() == -1)
                 return -1;
-            length += part.length() + part.getRawHeaders().toHeaderString().getBytes().length + "\r\n".length();
+            length += part.length() + partHeader.getBytes().length + "\r\n".length();
         }
         length += (getBoundaryEnd()).getBytes().length;
         return totalToWrite = length;
@@ -238,6 +237,6 @@ public void addPart(Part part) {
 
     @Override
     public Multimap get() {
-        return new Multimap(formData);
+        return new Multimap(formData.getMultiMap());
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java b/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java
index 56fcecb58..b66c711e0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java
@@ -2,8 +2,9 @@
 
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.callback.CompletedCallback;
+import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.Multimap;
-import com.koushikdutta.async.http.cache.RawHeaders;
+
 import org.apache.http.NameValuePair;
 
 import java.io.File;
@@ -12,11 +13,11 @@
 public class Part {
     public static final String CONTENT_DISPOSITION = "Content-Disposition";
     
-    RawHeaders mHeaders;
+    Headers mHeaders;
     Multimap mContentDisposition;
-    public Part(RawHeaders headers) {
+    public Part(Headers headers) {
         mHeaders = headers;
-        mContentDisposition = Multimap.parseHeader(mHeaders, CONTENT_DISPOSITION);
+        mContentDisposition = Multimap.parseSemicolonDelimited(mHeaders.get(CONTENT_DISPOSITION));
     }
     
     public String getName() {
@@ -26,7 +27,7 @@ public String getName() {
     private long length = -1;
     public Part(String name, long length, List<NameValuePair> contentDisposition) {
         this.length = length;
-        mHeaders = new RawHeaders();
+        mHeaders = new Headers();
         StringBuilder builder = new StringBuilder(String.format("form-data; name=\"%s\"", name));
         if (contentDisposition != null) {
             for (NameValuePair pair: contentDisposition) {
@@ -34,10 +35,10 @@ public Part(String name, long length, List<NameValuePair> contentDisposition) {
             }
         }
         mHeaders.set(CONTENT_DISPOSITION, builder.toString());
-        mContentDisposition = Multimap.parseHeader(mHeaders, CONTENT_DISPOSITION);
+        mContentDisposition = Multimap.parseSemicolonDelimited(mHeaders.get(CONTENT_DISPOSITION));
     }
 
-    public RawHeaders getRawHeaders() {
+    public Headers getRawHeaders() {
         return mHeaders;
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/CacheUtil.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/CacheUtil.java
deleted file mode 100644
index caadf8f30..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/CacheUtil.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.koushikdutta.async.http.cache;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Created by koush on 7/21/14.
- */
-class CacheUtil {
-    static Set<String> varyFields(RawHeaders headers) {
-        HashSet<String> ret = new HashSet<String>();
-        String value = headers.get("Vary");
-        if (value == null)
-            return ret;
-        for (String varyField : value.split(",")) {
-            ret.add(varyField.trim());
-        }
-        return ret;
-    }
-
-    static boolean isCacheable(RawHeaders requestHeaders, RawHeaders responseHeaders) {
-        ResponseHeaders r = new ResponseHeaders(null, responseHeaders);
-        return r.isCacheable(new RequestHeaders(null, requestHeaders));
-    }
-
-    static boolean isNoCache(RawHeaders headers) {
-        return new RequestHeaders(null, headers).isNoCache();
-    }
-
-    ResponseSource chooseResponseSource(long nowMillis, RawHeaders request, RawHeaders response) {
-        RequestHeaders requestHeaders = new RequestHeaders(null, request);
-        ResponseHeaders responseHeaders = new ResponseHeaders(null, response);
-        return responseHeaders.chooseResponseSource(nowMillis, requestHeaders);
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/RawHeaders.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/RawHeaders.java
index 53be34091..9274a54e3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/RawHeaders.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/RawHeaders.java
@@ -44,7 +44,7 @@
  * <p>This class trims whitespace from values. It never returns values with
  * leading or trailing whitespace.
  */
-public final class RawHeaders {
+final class RawHeaders {
     private static final Comparator<String> FIELD_NAME_COMPARATOR = new Comparator<String>() {
         @Override public int compare(String a, String b) {
             if (a == b) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index 22f0ac2a3..447c81b05 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -18,6 +18,7 @@
 import com.koushikdutta.async.http.AsyncHttpClientMiddleware;
 import com.koushikdutta.async.http.AsyncHttpGet;
 import com.koushikdutta.async.http.AsyncHttpRequest;
+import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.SimpleMiddleware;
 import com.koushikdutta.async.util.Allocator;
 import com.koushikdutta.async.util.Charsets;
@@ -95,7 +96,10 @@ public void setCaching(boolean caching) {
     // also see if this can be turned into a conditional cache request.
     @Override
     public Cancellable getSocket(final GetSocketData data) {
-        if (cache == null || !caching || CacheUtil.isNoCache(data.request.getHeaders())) {
+        RequestHeaders requestHeaders = new RequestHeaders(data.request.getUri(), RawHeaders.fromMultimap(data.request.getHeaders().getMultiMap()));
+        data.state.put("request-headers", requestHeaders);
+
+        if (cache == null || !caching || requestHeaders.isNoCache()) {
             networkCount++;
             return null;
         }
@@ -121,7 +125,7 @@ public Cancellable getSocket(final GetSocketData data) {
         }
 
         // verify the entry matches
-        if (!entry.matches(data.request.getUri(), data.request.getMethod(), data.request.getHeaders().toMultimap())) {
+        if (!entry.matches(data.request.getUri(), data.request.getMethod(), data.request.getHeaders().getMultiMap())) {
             networkCount++;
             StreamUtility.closeQuietly(snapshot);
             return null;
@@ -154,7 +158,6 @@ public Cancellable getSocket(final GetSocketData data) {
         cachedResponseHeaders.setLocalTimestamps(System.currentTimeMillis(), System.currentTimeMillis());
 
         long now = System.currentTimeMillis();
-        RequestHeaders requestHeaders = new RequestHeaders(null, data.request.getHeaders());
         ResponseSource responseSource = cachedResponseHeaders.chooseResponseSource(now, requestHeaders);
 
         if (responseSource == ResponseSource.CACHE) {
@@ -218,13 +221,18 @@ public void onBodyDecoder(OnBodyData data) {
         }
 
         CacheData cacheData = data.state.get("cache-data");
+        RawHeaders rh = RawHeaders.fromMultimap(data.headers.getMultiMap());
+        rh.setStatusLine(String.format("%s %s %s", data.response.protocol(), data.response.code(), data.response.message()));
+        ResponseHeaders networkResponse = new ResponseHeaders(data.request.getUri(), rh);
+        data.state.put("response-headers", networkResponse);
         if (cacheData != null) {
-            ResponseHeaders networkResponse = new ResponseHeaders(null, data.headers);
             if (cacheData.cachedResponseHeaders.validate(networkResponse)) {
                 data.request.logi("Serving response from conditional cache");
                 data.headers.removeAll("Content-Length");
-                data.headers = cacheData.cachedResponseHeaders.combine(networkResponse).getHeaders();
-                data.headers.setStatusLine(cacheData.cachedResponseHeaders.getHeaders().getStatusLine());
+                ResponseHeaders combined = cacheData.cachedResponseHeaders.combine(networkResponse);
+                data.headers = new Headers(combined.getHeaders().toMultimap());
+                data.response.code(combined.getHeaders().getResponseCode());
+                data.response.message(combined.getHeaders().getResponseMessage());
 
                 data.headers.set(SERVED_FROM, CONDITIONAL_CACHE);
                 conditionalCacheHitCount++;
@@ -244,7 +252,8 @@ public void onBodyDecoder(OnBodyData data) {
         if (!caching)
             return;
 
-        if (!CacheUtil.isCacheable(data.request.getHeaders(), data.headers) || !data.request.getMethod().equals(AsyncHttpGet.METHOD)) {
+        RequestHeaders requestHeaders = data.state.get("request-headers");
+        if (requestHeaders == null || !networkResponse.isCacheable(requestHeaders) || !data.request.getMethod().equals(AsyncHttpGet.METHOD)) {
             /*
              * Don't cache non-GET responses. We're technically allowed to cache
              * HEAD requests and some POST requests, but the complexity of doing
@@ -256,8 +265,8 @@ public void onBodyDecoder(OnBodyData data) {
         }
 
         String key = FileCache.toKeyString(data.request.getUri());
-        RawHeaders varyHeaders = data.request.getHeaders().getAll(CacheUtil.varyFields(data.headers));
-        Entry entry = new Entry(data.request.getUri(), varyHeaders, data.request, data.headers);
+        RawHeaders varyHeaders = requestHeaders.getHeaders().getAll(networkResponse.getVaryFields());
+        Entry entry = new Entry(data.request.getUri(), varyHeaders, data.request, networkResponse.getHeaders());
         BodyCacher cacher = new BodyCacher();
         EntryEditor editor = new EntryEditor(key);
         try {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/callback/HeadersCallback.java b/AndroidAsync/src/com/koushikdutta/async/http/callback/HeadersCallback.java
deleted file mode 100644
index 68db69f2a..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/callback/HeadersCallback.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.koushikdutta.async.http.callback;
-
-import com.koushikdutta.async.http.cache.RawHeaders;
-
-/**
- * Created by koush on 6/30/13.
- */
-public interface HeadersCallback {
-    public void onHeaders(RawHeaders headers);
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/filter/ContentLengthFilter.java b/AndroidAsync/src/com/koushikdutta/async/http/filter/ContentLengthFilter.java
index d1b05a2ef..41aa217b3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/filter/ContentLengthFilter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/filter/ContentLengthFilter.java
@@ -12,7 +12,7 @@ public ContentLengthFilter(long contentLength) {
     @Override
     protected void report(Exception e) {
         if (e == null && totalRead != contentLength)
-            e = new PrematureDataEndException("End of data reached before content length was read");
+            e = new PrematureDataEndException("End of data reached before content length was read: " + totalRead + "/" + contentLength + " Paused: " + isPaused());
         super.report(e);
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 1c981b796..3d6566933 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -20,16 +20,18 @@
 import com.koushikdutta.async.http.AsyncHttpGet;
 import com.koushikdutta.async.http.AsyncHttpHead;
 import com.koushikdutta.async.http.AsyncHttpPost;
+import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.HttpUtil;
 import com.koushikdutta.async.http.Multimap;
+import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.WebSocket;
 import com.koushikdutta.async.http.WebSocketImpl;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
-import com.koushikdutta.async.http.cache.RawHeaders;
 import com.koushikdutta.async.util.StreamUtility;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -52,10 +54,16 @@ public void stop() {
         }
     }
     
-    protected void onRequest(AsyncHttpServerRequest request, AsyncHttpServerResponse response) {
+    protected boolean onRequest(AsyncHttpServerRequest request, AsyncHttpServerResponse response) {
+        return false;
     }
 
-    protected AsyncHttpRequestBody onUnknownBody(RawHeaders headers) {
+    protected void onRequest(HttpServerRequestCallback callback, AsyncHttpServerRequest request, AsyncHttpServerResponse response) {
+        if (callback != null)
+            callback.onRequest(request, response);
+    }
+
+    protected AsyncHttpRequestBody onUnknownBody(Headers headers) {
         return new UnknownRequestBody(headers.get("Content-Type"));
     }
 
@@ -63,7 +71,7 @@ protected AsyncHttpRequestBody onUnknownBody(RawHeaders headers) {
         @Override
         public void onAccepted(final AsyncSocket socket) {
             AsyncHttpServerRequestImpl req = new AsyncHttpServerRequestImpl() {
-                Pair match;
+                HttpServerRequestCallback match;
                 String fullPath;
                 String path;
                 boolean responseComplete;
@@ -72,13 +80,13 @@ public void onAccepted(final AsyncSocket socket) {
                 boolean hasContinued;
 
                 @Override
-                protected AsyncHttpRequestBody onUnknownBody(RawHeaders headers) {
+                protected AsyncHttpRequestBody onUnknownBody(Headers headers) {
                     return AsyncHttpServer.this.onUnknownBody(headers);
                 }
 
                 @Override
                 protected void onHeadersReceived() {
-                    RawHeaders headers = getHeaders();
+                    Headers headers = getHeaders();
 
                     // should the negotiation of 100 continue be here, or in the request impl?
                     // probably here, so AsyncResponse can negotiate a 100 continue.
@@ -101,7 +109,7 @@ public void onCompleted(Exception ex) {
                     }
 //                    System.out.println(headers.toHeaderString());
                     
-                    String statusLine = headers.getStatusLine();
+                    String statusLine = getStatusLine();
                     String[] parts = statusLine.split(" ");
                     fullPath = parts[1];
                     path = fullPath.split("\\?")[0];
@@ -113,7 +121,7 @@ public void onCompleted(Exception ex) {
                                 Matcher m = p.regex.matcher(path);
                                 if (m.matches()) {
                                     mMatcher = m;
-                                    match = p;
+                                    match = p.callback;
                                     break;
                                 }
                             }
@@ -130,26 +138,26 @@ protected void onEnd() {
                         }
                     };
                     
-                    onRequest(this, res);
-                    
-                    if (match == null) {
-                        res.responseCode(404);
+                    boolean handled = onRequest(this, res);
+
+                    if (match == null && !handled) {
+                        res.code(404);
                         res.end();
                         return;
                     }
 
                     if (!getBody().readFullyOnRequest()) {
-                        match.callback.onRequest(this, res);
+                        onRequest(match, this, res);
                     }
                     else if (requestComplete) {
-                        match.callback.onRequest(this, res);
+                        onRequest(match, this, res);
                     }
                 }
 
                 @Override
                 public void onCompleted(Exception e) {
                     // if the protocol was switched off http, ignore this request/response.
-                    if (res.getHeaders().getResponseCode() == 101)
+                    if (res.code() == 101)
                         return;
                     requestComplete = true;
                     super.onCompleted(e);
@@ -165,14 +173,13 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                     handleOnCompleted();
 
                     if (getBody().readFullyOnRequest()) {
-                        if (match != null)
-                            match.callback.onRequest(this, res);
+                        onRequest(match, this, res);
                     }
                 }
                 
                 private void handleOnCompleted() {
                     if (requestComplete && responseComplete) {
-                        if (HttpUtil.isKeepAlive(getHeaders())) {
+                        if (HttpUtil.isKeepAlive(Protocol.HTTP_1_1, getHeaders())) {
                             onAccepted(socket);
                         }
                         else {
@@ -266,7 +273,7 @@ private static class Pair {
         HttpServerRequestCallback callback;
     }
     
-    Hashtable<String, ArrayList<Pair>> mActions = new Hashtable<String, ArrayList<Pair>>();
+    final Hashtable<String, ArrayList<Pair>> mActions = new Hashtable<String, ArrayList<Pair>>();
     
     public void addAction(String action, String regex, HttpServerRequestCallback callback) {
         Pair p = new Pair();
@@ -284,7 +291,7 @@ public void addAction(String action, String regex, HttpServerRequestCallback cal
     }
 
     public static interface WebSocketRequestCallback {
-        public void onConnected(WebSocket webSocket, RawHeaders headers);
+        public void onConnected(WebSocket webSocket, Headers headers);
     }
 
     public void websocket(String regex, final WebSocketRequestCallback callback) {
@@ -307,13 +314,13 @@ public void onRequest(final AsyncHttpServerRequest request, final AsyncHttpServe
                     }
                 }
                 if (!"websocket".equalsIgnoreCase(request.getHeaders().get("Upgrade")) || !hasUpgrade) {
-                    response.responseCode(404);
+                    response.code(404);
                     response.end();
                     return;
                 }
                 String peerProtocol = request.getHeaders().get("Sec-WebSocket-Protocol");
                 if (!TextUtils.equals(protocol, peerProtocol)) {
-                    response.responseCode(404);
+                    response.code(404);
                     response.end();
                     return;
                 }
@@ -379,14 +386,14 @@ public void directory(Context context, String regex, final String assetPath) {
             public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
                 String path = request.getMatcher().replaceAll("");
                 android.util.Pair<Integer, InputStream> pair = getAssetStream(_context, assetPath + path);
-                final InputStream is = pair.second;
-                response.getHeaders().set("Content-Length", String.valueOf(pair.first));
-                if (is == null) {
-                    response.responseCode(404);
+                if (pair == null || pair.second == null) {
+                    response.code(404);
                     response.end();
                     return;
                 }
-                response.responseCode(200);
+                final InputStream is = pair.second;
+                response.getHeaders().set("Content-Length", String.valueOf(pair.first));
+                response.code(200);
                 response.getHeaders().add("Content-Type", getContentType(assetPath + path));
                 Util.pump(is, response, new CompletedCallback() {
                     @Override
@@ -402,15 +409,15 @@ public void onCompleted(Exception ex) {
             public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
                 String path = request.getMatcher().replaceAll("");
                 android.util.Pair<Integer, InputStream> pair = getAssetStream(_context, assetPath + path);
-                final InputStream is = pair.second;
-                StreamUtility.closeQuietly(is);
-                response.getHeaders().set("Content-Length", String.valueOf(pair.first));
-                if (is == null) {
-                    response.responseCode(404);
+                if (pair == null || pair.second == null) {
+                    response.code(404);
                     response.end();
                     return;
                 }
-                response.responseCode(200);
+                final InputStream is = pair.second;
+                StreamUtility.closeQuietly(is);
+                response.getHeaders().set("Content-Length", String.valueOf(pair.first));
+                response.code(200);
                 response.getHeaders().add("Content-Type", getContentType(assetPath + path));
                 response.writeHead();
                 response.end();
@@ -455,13 +462,13 @@ public int compare(File lhs, File rhs) {
                     return;
                 }
                 if (!file.isFile()) {
-                    response.responseCode(404);
+                    response.code(404);
                     response.end();
                     return;
                 }
                 try {
                     FileInputStream is = new FileInputStream(file);
-                    response.responseCode(200);
+                    response.code(200);
                     Util.pump(is, response, new CompletedCallback() {
                         @Override
                         public void onCompleted(Exception ex) {
@@ -469,10 +476,9 @@ public void onCompleted(Exception ex) {
                         }
                     });
                 }
-                catch (Exception ex) {
-                    response.responseCode(404);
+                catch (FileNotFoundException ex) {
+                    response.code(404);
                     response.end();
-                    return;
                 }
             }
         });
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
index 77ce87545..1b0292f39 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
@@ -2,14 +2,14 @@
 
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.DataEmitter;
+import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.Multimap;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
-import com.koushikdutta.async.http.cache.RawHeaders;
 
 import java.util.regex.Matcher;
 
 public interface AsyncHttpServerRequest extends DataEmitter {
-    public RawHeaders getHeaders();
+    public Headers getHeaders();
     public Matcher getMatcher();
     public AsyncHttpRequestBody getBody();
     public AsyncSocket getSocket();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
index ba0576fd3..15bed1025 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
@@ -7,17 +7,23 @@
 import com.koushikdutta.async.LineEmitter.StringCallback;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
+import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.HttpUtil;
+import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
-import com.koushikdutta.async.http.cache.RawHeaders;
 
 import java.util.regex.Matcher;
 
 public abstract class AsyncHttpServerRequestImpl extends FilteredDataEmitter implements AsyncHttpServerRequest, CompletedCallback {
-    private RawHeaders mRawHeaders = new RawHeaders();
+    private String statusLine;
+    private Headers mRawHeaders = new Headers();
     AsyncSocket mSocket;
     Matcher mMatcher;
 
+    public String getStatusLine() {
+        return statusLine;
+    }
+
     private CompletedCallback mReporter = new CompletedCallback() {
         @Override
         public void onCompleted(Exception error) {
@@ -35,11 +41,10 @@ public void onCompleted(Exception e) {
     abstract protected void onHeadersReceived();
     
     protected void onNotHttp() {
-        System.out.println("not http: " + mRawHeaders.getStatusLine());
-        System.out.println("not http: " + mRawHeaders.getStatusLine().length());
+        System.out.println("not http!");
     }
 
-    protected AsyncHttpRequestBody onUnknownBody(RawHeaders headers) {
+    protected AsyncHttpRequestBody onUnknownBody(Headers headers) {
         return null;
     }
     
@@ -47,9 +52,9 @@ protected AsyncHttpRequestBody onUnknownBody(RawHeaders headers) {
         @Override
         public void onStringAvailable(String s) {
             try {
-                if (mRawHeaders.getStatusLine() == null) {
-                    mRawHeaders.setStatusLine(s);
-                    if (!mRawHeaders.getStatusLine().contains("HTTP/")) {
+                if (statusLine == null) {
+                    statusLine = s;
+                    if (!statusLine.contains("HTTP/")) {
                         onNotHttp();
                         mSocket.setDataCallback(null);
                     }
@@ -58,7 +63,7 @@ else if (!"\r".equals(s)){
                     mRawHeaders.addLine(s);
                 }
                 else {
-                    DataEmitter emitter = HttpUtil.getBodyDecoder(mSocket, mRawHeaders, true);
+                    DataEmitter emitter = HttpUtil.getBodyDecoder(mSocket, Protocol.HTTP_1_1, mRawHeaders, true);
 //                    emitter.setEndCallback(mReporter);
                     mBody = HttpUtil.getBody(emitter, mReporter, mRawHeaders);
                     if (mBody == null) {
@@ -96,7 +101,7 @@ public AsyncSocket getSocket() {
     }
 
     @Override
-    public RawHeaders getHeaders() {
+    public Headers getHeaders() {
         return mRawHeaders;
     }
 
@@ -140,4 +145,11 @@ public void resume() {
     public boolean isPaused() {
         return mSocket.isPaused();
     }
+
+    @Override
+    public String toString() {
+        if (mRawHeaders == null)
+            return super.toString();
+        return mRawHeaders.toPrefixString(statusLine);
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
index 87fbc5e2e..bc6e33295 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
@@ -3,7 +3,7 @@
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.callback.CompletedCallback;
-import com.koushikdutta.async.http.cache.RawHeaders;
+import com.koushikdutta.async.http.Headers;
 
 import org.json.JSONObject;
 
@@ -17,8 +17,9 @@ public interface AsyncHttpServerResponse extends DataSink, CompletedCallback {
     public void send(JSONObject json);
     public void sendFile(File file);
     public void sendStream(InputStream inputStream, long totalLength);
-    public void responseCode(int code);
-    public RawHeaders getHeaders();
+    public AsyncHttpServerResponse code(int code);
+    public int code();
+    public Headers getHeaders();
     public void writeHead();
     public void setContentType(String contentType);
     public void redirect(String location);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index 0fe4e1001..3cc5d63f6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -11,8 +11,10 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.http.AsyncHttpHead;
+import com.koushikdutta.async.http.AsyncHttpResponse;
+import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.HttpUtil;
-import com.koushikdutta.async.http.cache.RawHeaders;
+import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.filter.ChunkedOutputFilter;
 import com.koushikdutta.async.util.StreamUtility;
 
@@ -21,15 +23,16 @@
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 
 public class AsyncHttpServerResponseImpl implements AsyncHttpServerResponse {
-    private RawHeaders mRawHeaders = new RawHeaders();
+    private Headers mRawHeaders = new Headers();
     private long mContentLength = -1;
 
     @Override
-    public RawHeaders getHeaders() {
+    public Headers getHeaders() {
         return mRawHeaders;
     }
     
@@ -42,7 +45,7 @@ public AsyncSocket getSocket() {
     AsyncHttpServerResponseImpl(AsyncSocket socket, AsyncHttpServerRequestImpl req) {
         mSocket = socket;
         mRequest = req;
-        if (HttpUtil.isKeepAlive(req.getHeaders()))
+        if (HttpUtil.isKeepAlive(Protocol.HTTP_1_1, req.getHeaders()))
             mRawHeaders.set("Connection", "Keep-Alive");
     }
 
@@ -69,7 +72,6 @@ void initFirstWrite() {
             return;
 
         mHasWritten = true;
-        assert null != mRawHeaders.getStatusLine();
         String currentEncoding = mRawHeaders.get("Transfer-Encoding");
         if ("".equals(currentEncoding))
             mRawHeaders.removeAll("Transfer-Encoding");
@@ -129,7 +131,9 @@ public void writeHead() {
     private void writeHeadInternal() {
         assert !mHeadWritten;
         mHeadWritten = true;
-        Util.writeAll(mSocket, mRawHeaders.toHeaderString().getBytes(), new CompletedCallback() {
+        String statusLine = String.format("HTTP/1.1 %s %s", code, AsyncHttpServer.getResponseCodeDescription(code));
+        String rh = mRawHeaders.toPrefixString(statusLine);
+        Util.writeAll(mSocket, rh.getBytes(), new CompletedCallback() {
             @Override
             public void onCompleted(Exception ex) {
                 // TODO: HACK!!!
@@ -153,8 +157,6 @@ public void setContentType(String contentType) {
     @Override
     public void send(String contentType, final String string) {
         try {
-            if (mRawHeaders.getStatusLine() == null)
-                responseCode(200);
             assert mContentLength < 0;
             byte[] bytes = string.getBytes("UTF-8");
             mContentLength = bytes.length;
@@ -184,7 +186,6 @@ protected void report(Exception e) {
 
     @Override
     public void send(String string) {
-        responseCode(200);
         String contentType = mRawHeaders.get("Content-Type");
         if (contentType == null)
             contentType = "text/html; charset=utf8";
@@ -206,7 +207,7 @@ public void sendStream(final InputStream inputStream, long totalLength) {
             String[] parts = range.split("=");
             if (parts.length != 2 || !"bytes".equals(parts[0])) {
                 // Requested range not satisfiable
-                responseCode(416);
+                code(416);
                 end();
                 return;
             }
@@ -222,11 +223,11 @@ public void sendStream(final InputStream inputStream, long totalLength) {
                 else
                     end = totalLength - 1;
 
-                responseCode(206);
+                code(206);
                 getHeaders().set("Content-Range", String.format("bytes %d-%d/%d", start, end, totalLength));
             }
             catch (Exception e) {
-                responseCode(416);
+                code(416);
                 end();
                 return;
             }
@@ -237,8 +238,6 @@ public void sendStream(final InputStream inputStream, long totalLength) {
             mContentLength = end - start + 1;
             mRawHeaders.set("Content-Length", String.valueOf(mContentLength));
             mRawHeaders.set("Accept-Ranges", "bytes");
-            if (getHeaders().getStatusLine() == null)
-                responseCode(200);
             if (mRequest.getMethod().equals(AsyncHttpHead.METHOD)) {
                 writeHead();
                 onEnd();
@@ -253,7 +252,7 @@ public void onCompleted(Exception ex) {
             });
         }
         catch (Exception e) {
-            responseCode(404);
+            code(500);
             end();
         }
     }
@@ -266,21 +265,27 @@ public void sendFile(File file) {
             FileInputStream fin = new FileInputStream(file);
             sendStream(new BufferedInputStream(fin, 64000), file.length());
         }
-        catch (Exception e) {
-            responseCode(404);
+        catch (FileNotFoundException e) {
+            code(404);
             end();
         }
     }
 
+    int code = 200;
+    @Override
+    public AsyncHttpServerResponse code(int code) {
+        this.code = code;
+        return this;
+    }
+
     @Override
-    public void responseCode(int code) {
-        String status = AsyncHttpServer.getResponseCodeDescription(code);
-        mRawHeaders.setStatusLine(String.format("HTTP/1.1 %d %s", code, status));
+    public int code() {
+        return code;
     }
 
     @Override
     public void redirect(String location) {
-        responseCode(302);
+        code(302);
         mRawHeaders.set("Location", location);
         end();
     }
@@ -311,4 +316,12 @@ public CompletedCallback getClosedCallback() {
     public AsyncServer getServer() {
         return mSocket.getServer();
     }
+
+    @Override
+    public String toString() {
+        if (mRawHeaders == null)
+            return super.toString();
+        String statusLine = String.format("HTTP/1.1 %s %s", code, AsyncHttpServer.getResponseCodeDescription(code));
+        return mRawHeaders.toPrefixString(statusLine);
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncProxyServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncProxyServer.java
new file mode 100644
index 000000000..8a16c092a
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncProxyServer.java
@@ -0,0 +1,81 @@
+package com.koushikdutta.async.http.server;
+
+import android.net.Uri;
+
+import com.koushikdutta.async.AsyncServer;
+import com.koushikdutta.async.Util;
+import com.koushikdutta.async.callback.CompletedCallback;
+import com.koushikdutta.async.http.AsyncHttpClient;
+import com.koushikdutta.async.http.AsyncHttpRequest;
+import com.koushikdutta.async.http.AsyncHttpResponse;
+import com.koushikdutta.async.http.callback.HttpConnectCallback;
+
+/**
+ * Created by koush on 7/22/14.
+ */
+public class AsyncProxyServer extends AsyncHttpServer {
+    AsyncHttpClient proxyClient;
+    public AsyncProxyServer(AsyncServer server) {
+        proxyClient = new AsyncHttpClient(server);
+    }
+
+    @Override
+    protected void onRequest(HttpServerRequestCallback callback, AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
+        super.onRequest(callback, request, response);
+
+        if (callback != null)
+            return;
+
+        try {
+            Uri uri;
+
+            try {
+                uri = Uri.parse(request.getPath());
+                if (uri.getScheme() == null)
+                    throw new Exception("no host or full uri provided");
+            }
+            catch (Exception e) {
+                String host = request.getHeaders().get("Host");
+                int port = 80;
+                if (host != null) {
+                    String[] splits = host.split(":", 2);
+                    if (splits.length == 2) {
+                        host = splits[0];
+                        port = Integer.parseInt(splits[1]);
+                    }
+                }
+                uri = Uri.parse("http://" + host + ":" + port + request.getPath());
+            }
+
+            proxyClient.execute(new AsyncHttpRequest(uri, request.getMethod(), request.getHeaders()), new HttpConnectCallback() {
+                @Override
+                public void onConnectCompleted(Exception ex, AsyncHttpResponse remoteResponse) {
+                    if (ex != null) {
+                        response.code(500);
+                        response.send(ex.getMessage());
+                        return;
+                    }
+                    response.code(remoteResponse.code());
+                    response.getHeaders().addAll(remoteResponse.headers());
+                    response.getHeaders().removeAll("Transfer-Encoding");
+                    response.getHeaders().removeAll("Content-Encoding");
+                    Util.pump(remoteResponse, response, new CompletedCallback() {
+                        @Override
+                        public void onCompleted(Exception ex) {
+                            response.end();
+                        }
+                    });
+                }
+            });
+        }
+        catch (Exception e) {
+            response.code(500);
+            response.send(e.getMessage());
+        }
+    }
+
+    @Override
+    protected boolean onRequest(AsyncHttpServerRequest request, AsyncHttpServerResponse response) {
+        return true;
+    }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
index 484b6d4e7..18e856cf1 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
@@ -1,7 +1,5 @@
 package com.koushikdutta.async.http.spdy;
 
-import android.text.TextUtils;
-
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.BufferedDataEmitter;
@@ -11,8 +9,7 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
-import com.koushikdutta.async.http.spdy.okhttp.Protocol;
-import com.koushikdutta.async.http.spdy.okhttp.internal.NamedRunnable;
+import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.ErrorCode;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.FrameReader;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.FrameWriter;
@@ -22,14 +19,11 @@
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Ping;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Settings;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Spdy3;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.SpdyConnection;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.SpdyStream;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Variant;
 import com.koushikdutta.async.http.spdy.okio.BufferedSource;
 import com.koushikdutta.async.http.spdy.okio.ByteString;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 837a12666..35d425782 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -8,7 +8,7 @@
 import com.koushikdutta.async.http.AsyncHttpClient;
 import com.koushikdutta.async.http.AsyncSSLEngineConfigurator;
 import com.koushikdutta.async.http.AsyncSSLSocketMiddleware;
-import com.koushikdutta.async.http.spdy.okhttp.Protocol;
+import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.util.Charsets;
 
 import java.lang.reflect.Field;
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
index b9645e407..5be77f90e 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
@@ -26,6 +26,7 @@
 import com.koushikdutta.async.http.server.AsyncHttpServer;
 import com.koushikdutta.async.http.server.AsyncHttpServerRequest;
 import com.koushikdutta.async.http.server.AsyncHttpServerResponse;
+import com.koushikdutta.async.http.server.AsyncProxyServer;
 import com.koushikdutta.async.http.server.HttpServerRequestCallback;
 
 import junit.framework.Assert;
@@ -281,23 +282,13 @@ public void testProxy() throws Exception {
         wasProxied = false;
         final AsyncServer proxyServer = new AsyncServer();
         try {
-            AsyncHttpServer httpServer = new AsyncHttpServer();
-            httpServer.get(".*", new HttpServerRequestCallback() {
+            AsyncProxyServer httpServer = new AsyncProxyServer(proxyServer) {
                 @Override
-                public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
-                    Log.i("Proxy", "Proxying request");
+                protected boolean onRequest(AsyncHttpServerRequest request, AsyncHttpServerResponse response) {
                     wasProxied = true;
-                    AsyncHttpClient proxying = new AsyncHttpClient(proxyServer);
-
-                    String url = request.getPath();
-                    proxying.executeString(new AsyncHttpGet(url), new StringCallback() {
-                        @Override
-                        public void onCompleted(Exception e, AsyncHttpResponse source, String result) {
-                            response.send(result);
-                        }
-                    });
+                    return super.onRequest(request, response);
                 }
-            });
+            };
 
             AsyncServerSocket socket = httpServer.listen(proxyServer, 0);
 
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java b/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
index a72f306c3..18aa00b45 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
@@ -29,7 +29,7 @@ public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerRespo
                     // setting this to empty is a hacky way of telling the framework not to use
                     // transfer-encoding. It will get removed.
                     response.getHeaders().set("Transfer-Encoding", "");
-                    response.responseCode(200);
+                    response.code(200);
                     Util.writeAll(response, "foobarbeepboop".getBytes(), new CompletedCallback() {
                         @Override
                         public void onCompleted(Exception ex) {
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/OkHttpTest.java b/AndroidAsync/test/src/com/koushikdutta/async/test/OkHttpTest.java
index d63494b63..821de08fd 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/OkHttpTest.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/OkHttpTest.java
@@ -5,7 +5,7 @@
 
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.http.spdy.okhttp.Handshake;
-import com.koushikdutta.async.http.spdy.okhttp.Protocol;
+import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.util.Charsets;
 
 import org.conscrypt.OpenSSLProvider;
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
index dcbe6c810..03de7da91 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
@@ -4,9 +4,9 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.http.AsyncHttpClient;
 import com.koushikdutta.async.http.AsyncHttpClient.WebSocketConnectCallback;
+import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.WebSocket;
 import com.koushikdutta.async.http.WebSocket.StringCallback;
-import com.koushikdutta.async.http.cache.RawHeaders;
 import com.koushikdutta.async.http.server.AsyncHttpServer;
 import com.koushikdutta.async.http.server.AsyncHttpServer.WebSocketRequestCallback;
 
@@ -34,7 +34,7 @@ public void onCompleted(Exception ex) {
     
         httpServer.websocket("/ws", new WebSocketRequestCallback() {
             @Override
-            public void onConnected(final WebSocket webSocket, RawHeaders headers) {
+            public void onConnected(final WebSocket webSocket, Headers headers) {
                 webSocket.setStringCallback(new StringCallback() {
                     @Override
                     public void onStringAvailable(String s) {

From e65860783f5aaf389ba2cab560bdef9a030dc077 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 23 Jul 2014 01:22:08 -0700
Subject: [PATCH 037/399] Behavior fixes around BufferedDataEmitter.

---
 .../async/AsyncSSLSocketWrapper.java          | 22 +++++++++---
 .../async/BufferedDataEmitter.java            | 34 +++++++++----------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 84d7da1c1..44981128e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -141,8 +141,21 @@ public void onWriteable() {
             }
         });
 
-        // SSL needs buffering of data written during handshake.
-        // aka exhcange.setDatacallback
+
+        // here's the stack of emitters
+        // ssl emitter
+        // buffered data emitter
+        // socket
+
+        // ssl emitter needs a buffered emitter
+        // in case there is an underflow.
+        // buffered emitter will read from the socket,
+        // and replay data forever.
+
+        // on pause, the emitter is paused to prevent the buffered
+        // socket and itself from firing.
+        // on resume, emitter is resumed, ssl buffer is flushed as well
+
         mEmitter = new BufferedDataEmitter(socket);
         mEmitter.setEndCallback(new CompletedCallback() {
             @Override
@@ -467,14 +480,13 @@ public CompletedCallback getEndCallback() {
 
     @Override
     public void pause() {
-        mSocket.pause();
+        mEmitter.pause();
     }
 
     @Override
     public void resume() {
+        mEmitter.resume();
         onDataAvailable();
-        mEmitter.onDataAvailable();
-        mSocket.resume();
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java b/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java
index 009f6c6bd..4ddc3f225 100644
--- a/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java
@@ -3,12 +3,18 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 
-public class BufferedDataEmitter implements DataEmitter, DataCallback {
+public class BufferedDataEmitter implements DataEmitter {
     DataEmitter mEmitter;
     public BufferedDataEmitter(DataEmitter emitter) {
         mEmitter = emitter;
-        mEmitter.setDataCallback(this);
-        
+        mEmitter.setDataCallback(new DataCallback() {
+            @Override
+            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+                bb.get(mBuffers);
+                BufferedDataEmitter.this.onDataAvailable();
+            }
+        });
+
         mEmitter.setEndCallback(new CompletedCallback() {
             @Override
             public void onCompleted(Exception ex) {
@@ -29,9 +35,9 @@ public void close() {
     Exception mEndException;
     
     public void onDataAvailable() {
-        if (mDataCallback != null && !mPaused && mBuffers.remaining() > 0)
+        if (mDataCallback != null && !isPaused() && mBuffers.remaining() > 0)
             mDataCallback.onDataAvailable(this, mBuffers);
-        
+
         if (mEnded && mBuffers.remaining() == 0)
             mEndCallback.onCompleted(mEndException);
     }
@@ -41,6 +47,8 @@ public void onDataAvailable() {
     DataCallback mDataCallback;
     @Override
     public void setDataCallback(DataCallback callback) {
+        if (mDataCallback != null)
+            throw new RuntimeException("Buffered Data Emitter callback may only be set once");
         mDataCallback = callback;
     }
 
@@ -54,30 +62,20 @@ public boolean isChunked() {
         return false;
     }
 
-    @Override
-    public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-        bb.get(mBuffers);
-
-        onDataAvailable();        
-    }
-
-    private boolean mPaused;
     @Override
     public void pause() {
-        mPaused = true;
+        mEmitter.pause();
     }
 
     @Override
     public void resume() {
-        if (!mPaused)
-            return;
-        mPaused = false;
+        mEmitter.resume();
         onDataAvailable();
     }
 
     @Override
     public boolean isPaused() {
-        return mPaused;
+        return mEmitter.isPaused();
     }
 
 

From 9ea60965820b604fb24373162300eb640a9da15a Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 23 Jul 2014 19:16:52 -0700
Subject: [PATCH 038/399] Remove usage of BufferedDataEmitter. Buffering done
 in SSL Socket.

---
 .../async/AsyncSSLSocketWrapper.java          | 142 +++++++++---------
 1 file changed, 72 insertions(+), 70 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 44981128e..54138960d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -35,7 +35,6 @@ public interface HandshakeCallback {
     static SSLContext defaultSSLContext;
 
     AsyncSocket mSocket;
-    BufferedDataEmitter mEmitter;
     BufferedDataSink mSink;
     boolean mUnwrapping;
     SSLEngine engine;
@@ -117,7 +116,7 @@ public void onCompleted(Exception ex) {
 
     boolean mEnded;
     Exception mEndException;
-    final ByteBufferList transformed = new ByteBufferList();
+    final ByteBufferList pending = new ByteBufferList();
 
     private AsyncSSLSocketWrapper(AsyncSocket socket,
                                   String host, int port,
@@ -155,90 +154,93 @@ public void onWriteable() {
         // on pause, the emitter is paused to prevent the buffered
         // socket and itself from firing.
         // on resume, emitter is resumed, ssl buffer is flushed as well
-
-        mEmitter = new BufferedDataEmitter(socket);
-        mEmitter.setEndCallback(new CompletedCallback() {
+        mSocket.setEndCallback(new CompletedCallback() {
             @Override
             public void onCompleted(Exception ex) {
                 if (mEnded)
                     return;
                 mEnded = true;
                 mEndException = ex;
-                if (!transformed.hasRemaining() && mEndCallback != null)
+                if (!pending.hasRemaining() && mEndCallback != null)
                     mEndCallback.onCompleted(ex);
             }
         });
 
-        final Allocator allocator = new Allocator();
-        allocator.setMinAlloc(8192);
-        mEmitter.setDataCallback(new DataCallback() {
-            @Override
-            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-                if (mUnwrapping)
-                    return;
-                try {
-                    mUnwrapping = true;
+        mSocket.setDataCallback(dataCallback);
+    }
 
-                    if (bb.hasRemaining()) {
-                        ByteBuffer all = bb.getAll();
-                        bb.add(all);
-                    }
+    final DataCallback dataCallback = new DataCallback() {
+        final Allocator allocator = new Allocator().setMinAlloc(8192);
+        final ByteBufferList buffered = new ByteBufferList();
 
-                    ByteBuffer b = ByteBufferList.EMPTY_BYTEBUFFER;
-                    while (true) {
-                        if (b.remaining() == 0 && bb.size() > 0) {
-                            b = bb.remove();
-                        }
-                        int remaining = b.remaining();
-                        int before = transformed.remaining();
-
-                        SSLEngineResult res;
-                        {
-                            // wrap to prevent access to the readBuf
-                            ByteBuffer readBuf = allocator.allocate();
-                            res = engine.unwrap(b, readBuf);
-                            addToPending(transformed, readBuf);
-                            allocator.track(transformed.remaining() - before);
-                        }
-                        if (res.getStatus() == Status.BUFFER_OVERFLOW) {
-                            allocator.setMinAlloc(allocator.getMinAlloc() * 2);
-                            remaining = -1;
-                        }
-                        else if (res.getStatus() == Status.BUFFER_UNDERFLOW) {
-                            bb.addFirst(b);
-                            if (bb.size() <= 1) {
-                                break;
-                            }
-                            // pack it
-                            remaining = -1;
-                            b = bb.getAll();
-                            bb.addFirst(b);
-                            b = ByteBufferList.EMPTY_BYTEBUFFER;
-                        }
-                        handleHandshakeStatus(res.getHandshakeStatus());
-                        if (b.remaining() == remaining && before == transformed.remaining()) {
-                            bb.addFirst(b);
+        @Override
+        public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+            if (mUnwrapping)
+                return;
+            try {
+                mUnwrapping = true;
+
+                bb.get(buffered);
+
+                if (buffered.hasRemaining()) {
+                    ByteBuffer all = buffered.getAll();
+                    buffered.add(all);
+                }
+
+                ByteBuffer b = ByteBufferList.EMPTY_BYTEBUFFER;
+                while (true) {
+                    if (b.remaining() == 0 && buffered.size() > 0) {
+                        b = buffered.remove();
+                    }
+                    int remaining = b.remaining();
+                    int before = pending.remaining();
+
+                    SSLEngineResult res;
+                    {
+                        // wrap to prevent access to the readBuf
+                        ByteBuffer readBuf = allocator.allocate();
+                        res = engine.unwrap(b, readBuf);
+                        addToPending(pending, readBuf);
+                        allocator.track(pending.remaining() - before);
+                    }
+                    if (res.getStatus() == Status.BUFFER_OVERFLOW) {
+                        allocator.setMinAlloc(allocator.getMinAlloc() * 2);
+                        remaining = -1;
+                    }
+                    else if (res.getStatus() == Status.BUFFER_UNDERFLOW) {
+                        buffered.addFirst(b);
+                        if (buffered.size() <= 1) {
                             break;
                         }
+                        // pack it
+                        remaining = -1;
+                        b = buffered.getAll();
+                        buffered.addFirst(b);
+                        b = ByteBufferList.EMPTY_BYTEBUFFER;
+                    }
+                    handleHandshakeStatus(res.getHandshakeStatus());
+                    if (b.remaining() == remaining && before == pending.remaining()) {
+                        buffered.addFirst(b);
+                        break;
                     }
-
-                    AsyncSSLSocketWrapper.this.onDataAvailable();
-                }
-                catch (SSLException ex) {
-                    ex.printStackTrace();
-                    report(ex);
-                }
-                finally {
-                    mUnwrapping = false;
                 }
+
+                AsyncSSLSocketWrapper.this.onDataAvailable();
             }
-        });
-    }
+            catch (SSLException ex) {
+                ex.printStackTrace();
+                report(ex);
+            }
+            finally {
+                mUnwrapping = false;
+            }
+        }
+    };
 
     public void onDataAvailable() {
-        Util.emitAllData(this, transformed);
+        Util.emitAllData(this, pending);
 
-        if (mEnded && !transformed.hasRemaining())
+        if (mEnded && !pending.hasRemaining())
             mEndCallback.onCompleted(mEndException);
     }
 
@@ -283,7 +285,7 @@ private void handleHandshakeStatus(HandshakeStatus status) {
         }
 
         if (status == HandshakeStatus.NEED_UNWRAP) {
-            mEmitter.onDataAvailable();
+            dataCallback.onDataAvailable(this, new ByteBufferList());
         }
 
         try {
@@ -336,7 +338,7 @@ private void handleHandshakeStatus(HandshakeStatus status) {
                 handshakeCallback = null;
                 if (mWriteableCallback != null)
                     mWriteableCallback.onWriteable();
-                mEmitter.onDataAvailable();
+                onDataAvailable();
             }
         }
         catch (NoSuchAlgorithmException ex) {
@@ -480,12 +482,12 @@ public CompletedCallback getEndCallback() {
 
     @Override
     public void pause() {
-        mEmitter.pause();
+        mSocket.pause();
     }
 
     @Override
     public void resume() {
-        mEmitter.resume();
+        mSocket.resume();
         onDataAvailable();
     }
 

From 26c3c5bf969faadaf3d001b58c4c2731b9b0154a Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 23 Jul 2014 22:29:38 -0700
Subject: [PATCH 039/399] fix race conditions around header writing

---
 .../server/AsyncHttpServerResponseImpl.java   | 107 ++++++++++--------
 1 file changed, 58 insertions(+), 49 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index 3cc5d63f6..fbf4ba2a1 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -53,15 +53,16 @@ public AsyncSocket getSocket() {
     public void write(ByteBufferList bb) {
         if (bb.remaining() == 0)
             return;
-        writeInternal(bb);
-    }
 
-    private void writeInternal(ByteBufferList bb) {
         assert !mEnded;
         if (!mHasWritten) {
             initFirstWrite();
             return;
         }
+        if (mSink == null) {
+            System.out.println("poop squat");
+            return;
+        }
         mSink.write(bb);
     }
 
@@ -72,36 +73,57 @@ void initFirstWrite() {
             return;
 
         mHasWritten = true;
-        String currentEncoding = mRawHeaders.get("Transfer-Encoding");
-        if ("".equals(currentEncoding))
-            mRawHeaders.removeAll("Transfer-Encoding");
-        boolean canUseChunked = ("Chunked".equalsIgnoreCase(currentEncoding) || currentEncoding == null)
-           && !"close".equalsIgnoreCase(mRawHeaders.get("Connection"));
-        if (mContentLength < 0) {
-            String contentLength = mRawHeaders.get("Content-Length");
-            if (!TextUtils.isEmpty(contentLength))
-                mContentLength = Long.valueOf(contentLength);
-        }
-        if (mContentLength < 0 && canUseChunked) {
-            mRawHeaders.set("Transfer-Encoding", "Chunked");
-            mSink = new ChunkedOutputFilter(mSocket);
-        }
-        else {
-            mSink = mSocket;
-        }
-        writeHeadInternal();
+
+        String statusLine = String.format("HTTP/1.1 %s %s", code, AsyncHttpServer.getResponseCodeDescription(code));
+        String rh = mRawHeaders.toPrefixString(statusLine);
+        Util.writeAll(mSocket, rh.getBytes(), new CompletedCallback() {
+            @Override
+            public void onCompleted(Exception ex) {
+                String currentEncoding = mRawHeaders.get("Transfer-Encoding");
+                if ("".equals(currentEncoding))
+                    mRawHeaders.removeAll("Transfer-Encoding");
+                boolean canUseChunked = ("Chunked".equalsIgnoreCase(currentEncoding) || currentEncoding == null)
+                && !"close".equalsIgnoreCase(mRawHeaders.get("Connection"));
+                if (mContentLength < 0) {
+                    String contentLength = mRawHeaders.get("Content-Length");
+                    if (!TextUtils.isEmpty(contentLength))
+                        mContentLength = Long.valueOf(contentLength);
+                }
+                if (mContentLength < 0 && canUseChunked) {
+                    mRawHeaders.set("Transfer-Encoding", "Chunked");
+                    ChunkedOutputFilter chunked = new ChunkedOutputFilter(mSocket);
+                    chunked.setMaxBuffer(0);
+                    mSink = chunked;
+                }
+                else {
+                    mSink = mSocket;
+                }
+
+                mSink.setClosedCallback(closedCallback);
+                closedCallback = null;
+                mSink.setWriteableCallback(writable);
+                if (writable != null) {
+                    writable.onWriteable();
+                    writable = null;
+                }
+            }
+        });
     }
 
+    WritableCallback writable;
     @Override
     public void setWriteableCallback(WritableCallback handler) {
-        initFirstWrite();
-        mSink.setWriteableCallback(handler);
+        if (mSink != null)
+            mSink.setWriteableCallback(handler);
+        else
+            writable = handler;
     }
 
     @Override
     public WritableCallback getWriteableCallback() {
-        initFirstWrite();
-        return mSink.getWriteableCallback();
+        if (mSink != null)
+            return mSink.getWriteableCallback();
+        return writable;
     }
 
     @Override
@@ -120,37 +142,18 @@ else if (!mHasWritten) {
                 onEnd();
             }
         }
+        else {
+            onEnd();
+        }
     }
 
-    private boolean mHeadWritten = false;
     @Override
     public void writeHead() {
         initFirstWrite();
     }
 
-    private void writeHeadInternal() {
-        assert !mHeadWritten;
-        mHeadWritten = true;
-        String statusLine = String.format("HTTP/1.1 %s %s", code, AsyncHttpServer.getResponseCodeDescription(code));
-        String rh = mRawHeaders.toPrefixString(statusLine);
-        Util.writeAll(mSocket, rh.getBytes(), new CompletedCallback() {
-            @Override
-            public void onCompleted(Exception ex) {
-                // TODO: HACK!!!
-                // this really needs to be fixed. Not sure how to deal w/ writehead and
-                // first write
-                if (mSink instanceof BufferedDataSink)
-                    ((BufferedDataSink)mSink).setDataSink(mSocket);
-                WritableCallback writableCallback = getWriteableCallback();
-                if (writableCallback != null)
-                    writableCallback.onWriteable();
-            }
-        });
-    }
-
     @Override
     public void setContentType(String contentType) {
-        assert !mHeadWritten;
         mRawHeaders.set("Content-Type", contentType);
     }
 
@@ -302,14 +305,20 @@ public boolean isOpen() {
         return mSocket.isOpen();
     }
 
+    CompletedCallback closedCallback;
     @Override
     public void setClosedCallback(CompletedCallback handler) {
-        mSink.setClosedCallback(handler);
+        if (mSink != null)
+            mSink.setClosedCallback(handler);
+        else
+            closedCallback = handler;
     }
 
     @Override
     public CompletedCallback getClosedCallback() {
-        return mSink.getClosedCallback();
+        if (mSink != null)
+            return mSink.getClosedCallback();
+        return closedCallback;
     }
 
     @Override

From ad5709a17b41306f76fc446673bb5779fcd98666 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 23 Jul 2014 23:52:42 -0700
Subject: [PATCH 040/399] Fix header chunking bug in
 AsyncHttpServerResponseImpl. Fix resume bugs in ChunkedInputFilter.

---
 .../async/AsyncSSLSocketWrapper.java          | 11 ----
 .../async/http/filter/ChunkedInputFilter.java |  9 ++--
 .../server/AsyncHttpServerResponseImpl.java   | 52 ++++++++++++-------
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 54138960d..0f777e6ea 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -140,17 +140,6 @@ public void onWriteable() {
             }
         });
 
-
-        // here's the stack of emitters
-        // ssl emitter
-        // buffered data emitter
-        // socket
-
-        // ssl emitter needs a buffered emitter
-        // in case there is an underflow.
-        // buffered emitter will read from the socket,
-        // and replay data forever.
-
         // on pause, the emitter is paused to prevent the buffered
         // socket and itself from firing.
         // on resume, emitter is resumed, ssl buffer is flushed as well
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedInputFilter.java b/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedInputFilter.java
index 652e907d1..f049a066e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedInputFilter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedInputFilter.java
@@ -43,6 +43,7 @@ protected void report(Exception e) {
         super.report(e);
     }
 
+    ByteBufferList pending = new ByteBufferList();
     @Override
     public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
         try {
@@ -82,12 +83,8 @@ else if (c >= 'A' && c <= 'F')
                     }
                     if (reading == 0)
                         break;
-                    ByteBufferList chunk = bb.get(reading);
-                    int newRemaining = bb.remaining();
-                    assert remaining == chunk.remaining() + bb.remaining();
-                    assert reading == chunk.remaining();
-                    Util.emitAllData(this, chunk);
-                    assert newRemaining == bb.remaining();
+                    bb.get(pending, reading);
+                    Util.emitAllData(this, pending);
                     break;
                 case CHUNK_CR:
                     if (!checkCR(bb.getByteChar()))
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index fbf4ba2a1..cdbfa5cc0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -51,18 +51,21 @@ public AsyncSocket getSocket() {
 
     @Override
     public void write(ByteBufferList bb) {
-        if (bb.remaining() == 0)
-            return;
-
+        // order is important here...
         assert !mEnded;
-        if (!mHasWritten) {
+        // do the header write... this will call onWritable, which may be reentrant
+        if (!mHasWritten)
             initFirstWrite();
+
+        // now check to see if the list is empty. reentrancy may cause it to empty itself.
+        if (bb.remaining() == 0)
             return;
-        }
-        if (mSink == null) {
-            System.out.println("poop squat");
+
+        // null sink means that the header has not finished writing
+        if (mSink == null)
             return;
-        }
+
+        // can successfully write!
         mSink.write(bb);
     }
 
@@ -74,23 +77,32 @@ void initFirstWrite() {
 
         mHasWritten = true;
 
+        final boolean isChunked;
+        String currentEncoding = mRawHeaders.get("Transfer-Encoding");
+        if ("".equals(currentEncoding))
+            mRawHeaders.removeAll("Transfer-Encoding");
+        boolean canUseChunked = ("Chunked".equalsIgnoreCase(currentEncoding) || currentEncoding == null)
+        && !"close".equalsIgnoreCase(mRawHeaders.get("Connection"));
+        if (mContentLength < 0) {
+            String contentLength = mRawHeaders.get("Content-Length");
+            if (!TextUtils.isEmpty(contentLength))
+                mContentLength = Long.valueOf(contentLength);
+        }
+        if (mContentLength < 0 && canUseChunked) {
+            mRawHeaders.set("Transfer-Encoding", "Chunked");
+            isChunked = true;
+        }
+        else {
+            isChunked = false;
+        }
+
         String statusLine = String.format("HTTP/1.1 %s %s", code, AsyncHttpServer.getResponseCodeDescription(code));
         String rh = mRawHeaders.toPrefixString(statusLine);
+
         Util.writeAll(mSocket, rh.getBytes(), new CompletedCallback() {
             @Override
             public void onCompleted(Exception ex) {
-                String currentEncoding = mRawHeaders.get("Transfer-Encoding");
-                if ("".equals(currentEncoding))
-                    mRawHeaders.removeAll("Transfer-Encoding");
-                boolean canUseChunked = ("Chunked".equalsIgnoreCase(currentEncoding) || currentEncoding == null)
-                && !"close".equalsIgnoreCase(mRawHeaders.get("Connection"));
-                if (mContentLength < 0) {
-                    String contentLength = mRawHeaders.get("Content-Length");
-                    if (!TextUtils.isEmpty(contentLength))
-                        mContentLength = Long.valueOf(contentLength);
-                }
-                if (mContentLength < 0 && canUseChunked) {
-                    mRawHeaders.set("Transfer-Encoding", "Chunked");
+                if (isChunked) {
                     ChunkedOutputFilter chunked = new ChunkedOutputFilter(mSocket);
                     chunked.setMaxBuffer(0);
                     mSink = chunked;

From c08b7a36ce3cfc3032819089554a74ae4fae5cd4 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 24 Jul 2014 00:19:29 -0700
Subject: [PATCH 041/399] Pump the writable callback in a posted method.

---
 AndroidAsync/src/com/koushikdutta/async/Util.java   |  9 ++-------
 .../http/server/AsyncHttpServerResponseImpl.java    | 13 +++++++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/Util.java b/AndroidAsync/src/com/koushikdutta/async/Util.java
index c8df5b77f..5dc0359bc 100644
--- a/AndroidAsync/src/com/koushikdutta/async/Util.java
+++ b/AndroidAsync/src/com/koushikdutta/async/Util.java
@@ -4,6 +4,7 @@
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.util.Allocator;
+import com.koushikdutta.async.util.StreamUtility;
 import com.koushikdutta.async.wrapper.AsyncSocketWrapper;
 import com.koushikdutta.async.wrapper.DataEmitterWrapper;
 
@@ -69,13 +70,7 @@ private void cleanup() {
                 ds.setClosedCallback(null);
                 ds.setWriteableCallback(null);
                 pending.recycle();
-                pending = null;
-                try {
-                    is.close();
-                }
-                catch (IOException e) {
-                    e.printStackTrace();
-                }
+                StreamUtility.closeQuietly(is);
             }
             ByteBufferList pending = new ByteBufferList();
             Allocator allocator = new Allocator();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index cdbfa5cc0..41c20cecd 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -114,10 +114,15 @@ public void onCompleted(Exception ex) {
                 mSink.setClosedCallback(closedCallback);
                 closedCallback = null;
                 mSink.setWriteableCallback(writable);
-                if (writable != null) {
-                    writable.onWriteable();
-                    writable = null;
-                }
+                writable = null;
+                getServer().post(new Runnable() {
+                    @Override
+                    public void run() {
+                        WritableCallback wb = getWriteableCallback();
+                        if (wb != null)
+                            wb.onWriteable();
+                    }
+                });
             }
         });
     }

From c866d2bffa839b92c90bb389227fbe12b7883a7c Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 24 Jul 2014 00:45:57 -0700
Subject: [PATCH 042/399] potential fix for selector exception in L preview.

https://github.com/koush/AndroidAsync/issues/196
---
 AndroidAsync/src/com/koushikdutta/async/AsyncServer.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index a1c7a476a..6d5e5575e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -126,7 +126,12 @@ private static void wakeup(final SelectorWrapper selector) {
         synchronousWorkers.execute(new Runnable() {
             @Override
             public void run() {
-                selector.wakeupOnce();
+                try {
+                    selector.wakeupOnce();
+                }
+                catch (Exception e) {
+                    Log.i(LOGTAG, "Selector Exception? L Preview?");
+                }
             }
         });
     }

From 86fb8a6e63afd2212d017c84e19358baf83205ea Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 24 Jul 2014 00:46:14 -0700
Subject: [PATCH 043/399] potential fix for selector exception in L preview.

https://github.com/koush/AndroidAsync/issues/196
---
 AndroidAsync/src/com/koushikdutta/async/AsyncServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index b399362ca..6d5e5575e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -130,7 +130,7 @@ public void run() {
                     selector.wakeupOnce();
                 }
                 catch (Exception e) {
-                    Log.i(LOGTAG, "Selector shit the bed.");
+                    Log.i(LOGTAG, "Selector Exception? L Preview?");
                 }
             }
         });

From c3618aa1598ac3de0d39f199274812c5782798de Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 24 Jul 2014 00:56:50 -0700
Subject: [PATCH 044/399] okhttp spdy

---
 .gitignore                                    |   5 +-
 AndroidAsync/AndroidAsync-AndroidAsync.iml    |   1 +
 .../async/http/spdy/okhttp/Handshake.java     | 106 ++
 .../http/spdy/okhttp/internal/BitArray.java   | 177 ++++
 .../spdy/okhttp/internal/NamedRunnable.java   |  40 +
 .../async/http/spdy/okhttp/internal/Util.java | 226 +++++
 .../spdy/okhttp/internal/spdy/ErrorCode.java  |  89 ++
 .../okhttp/internal/spdy/FrameReader.java     | 140 +++
 .../okhttp/internal/spdy/FrameWriter.java     | 100 ++
 .../spdy/okhttp/internal/spdy/Header.java     |  57 ++
 .../okhttp/internal/spdy/HeadersMode.java     |  49 +
 .../okhttp/internal/spdy/HpackDraft08.java    | 491 ++++++++++
 .../okhttp/internal/spdy/Http20Draft13.java   | 760 +++++++++++++++
 .../spdy/okhttp/internal/spdy/Huffman.java    | 225 +++++
 .../internal/spdy/IncomingStreamHandler.java  |  36 +
 .../internal/spdy/NameValueBlockReader.java   | 119 +++
 .../http/spdy/okhttp/internal/spdy/Ping.java  |  71 ++
 .../okhttp/internal/spdy/PushObserver.java    |  96 ++
 .../spdy/okhttp/internal/spdy/Settings.java   | 223 +++++
 .../http/spdy/okhttp/internal/spdy/Spdy3.java | 514 ++++++++++
 .../okhttp/internal/spdy/SpdyConnection.java  | 874 +++++++++++++++++
 .../spdy/okhttp/internal/spdy/SpdyStream.java | 577 +++++++++++
 .../spdy/okhttp/internal/spdy/Variant.java    |  40 +
 .../async/http/spdy/okio/AsyncTimeout.java    | 318 ++++++
 .../async/http/spdy/okio/Base64.java          | 147 +++
 .../async/http/spdy/okio/Buffer.java          | 911 ++++++++++++++++++
 .../async/http/spdy/okio/BufferedSink.java    |  82 ++
 .../async/http/spdy/okio/BufferedSource.java  | 171 ++++
 .../async/http/spdy/okio/ByteString.java      | 283 ++++++
 .../async/http/spdy/okio/DeflaterSink.java    | 150 +++
 .../http/spdy/okio/ForwardingSource.java      |  49 +
 .../async/http/spdy/okio/InflaterSource.java  | 123 +++
 .../async/http/spdy/okio/Okio.java            | 194 ++++
 .../http/spdy/okio/RealBufferedSink.java      | 207 ++++
 .../http/spdy/okio/RealBufferedSource.java    | 301 ++++++
 .../async/http/spdy/okio/Segment.java         | 135 +++
 .../async/http/spdy/okio/SegmentPool.java     |  64 ++
 .../async/http/spdy/okio/Sink.java            |  66 ++
 .../async/http/spdy/okio/Source.java          |  78 ++
 .../async/http/spdy/okio/Timeout.java         | 153 +++
 .../async/http/spdy/okio/Util.java            |  72 ++
 41 files changed, 8517 insertions(+), 3 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/Handshake.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/BitArray.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/NamedRunnable.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/Util.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/ErrorCode.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameWriter.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Header.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeadersMode.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Huffman.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/IncomingStreamHandler.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/NameValueBlockReader.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Ping.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/PushObserver.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Settings.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/SpdyConnection.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/SpdyStream.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Variant.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/AsyncTimeout.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Base64.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Buffer.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/BufferedSink.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/BufferedSource.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/ByteString.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/DeflaterSink.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/ForwardingSource.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/InflaterSource.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Okio.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/RealBufferedSink.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/RealBufferedSource.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Segment.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/SegmentPool.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Sink.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Source.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Timeout.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Util.java

diff --git a/.gitignore b/.gitignore
index 30c8bb1d2..cc439fd96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@ gen
 build
 .idea/
 .DS_Store
-
-okhttp
-okio
+okhttp/
+okio/
 libs
diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index f88736b56..83bc4a321 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -57,6 +57,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/Handshake.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/Handshake.java
new file mode 100644
index 000000000..b9ae5de7c
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/Handshake.java
@@ -0,0 +1,106 @@
+package com.koushikdutta.async.http.spdy.okhttp;
+
+import com.koushikdutta.async.http.spdy.okhttp.internal.Util;
+
+import java.security.Principal;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+import java.util.Collections;
+import java.util.List;
+
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLSession;
+
+/**
+ * A record of a TLS handshake. For HTTPS clients, the client is <i>local</i>
+ * and the remote server is its <i>peer</i>.
+ *
+ * <p>This value object describes a completed handshake. Use {@link
+ * javax.net.ssl.SSLSocketFactory} to set policy for new handshakes.
+ */
+public final class Handshake {
+  private final String cipherSuite;
+  private final List<Certificate> peerCertificates;
+  private final List<Certificate> localCertificates;
+
+  private Handshake(
+      String cipherSuite, List<Certificate> peerCertificates, List<Certificate> localCertificates) {
+    this.cipherSuite = cipherSuite;
+    this.peerCertificates = peerCertificates;
+    this.localCertificates = localCertificates;
+  }
+
+  public static Handshake get(SSLSession session) {
+    String cipherSuite = session.getCipherSuite();
+    if (cipherSuite == null) throw new IllegalStateException("cipherSuite == null");
+
+    Certificate[] peerCertificates;
+    try {
+      peerCertificates = session.getPeerCertificates();
+    } catch (SSLPeerUnverifiedException ignored) {
+      peerCertificates = null;
+    }
+    List<Certificate> peerCertificatesList = peerCertificates != null
+        ? Util.immutableList(peerCertificates)
+        : Collections.<Certificate>emptyList();
+
+    Certificate[] localCertificates = session.getLocalCertificates();
+    List<Certificate> localCertificatesList = localCertificates != null
+        ? Util.immutableList(localCertificates)
+        : Collections.<Certificate>emptyList();
+
+    return new Handshake(cipherSuite, peerCertificatesList, localCertificatesList);
+  }
+
+  public static Handshake get(
+      String cipherSuite, List<Certificate> peerCertificates, List<Certificate> localCertificates) {
+    if (cipherSuite == null) throw new IllegalArgumentException("cipherSuite == null");
+    return new Handshake(cipherSuite, Util.immutableList(peerCertificates),
+        Util.immutableList(localCertificates));
+  }
+
+  /** Returns a cipher suite name like "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA". */
+  public String cipherSuite() {
+    return cipherSuite;
+  }
+
+  /** Returns a possibly-empty list of certificates that identify the remote peer. */
+  public List<Certificate> peerCertificates() {
+    return peerCertificates;
+  }
+
+  /** Returns the remote peer's principle, or null if that peer is anonymous. */
+  public Principal peerPrincipal() {
+    return !peerCertificates.isEmpty()
+        ? ((X509Certificate) peerCertificates.get(0)).getSubjectX500Principal()
+        : null;
+  }
+
+  /** Returns a possibly-empty list of certificates that identify this peer. */
+  public List<Certificate> localCertificates() {
+    return localCertificates;
+  }
+
+  /** Returns the local principle, or null if this peer is anonymous. */
+  public Principal localPrincipal() {
+    return !localCertificates.isEmpty()
+        ? ((X509Certificate) localCertificates.get(0)).getSubjectX500Principal()
+        : null;
+  }
+
+  @Override public boolean equals(Object other) {
+    if (!(other instanceof Handshake)) return false;
+    Handshake that = (Handshake) other;
+    return cipherSuite.equals(that.cipherSuite)
+        && peerCertificates.equals(that.peerCertificates)
+        && localCertificates.equals(that.localCertificates);
+  }
+
+  @Override public int hashCode() {
+    int result = 17;
+    result = 31 * result + cipherSuite.hashCode();
+    result = 31 * result + peerCertificates.hashCode();
+    result = 31 * result + localCertificates.hashCode();
+    return result;
+  }
+}
\ No newline at end of file
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/BitArray.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/BitArray.java
new file mode 100644
index 000000000..5db2b6e20
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/BitArray.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2014 Square Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okhttp.internal;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static java.lang.String.format;
+
+/** A simple bitset which supports left shifting. */
+public interface BitArray {
+
+  void clear();
+
+  void set(int index);
+
+  void toggle(int index);
+
+  boolean get(int index);
+
+  void shiftLeft(int count);
+
+  /** Bit set that only supports settings bits 0 - 63. */
+  public final class FixedCapacity implements BitArray {
+    long data = 0x0000000000000000L;
+
+    @Override public void clear() {
+      data = 0x0000000000000000L;
+    }
+
+    @Override public void set(int index) {
+      data |= (1L << checkInput(index));
+    }
+
+    @Override public void toggle(int index) {
+      data ^= (1L << checkInput(index));
+    }
+
+    @Override public boolean get(int index) {
+      return ((data >> checkInput(index)) & 1L) == 1;
+    }
+
+    @Override public void shiftLeft(int count) {
+      data = data << checkInput(count);
+    }
+
+    @Override public String toString() {
+      return Long.toBinaryString(data);
+    }
+
+    public BitArray toVariableCapacity() {
+      return new VariableCapacity(this);
+    }
+
+    private static int checkInput(int index) {
+      if (index < 0 || index > 63) {
+        throw new IllegalArgumentException(format("input must be between 0 and 63: %s", index));
+      }
+      return index;
+    }
+  }
+
+  /** Bit set that grows as needed. */
+  public final class VariableCapacity implements BitArray {
+
+    long[] data;
+
+    // Start offset which allows for cheap shifting. Data is always kept on 64-bit bounds but we
+    // offset the outward facing index to support shifts without having to move the underlying bits.
+    private int start; // Valid values are [0..63]
+
+    public VariableCapacity() {
+      data = new long[1];
+    }
+
+    private VariableCapacity(FixedCapacity small) {
+      data = new long[] {small.data, 0};
+    }
+
+    private void growToSize(int size) {
+      long[] newData = new long[size];
+      if (data != null) {
+        System.arraycopy(data, 0, newData, 0, data.length);
+      }
+      data = newData;
+    }
+
+    private int offsetOf(int index) {
+      index += start;
+      int offset = index / 64;
+      if (offset > data.length - 1) {
+        growToSize(offset + 1);
+      }
+      return offset;
+    }
+
+    private int shiftOf(int index) {
+      return (index + start) % 64;
+    }
+
+    @Override public void clear() {
+      Arrays.fill(data, 0);
+    }
+
+    @Override public void set(int index) {
+      checkInput(index);
+      int offset = offsetOf(index);
+      data[offset] |= 1L << shiftOf(index);
+    }
+
+    @Override public void toggle(int index) {
+      checkInput(index);
+      int offset = offsetOf(index);
+      data[offset] ^= 1L << shiftOf(index);
+    }
+
+    @Override public boolean get(int index) {
+      checkInput(index);
+      int offset = offsetOf(index);
+      return (data[offset] & (1L << shiftOf(index))) != 0;
+    }
+
+    @Override public void shiftLeft(int count) {
+      start -= checkInput(count);
+      if (start < 0) {
+        int arrayShift = (start / -64) + 1;
+        long[] newData = new long[data.length + arrayShift];
+        System.arraycopy(data, 0, newData, arrayShift, data.length);
+        data = newData;
+        start = 64 + (start % 64);
+      }
+    }
+
+    @Override public String toString() {
+      StringBuilder builder = new StringBuilder("{");
+      List<Integer> ints = toIntegerList();
+      for (int i = 0, count = ints.size(); i < count; i++) {
+        if (i > 0) {
+          builder.append(',');
+        }
+        builder.append(ints.get(i));
+      }
+      return builder.append('}').toString();
+    }
+
+    List<Integer> toIntegerList() {
+      List<Integer> ints = new ArrayList<Integer>();
+      for (int i = 0, count = data.length * 64 - start; i < count; i++) {
+        if (get(i)) {
+          ints.add(i);
+        }
+      }
+      return ints;
+    }
+
+    private static int checkInput(int index) {
+      if (index < 0) {
+        throw new IllegalArgumentException(format("input must be a positive number: %s", index));
+      }
+      return index;
+    }
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/NamedRunnable.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/NamedRunnable.java
new file mode 100644
index 000000000..9d9555162
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/NamedRunnable.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2013 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.koushikdutta.async.http.spdy.okhttp.internal;
+
+/**
+ * Runnable implementation which always sets its thread name.
+ */
+public abstract class NamedRunnable implements Runnable {
+  private final String name;
+
+  public NamedRunnable(String format, Object... args) {
+    this.name = String.format(format, args);
+  }
+
+  @Override public final void run() {
+    String oldName = Thread.currentThread().getName();
+    Thread.currentThread().setName(name);
+    try {
+      execute();
+    } finally {
+      Thread.currentThread().setName(oldName);
+    }
+  }
+
+  protected abstract void execute();
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/Util.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/Util.java
new file mode 100644
index 000000000..a6e00f45a
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/Util.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.koushikdutta.async.http.spdy.okhttp.internal;
+
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Header;
+import com.koushikdutta.async.http.spdy.okio.Buffer;
+import com.koushikdutta.async.http.spdy.okio.ByteString;
+import com.koushikdutta.async.http.spdy.okio.Source;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URI;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ThreadFactory;
+
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+/** Junk drawer of utility methods. */
+public final class Util {
+  public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+  public static final String[] EMPTY_STRING_ARRAY = new String[0];
+
+  /** A cheap and type-safe constant for the US-ASCII Charset. */
+  public static final Charset US_ASCII = Charset.forName("US-ASCII");
+
+  /** A cheap and type-safe constant for the UTF-8 Charset. */
+  public static final Charset UTF_8 = Charset.forName("UTF-8");
+
+  private Util() {
+  }
+
+  public static int getEffectivePort(URI uri) {
+    return getEffectivePort(uri.getScheme(), uri.getPort());
+  }
+
+  public static int getEffectivePort(URL url) {
+    return getEffectivePort(url.getProtocol(), url.getPort());
+  }
+
+  private static int getEffectivePort(String scheme, int specifiedPort) {
+    return specifiedPort != -1 ? specifiedPort : getDefaultPort(scheme);
+  }
+
+  public static int getDefaultPort(String protocol) {
+    if ("http".equals(protocol)) return 80;
+    if ("https".equals(protocol)) return 443;
+    return -1;
+  }
+
+  public static void checkOffsetAndCount(long arrayLength, long offset, long count) {
+    if ((offset | count) < 0 || offset > arrayLength || arrayLength - offset < count) {
+      throw new ArrayIndexOutOfBoundsException();
+    }
+  }
+
+  /** Returns true if two possibly-null objects are equal. */
+  public static boolean equal(Object a, Object b) {
+    return a == b || (a != null && a.equals(b));
+  }
+
+  /**
+   * Closes {@code closeable}, ignoring any checked exceptions. Does nothing
+   * if {@code closeable} is null.
+   */
+  public static void closeQuietly(Closeable closeable) {
+    if (closeable != null) {
+      try {
+        closeable.close();
+      } catch (RuntimeException rethrown) {
+        throw rethrown;
+      } catch (Exception ignored) {
+      }
+    }
+  }
+
+  /**
+   * Closes {@code socket}, ignoring any checked exceptions. Does nothing if
+   * {@code socket} is null.
+   */
+  public static void closeQuietly(Socket socket) {
+    if (socket != null) {
+      try {
+        socket.close();
+      } catch (RuntimeException rethrown) {
+        throw rethrown;
+      } catch (Exception ignored) {
+      }
+    }
+  }
+
+  /**
+   * Closes {@code serverSocket}, ignoring any checked exceptions. Does nothing if
+   * {@code serverSocket} is null.
+   */
+  public static void closeQuietly(ServerSocket serverSocket) {
+    if (serverSocket != null) {
+      try {
+        serverSocket.close();
+      } catch (RuntimeException rethrown) {
+        throw rethrown;
+      } catch (Exception ignored) {
+      }
+    }
+  }
+
+  /**
+   * Closes {@code a} and {@code b}. If either close fails, this completes
+   * the other close and rethrows the first encountered exception.
+   */
+  public static void closeAll(Closeable a, Closeable b) throws IOException {
+    Throwable thrown = null;
+    try {
+      a.close();
+    } catch (Throwable e) {
+      thrown = e;
+    }
+    try {
+      b.close();
+    } catch (Throwable e) {
+      if (thrown == null) thrown = e;
+    }
+    if (thrown == null) return;
+    if (thrown instanceof IOException) throw (IOException) thrown;
+    if (thrown instanceof RuntimeException) throw (RuntimeException) thrown;
+    if (thrown instanceof Error) throw (Error) thrown;
+    throw new AssertionError(thrown);
+  }
+
+  /**
+   * Deletes the contents of {@code dir}. Throws an IOException if any file
+   * could not be deleted, or if {@code dir} is not a readable directory.
+   */
+  public static void deleteContents(File dir) throws IOException {
+    File[] files = dir.listFiles();
+    if (files == null) {
+      throw new IOException("not a readable directory: " + dir);
+    }
+    for (File file : files) {
+      if (file.isDirectory()) {
+        deleteContents(file);
+      }
+      if (!file.delete()) {
+        throw new IOException("failed to delete file: " + file);
+      }
+    }
+  }
+
+  /** Reads until {@code in} is exhausted or the timeout has elapsed. */
+  public static boolean skipAll(Source in, int timeoutMillis) throws IOException {
+    // TODO: Implement deadlines everywhere so they can do this work.
+    long startNanos = System.nanoTime();
+    Buffer skipBuffer = new Buffer();
+    while (NANOSECONDS.toMillis(System.nanoTime() - startNanos) < timeoutMillis) {
+      long read = in.read(skipBuffer, 2048);
+      if (read == -1) return true; // Successfully exhausted the stream.
+      skipBuffer.clear();
+    }
+    return false; // Ran out of time.
+  }
+
+  /** Returns a 32 character string containing a hash of {@code s}. */
+  public static String hash(String s) {
+    try {
+      MessageDigest messageDigest = MessageDigest.getInstance("MD5");
+      byte[] md5bytes = messageDigest.digest(s.getBytes("UTF-8"));
+      return ByteString.of(md5bytes).hex();
+    } catch (NoSuchAlgorithmException e) {
+      throw new AssertionError(e);
+    } catch (UnsupportedEncodingException e) {
+      throw new AssertionError(e);
+    }
+  }
+
+  /** Returns an immutable copy of {@code list}. */
+  public static <T> List<T> immutableList(List<T> list) {
+    return Collections.unmodifiableList(new ArrayList<T>(list));
+  }
+
+  /** Returns an immutable list containing {@code elements}. */
+  public static <T> List<T> immutableList(T... elements) {
+    return Collections.unmodifiableList(Arrays.asList(elements.clone()));
+  }
+
+  public static ThreadFactory threadFactory(final String name, final boolean daemon) {
+    return new ThreadFactory() {
+      @Override public Thread newThread(Runnable runnable) {
+        Thread result = new Thread(runnable, name);
+        result.setDaemon(daemon);
+        return result;
+      }
+    };
+  }
+
+  public static List<Header> headerEntries(String... elements) {
+    List<Header> result = new ArrayList<Header>(elements.length / 2);
+    for (int i = 0; i < elements.length; i += 2) {
+      result.add(new Header(elements[i], elements[i + 1]));
+    }
+    return result;
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/ErrorCode.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/ErrorCode.java
new file mode 100644
index 000000000..9a83aaae5
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/ErrorCode.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2013 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+// http://tools.ietf.org/html/draft-ietf-httpbis-http2-13#section-7
+public enum ErrorCode {
+  /** Not an error! For SPDY stream resets, prefer null over NO_ERROR. */
+  NO_ERROR(0, -1, 0),
+
+  PROTOCOL_ERROR(1, 1, 1),
+
+  /** A subtype of PROTOCOL_ERROR used by SPDY. */
+  INVALID_STREAM(1, 2, -1),
+
+  /** A subtype of PROTOCOL_ERROR used by SPDY. */
+  UNSUPPORTED_VERSION(1, 4, -1),
+
+  /** A subtype of PROTOCOL_ERROR used by SPDY. */
+  STREAM_IN_USE(1, 8, -1),
+
+  /** A subtype of PROTOCOL_ERROR used by SPDY. */
+  STREAM_ALREADY_CLOSED(1, 9, -1),
+
+  INTERNAL_ERROR(2, 6, 2),
+
+  FLOW_CONTROL_ERROR(3, 7, -1),
+
+  STREAM_CLOSED(5, -1, -1),
+
+  FRAME_TOO_LARGE(6, 11, -1),
+
+  REFUSED_STREAM(7, 3, -1),
+
+  CANCEL(8, 5, -1),
+
+  COMPRESSION_ERROR(9, -1, -1),
+
+  CONNECT_ERROR(10, -1, -1),
+
+  ENHANCE_YOUR_CALM(11, -1, -1),
+
+  INADEQUATE_SECURITY(12, -1, -1),
+
+  INVALID_CREDENTIALS(-1, 10, -1);
+
+  public final int httpCode;
+  public final int spdyRstCode;
+  public final int spdyGoAwayCode;
+
+  private ErrorCode(int httpCode, int spdyRstCode, int spdyGoAwayCode) {
+    this.httpCode = httpCode;
+    this.spdyRstCode = spdyRstCode;
+    this.spdyGoAwayCode = spdyGoAwayCode;
+  }
+
+  public static ErrorCode fromSpdy3Rst(int code) {
+    for (ErrorCode errorCode : ErrorCode.values()) {
+      if (errorCode.spdyRstCode == code) return errorCode;
+    }
+    return null;
+  }
+
+  public static ErrorCode fromHttp2(int code) {
+    for (ErrorCode errorCode : ErrorCode.values()) {
+      if (errorCode.httpCode == code) return errorCode;
+    }
+    return null;
+  }
+
+  public static ErrorCode fromSpdyGoAway(int code) {
+    for (ErrorCode errorCode : ErrorCode.values()) {
+      if (errorCode.spdyGoAwayCode == code) return errorCode;
+    }
+    return null;
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
new file mode 100644
index 000000000..5305f632e
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.http.spdy.okio.BufferedSource;
+import com.koushikdutta.async.http.spdy.okio.ByteString;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.List;
+
+/** Reads transport frames for SPDY/3 or HTTP/2. */
+public interface FrameReader extends Closeable {
+  boolean canProcessFrame(ByteBufferList bb);
+  void readConnectionPreface() throws IOException;
+  boolean nextFrame(Handler handler) throws IOException;
+
+  public interface Handler {
+    void data(boolean inFinished, int streamId, BufferedSource source, int length)
+        throws IOException;
+
+    /**
+     * Create or update incoming headers, creating the corresponding streams
+     * if necessary. Frames that trigger this are SPDY SYN_STREAM, HEADERS, and
+     * SYN_REPLY, and HTTP/2 HEADERS and PUSH_PROMISE.
+     *
+     * @param outFinished true if the receiver should not send further frames.
+     * @param inFinished true if the sender will not send further frames.
+     * @param streamId the stream owning these headers.
+     * @param associatedStreamId the stream that triggered the sender to create
+     *     this stream.
+     */
+    void headers(boolean outFinished, boolean inFinished, int streamId, int associatedStreamId,
+                 List<Header> headerBlock, HeadersMode headersMode);
+    void rstStream(int streamId, ErrorCode errorCode);
+    void settings(boolean clearPrevious, Settings settings);
+
+    /** HTTP/2 only. */
+    void ackSettings();
+
+    /**
+     *  Read a connection-level ping from the peer.  {@code ack} indicates this
+     *  is a reply.  Payload parameters are different between SPDY/3 and HTTP/2.
+     *  <p>
+     *  In SPDY/3, only the first {@code payload1} parameter is set.  If the
+     *  reader is a client, it is an unsigned even number.  Likewise, a server
+     *  will receive an odd number.
+     *  <p>
+     *  In HTTP/2, both {@code payload1} and {@code payload2} parameters are
+     *  set. The data is opaque binary, and there are no rules on the content.
+     */
+    void ping(boolean ack, int payload1, int payload2);
+
+    /**
+     * The peer tells us to stop creating streams.  It is safe to replay
+     * streams with {@code ID > lastGoodStreamId} on a new connection.  In-
+     * flight streams with {@code ID <= lastGoodStreamId} can only be replayed
+     * on a new connection if they are idempotent.
+     *
+     * @param lastGoodStreamId the last stream ID the peer processed before
+     *     sending this message. If {@code lastGoodStreamId} is zero, the peer
+     *     processed no frames.
+     * @param errorCode reason for closing the connection.
+     * @param debugData only valid for HTTP/2; opaque debug data to send.
+     */
+    void goAway(int lastGoodStreamId, ErrorCode errorCode, ByteString debugData);
+
+    /**
+     * Notifies that an additional {@code windowSizeIncrement} bytes can be
+     * sent on {@code streamId}, or the connection if {@code streamId} is zero.
+     */
+    void windowUpdate(int streamId, long windowSizeIncrement);
+
+    /**
+     * Called when reading a headers or priority frame. This may be used to
+     * change the stream's weight from the default (16) to a new value.
+     *
+     * @param streamId stream which has a priority change.
+     * @param streamDependency the stream ID this stream is dependent on.
+     * @param weight relative proportion of priority in [1..256].
+     * @param exclusive inserts this stream ID as the sole child of
+     *     {@code streamDependency}.
+     */
+    void priority(int streamId, int streamDependency, int weight, boolean exclusive);
+
+    /**
+     * HTTP/2 only. Receive a push promise header block.
+     * <p>
+     * A push promise contains all the headers that pertain to a server-initiated
+     * request, and a {@code promisedStreamId} to which response frames will be
+     * delivered. Push promise frames are sent as a part of the response to
+     * {@code streamId}.
+     *
+     * @param streamId client-initiated stream ID.  Must be an odd number.
+     * @param promisedStreamId server-initiated stream ID.  Must be an even
+     * number.
+     * @param requestHeaders minimally includes {@code :method}, {@code :scheme},
+     * {@code :authority}, and (@code :path}.
+     */
+    void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders)
+        throws IOException;
+
+    /**
+     * HTTP/2 only. Expresses that resources for the connection or a client-
+     * initiated stream are available from a different network location or
+     * protocol configuration.
+     *
+     * <p>See <a href="https://tools.ietf.org/html/draft-ietf-httpbis-alt-svc-01">alt-svc</a>
+     *
+     * @param streamId when a client-initiated stream ID (odd number), the
+     *     origin of this alternate service is the origin of the stream. When
+     *     zero, the origin is specified in the {@code origin} parameter.
+     * @param origin when present, the
+     *     <a href="http://tools.ietf.org/html/rfc6454">origin</a> is typically
+     *     represented as a combination of scheme, host and port. When empty,
+     *     the origin is that of the {@code streamId}.
+     * @param protocol an ALPN protocol, such as {@code h2}.
+     * @param host an IP address or hostname.
+     * @param port the IP port associated with the service.
+     * @param maxAge time in seconds that this alternative is considered fresh.
+     */
+    void alternateService(int streamId, String origin, ByteString protocol, String host, int port,
+                          long maxAge);
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameWriter.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameWriter.java
new file mode 100644
index 000000000..f8781767c
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameWriter.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+import com.koushikdutta.async.http.spdy.okio.Buffer;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.List;
+
+/** Writes transport frames for SPDY/3 or HTTP/2. */
+public interface FrameWriter extends Closeable {
+  /** HTTP/2 only. */
+  void connectionPreface() throws IOException;
+  void ackSettings() throws IOException;
+
+  /**
+   * HTTP/2 only. Send a push promise header block.
+   * <p>
+   * A push promise contains all the headers that pertain to a server-initiated
+   * request, and a {@code promisedStreamId} to which response frames will be
+   * delivered. Push promise frames are sent as a part of the response to
+   * {@code streamId}.  The {@code promisedStreamId} has a priority of one
+   * greater than {@code streamId}.
+   *
+   * @param streamId client-initiated stream ID.  Must be an odd number.
+   * @param promisedStreamId server-initiated stream ID.  Must be an even
+   * number.
+   * @param requestHeaders minimally includes {@code :method}, {@code :scheme},
+   * {@code :authority}, and (@code :path}.
+   */
+  void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders)
+      throws IOException;
+
+  /** SPDY/3 only. */
+  void flush() throws IOException;
+  void synStream(boolean outFinished, boolean inFinished, int streamId, int associatedStreamId,
+                 List<Header> headerBlock) throws IOException;
+  void synReply(boolean outFinished, int streamId, List<Header> headerBlock)
+      throws IOException;
+  void headers(int streamId, List<Header> headerBlock) throws IOException;
+  void rstStream(int streamId, ErrorCode errorCode) throws IOException;
+
+  /**
+   * {@code data.length} may be longer than the max length of the variant's data frame.
+   * Implementations must send multiple frames as necessary.
+   *
+   * @param source the buffer to draw bytes from. May be null if byteCount is 0.
+   */
+  void data(boolean outFinished, int streamId, Buffer source, int byteCount) throws IOException;
+
+  void data(boolean outFinished, int streamId, Buffer source) throws IOException;
+
+  /** Write okhttp's settings to the peer. */
+  void settings(Settings okHttpSettings) throws IOException;
+
+  /**
+   *  Send a connection-level ping to the peer.  {@code ack} indicates this is
+   *  a reply.  Payload parameters are different between SPDY/3 and HTTP/2.
+   *  <p>
+   *  In SPDY/3, only the first {@code payload1} parameter is sent.  If the
+   *  sender is a client, it is an unsigned odd number.  Likewise, a server
+   *  will send an even number.
+   *  <p>
+   *  In HTTP/2, both {@code payload1} and {@code payload2} parameters are
+   *  sent.  The data is opaque binary, and there are no rules on the content.
+   */
+  void ping(boolean ack, int payload1, int payload2) throws IOException;
+
+  /**
+   * Tell the peer to stop creating streams and that we last processed
+   * {@code lastGoodStreamId}, or zero if no streams were processed.
+   *
+   * @param lastGoodStreamId the last stream ID processed, or zero if no
+   * streams were processed.
+   * @param errorCode reason for closing the connection.
+   * @param debugData only valid for HTTP/2; opaque debug data to send.
+   */
+  void goAway(int lastGoodStreamId, ErrorCode errorCode, byte[] debugData) throws IOException;
+
+  /**
+   * Inform peer that an additional {@code windowSizeIncrement} bytes can be
+   * sent on {@code streamId}, or the connection if {@code streamId} is zero.
+   */
+  void windowUpdate(int streamId, long windowSizeIncrement) throws IOException;
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Header.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Header.java
new file mode 100644
index 000000000..ba0244fcb
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Header.java
@@ -0,0 +1,57 @@
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+
+import com.koushikdutta.async.http.spdy.okio.ByteString;
+
+/** HTTP header: the name is an ASCII string, but the value can be UTF-8. */
+public final class Header {
+  // Special header names defined in the SPDY and HTTP/2 specs.
+  public static final ByteString RESPONSE_STATUS = ByteString.encodeUtf8(":status");
+  public static final ByteString TARGET_METHOD = ByteString.encodeUtf8(":method");
+  public static final ByteString TARGET_PATH = ByteString.encodeUtf8(":path");
+  public static final ByteString TARGET_SCHEME = ByteString.encodeUtf8(":scheme");
+  public static final ByteString TARGET_AUTHORITY = ByteString.encodeUtf8(":authority"); // HTTP/2
+  public static final ByteString TARGET_HOST = ByteString.encodeUtf8(":host"); // spdy/3
+  public static final ByteString VERSION = ByteString.encodeUtf8(":version"); // spdy/3
+
+  /** Name in case-insensitive ASCII encoding. */
+  public final ByteString name;
+  /** Value in UTF-8 encoding. */
+  public final ByteString value;
+  final int hpackSize;
+
+  // TODO: search for toLowerCase and consider moving logic here.
+  public Header(String name, String value) {
+    this(ByteString.encodeUtf8(name), ByteString.encodeUtf8(value));
+  }
+
+  public Header(ByteString name, String value) {
+    this(name, ByteString.encodeUtf8(value));
+  }
+
+  public Header(ByteString name, ByteString value) {
+    this.name = name;
+    this.value = value;
+    this.hpackSize = 32 + name.size() + value.size();
+  }
+
+  @Override public boolean equals(Object other) {
+    if (other instanceof Header) {
+      Header that = (Header) other;
+      return this.name.equals(that.name)
+          && this.value.equals(that.value);
+    }
+    return false;
+  }
+
+  @Override public int hashCode() {
+    int result = 17;
+    result = 31 * result + name.hashCode();
+    result = 31 * result + value.hashCode();
+    return result;
+  }
+
+  @Override public String toString() {
+    return String.format("%s: %s", name.utf8(), value.utf8());
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeadersMode.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeadersMode.java
new file mode 100644
index 000000000..7ec54b58a
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeadersMode.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2013 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+public enum HeadersMode {
+  SPDY_SYN_STREAM,
+  SPDY_REPLY,
+  SPDY_HEADERS,
+  HTTP_20_HEADERS;
+
+  /** Returns true if it is an error these headers to create a new stream. */
+  public boolean failIfStreamAbsent() {
+    return this == SPDY_REPLY || this == SPDY_HEADERS;
+  }
+
+  /** Returns true if it is an error these headers to update an existing stream. */
+  public boolean failIfStreamPresent() {
+    return this == SPDY_SYN_STREAM;
+  }
+
+  /**
+   * Returns true if it is an error these headers to be the initial headers of a
+   * response.
+   */
+  public boolean failIfHeadersAbsent() {
+    return this == SPDY_HEADERS;
+  }
+
+  /**
+   * Returns true if it is an error these headers to be update existing headers
+   * of a response.
+   */
+  public boolean failIfHeadersPresent() {
+    return this == SPDY_REPLY;
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java
new file mode 100644
index 000000000..397736f71
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java
@@ -0,0 +1,491 @@
+/*
+ * Copyright (C) 2013 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+import com.koushikdutta.async.http.spdy.okhttp.internal.BitArray;
+import com.koushikdutta.async.http.spdy.okio.Buffer;
+import com.koushikdutta.async.http.spdy.okio.BufferedSource;
+import com.koushikdutta.async.http.spdy.okio.ByteString;
+import com.koushikdutta.async.http.spdy.okio.Okio;
+import com.koushikdutta.async.http.spdy.okio.Source;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Read and write HPACK v08.
+ *
+ * http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08
+ *
+ * This implementation uses an array for the header table with a bitset for
+ * references.  Dynamic entries are added to the array, starting in the last
+ * position moving forward.  When the array fills, it is doubled.
+ */
+final class HpackDraft08 {
+  private static final int PREFIX_4_BITS = 0x0f;
+  private static final int PREFIX_6_BITS = 0x3f;
+  private static final int PREFIX_7_BITS = 0x7f;
+
+  private static final Header[] STATIC_HEADER_TABLE = new Header[] {
+      new Header(Header.TARGET_AUTHORITY, ""),
+      new Header(Header.TARGET_METHOD, "GET"),
+      new Header(Header.TARGET_METHOD, "POST"),
+      new Header(Header.TARGET_PATH, "/"),
+      new Header(Header.TARGET_PATH, "/index.html"),
+      new Header(Header.TARGET_SCHEME, "http"),
+      new Header(Header.TARGET_SCHEME, "https"),
+      new Header(Header.RESPONSE_STATUS, "200"),
+      new Header(Header.RESPONSE_STATUS, "204"),
+      new Header(Header.RESPONSE_STATUS, "206"),
+      new Header(Header.RESPONSE_STATUS, "304"),
+      new Header(Header.RESPONSE_STATUS, "400"),
+      new Header(Header.RESPONSE_STATUS, "404"),
+      new Header(Header.RESPONSE_STATUS, "500"),
+      new Header("accept-charset", ""),
+      new Header("accept-encoding", "gzip, deflate"),
+      new Header("accept-language", ""),
+      new Header("accept-ranges", ""),
+      new Header("accept", ""),
+      new Header("access-control-allow-origin", ""),
+      new Header("age", ""),
+      new Header("allow", ""),
+      new Header("authorization", ""),
+      new Header("cache-control", ""),
+      new Header("content-disposition", ""),
+      new Header("content-encoding", ""),
+      new Header("content-language", ""),
+      new Header("content-length", ""),
+      new Header("content-location", ""),
+      new Header("content-range", ""),
+      new Header("content-type", ""),
+      new Header("cookie", ""),
+      new Header("date", ""),
+      new Header("etag", ""),
+      new Header("expect", ""),
+      new Header("expires", ""),
+      new Header("from", ""),
+      new Header("host", ""),
+      new Header("if-match", ""),
+      new Header("if-modified-since", ""),
+      new Header("if-none-match", ""),
+      new Header("if-range", ""),
+      new Header("if-unmodified-since", ""),
+      new Header("last-modified", ""),
+      new Header("link", ""),
+      new Header("location", ""),
+      new Header("max-forwards", ""),
+      new Header("proxy-authenticate", ""),
+      new Header("proxy-authorization", ""),
+      new Header("range", ""),
+      new Header("referer", ""),
+      new Header("refresh", ""),
+      new Header("retry-after", ""),
+      new Header("server", ""),
+      new Header("set-cookie", ""),
+      new Header("strict-transport-security", ""),
+      new Header("transfer-encoding", ""),
+      new Header("user-agent", ""),
+      new Header("vary", ""),
+      new Header("via", ""),
+      new Header("www-authenticate", "")
+  };
+
+  private HpackDraft08() {
+  }
+
+  // http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08#section-3.2
+  static final class Reader {
+
+    private final List<Header> emittedHeaders = new ArrayList<Header>();
+    private final BufferedSource source;
+
+    private int maxHeaderTableByteCountSetting;
+    private int maxHeaderTableByteCount;
+    // Visible for testing.
+    Header[] headerTable = new Header[8];
+    // Array is populated back to front, so new entries always have lowest index.
+    int nextHeaderIndex = headerTable.length - 1;
+    int headerCount = 0;
+
+    /**
+     * Set bit positions indicate {@code headerTable[pos]} should be emitted.
+     */
+    // Using a BitArray as it has left-shift operator.
+    BitArray referencedHeaders = new BitArray.FixedCapacity();
+
+    /**
+     * Set bit positions indicate {@code headerTable[pos]} was already emitted.
+     */
+    BitArray emittedReferencedHeaders = new BitArray.FixedCapacity();
+    int headerTableByteCount = 0;
+
+    Reader(int maxHeaderTableByteCountSetting, Source source) {
+      this.maxHeaderTableByteCountSetting = maxHeaderTableByteCountSetting;
+      this.maxHeaderTableByteCount = maxHeaderTableByteCountSetting;
+      this.source = Okio.buffer(source);
+    }
+
+    int maxHeaderTableByteCount() {
+      return maxHeaderTableByteCount;
+    }
+
+    /**
+     * Called by the reader when the peer sent a new header table size setting.
+     * While this establishes the maximum header table size, the
+     * {@link #maxHeaderTableByteCount} set during processing may limit the
+     * table size to a smaller amount.
+     * <p> Evicts entries or clears the table as needed.
+     */
+    void maxHeaderTableByteCountSetting(int newMaxHeaderTableByteCountSetting) {
+      this.maxHeaderTableByteCountSetting = newMaxHeaderTableByteCountSetting;
+      this.maxHeaderTableByteCount = maxHeaderTableByteCountSetting;
+      adjustHeaderTableByteCount();
+    }
+
+    private void adjustHeaderTableByteCount() {
+      if (maxHeaderTableByteCount < headerTableByteCount) {
+        if (maxHeaderTableByteCount == 0) {
+          clearHeaderTable();
+        } else {
+          evictToRecoverBytes(headerTableByteCount - maxHeaderTableByteCount);
+        }
+      }
+    }
+
+    private void clearHeaderTable() {
+      clearReferenceSet();
+      Arrays.fill(headerTable, null);
+      nextHeaderIndex = headerTable.length - 1;
+      headerCount = 0;
+      headerTableByteCount = 0;
+    }
+
+    /** Returns the count of entries evicted. */
+    private int evictToRecoverBytes(int bytesToRecover) {
+      int entriesToEvict = 0;
+      if (bytesToRecover > 0) {
+        // determine how many headers need to be evicted.
+        for (int j = headerTable.length - 1; j >= nextHeaderIndex && bytesToRecover > 0; j--) {
+          bytesToRecover -= headerTable[j].hpackSize;
+          headerTableByteCount -= headerTable[j].hpackSize;
+          headerCount--;
+          entriesToEvict++;
+        }
+        referencedHeaders.shiftLeft(entriesToEvict);
+        emittedReferencedHeaders.shiftLeft(entriesToEvict);
+        System.arraycopy(headerTable, nextHeaderIndex + 1, headerTable,
+            nextHeaderIndex + 1 + entriesToEvict, headerCount);
+        nextHeaderIndex += entriesToEvict;
+      }
+      return entriesToEvict;
+    }
+
+    /**
+     * Read {@code byteCount} bytes of headers from the source stream into the
+     * set of emitted headers. This implementation does not propagate the never
+     * indexed flag of a header.
+     */
+    void readHeaders() throws IOException {
+      while (!source.exhausted()) {
+        int b = source.readByte() & 0xff;
+        if (b == 0x80) { // 10000000
+          throw new IOException("index == 0");
+        } else if ((b & 0x80) == 0x80) { // 1NNNNNNN
+          int index = readInt(b, PREFIX_7_BITS);
+          readIndexedHeader(index - 1);
+        } else if (b == 0x40) { // 01000000
+          readLiteralHeaderWithIncrementalIndexingNewName();
+        } else if ((b & 0x40) == 0x40) {  // 01NNNNNN
+          int index = readInt(b, PREFIX_6_BITS);
+          readLiteralHeaderWithIncrementalIndexingIndexedName(index - 1);
+        } else if ((b & 0x20) == 0x20) {  // 001NNNNN
+          if ((b & 0x10) == 0x10) { // 0011NNNN
+            if ((b & 0x0f) != 0) throw new IOException("Invalid header table state change " + b);
+            clearReferenceSet(); // 00110000
+          } else { // 0010NNNN
+            maxHeaderTableByteCount = readInt(b, PREFIX_4_BITS);
+            if (maxHeaderTableByteCount < 0
+                || maxHeaderTableByteCount > maxHeaderTableByteCountSetting) {
+              throw new IOException("Invalid header table byte count " + maxHeaderTableByteCount);
+            }
+            adjustHeaderTableByteCount();
+          }
+        } else if (b == 0x10 || b == 0) { // 000?0000 - Ignore never indexed bit.
+          readLiteralHeaderWithoutIndexingNewName();
+        } else { // 000?NNNN - Ignore never indexed bit.
+          int index = readInt(b, PREFIX_4_BITS);
+          readLiteralHeaderWithoutIndexingIndexedName(index - 1);
+        }
+      }
+    }
+
+    private void clearReferenceSet() {
+      referencedHeaders.clear();
+      emittedReferencedHeaders.clear();
+    }
+
+    void emitReferenceSet() {
+      for (int i = headerTable.length - 1; i != nextHeaderIndex; --i) {
+        if (referencedHeaders.get(i) && !emittedReferencedHeaders.get(i)) {
+          emittedHeaders.add(headerTable[i]);
+        }
+      }
+    }
+
+    /**
+     * Returns all headers emitted since they were last cleared, then clears the
+     * emitted headers.
+     */
+    List<Header> getAndReset() {
+      List<Header> result = new ArrayList<Header>(emittedHeaders);
+      emittedHeaders.clear();
+      emittedReferencedHeaders.clear();
+      return result;
+    }
+
+    private void readIndexedHeader(int index) throws IOException {
+      if (isStaticHeader(index)) {
+        index -= headerCount;
+        if (index > STATIC_HEADER_TABLE.length - 1) {
+          throw new IOException("Header index too large " + (index + 1));
+        }
+        Header staticEntry = STATIC_HEADER_TABLE[index];
+        if (maxHeaderTableByteCount == 0) {
+          emittedHeaders.add(staticEntry);
+        } else {
+          insertIntoHeaderTable(-1, staticEntry);
+        }
+      } else {
+        int headerTableIndex = headerTableIndex(index);
+        if (!referencedHeaders.get(headerTableIndex)) { // When re-referencing, emit immediately.
+          emittedHeaders.add(headerTable[headerTableIndex]);
+          emittedReferencedHeaders.set(headerTableIndex);
+        }
+        referencedHeaders.toggle(headerTableIndex);
+      }
+    }
+
+    // referencedHeaders is relative to nextHeaderIndex + 1.
+    private int headerTableIndex(int index) {
+      return nextHeaderIndex + 1 + index;
+    }
+
+    private void readLiteralHeaderWithoutIndexingIndexedName(int index) throws IOException {
+      ByteString name = getName(index);
+      ByteString value = readByteString();
+      emittedHeaders.add(new Header(name, value));
+    }
+
+    private void readLiteralHeaderWithoutIndexingNewName() throws IOException {
+      ByteString name = checkLowercase(readByteString());
+      ByteString value = readByteString();
+      emittedHeaders.add(new Header(name, value));
+    }
+
+    private void readLiteralHeaderWithIncrementalIndexingIndexedName(int nameIndex)
+        throws IOException {
+      ByteString name = getName(nameIndex);
+      ByteString value = readByteString();
+      insertIntoHeaderTable(-1, new Header(name, value));
+    }
+
+    private void readLiteralHeaderWithIncrementalIndexingNewName() throws IOException {
+      ByteString name = checkLowercase(readByteString());
+      ByteString value = readByteString();
+      insertIntoHeaderTable(-1, new Header(name, value));
+    }
+
+    private ByteString getName(int index) {
+      if (isStaticHeader(index)) {
+        return STATIC_HEADER_TABLE[index - headerCount].name;
+      } else {
+        return headerTable[headerTableIndex(index)].name;
+      }
+    }
+
+    private boolean isStaticHeader(int index) {
+      return index >= headerCount;
+    }
+
+    /** index == -1 when new. */
+    private void insertIntoHeaderTable(int index, Header entry) {
+      int delta = entry.hpackSize;
+      if (index != -1) { // Index -1 == new header.
+        delta -= headerTable[headerTableIndex(index)].hpackSize;
+      }
+
+      // if the new or replacement header is too big, drop all entries.
+      if (delta > maxHeaderTableByteCount) {
+        clearHeaderTable();
+        // emit the large header to the callback.
+        emittedHeaders.add(entry);
+        return;
+      }
+
+      // Evict headers to the required length.
+      int bytesToRecover = (headerTableByteCount + delta) - maxHeaderTableByteCount;
+      int entriesEvicted = evictToRecoverBytes(bytesToRecover);
+
+      if (index == -1) { // Adding a value to the header table.
+        if (headerCount + 1 > headerTable.length) { // Need to grow the header table.
+          Header[] doubled = new Header[headerTable.length * 2];
+          System.arraycopy(headerTable, 0, doubled, headerTable.length, headerTable.length);
+          if (doubled.length == 64) {
+            referencedHeaders = ((BitArray.FixedCapacity) referencedHeaders).toVariableCapacity();
+            emittedReferencedHeaders =
+                ((BitArray.FixedCapacity) emittedReferencedHeaders).toVariableCapacity();
+          }
+          referencedHeaders.shiftLeft(headerTable.length);
+          emittedReferencedHeaders.shiftLeft(headerTable.length);
+          nextHeaderIndex = headerTable.length - 1;
+          headerTable = doubled;
+        }
+        index = nextHeaderIndex--;
+        referencedHeaders.set(index);
+        headerTable[index] = entry;
+        headerCount++;
+      } else { // Replace value at same position.
+        index += headerTableIndex(index) + entriesEvicted;
+        referencedHeaders.set(index);
+        headerTable[index] = entry;
+      }
+      headerTableByteCount += delta;
+    }
+
+    private int readByte() throws IOException {
+      return source.readByte() & 0xff;
+    }
+
+    int readInt(int firstByte, int prefixMask) throws IOException {
+      int prefix = firstByte & prefixMask;
+      if (prefix < prefixMask) {
+        return prefix; // This was a single byte value.
+      }
+
+      // This is a multibyte value. Read 7 bits at a time.
+      int result = prefixMask;
+      int shift = 0;
+      while (true) {
+        int b = readByte();
+        if ((b & 0x80) != 0) { // Equivalent to (b >= 128) since b is in [0..255].
+          result += (b & 0x7f) << shift;
+          shift += 7;
+        } else {
+          result += b << shift; // Last byte.
+          break;
+        }
+      }
+      return result;
+    }
+
+    /** Reads a potentially Huffman encoded byte string. */
+    ByteString readByteString() throws IOException {
+      int firstByte = readByte();
+      boolean huffmanDecode = (firstByte & 0x80) == 0x80; // 1NNNNNNN
+      int length = readInt(firstByte, PREFIX_7_BITS);
+
+      if (huffmanDecode) {
+        return ByteString.of(Huffman.get().decode(source.readByteArray(length)));
+      } else {
+        return source.readByteString(length);
+      }
+    }
+  }
+
+  private static final Map<ByteString, Integer> NAME_TO_FIRST_INDEX = nameToFirstIndex();
+
+  private static Map<ByteString, Integer> nameToFirstIndex() {
+    Map<ByteString, Integer> result = new LinkedHashMap<ByteString, Integer>(STATIC_HEADER_TABLE.length);
+    for (int i = 0; i < STATIC_HEADER_TABLE.length; i++) {
+      if (!result.containsKey(STATIC_HEADER_TABLE[i].name)) {
+        result.put(STATIC_HEADER_TABLE[i].name, i);
+      }
+    }
+    return Collections.unmodifiableMap(result);
+  }
+
+  static final class Writer {
+    private final Buffer out;
+
+    Writer(Buffer out) {
+      this.out = out;
+    }
+
+    /** This does not use "never indexed" semantics for sensitive headers. */
+    // https://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08#section-4.3.3
+    void writeHeaders(List<Header> headerBlock) throws IOException {
+      // TODO: implement index tracking
+      for (int i = 0, size = headerBlock.size(); i < size; i++) {
+        ByteString name = headerBlock.get(i).name.toAsciiLowercase();
+        Integer staticIndex = NAME_TO_FIRST_INDEX.get(name);
+        if (staticIndex != null) {
+          // Literal Header Field without Indexing - Indexed Name.
+          writeInt(staticIndex + 1, PREFIX_4_BITS, 0);
+          writeByteString(headerBlock.get(i).value);
+        } else {
+          out.writeByte(0x00); // Literal Header without Indexing - New Name.
+          writeByteString(name);
+          writeByteString(headerBlock.get(i).value);
+        }
+      }
+    }
+
+    // http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08#section-4.1.1
+    void writeInt(int value, int prefixMask, int bits) throws IOException {
+      // Write the raw value for a single byte value.
+      if (value < prefixMask) {
+        out.writeByte(bits | value);
+        return;
+      }
+
+      // Write the mask to start a multibyte value.
+      out.writeByte(bits | prefixMask);
+      value -= prefixMask;
+
+      // Write 7 bits at a time 'til we're done.
+      while (value >= 0x80) {
+        int b = value & 0x7f;
+        out.writeByte(b | 0x80);
+        value >>>= 7;
+      }
+      out.writeByte(value);
+    }
+
+    void writeByteString(ByteString data) throws IOException {
+      writeInt(data.size(), PREFIX_7_BITS, 0);
+      out.write(data);
+    }
+  }
+
+  /**
+   * An HTTP/2 response cannot contain uppercase header characters and must
+   * be treated as malformed.
+   */
+  private static ByteString checkLowercase(ByteString name) throws IOException {
+    for (int i = 0, length = name.size(); i < length; i++) {
+      byte c = name.getByte(i);
+      if (c >= 'A' && c <= 'Z') {
+        throw new IOException("PROTOCOL_ERROR response malformed: mixed case name: " + name.utf8());
+      }
+    }
+    return name;
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java
new file mode 100644
index 000000000..88958ef15
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java
@@ -0,0 +1,760 @@
+/*
+ * Copyright (C) 2013 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.http.Protocol;
+import com.koushikdutta.async.http.spdy.okio.Buffer;
+import com.koushikdutta.async.http.spdy.okio.BufferedSink;
+import com.koushikdutta.async.http.spdy.okio.BufferedSource;
+import com.koushikdutta.async.http.spdy.okio.ByteString;
+import com.koushikdutta.async.http.spdy.okio.Source;
+import com.koushikdutta.async.http.spdy.okio.Timeout;
+
+import java.io.IOException;
+import java.nio.ByteOrder;
+import java.util.List;
+import java.util.logging.Logger;
+
+import static com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Http20Draft13.FrameLogger.formatHeader;
+import static com.koushikdutta.async.http.spdy.okio.ByteString.EMPTY;
+import static java.lang.String.format;
+import static java.util.logging.Level.FINE;
+
+/**
+ * Read and write HTTP/2 v13 frames.
+ * <p>http://tools.ietf.org/html/draft-ietf-httpbis-http2-13
+ */
+public final class Http20Draft13 implements Variant {
+  private static final Logger logger = Logger.getLogger(Http20Draft13.class.getName());
+
+  @Override public Protocol getProtocol() {
+    return Protocol.HTTP_2;
+  }
+
+  private static final ByteString CONNECTION_PREFACE
+      = ByteString.encodeUtf8("PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n");
+
+  static final int MAX_FRAME_SIZE = 0x3fff; // 16383
+
+  static final byte TYPE_DATA = 0x0;
+  static final byte TYPE_HEADERS = 0x1;
+  static final byte TYPE_PRIORITY = 0x2;
+  static final byte TYPE_RST_STREAM = 0x3;
+  static final byte TYPE_SETTINGS = 0x4;
+  static final byte TYPE_PUSH_PROMISE = 0x5;
+  static final byte TYPE_PING = 0x6;
+  static final byte TYPE_GOAWAY = 0x7;
+  static final byte TYPE_WINDOW_UPDATE = 0x8;
+  static final byte TYPE_CONTINUATION = 0x9;
+
+  static final byte FLAG_NONE = 0x0;
+  static final byte FLAG_ACK = 0x1; // Used for settings and ping.
+  static final byte FLAG_END_STREAM = 0x1; // Used for headers and data.
+  static final byte FLAG_END_SEGMENT = 0x2;
+  static final byte FLAG_END_HEADERS = 0x4; // Used for headers and continuation.
+  static final byte FLAG_END_PUSH_PROMISE = 0x4;
+  static final byte FLAG_PADDED = 0x8; // Used for headers and data.
+  static final byte FLAG_PRIORITY = 0x20; // Used for headers.
+  static final byte FLAG_COMPRESSED = 0x20; // Used for data.
+
+  /**
+   * Creates a frame reader with max header table size of 4096 and data frame
+   * compression disabled.
+   */
+  @Override public FrameReader newReader(BufferedSource source, boolean client) {
+    return new Reader(source, 4096, client);
+  }
+
+  @Override public FrameWriter newWriter(BufferedSink sink, boolean client) {
+    return new Writer(sink, client);
+  }
+
+  @Override public int maxFrameSize() {
+    return MAX_FRAME_SIZE;
+  }
+
+  static final class Reader implements FrameReader {
+    private final BufferedSource source;
+    private final ContinuationSource continuation;
+    private final boolean client;
+
+    // Visible for testing.
+    final HpackDraft08.Reader hpackReader;
+
+      @Override
+      public boolean canProcessFrame(ByteBufferList bb) {
+          if (bb.remaining() < 4)
+              return false;
+          bb.order(ByteOrder.BIG_ENDIAN);
+          int w1 = bb.peekInt();
+
+          short length = (short) ((w1 & 0x3fff0000) >> 16); // 14-bit unsigned == MAX_FRAME_SIZE
+          return bb.remaining() >= 8 + length;
+      }
+
+    Reader(BufferedSource source, int headerTableSize, boolean client) {
+      this.source = source;
+      this.client = client;
+      this.continuation = new ContinuationSource(this.source);
+      this.hpackReader = new HpackDraft08.Reader(headerTableSize, continuation);
+    }
+
+    @Override public void readConnectionPreface() throws IOException {
+      if (client) return; // Nothing to read; servers doesn't send a connection preface!
+      ByteString connectionPreface = source.readByteString(CONNECTION_PREFACE.size());
+      if (logger.isLoggable(FINE)) logger.fine(format("<< CONNECTION %s", connectionPreface.hex()));
+      if (!CONNECTION_PREFACE.equals(connectionPreface)) {
+        throw ioException("Expected a connection header but was %s", connectionPreface.utf8());
+      }
+    }
+
+    @Override public boolean nextFrame(Handler handler) throws IOException {
+      int w1;
+      int w2;
+      try {
+        w1 = source.readInt();
+        w2 = source.readInt();
+      } catch (IOException e) {
+        return false; // This might be a normal socket close.
+      }
+
+      // boolean r = (w1 & 0xc0000000) != 0; // Reserved: Ignore first 2 bits.
+      short length = (short) ((w1 & 0x3fff0000) >> 16); // 14-bit unsigned == MAX_FRAME_SIZE
+      byte type = (byte) ((w1 & 0xff00) >> 8);
+      byte flags = (byte) (w1 & 0xff);
+      // boolean r = (w2 & 0x80000000) != 0; // Reserved: Ignore first bit.
+      int streamId = (w2 & 0x7fffffff); // 31-bit opaque identifier.
+      if (logger.isLoggable(FINE)) logger.fine(formatHeader(true, streamId, length, type, flags));
+
+      switch (type) {
+        case TYPE_DATA:
+          readData(handler, length, flags, streamId);
+          break;
+
+        case TYPE_HEADERS:
+          readHeaders(handler, length, flags, streamId);
+          break;
+
+        case TYPE_PRIORITY:
+          readPriority(handler, length, flags, streamId);
+          break;
+
+        case TYPE_RST_STREAM:
+          readRstStream(handler, length, flags, streamId);
+          break;
+
+        case TYPE_SETTINGS:
+          readSettings(handler, length, flags, streamId);
+          break;
+
+        case TYPE_PUSH_PROMISE:
+          readPushPromise(handler, length, flags, streamId);
+          break;
+
+        case TYPE_PING:
+          readPing(handler, length, flags, streamId);
+          break;
+
+        case TYPE_GOAWAY:
+          readGoAway(handler, length, flags, streamId);
+          break;
+
+        case TYPE_WINDOW_UPDATE:
+          readWindowUpdate(handler, length, flags, streamId);
+          break;
+
+        default:
+          // Implementations MUST discard frames that have unknown or unsupported types.
+          source.skip(length);
+      }
+      return true;
+    }
+
+    private void readHeaders(Handler handler, short length, byte flags, int streamId)
+        throws IOException {
+      if (streamId == 0) throw ioException("PROTOCOL_ERROR: TYPE_HEADERS streamId == 0");
+
+      boolean endStream = (flags & FLAG_END_STREAM) != 0;
+
+      short padding = (flags & FLAG_PADDED) != 0 ? (short) (source.readByte() & 0xff) : 0;
+
+      if ((flags & FLAG_PRIORITY) != 0) {
+        readPriority(handler, streamId);
+        length -= 5; // account for above read.
+      }
+
+      length = lengthWithoutPadding(length, flags, padding);
+
+      List<Header> headerBlock = readHeaderBlock(length, padding, flags, streamId);
+
+      handler.headers(false, endStream, streamId, -1, headerBlock, HeadersMode.HTTP_20_HEADERS);
+    }
+
+    private List<Header> readHeaderBlock(short length, short padding, byte flags, int streamId)
+        throws IOException {
+      continuation.length = continuation.left = length;
+      continuation.padding = padding;
+      continuation.flags = flags;
+      continuation.streamId = streamId;
+
+      hpackReader.readHeaders();
+      hpackReader.emitReferenceSet();
+      // TODO: Concat multi-value headers with 0x0, except COOKIE, which uses 0x3B, 0x20.
+      // http://tools.ietf.org/html/draft-ietf-httpbis-http2-09#section-8.1.3
+      return hpackReader.getAndReset();
+    }
+
+    private void readData(Handler handler, short length, byte flags, int streamId)
+        throws IOException {
+      // TODO: checkState open or half-closed (local) or raise STREAM_CLOSED
+      boolean inFinished = (flags & FLAG_END_STREAM) != 0;
+      boolean gzipped = (flags & FLAG_COMPRESSED) != 0;
+      if (gzipped) {
+        throw ioException("PROTOCOL_ERROR: FLAG_COMPRESSED without SETTINGS_COMPRESS_DATA");
+      }
+
+      short padding = (flags & FLAG_PADDED) != 0 ? (short) (source.readByte() & 0xff) : 0;
+      length = lengthWithoutPadding(length, flags, padding);
+
+      handler.data(inFinished, streamId, source, length);
+      source.skip(padding);
+    }
+
+    private void readPriority(Handler handler, short length, byte flags, int streamId)
+        throws IOException {
+      if (length != 5) throw ioException("TYPE_PRIORITY length: %d != 5", length);
+      if (streamId == 0) throw ioException("TYPE_PRIORITY streamId == 0");
+      readPriority(handler, streamId);
+    }
+
+    private void readPriority(Handler handler, int streamId) throws IOException {
+      int w1 = source.readInt();
+      boolean exclusive = (w1 & 0x80000000) != 0;
+      int streamDependency = (w1 & 0x7fffffff);
+      int weight = (source.readByte() & 0xff) + 1;
+      handler.priority(streamId, streamDependency, weight, exclusive);
+    }
+
+    private void readRstStream(Handler handler, short length, byte flags, int streamId)
+        throws IOException {
+      if (length != 4) throw ioException("TYPE_RST_STREAM length: %d != 4", length);
+      if (streamId == 0) throw ioException("TYPE_RST_STREAM streamId == 0");
+      int errorCodeInt = source.readInt();
+      ErrorCode errorCode = ErrorCode.fromHttp2(errorCodeInt);
+      if (errorCode == null) {
+        throw ioException("TYPE_RST_STREAM unexpected error code: %d", errorCodeInt);
+      }
+      handler.rstStream(streamId, errorCode);
+    }
+
+    private void readSettings(Handler handler, short length, byte flags, int streamId)
+        throws IOException {
+      if (streamId != 0) throw ioException("TYPE_SETTINGS streamId != 0");
+      if ((flags & FLAG_ACK) != 0) {
+        if (length != 0) throw ioException("FRAME_SIZE_ERROR ack frame should be empty!");
+        handler.ackSettings();
+        return;
+      }
+
+      if (length % 6 != 0) throw ioException("TYPE_SETTINGS length %% 6 != 0: %s", length);
+      Settings settings = new Settings();
+      for (int i = 0; i < length; i += 6) {
+        short id = source.readShort();
+        int value = source.readInt();
+
+        switch (id) {
+          case 1: // SETTINGS_HEADER_TABLE_SIZE
+            break;
+          case 2: // SETTINGS_ENABLE_PUSH
+            if (value != 0 && value != 1) {
+              throw ioException("PROTOCOL_ERROR SETTINGS_ENABLE_PUSH != 0 or 1");
+            }
+            break;
+          case 3: // SETTINGS_MAX_CONCURRENT_STREAMS
+            id = 4; // Renumbered in draft 10.
+            break;
+          case 4: // SETTINGS_INITIAL_WINDOW_SIZE
+            id = 7; // Renumbered in draft 10.
+            if (value < 0) {
+              throw ioException("PROTOCOL_ERROR SETTINGS_INITIAL_WINDOW_SIZE > 2^31 - 1");
+            }
+            break;
+          case 5: // SETTINGS_COMPRESS_DATA
+            break;
+          default:
+            throw ioException("PROTOCOL_ERROR invalid settings id: %s", id);
+        }
+        settings.set(id, 0, value);
+      }
+      handler.settings(false, settings);
+      if (settings.getHeaderTableSize() >= 0) {
+        hpackReader.maxHeaderTableByteCountSetting(settings.getHeaderTableSize());
+      }
+    }
+
+    private void readPushPromise(Handler handler, short length, byte flags, int streamId)
+        throws IOException {
+      if (streamId == 0) {
+        throw ioException("PROTOCOL_ERROR: TYPE_PUSH_PROMISE streamId == 0");
+      }
+      short padding = (flags & FLAG_PADDED) != 0 ? (short) (source.readByte() & 0xff) : 0;
+      int promisedStreamId = source.readInt() & 0x7fffffff;
+      length -= 4; // account for above read.
+      length = lengthWithoutPadding(length, flags, padding);
+      List<Header> headerBlock = readHeaderBlock(length, padding, flags, streamId);
+      handler.pushPromise(streamId, promisedStreamId, headerBlock);
+    }
+
+    private void readPing(Handler handler, short length, byte flags, int streamId)
+        throws IOException {
+      if (length != 8) throw ioException("TYPE_PING length != 8: %s", length);
+      if (streamId != 0) throw ioException("TYPE_PING streamId != 0");
+      int payload1 = source.readInt();
+      int payload2 = source.readInt();
+      boolean ack = (flags & FLAG_ACK) != 0;
+      handler.ping(ack, payload1, payload2);
+    }
+
+    private void readGoAway(Handler handler, short length, byte flags, int streamId)
+        throws IOException {
+      if (length < 8) throw ioException("TYPE_GOAWAY length < 8: %s", length);
+      if (streamId != 0) throw ioException("TYPE_GOAWAY streamId != 0");
+      int lastStreamId = source.readInt();
+      int errorCodeInt = source.readInt();
+      int opaqueDataLength = length - 8;
+      ErrorCode errorCode = ErrorCode.fromHttp2(errorCodeInt);
+      if (errorCode == null) {
+        throw ioException("TYPE_GOAWAY unexpected error code: %d", errorCodeInt);
+      }
+      ByteString debugData = EMPTY;
+      if (opaqueDataLength > 0) { // Must read debug data in order to not corrupt the connection.
+        debugData = source.readByteString(opaqueDataLength);
+      }
+      handler.goAway(lastStreamId, errorCode, debugData);
+    }
+
+    private void readWindowUpdate(Handler handler, short length, byte flags, int streamId)
+        throws IOException {
+      if (length != 4) throw ioException("TYPE_WINDOW_UPDATE length !=4: %s", length);
+      long increment = (source.readInt() & 0x7fffffffL);
+      if (increment == 0) throw ioException("windowSizeIncrement was 0", increment);
+      handler.windowUpdate(streamId, increment);
+    }
+
+    @Override public void close() throws IOException {
+      source.close();
+    }
+  }
+
+  static final class Writer implements FrameWriter {
+    private final BufferedSink sink;
+    private final boolean client;
+    private final Buffer hpackBuffer;
+    private final HpackDraft08.Writer hpackWriter;
+    private boolean closed;
+
+    Writer(BufferedSink sink, boolean client) {
+      this.sink = sink;
+      this.client = client;
+      this.hpackBuffer = new Buffer();
+      this.hpackWriter = new HpackDraft08.Writer(hpackBuffer);
+    }
+
+    @Override public synchronized void flush() throws IOException {
+      if (closed) throw new IOException("closed");
+      sink.flush();
+    }
+
+    @Override public synchronized void ackSettings() throws IOException {
+      if (closed) throw new IOException("closed");
+      int length = 0;
+      byte type = TYPE_SETTINGS;
+      byte flags = FLAG_ACK;
+      int streamId = 0;
+      frameHeader(streamId, length, type, flags);
+      sink.flush();
+    }
+
+    @Override public synchronized void connectionPreface() throws IOException {
+      if (closed) throw new IOException("closed");
+      if (!client) return; // Nothing to write; servers don't send connection headers!
+      if (logger.isLoggable(FINE)) {
+        logger.fine(format(">> CONNECTION %s", CONNECTION_PREFACE.hex()));
+      }
+      sink.write(CONNECTION_PREFACE.toByteArray());
+      sink.flush();
+    }
+
+    @Override public synchronized void synStream(boolean outFinished, boolean inFinished,
+        int streamId, int associatedStreamId, List<Header> headerBlock)
+        throws IOException {
+      if (inFinished) throw new UnsupportedOperationException();
+      if (closed) throw new IOException("closed");
+      headers(outFinished, streamId, headerBlock);
+    }
+
+    @Override public synchronized void synReply(boolean outFinished, int streamId,
+        List<Header> headerBlock) throws IOException {
+      if (closed) throw new IOException("closed");
+      headers(outFinished, streamId, headerBlock);
+    }
+
+    @Override public synchronized void headers(int streamId, List<Header> headerBlock)
+        throws IOException {
+      if (closed) throw new IOException("closed");
+      headers(false, streamId, headerBlock);
+    }
+
+    @Override public synchronized void pushPromise(int streamId, int promisedStreamId,
+        List<Header> requestHeaders) throws IOException {
+      if (closed) throw new IOException("closed");
+      if (hpackBuffer.size() != 0) throw new IllegalStateException();
+      hpackWriter.writeHeaders(requestHeaders);
+
+      long byteCount = hpackBuffer.size();
+      int length = (int) Math.min(MAX_FRAME_SIZE - 4, byteCount);
+      byte type = TYPE_PUSH_PROMISE;
+      byte flags = byteCount == length ? FLAG_END_HEADERS : 0;
+      frameHeader(streamId, length + 4, type, flags);
+      sink.writeInt(promisedStreamId & 0x7fffffff);
+      sink.write(hpackBuffer, length);
+
+      if (byteCount > length) writeContinuationFrames(streamId, byteCount - length);
+    }
+
+    void headers(boolean outFinished, int streamId, List<Header> headerBlock) throws IOException {
+      if (closed) throw new IOException("closed");
+      if (hpackBuffer.size() != 0) throw new IllegalStateException();
+      hpackWriter.writeHeaders(headerBlock);
+
+      long byteCount = hpackBuffer.size();
+      int length = (int) Math.min(MAX_FRAME_SIZE, byteCount);
+      byte type = TYPE_HEADERS;
+      byte flags = byteCount == length ? FLAG_END_HEADERS : 0;
+      if (outFinished) flags |= FLAG_END_STREAM;
+      frameHeader(streamId, length, type, flags);
+      sink.write(hpackBuffer, length);
+
+      if (byteCount > length) writeContinuationFrames(streamId, byteCount - length);
+    }
+
+    private void writeContinuationFrames(int streamId, long byteCount) throws IOException {
+      while (byteCount > 0) {
+        int length = (int) Math.min(MAX_FRAME_SIZE, byteCount);
+        byteCount -= length;
+        frameHeader(streamId, length, TYPE_CONTINUATION, byteCount == 0 ? FLAG_END_HEADERS : 0);
+        sink.write(hpackBuffer, length);
+      }
+    }
+
+    @Override public synchronized void rstStream(int streamId, ErrorCode errorCode)
+        throws IOException {
+      if (closed) throw new IOException("closed");
+      if (errorCode.spdyRstCode == -1) throw new IllegalArgumentException();
+
+      int length = 4;
+      byte type = TYPE_RST_STREAM;
+      byte flags = FLAG_NONE;
+      frameHeader(streamId, length, type, flags);
+      sink.writeInt(errorCode.httpCode);
+      sink.flush();
+    }
+
+    @Override public synchronized void data(boolean outFinished, int streamId, Buffer source)
+        throws IOException {
+      data(outFinished, streamId, source, (int) source.size());
+    }
+
+    @Override public synchronized void data(boolean outFinished, int streamId, Buffer source,
+        int byteCount) throws IOException {
+      if (closed) throw new IOException("closed");
+      byte flags = FLAG_NONE;
+      if (outFinished) flags |= FLAG_END_STREAM;
+      dataFrame(streamId, flags, source, byteCount);
+    }
+
+    void dataFrame(int streamId, byte flags, Buffer buffer, int byteCount) throws IOException {
+      byte type = TYPE_DATA;
+      frameHeader(streamId, byteCount, type, flags);
+      if (byteCount > 0) {
+        sink.write(buffer, byteCount);
+      }
+    }
+
+    @Override public synchronized void settings(Settings settings) throws IOException {
+      if (closed) throw new IOException("closed");
+      int length = settings.size() * 6;
+      byte type = TYPE_SETTINGS;
+      byte flags = FLAG_NONE;
+      int streamId = 0;
+      frameHeader(streamId, length, type, flags);
+      for (int i = 0; i < Settings.COUNT; i++) {
+        if (!settings.isSet(i)) continue;
+        int id = i;
+        if (id == 4) id = 3; // SETTINGS_MAX_CONCURRENT_STREAMS renumbered.
+        else if (id == 7) id = 4; // SETTINGS_INITIAL_WINDOW_SIZE renumbered.
+        sink.writeShort(id);
+        sink.writeInt(settings.get(i));
+      }
+      sink.flush();
+    }
+
+    @Override public synchronized void ping(boolean ack, int payload1, int payload2)
+        throws IOException {
+      if (closed) throw new IOException("closed");
+      int length = 8;
+      byte type = TYPE_PING;
+      byte flags = ack ? FLAG_ACK : FLAG_NONE;
+      int streamId = 0;
+      frameHeader(streamId, length, type, flags);
+      sink.writeInt(payload1);
+      sink.writeInt(payload2);
+      sink.flush();
+    }
+
+    @Override public synchronized void goAway(int lastGoodStreamId, ErrorCode errorCode,
+        byte[] debugData) throws IOException {
+      if (closed) throw new IOException("closed");
+      if (errorCode.httpCode == -1) throw illegalArgument("errorCode.httpCode == -1");
+      int length = 8 + debugData.length;
+      byte type = TYPE_GOAWAY;
+      byte flags = FLAG_NONE;
+      int streamId = 0;
+      frameHeader(streamId, length, type, flags);
+      sink.writeInt(lastGoodStreamId);
+      sink.writeInt(errorCode.httpCode);
+      if (debugData.length > 0) {
+        sink.write(debugData);
+      }
+      sink.flush();
+    }
+
+    @Override public synchronized void windowUpdate(int streamId, long windowSizeIncrement)
+        throws IOException {
+      if (closed) throw new IOException("closed");
+      if (windowSizeIncrement == 0 || windowSizeIncrement > 0x7fffffffL) {
+        throw illegalArgument("windowSizeIncrement == 0 || windowSizeIncrement > 0x7fffffffL: %s",
+            windowSizeIncrement);
+      }
+      int length = 4;
+      byte type = TYPE_WINDOW_UPDATE;
+      byte flags = FLAG_NONE;
+      frameHeader(streamId, length, type, flags);
+      sink.writeInt((int) windowSizeIncrement);
+      sink.flush();
+    }
+
+    @Override public synchronized void close() throws IOException {
+      closed = true;
+      sink.close();
+    }
+
+    void frameHeader(int streamId, int length, byte type, byte flags) throws IOException {
+      if (logger.isLoggable(FINE)) logger.fine(formatHeader(false, streamId, length, type, flags));
+      if (length > MAX_FRAME_SIZE) {
+        throw illegalArgument("FRAME_SIZE_ERROR length > %d: %d", MAX_FRAME_SIZE, length);
+      }
+      if ((streamId & 0x80000000) != 0) throw illegalArgument("reserved bit set: %s", streamId);
+      sink.writeInt((length & 0x3fff) << 16 | (type & 0xff) << 8 | (flags & 0xff));
+      sink.writeInt(streamId & 0x7fffffff);
+    }
+  }
+
+  private static IllegalArgumentException illegalArgument(String message, Object... args) {
+    throw new IllegalArgumentException(format(message, args));
+  }
+
+  private static IOException ioException(String message, Object... args) throws IOException {
+    throw new IOException(format(message, args));
+  }
+
+  /**
+   * Decompression of the header block occurs above the framing layer. This
+   * class lazily reads continuation frames as they are needed by {@link
+   * HpackDraft08.Reader#readHeaders()}.
+   */
+  static final class ContinuationSource implements Source {
+    private final BufferedSource source;
+
+    short length;
+    byte flags;
+    int streamId;
+
+    short left;
+    short padding;
+
+    public ContinuationSource(BufferedSource source) {
+      this.source = source;
+    }
+
+    @Override public long read(Buffer sink, long byteCount) throws IOException {
+      while (left == 0) {
+        source.skip(padding);
+        padding = 0;
+        if ((flags & FLAG_END_HEADERS) != 0) return -1;
+        readContinuationHeader();
+        // TODO: test case for empty continuation header?
+      }
+
+      long read = source.read(sink, Math.min(byteCount, left));
+      if (read == -1) return -1;
+      left -= read;
+      return read;
+    }
+
+    @Override public Timeout timeout() {
+      return source.timeout();
+    }
+
+    @Override public void close() throws IOException {
+    }
+
+    private void readContinuationHeader() throws IOException {
+      int previousStreamId = streamId;
+      int w1 = source.readInt();
+      int w2 = source.readInt();
+      length = left = (short) ((w1 & 0x3fff0000) >> 16);
+      byte type = (byte) ((w1 & 0xff00) >> 8);
+      flags = (byte) (w1 & 0xff);
+      if (logger.isLoggable(FINE)) logger.fine(formatHeader(true, streamId, length, type, flags));
+      streamId = (w2 & 0x7fffffff);
+      if (type != TYPE_CONTINUATION) throw ioException("%s != TYPE_CONTINUATION", type);
+      if (streamId != previousStreamId) throw ioException("TYPE_CONTINUATION streamId changed");
+    }
+  }
+
+  private static short lengthWithoutPadding(short length, byte flags, short padding)
+      throws IOException {
+    if ((flags & FLAG_PADDED) != 0) length--; // Account for reading the padding length.
+    if (padding > length) {
+      throw ioException("PROTOCOL_ERROR padding %s > remaining length %s", padding, length);
+    }
+    return (short) (length - padding);
+  }
+
+  /**
+   * Logs a human-readable representation of HTTP/2 frame headers.
+   *
+   * <p>The format is:
+   *
+   * <pre>
+   *   direction streamID length type flags
+   * </pre>
+   * Where direction is {@code <<} for inbound and {@code >>} for outbound.
+   *
+   * <p> For example, the following would indicate a HEAD request sent from
+   * the client.
+   * <pre>
+   * {@code
+   *   << 0x0000000f    12 HEADERS       END_HEADERS|END_STREAM
+   * }
+   * </pre>
+   */
+  static final class FrameLogger {
+
+    static String formatHeader(boolean inbound, int streamId, int length, byte type, byte flags) {
+      String formattedType = type < TYPES.length ? TYPES[type] : format("0x%02x", type);
+      String formattedFlags = formatFlags(type, flags);
+      return format("%s 0x%08x %5d %-13s %s", inbound ? "<<" : ">>", streamId, length,
+          formattedType, formattedFlags);
+    }
+
+    /**
+     * Looks up valid string representing flags from the table. Invalid
+     * combinations are represented in binary.
+     */
+    // Visible for testing.
+    static String formatFlags(byte type, byte flags) {
+      if (flags == 0) return "";
+      switch (type) { // Special case types that have 0 or 1 flag.
+        case TYPE_SETTINGS:
+        case TYPE_PING:
+          return flags == FLAG_ACK ? "ACK" : BINARY[flags];
+        case TYPE_PRIORITY:
+        case TYPE_RST_STREAM:
+        case TYPE_GOAWAY:
+        case TYPE_WINDOW_UPDATE:
+          return BINARY[flags];
+      }
+      String result = flags < FLAGS.length ? FLAGS[flags] : BINARY[flags];
+      // Special case types that have overlap flag values.
+      if (type == TYPE_PUSH_PROMISE && (flags & FLAG_END_PUSH_PROMISE) != 0) {
+        return result.replace("HEADERS", "PUSH_PROMISE"); // TODO: Avoid allocation.
+      } else if (type == TYPE_DATA && (flags & FLAG_COMPRESSED) != 0) {
+        return result.replace("PRIORITY", "COMPRESSED"); // TODO: Avoid allocation.
+      }
+      return result;
+    }
+
+    /** Lookup table for valid frame types. */
+    private static final String[] TYPES = new String[] {
+        "DATA",
+        "HEADERS",
+        "PRIORITY",
+        "RST_STREAM",
+        "SETTINGS",
+        "PUSH_PROMISE",
+        "PING",
+        "GOAWAY",
+        "WINDOW_UPDATE",
+        "CONTINUATION"
+    };
+
+    /**
+     * Lookup table for valid flags for DATA, HEADERS, CONTINUATION. Invalid
+     * combinations are represented in binary.
+     */
+    private static final String[] FLAGS = new String[0x40]; // Highest bit flag is 0x20.
+    private static final String[] BINARY = new String[256];
+
+    static {
+      for (int i = 0; i < BINARY.length; i++) {
+        BINARY[i] = format("%8s", Integer.toBinaryString(i)).replace(' ', '0');
+      }
+
+      FLAGS[FLAG_NONE] = "";
+      FLAGS[FLAG_END_STREAM] = "END_STREAM";
+      FLAGS[FLAG_END_SEGMENT] = "END_SEGMENT";
+      FLAGS[FLAG_END_STREAM | FLAG_END_SEGMENT] = "END_STREAM|END_SEGMENT";
+      int[] prefixFlags =
+          new int[] {FLAG_END_STREAM, FLAG_END_SEGMENT, FLAG_END_SEGMENT | FLAG_END_STREAM};
+
+      FLAGS[FLAG_PADDED] = "PADDED";
+      for (int prefixFlag : prefixFlags) {
+         FLAGS[prefixFlag | FLAG_PADDED] = FLAGS[prefixFlag] + "|PADDED";
+      }
+
+      FLAGS[FLAG_END_HEADERS] = "END_HEADERS"; // Same as END_PUSH_PROMISE.
+      FLAGS[FLAG_PRIORITY] = "PRIORITY"; // Same as FLAG_COMPRESSED.
+      FLAGS[FLAG_END_HEADERS | FLAG_PRIORITY] = "END_HEADERS|PRIORITY"; // Only valid on HEADERS.
+      int[] frameFlags =
+          new int[] {FLAG_END_HEADERS, FLAG_PRIORITY, FLAG_END_HEADERS | FLAG_PRIORITY};
+
+      for (int frameFlag : frameFlags) {
+        for (int prefixFlag : prefixFlags) {
+          FLAGS[prefixFlag | frameFlag] = FLAGS[prefixFlag] + '|' + FLAGS[frameFlag];
+          FLAGS[prefixFlag | frameFlag | FLAG_PADDED] =
+              FLAGS[prefixFlag] + '|' + FLAGS[frameFlag] + "|PADDED";
+        }
+      }
+
+      for (int i = 0; i < FLAGS.length; i++) { // Fill in holes with binary representation.
+        if (FLAGS[i] == null) FLAGS[i] = BINARY[i];
+      }
+    }
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Huffman.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Huffman.java
new file mode 100644
index 000000000..dfa7153ef
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Huffman.java
@@ -0,0 +1,225 @@
+/*
+ * Copyright 2013 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * This class was originally composed from the following classes in
+ * <a href="https://github.com/twitter/hpack">Twitter Hpack</a>.
+ * <ul>
+ * <li>{@code com.twitter.hpack.HuffmanEncoder}</li>
+ * <li>{@code com.twitter.hpack.HuffmanDecoder}</li>
+ * <li>{@code com.twitter.hpack.HpackUtil}</li>
+ * </ul>
+ */
+class Huffman {
+
+  // Appendix C: Huffman Codes
+  // http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08#appendix-C
+  private static final int[] CODES = {
+      0x1ff8, 0x7fffd8, 0xfffffe2, 0xfffffe3, 0xfffffe4, 0xfffffe5, 0xfffffe6, 0xfffffe7, 0xfffffe8,
+      0xffffea, 0x3ffffffc, 0xfffffe9, 0xfffffea, 0x3ffffffd, 0xfffffeb, 0xfffffec, 0xfffffed,
+      0xfffffee, 0xfffffef, 0xffffff0, 0xffffff1, 0xffffff2, 0x3ffffffe, 0xffffff3, 0xffffff4,
+      0xffffff5, 0xffffff6, 0xffffff7, 0xffffff8, 0xffffff9, 0xffffffa, 0xffffffb, 0x14, 0x3f8,
+      0x3f9, 0xffa, 0x1ff9, 0x15, 0xf8, 0x7fa, 0x3fa, 0x3fb, 0xf9, 0x7fb, 0xfa, 0x16, 0x17, 0x18,
+      0x0, 0x1, 0x2, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x5c, 0xfb, 0x7ffc, 0x20, 0xffb,
+      0x3fc, 0x1ffa, 0x21, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
+      0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0xfc, 0x73, 0xfd, 0x1ffb, 0x7fff0,
+      0x1ffc, 0x3ffc, 0x22, 0x7ffd, 0x3, 0x23, 0x4, 0x24, 0x5, 0x25, 0x26, 0x27, 0x6, 0x74, 0x75,
+      0x28, 0x29, 0x2a, 0x7, 0x2b, 0x76, 0x2c, 0x8, 0x9, 0x2d, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7ffe,
+      0x7fc, 0x3ffd, 0x1ffd, 0xffffffc, 0xfffe6, 0x3fffd2, 0xfffe7, 0xfffe8, 0x3fffd3, 0x3fffd4,
+      0x3fffd5, 0x7fffd9, 0x3fffd6, 0x7fffda, 0x7fffdb, 0x7fffdc, 0x7fffdd, 0x7fffde, 0xffffeb,
+      0x7fffdf, 0xffffec, 0xffffed, 0x3fffd7, 0x7fffe0, 0xffffee, 0x7fffe1, 0x7fffe2, 0x7fffe3,
+      0x7fffe4, 0x1fffdc, 0x3fffd8, 0x7fffe5, 0x3fffd9, 0x7fffe6, 0x7fffe7, 0xffffef, 0x3fffda,
+      0x1fffdd, 0xfffe9, 0x3fffdb, 0x3fffdc, 0x7fffe8, 0x7fffe9, 0x1fffde, 0x7fffea, 0x3fffdd,
+      0x3fffde, 0xfffff0, 0x1fffdf, 0x3fffdf, 0x7fffeb, 0x7fffec, 0x1fffe0, 0x1fffe1, 0x3fffe0,
+      0x1fffe2, 0x7fffed, 0x3fffe1, 0x7fffee, 0x7fffef, 0xfffea, 0x3fffe2, 0x3fffe3, 0x3fffe4,
+      0x7ffff0, 0x3fffe5, 0x3fffe6, 0x7ffff1, 0x3ffffe0, 0x3ffffe1, 0xfffeb, 0x7fff1, 0x3fffe7,
+      0x7ffff2, 0x3fffe8, 0x1ffffec, 0x3ffffe2, 0x3ffffe3, 0x3ffffe4, 0x7ffffde, 0x7ffffdf,
+      0x3ffffe5, 0xfffff1, 0x1ffffed, 0x7fff2, 0x1fffe3, 0x3ffffe6, 0x7ffffe0, 0x7ffffe1, 0x3ffffe7,
+      0x7ffffe2, 0xfffff2, 0x1fffe4, 0x1fffe5, 0x3ffffe8, 0x3ffffe9, 0xffffffd, 0x7ffffe3,
+      0x7ffffe4, 0x7ffffe5, 0xfffec, 0xfffff3, 0xfffed, 0x1fffe6, 0x3fffe9, 0x1fffe7, 0x1fffe8,
+      0x7ffff3, 0x3fffea, 0x3fffeb, 0x1ffffee, 0x1ffffef, 0xfffff4, 0xfffff5, 0x3ffffea, 0x7ffff4,
+      0x3ffffeb, 0x7ffffe6, 0x3ffffec, 0x3ffffed, 0x7ffffe7, 0x7ffffe8, 0x7ffffe9, 0x7ffffea,
+      0x7ffffeb, 0xffffffe, 0x7ffffec, 0x7ffffed, 0x7ffffee, 0x7ffffef, 0x7fffff0, 0x3ffffee
+  };
+
+  private static final byte[] CODE_LENGTHS = {
+      13, 23, 28, 28, 28, 28, 28, 28, 28, 24, 30, 28, 28, 30, 28, 28, 28, 28, 28, 28, 28, 28, 30,
+      28, 28, 28, 28, 28, 28, 28, 28, 28, 6, 10, 10, 12, 13, 6, 8, 11, 10, 10, 8, 11, 8, 6, 6, 6, 5,
+      5, 5, 6, 6, 6, 6, 6, 6, 6, 7, 8, 15, 6, 12, 10, 13, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+      7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 13, 19, 13, 14, 6, 15, 5, 6, 5, 6, 5, 6, 6, 6, 5, 7, 7, 6,
+      6, 6, 5, 6, 7, 6, 5, 5, 6, 7, 7, 7, 7, 7, 15, 11, 14, 13, 28, 20, 22, 20, 20, 22, 22, 22, 23,
+      22, 23, 23, 23, 23, 23, 24, 23, 24, 24, 22, 23, 24, 23, 23, 23, 23, 21, 22, 23, 22, 23, 23,
+      24, 22, 21, 20, 22, 22, 23, 23, 21, 23, 22, 22, 24, 21, 22, 23, 23, 21, 21, 22, 21, 23, 22,
+      23, 23, 20, 22, 22, 22, 23, 22, 22, 23, 26, 26, 20, 19, 22, 23, 22, 25, 26, 26, 26, 27, 27,
+      26, 24, 25, 19, 21, 26, 27, 27, 26, 27, 24, 21, 21, 26, 26, 28, 27, 27, 27, 20, 24, 20, 21,
+      22, 21, 21, 23, 22, 22, 25, 25, 24, 24, 26, 23, 26, 27, 26, 26, 27, 27, 27, 27, 27, 28, 27,
+      27, 27, 27, 27, 26
+  };
+
+  private static final Huffman INSTANCE = new Huffman();
+
+  public static Huffman get() {
+    return INSTANCE;
+  }
+
+  private final Node root = new Node();
+
+  private Huffman() {
+    buildTree();
+  }
+
+  void encode(byte[] data, OutputStream out) throws IOException {
+    long current = 0;
+    int n = 0;
+
+    for (int i = 0; i < data.length; i++) {
+      int b = data[i] & 0xFF;
+      int code = CODES[b];
+      int nbits = CODE_LENGTHS[b];
+
+      current <<= nbits;
+      current |= code;
+      n += nbits;
+
+      while (n >= 8) {
+        n -= 8;
+        out.write(((int) (current >> n)));
+      }
+    }
+
+    if (n > 0) {
+      current <<= (8 - n);
+      current |= (0xFF >>> n);
+      out.write((int) current);
+    }
+  }
+
+  int encodedLength(byte[] bytes) {
+    long len = 0;
+
+    for (int i = 0; i < bytes.length; i++) {
+      int b = bytes[i] & 0xFF;
+      len += CODE_LENGTHS[b];
+    }
+
+    return (int) ((len + 7) >> 3);
+  }
+
+  byte[] decode(byte[] buf) throws IOException {
+    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    Node node = root;
+    int current = 0;
+    int nbits = 0;
+    for (int i = 0; i < buf.length; i++) {
+      int b = buf[i] & 0xFF;
+      current = (current << 8) | b;
+      nbits += 8;
+      while (nbits >= 8) {
+        int c = (current >>> (nbits - 8)) & 0xFF;
+        node = node.children[c];
+        if (node.children == null) {
+          // terminal node
+          baos.write(node.symbol);
+          nbits -= node.terminalBits;
+          node = root;
+        } else {
+          // non-terminal node
+          nbits -= 8;
+        }
+      }
+    }
+
+    while (nbits > 0) {
+      int c = (current << (8 - nbits)) & 0xFF;
+      node = node.children[c];
+      if (node.children != null || node.terminalBits > nbits) {
+        break;
+      }
+      baos.write(node.symbol);
+      nbits -= node.terminalBits;
+      node = root;
+    }
+
+    return baos.toByteArray();
+  }
+
+  private void buildTree() {
+    for (int i = 0; i < CODE_LENGTHS.length; i++) {
+      addCode(i, CODES[i], CODE_LENGTHS[i]);
+    }
+  }
+
+  private void addCode(int sym, int code, byte len) {
+    Node terminal = new Node(sym, len);
+
+    Node current = root;
+    while (len > 8) {
+      len -= 8;
+      int i = ((code >>> len) & 0xFF);
+      if (current.children == null) {
+        throw new IllegalStateException("invalid dictionary: prefix not unique");
+      }
+      if (current.children[i] == null) {
+        current.children[i] = new Node();
+      }
+      current = current.children[i];
+    }
+
+    int shift = 8 - len;
+    int start = (code << shift) & 0xFF;
+    int end = 1 << shift;
+    for (int i = start; i < start + end; i++) {
+      current.children[i] = terminal;
+    }
+  }
+
+  private static final class Node {
+
+    // Null if terminal.
+    private final Node[] children;
+
+    // Terminal nodes have a symbol.
+    private final int symbol;
+
+    // Number of bits represented in the terminal node.
+    private final int terminalBits;
+
+    /** Construct an internal node. */
+    Node() {
+      this.children = new Node[256];
+      this.symbol = 0; // Not read.
+      this.terminalBits = 0; // Not read.
+    }
+
+    /**
+     * Construct a terminal node.
+     *
+     * @param symbol symbol the node represents
+     * @param bits length of Huffman code in bits
+     */
+    Node(int symbol, int bits) {
+      this.children = null;
+      this.symbol = symbol;
+      int b = bits & 0x07;
+      this.terminalBits = b == 0 ? 8 : b;
+    }
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/IncomingStreamHandler.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/IncomingStreamHandler.java
new file mode 100644
index 000000000..d36799f78
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/IncomingStreamHandler.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+import java.io.IOException;
+
+/** Listener to be notified when a connected peer creates a new stream. */
+public interface IncomingStreamHandler {
+  IncomingStreamHandler REFUSE_INCOMING_STREAMS = new IncomingStreamHandler() {
+    @Override public void receive(SpdyStream stream) throws IOException {
+      stream.close(ErrorCode.REFUSED_STREAM);
+    }
+  };
+
+  /**
+   * Handle a new stream from this connection's peer. Implementations should
+   * respond by either {@link SpdyStream#reply replying to the stream} or
+   * {@link SpdyStream#close closing it}. This response does not need to be
+   * synchronous.
+   */
+  void receive(SpdyStream stream) throws IOException;
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/NameValueBlockReader.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/NameValueBlockReader.java
new file mode 100644
index 000000000..adc15f898
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/NameValueBlockReader.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2013 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+import com.koushikdutta.async.http.spdy.okio.Buffer;
+import com.koushikdutta.async.http.spdy.okio.BufferedSource;
+import com.koushikdutta.async.http.spdy.okio.ByteString;
+import com.koushikdutta.async.http.spdy.okio.ForwardingSource;
+import com.koushikdutta.async.http.spdy.okio.InflaterSource;
+import com.koushikdutta.async.http.spdy.okio.Okio;
+import com.koushikdutta.async.http.spdy.okio.Source;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.DataFormatException;
+import java.util.zip.Inflater;
+
+/**
+ * Reads a SPDY/3 Name/Value header block. This class is made complicated by the
+ * requirement that we're strict with which bytes we put in the compressed bytes
+ * buffer. We need to put all compressed bytes into that buffer -- but no other
+ * bytes.
+ */
+class NameValueBlockReader {
+  /** This source transforms compressed bytes into uncompressed bytes. */
+  private final InflaterSource inflaterSource;
+
+  /**
+   * How many compressed bytes must be read into inflaterSource before
+   * {@link #readNameValueBlock} returns.
+   */
+  private int compressedLimit;
+
+  /** This source holds inflated bytes. */
+  private final BufferedSource source;
+
+  public NameValueBlockReader(BufferedSource source) {
+    // Limit the inflater input stream to only those bytes in the Name/Value
+    // block. We cut the inflater off at its source because we can't predict the
+    // ratio of compressed bytes to uncompressed bytes.
+    Source throttleSource = new ForwardingSource(source) {
+      @Override public long read(Buffer sink, long byteCount) throws IOException {
+        if (compressedLimit == 0) return -1; // Out of data for the current block.
+        long read = super.read(sink, Math.min(byteCount, compressedLimit));
+        if (read == -1) return -1;
+        compressedLimit -= read;
+        return read;
+      }
+    };
+
+    // Subclass inflater to install a dictionary when it's needed.
+    Inflater inflater = new Inflater() {
+      @Override public int inflate(byte[] buffer, int offset, int count)
+          throws DataFormatException {
+        int result = super.inflate(buffer, offset, count);
+        if (result == 0 && needsDictionary()) {
+          setDictionary(Spdy3.DICTIONARY);
+          result = super.inflate(buffer, offset, count);
+        }
+        return result;
+      }
+    };
+
+    this.inflaterSource = new InflaterSource(throttleSource, inflater);
+    this.source = Okio.buffer(inflaterSource);
+  }
+
+  public List<Header> readNameValueBlock(int length) throws IOException {
+    this.compressedLimit += length;
+
+    int numberOfPairs = source.readInt();
+    if (numberOfPairs < 0) throw new IOException("numberOfPairs < 0: " + numberOfPairs);
+    if (numberOfPairs > 1024) throw new IOException("numberOfPairs > 1024: " + numberOfPairs);
+
+    List<Header> entries = new ArrayList<Header>(numberOfPairs);
+    for (int i = 0; i < numberOfPairs; i++) {
+      ByteString name = readByteString().toAsciiLowercase();
+      ByteString values = readByteString();
+      if (name.size() == 0) throw new IOException("name.size == 0");
+      entries.add(new Header(name, values));
+    }
+
+    doneReading();
+    return entries;
+  }
+
+  private ByteString readByteString() throws IOException {
+    int length = source.readInt();
+    return source.readByteString(length);
+  }
+
+  private void doneReading() throws IOException {
+    // Move any outstanding unread bytes into the inflater. One side-effect of
+    // deflate compression is that sometimes there are bytes remaining in the
+    // stream after we've consumed all of the content.
+    if (compressedLimit > 0) {
+      inflaterSource.refill();
+      if (compressedLimit != 0) throw new IOException("compressedLimit > 0: " + compressedLimit);
+    }
+  }
+
+  public void close() throws IOException {
+    source.close();
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Ping.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Ping.java
new file mode 100644
index 000000000..0a82b4308
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Ping.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2012 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A locally-originated ping.
+ */
+public final class Ping {
+  private final CountDownLatch latch = new CountDownLatch(1);
+  private long sent = -1;
+  private long received = -1;
+
+  Ping() {
+  }
+
+  public void send() {
+    if (sent != -1) throw new IllegalStateException();
+    sent = System.nanoTime();
+  }
+
+  public void receive() {
+    if (received != -1 || sent == -1) throw new IllegalStateException();
+    received = System.nanoTime();
+    latch.countDown();
+  }
+
+  void cancel() {
+    if (received != -1 || sent == -1) throw new IllegalStateException();
+    received = sent - 1;
+    latch.countDown();
+  }
+
+  /**
+   * Returns the round trip time for this ping in nanoseconds, waiting for the
+   * response to arrive if necessary. Returns -1 if the response was
+   * canceled.
+   */
+  public long roundTripTime() throws InterruptedException {
+    latch.await();
+    return received - sent;
+  }
+
+  /**
+   * Returns the round trip time for this ping in nanoseconds, or -1 if the
+   * response was canceled, or -2 if the timeout elapsed before the round
+   * trip completed.
+   */
+  public long roundTripTime(long timeout, TimeUnit unit) throws InterruptedException {
+    if (latch.await(timeout, unit)) {
+      return received - sent;
+    } else {
+      return -2;
+    }
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/PushObserver.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/PushObserver.java
new file mode 100644
index 000000000..fcec1732b
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/PushObserver.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+import com.koushikdutta.async.http.spdy.okio.BufferedSource;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * {@link com.squareup.okhttp.Protocol#HTTP_2 HTTP/2} only.
+ * Processes server-initiated HTTP requests on the client. Implementations must
+ * quickly dispatch callbacks to avoid creating a bottleneck.
+ *
+ * <p>While {@link #onReset} may occur at any time, the following callbacks are
+ * expected in order, correlated by stream ID.
+ * <ul>
+ *   <li>{@link #onRequest}</li>
+ *   <li>{@link #onHeaders} (unless canceled)</li>
+ *   <li>{@link #onData} (optional sequence of data frames)</li>
+ * </ul>
+ *
+ * <p>As a stream ID is scoped to a single HTTP/2 connection, implementations
+ * which target multiple connections should expect repetition of stream IDs.
+ *
+ * <p>Return true to request cancellation of a pushed stream.  Note that this
+ * does not guarantee future frames won't arrive on the stream ID.
+ */
+public interface PushObserver {
+  /**
+   * Describes the request that the server intends to push a response for.
+   *
+   * @param streamId server-initiated stream ID: an even number.
+   * @param requestHeaders minimally includes {@code :method}, {@code :scheme},
+   * {@code :authority}, and (@code :path}.
+   */
+  boolean onRequest(int streamId, List<Header> requestHeaders);
+
+  /**
+   * The response headers corresponding to a pushed request.  When {@code last}
+   * is true, there are no data frames to follow.
+   *
+   * @param streamId server-initiated stream ID: an even number.
+   * @param responseHeaders minimally includes {@code :status}.
+   * @param last when true, there is no response data.
+   */
+  boolean onHeaders(int streamId, List<Header> responseHeaders, boolean last);
+
+  /**
+   * A chunk of response data corresponding to a pushed request.  This data
+   * must either be read or skipped.
+   *
+   * @param streamId server-initiated stream ID: an even number.
+   * @param source location of data corresponding with this stream ID.
+   * @param byteCount number of bytes to read or skip from the source.
+   * @param last when true, there are no data frames to follow.
+   */
+  boolean onData(int streamId, BufferedSource source, int byteCount, boolean last)
+      throws IOException;
+
+  /** Indicates the reason why this stream was canceled. */
+  void onReset(int streamId, ErrorCode errorCode);
+
+  PushObserver CANCEL = new PushObserver() {
+
+    @Override public boolean onRequest(int streamId, List<Header> requestHeaders) {
+      return true;
+    }
+
+    @Override public boolean onHeaders(int streamId, List<Header> responseHeaders, boolean last) {
+      return true;
+    }
+
+    @Override public boolean onData(int streamId, BufferedSource source, int byteCount,
+        boolean last) throws IOException {
+      source.skip(byteCount);
+      return true;
+    }
+
+    @Override public void onReset(int streamId, ErrorCode errorCode) {
+    }
+  };
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Settings.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Settings.java
new file mode 100644
index 000000000..4b332f6c9
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Settings.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright (C) 2012 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+import java.util.Arrays;
+
+/**
+ * Settings describe characteristics of the sending peer, which are used by the receiving peer.
+ * Settings are {@link com.koushikdutta.async.http.spdy.okhttp.internal.spdy.SpdyConnection connection} scoped.
+ */
+public final class Settings {
+  /**
+   * From the SPDY/3 and HTTP/2 specs, the default initial window size for all
+   * streams is 64 KiB. (Chrome 25 uses 10 MiB).
+   */
+  public static final int DEFAULT_INITIAL_WINDOW_SIZE = 64 * 1024;
+
+  /** Peer request to clear durable settings. */
+  static final int FLAG_CLEAR_PREVIOUSLY_PERSISTED_SETTINGS = 0x1;
+
+  /** Sent by servers only. The peer requests this setting persisted for future connections. */
+  static final int PERSIST_VALUE = 0x1;
+  /** Sent by clients only. The client is reminding the server of a persisted value. */
+  static final int PERSISTED = 0x2;
+
+  /** spdy/3: Sender's estimate of max incoming kbps. */
+  static final int UPLOAD_BANDWIDTH = 1;
+  /** HTTP/2: Size in bytes of the table used to decode the sender's header blocks. */
+  static final int HEADER_TABLE_SIZE = 1;
+  /** spdy/3: Sender's estimate of max outgoing kbps. */
+  static final int DOWNLOAD_BANDWIDTH = 2;
+  /** HTTP/2: The peer must not send a PUSH_PROMISE frame when this is 0. */
+  static final int ENABLE_PUSH = 2;
+  /** spdy/3: Sender's estimate of millis between sending a request and receiving a response. */
+  static final int ROUND_TRIP_TIME = 3;
+  /** Sender's maximum number of concurrent streams. */
+  static final int MAX_CONCURRENT_STREAMS = 4;
+  /** spdy/3: Current CWND in Packets. */
+  static final int CURRENT_CWND = 5;
+  /** spdy/3: Retransmission rate. Percentage */
+  static final int DOWNLOAD_RETRANS_RATE = 6;
+  /** Window size in bytes. */
+  static final int INITIAL_WINDOW_SIZE = 7;
+  /** spdy/3: Window size in bytes. */
+  static final int CLIENT_CERTIFICATE_VECTOR_SIZE = 8;
+  /** Flow control options. */
+  static final int FLOW_CONTROL_OPTIONS = 10;
+
+  /** Total number of settings. */
+  static final int COUNT = 10;
+
+  /** If set, flow control is disabled for streams directed to the sender of these settings. */
+  static final int FLOW_CONTROL_OPTIONS_DISABLED = 0x1;
+
+  /** Bitfield of which flags that values. */
+  private int set;
+
+  /** Bitfield of flags that have {@link #PERSIST_VALUE}. */
+  private int persistValue;
+
+  /** Bitfield of flags that have {@link #PERSISTED}. */
+  private int persisted;
+
+  /** Flag values. */
+  private final int[] values = new int[COUNT];
+
+  public void clear() {
+    set = persistValue = persisted = 0;
+    Arrays.fill(values, 0);
+  }
+
+  Settings set(int id, int idFlags, int value) {
+    if (id >= values.length) {
+      return this; // Discard unknown settings.
+    }
+
+    int bit = 1 << id;
+    set |= bit;
+    if ((idFlags & PERSIST_VALUE) != 0) {
+      persistValue |= bit;
+    } else {
+      persistValue &= ~bit;
+    }
+    if ((idFlags & PERSISTED) != 0) {
+      persisted |= bit;
+    } else {
+      persisted &= ~bit;
+    }
+
+    values[id] = value;
+    return this;
+  }
+
+  /** Returns true if a value has been assigned for the setting {@code id}. */
+  boolean isSet(int id) {
+    int bit = 1 << id;
+    return (set & bit) != 0;
+  }
+
+  /** Returns the value for the setting {@code id}, or 0 if unset. */
+  int get(int id) {
+    return values[id];
+  }
+
+  /** Returns the flags for the setting {@code id}, or 0 if unset. */
+  int flags(int id) {
+    int result = 0;
+    if (isPersisted(id)) result |= Settings.PERSISTED;
+    if (persistValue(id)) result |= Settings.PERSIST_VALUE;
+    return result;
+  }
+
+  /** Returns the number of settings that have values assigned. */
+  int size() {
+    return Integer.bitCount(set);
+  }
+
+  /** spdy/3 only. */
+  int getUploadBandwidth(int defaultValue) {
+    int bit = 1 << UPLOAD_BANDWIDTH;
+    return (bit & set) != 0 ? values[UPLOAD_BANDWIDTH] : defaultValue;
+  }
+
+  /** HTTP/2 only. Returns -1 if unset. */
+  int getHeaderTableSize() {
+    int bit = 1 << HEADER_TABLE_SIZE;
+    return (bit & set) != 0 ? values[HEADER_TABLE_SIZE] : -1;
+  }
+
+  /** spdy/3 only. */
+  int getDownloadBandwidth(int defaultValue) {
+    int bit = 1 << DOWNLOAD_BANDWIDTH;
+    return (bit & set) != 0 ? values[DOWNLOAD_BANDWIDTH] : defaultValue;
+  }
+
+  /** HTTP/2 only. */
+  // TODO: honor this setting in HTTP/2.
+  boolean getEnablePush(boolean defaultValue) {
+    int bit = 1 << ENABLE_PUSH;
+    return ((bit & set) != 0 ? values[ENABLE_PUSH] : defaultValue ? 1 : 0) == 1;
+  }
+
+  /** spdy/3 only. */
+  int getRoundTripTime(int defaultValue) {
+    int bit = 1 << ROUND_TRIP_TIME;
+    return (bit & set) != 0 ? values[ROUND_TRIP_TIME] : defaultValue;
+  }
+
+  // TODO: honor this setting in spdy/3 and HTTP/2.
+  int getMaxConcurrentStreams(int defaultValue) {
+    int bit = 1 << MAX_CONCURRENT_STREAMS;
+    return (bit & set) != 0 ? values[MAX_CONCURRENT_STREAMS] : defaultValue;
+  }
+
+  /** spdy/3 only. */
+  int getCurrentCwnd(int defaultValue) {
+    int bit = 1 << CURRENT_CWND;
+    return (bit & set) != 0 ? values[CURRENT_CWND] : defaultValue;
+  }
+
+  /** spdy/3 only. */
+  int getDownloadRetransRate(int defaultValue) {
+    int bit = 1 << DOWNLOAD_RETRANS_RATE;
+    return (bit & set) != 0 ? values[DOWNLOAD_RETRANS_RATE] : defaultValue;
+  }
+
+  public int getInitialWindowSize(int defaultValue) {
+    int bit = 1 << INITIAL_WINDOW_SIZE;
+    return (bit & set) != 0 ? values[INITIAL_WINDOW_SIZE] : defaultValue;
+  }
+
+  /** spdy/3 only. */
+  int getClientCertificateVectorSize(int defaultValue) {
+    int bit = 1 << CLIENT_CERTIFICATE_VECTOR_SIZE;
+    return (bit & set) != 0 ? values[CLIENT_CERTIFICATE_VECTOR_SIZE] : defaultValue;
+  }
+
+  // TODO: honor this setting in spdy/3 and HTTP/2.
+  boolean isFlowControlDisabled() {
+    int bit = 1 << FLOW_CONTROL_OPTIONS;
+    int value = (bit & set) != 0 ? values[FLOW_CONTROL_OPTIONS] : 0;
+    return (value & FLOW_CONTROL_OPTIONS_DISABLED) != 0;
+  }
+
+  /**
+   * Returns true if this user agent should use this setting in future spdy/3
+   * connections to the same host.
+   */
+  boolean persistValue(int id) {
+    int bit = 1 << id;
+    return (persistValue & bit) != 0;
+  }
+
+  /** Returns true if this setting was persisted. */
+  boolean isPersisted(int id) {
+    int bit = 1 << id;
+    return (persisted & bit) != 0;
+  }
+
+  /**
+   * Writes {@code other} into this. If any setting is populated by this and
+   * {@code other}, the value and flags from {@code other} will be kept.
+   */
+  public void merge(Settings other) {
+    for (int i = 0; i < COUNT; i++) {
+      if (!other.isSet(i)) continue;
+      set(i, other.flags(i), other.get(i));
+    }
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
new file mode 100644
index 000000000..72a3df2ba
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
@@ -0,0 +1,514 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.http.Protocol;
+import com.koushikdutta.async.http.spdy.okhttp.internal.Util;
+import com.koushikdutta.async.http.spdy.okio.Buffer;
+import com.koushikdutta.async.http.spdy.okio.BufferedSink;
+import com.koushikdutta.async.http.spdy.okio.BufferedSource;
+import com.koushikdutta.async.http.spdy.okio.ByteString;
+import com.koushikdutta.async.http.spdy.okio.DeflaterSink;
+import com.koushikdutta.async.http.spdy.okio.Okio;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.ProtocolException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.List;
+import java.util.zip.Deflater;
+
+
+/**
+ * Read and write spdy/3.1 frames.
+ * http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3-1
+ */
+public final class Spdy3 implements Variant {
+
+  @Override public Protocol getProtocol() {
+    return Protocol.SPDY_3;
+  }
+
+  static final int TYPE_DATA = 0x0;
+  static final int TYPE_SYN_STREAM = 0x1;
+  static final int TYPE_SYN_REPLY = 0x2;
+  static final int TYPE_RST_STREAM = 0x3;
+  static final int TYPE_SETTINGS = 0x4;
+  static final int TYPE_PING = 0x6;
+  static final int TYPE_GOAWAY = 0x7;
+  static final int TYPE_HEADERS = 0x8;
+  static final int TYPE_WINDOW_UPDATE = 0x9;
+
+  static final int FLAG_FIN = 0x1;
+  static final int FLAG_UNIDIRECTIONAL = 0x2;
+
+  static final int VERSION = 3;
+
+  static final byte[] DICTIONARY;
+  static {
+    try {
+      DICTIONARY = ("\u0000\u0000\u0000\u0007options\u0000\u0000\u0000\u0004hea"
+          + "d\u0000\u0000\u0000\u0004post\u0000\u0000\u0000\u0003put\u0000\u0000\u0000\u0006dele"
+          + "te\u0000\u0000\u0000\u0005trace\u0000\u0000\u0000\u0006accept\u0000\u0000\u0000"
+          + "\u000Eaccept-charset\u0000\u0000\u0000\u000Faccept-encoding\u0000\u0000\u0000\u000Fa"
+          + "ccept-language\u0000\u0000\u0000\raccept-ranges\u0000\u0000\u0000\u0003age\u0000"
+          + "\u0000\u0000\u0005allow\u0000\u0000\u0000\rauthorization\u0000\u0000\u0000\rcache-co"
+          + "ntrol\u0000\u0000\u0000\nconnection\u0000\u0000\u0000\fcontent-base\u0000\u0000"
+          + "\u0000\u0010content-encoding\u0000\u0000\u0000\u0010content-language\u0000\u0000"
+          + "\u0000\u000Econtent-length\u0000\u0000\u0000\u0010content-location\u0000\u0000\u0000"
+          + "\u000Bcontent-md5\u0000\u0000\u0000\rcontent-range\u0000\u0000\u0000\fcontent-type"
+          + "\u0000\u0000\u0000\u0004date\u0000\u0000\u0000\u0004etag\u0000\u0000\u0000\u0006expe"
+          + "ct\u0000\u0000\u0000\u0007expires\u0000\u0000\u0000\u0004from\u0000\u0000\u0000"
+          + "\u0004host\u0000\u0000\u0000\bif-match\u0000\u0000\u0000\u0011if-modified-since"
+          + "\u0000\u0000\u0000\rif-none-match\u0000\u0000\u0000\bif-range\u0000\u0000\u0000"
+          + "\u0013if-unmodified-since\u0000\u0000\u0000\rlast-modified\u0000\u0000\u0000\blocati"
+          + "on\u0000\u0000\u0000\fmax-forwards\u0000\u0000\u0000\u0006pragma\u0000\u0000\u0000"
+          + "\u0012proxy-authenticate\u0000\u0000\u0000\u0013proxy-authorization\u0000\u0000"
+          + "\u0000\u0005range\u0000\u0000\u0000\u0007referer\u0000\u0000\u0000\u000Bretry-after"
+          + "\u0000\u0000\u0000\u0006server\u0000\u0000\u0000\u0002te\u0000\u0000\u0000\u0007trai"
+          + "ler\u0000\u0000\u0000\u0011transfer-encoding\u0000\u0000\u0000\u0007upgrade\u0000"
+          + "\u0000\u0000\nuser-agent\u0000\u0000\u0000\u0004vary\u0000\u0000\u0000\u0003via"
+          + "\u0000\u0000\u0000\u0007warning\u0000\u0000\u0000\u0010www-authenticate\u0000\u0000"
+          + "\u0000\u0006method\u0000\u0000\u0000\u0003get\u0000\u0000\u0000\u0006status\u0000"
+          + "\u0000\u0000\u0006200 OK\u0000\u0000\u0000\u0007version\u0000\u0000\u0000\bHTTP/1.1"
+          + "\u0000\u0000\u0000\u0003url\u0000\u0000\u0000\u0006public\u0000\u0000\u0000\nset-coo"
+          + "kie\u0000\u0000\u0000\nkeep-alive\u0000\u0000\u0000\u0006origin100101201202205206300"
+          + "302303304305306307402405406407408409410411412413414415416417502504505203 Non-Authori"
+          + "tative Information204 No Content301 Moved Permanently400 Bad Request401 Unauthorized"
+          + "403 Forbidden404 Not Found500 Internal Server Error501 Not Implemented503 Service Un"
+          + "availableJan Feb Mar Apr May Jun Jul Aug Sept Oct Nov Dec 00:00:00 Mon, Tue, Wed, Th"
+          + "u, Fri, Sat, Sun, GMTchunked,text/html,image/png,image/jpg,image/gif,application/xml"
+          + ",application/xhtml+xml,text/plain,text/javascript,publicprivatemax-age=gzip,deflate,"
+          + "sdchcharset=utf-8charset=iso-8859-1,utf-,*,enq=0.").getBytes(Util.UTF_8.name());
+    } catch (UnsupportedEncodingException e) {
+      throw new AssertionError();
+    }
+  }
+
+  @Override public FrameReader newReader(BufferedSource source, boolean client) {
+    return new Reader(source, client);
+  }
+
+  @Override public FrameWriter newWriter(BufferedSink sink, boolean client) {
+    return new Writer(sink, client);
+  }
+
+  @Override public int maxFrameSize() {
+    return 16383;
+  }
+
+  /** Read spdy/3 frames. */
+  static final class Reader implements FrameReader {
+    private final BufferedSource source;
+    private final boolean client;
+    private final NameValueBlockReader headerBlockReader;
+
+    Reader(BufferedSource source, boolean client) {
+      this.source = source;
+      this.headerBlockReader = new NameValueBlockReader(this.source);
+      this.client = client;
+    }
+
+    @Override public void readConnectionPreface() {
+    }
+
+      @Override
+      public boolean canProcessFrame(ByteBufferList bb) {
+          if (bb.remaining() < 8)
+              return false;
+          ByteBuffer peek = ByteBuffer.wrap(bb.peekBytes(8)).order(ByteOrder.BIG_ENDIAN);
+          peek.getInt();
+          int w2 = peek.getInt();
+
+          int length = (w2 & 0xffffff);
+          return bb.remaining() >= 8 + length;
+      }
+
+      /**
+     * Send the next frame to {@code handler}. Returns true unless there are no
+     * more frames on the stream.
+     */
+    @Override public boolean nextFrame(Handler handler) throws IOException {
+      int w1;
+      int w2;
+      try {
+        w1 = source.readInt();
+        w2 = source.readInt();
+      } catch (IOException e) {
+        return false; // This might be a normal socket close.
+      }
+
+      boolean control = (w1 & 0x80000000) != 0;
+      int flags = (w2 & 0xff000000) >>> 24;
+      int length = (w2 & 0xffffff);
+
+      if (control) {
+        int version = (w1 & 0x7fff0000) >>> 16;
+        int type = (w1 & 0xffff);
+
+        if (version != 3) {
+          throw new ProtocolException("version != 3: " + version);
+        }
+
+        switch (type) {
+          case TYPE_SYN_STREAM:
+            readSynStream(handler, flags, length);
+            return true;
+
+          case TYPE_SYN_REPLY:
+            readSynReply(handler, flags, length);
+            return true;
+
+          case TYPE_RST_STREAM:
+            readRstStream(handler, flags, length);
+            return true;
+
+          case TYPE_SETTINGS:
+            readSettings(handler, flags, length);
+            return true;
+
+          case TYPE_PING:
+            readPing(handler, flags, length);
+            return true;
+
+          case TYPE_GOAWAY:
+            readGoAway(handler, flags, length);
+            return true;
+
+          case TYPE_HEADERS:
+            readHeaders(handler, flags, length);
+            return true;
+
+          case TYPE_WINDOW_UPDATE:
+            readWindowUpdate(handler, flags, length);
+            return true;
+
+          default:
+            source.skip(length);
+            return true;
+        }
+      } else {
+        int streamId = w1 & 0x7fffffff;
+        boolean inFinished = (flags & FLAG_FIN) != 0;
+        handler.data(inFinished, streamId, source, length);
+        return true;
+      }
+    }
+
+    private void readSynStream(Handler handler, int flags, int length) throws IOException {
+      int w1 = source.readInt();
+      int w2 = source.readInt();
+      int streamId = w1 & 0x7fffffff;
+      int associatedStreamId = w2 & 0x7fffffff;
+      source.readShort(); // int priority = (s3 & 0xe000) >>> 13; int slot = s3 & 0xff;
+      List<Header> headerBlock = headerBlockReader.readNameValueBlock(length - 10);
+
+      boolean inFinished = (flags & FLAG_FIN) != 0;
+      boolean outFinished = (flags & FLAG_UNIDIRECTIONAL) != 0;
+      handler.headers(outFinished, inFinished, streamId, associatedStreamId, headerBlock,
+          HeadersMode.SPDY_SYN_STREAM);
+    }
+
+    private void readSynReply(Handler handler, int flags, int length) throws IOException {
+      int w1 = source.readInt();
+      int streamId = w1 & 0x7fffffff;
+      List<Header> headerBlock = headerBlockReader.readNameValueBlock(length - 4);
+      boolean inFinished = (flags & FLAG_FIN) != 0;
+      handler.headers(false, inFinished, streamId, -1, headerBlock, HeadersMode.SPDY_REPLY);
+    }
+
+    private void readRstStream(Handler handler, int flags, int length) throws IOException {
+      if (length != 8) throw ioException("TYPE_RST_STREAM length: %d != 8", length);
+      int streamId = source.readInt() & 0x7fffffff;
+      int errorCodeInt = source.readInt();
+      ErrorCode errorCode = ErrorCode.fromSpdy3Rst(errorCodeInt);
+      if (errorCode == null) {
+        throw ioException("TYPE_RST_STREAM unexpected error code: %d", errorCodeInt);
+      }
+      handler.rstStream(streamId, errorCode);
+    }
+
+    private void readHeaders(Handler handler, int flags, int length) throws IOException {
+      int w1 = source.readInt();
+      int streamId = w1 & 0x7fffffff;
+      List<Header> headerBlock = headerBlockReader.readNameValueBlock(length - 4);
+      handler.headers(false, false, streamId, -1, headerBlock, HeadersMode.SPDY_HEADERS);
+    }
+
+    private void readWindowUpdate(Handler handler, int flags, int length) throws IOException {
+      if (length != 8) throw ioException("TYPE_WINDOW_UPDATE length: %d != 8", length);
+      int w1 = source.readInt();
+      int w2 = source.readInt();
+      int streamId = w1 & 0x7fffffff;
+      long increment = w2 & 0x7fffffff;
+      if (increment == 0) throw ioException("windowSizeIncrement was 0", increment);
+      handler.windowUpdate(streamId, increment);
+    }
+
+    private void readPing(Handler handler, int flags, int length) throws IOException {
+      if (length != 4) throw ioException("TYPE_PING length: %d != 4", length);
+      int id = source.readInt();
+      boolean ack = client == ((id & 1) == 1);
+      handler.ping(ack, id, 0);
+    }
+
+    private void readGoAway(Handler handler, int flags, int length) throws IOException {
+      if (length != 8) throw ioException("TYPE_GOAWAY length: %d != 8", length);
+      int lastGoodStreamId = source.readInt() & 0x7fffffff;
+      int errorCodeInt = source.readInt();
+      ErrorCode errorCode = ErrorCode.fromSpdyGoAway(errorCodeInt);
+      if (errorCode == null) {
+        throw ioException("TYPE_GOAWAY unexpected error code: %d", errorCodeInt);
+      }
+      handler.goAway(lastGoodStreamId, errorCode, ByteString.EMPTY);
+    }
+
+    private void readSettings(Handler handler, int flags, int length) throws IOException {
+      int numberOfEntries = source.readInt();
+      if (length != 4 + 8 * numberOfEntries) {
+        throw ioException("TYPE_SETTINGS length: %d != 4 + 8 * %d", length, numberOfEntries);
+      }
+      Settings settings = new Settings();
+      for (int i = 0; i < numberOfEntries; i++) {
+        int w1 = source.readInt();
+        int value = source.readInt();
+        int idFlags = (w1 & 0xff000000) >>> 24;
+        int id = w1 & 0xffffff;
+        settings.set(id, idFlags, value);
+      }
+      boolean clearPrevious = (flags & Settings.FLAG_CLEAR_PREVIOUSLY_PERSISTED_SETTINGS) != 0;
+      handler.settings(clearPrevious, settings);
+    }
+
+    private static IOException ioException(String message, Object... args) throws IOException {
+      throw new IOException(String.format(message, args));
+    }
+
+    @Override public void close() throws IOException {
+      headerBlockReader.close();
+    }
+  }
+
+  /** Write spdy/3 frames. */
+  static final class Writer implements FrameWriter {
+    private final BufferedSink sink;
+    private final Buffer headerBlockBuffer;
+    private final BufferedSink headerBlockOut;
+    private final boolean client;
+    private boolean closed;
+
+    Writer(BufferedSink sink, boolean client) {
+      this.sink = sink;
+      this.client = client;
+
+      Deflater deflater = new Deflater();
+      deflater.setDictionary(DICTIONARY);
+      headerBlockBuffer = new Buffer();
+      headerBlockOut = Okio.buffer(new DeflaterSink(headerBlockBuffer, deflater));
+    }
+
+    @Override public void ackSettings() {
+      // Do nothing: no ACK for SPDY/3 settings.
+    }
+
+    @Override
+    public void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders)
+        throws IOException {
+      // Do nothing: no push promise for SPDY/3.
+    }
+
+    @Override public synchronized void connectionPreface() {
+      // Do nothing: no connection preface for SPDY/3.
+    }
+
+    @Override public synchronized void flush() throws IOException {
+      if (closed) throw new IOException("closed");
+      sink.flush();
+    }
+
+    @Override public synchronized void synStream(boolean outFinished, boolean inFinished,
+        int streamId, int associatedStreamId, List<Header> headerBlock)
+        throws IOException {
+      if (closed) throw new IOException("closed");
+      writeNameValueBlockToBuffer(headerBlock);
+      int length = (int) (10 + headerBlockBuffer.size());
+      int type = TYPE_SYN_STREAM;
+      int flags = (outFinished ? FLAG_FIN : 0) | (inFinished ? FLAG_UNIDIRECTIONAL : 0);
+
+      int unused = 0;
+      sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+      sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
+      sink.writeInt(streamId & 0x7fffffff);
+      sink.writeInt(associatedStreamId & 0x7fffffff);
+      sink.writeShort((unused & 0x7) << 13 | (unused & 0x1f) << 8 | (unused & 0xff));
+      sink.writeAll(headerBlockBuffer);
+      sink.flush();
+    }
+
+    @Override public synchronized void synReply(boolean outFinished, int streamId,
+        List<Header> headerBlock) throws IOException {
+      if (closed) throw new IOException("closed");
+      writeNameValueBlockToBuffer(headerBlock);
+      int type = TYPE_SYN_REPLY;
+      int flags = (outFinished ? FLAG_FIN : 0);
+      int length = (int) (headerBlockBuffer.size() + 4);
+
+      sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+      sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
+      sink.writeInt(streamId & 0x7fffffff);
+      sink.writeAll(headerBlockBuffer);
+      sink.flush();
+    }
+
+    @Override public synchronized void headers(int streamId, List<Header> headerBlock)
+        throws IOException {
+      if (closed) throw new IOException("closed");
+      writeNameValueBlockToBuffer(headerBlock);
+      int flags = 0;
+      int type = TYPE_HEADERS;
+      int length = (int) (headerBlockBuffer.size() + 4);
+
+      sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+      sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
+      sink.writeInt(streamId & 0x7fffffff);
+      sink.writeAll(headerBlockBuffer);
+    }
+
+    @Override public synchronized void rstStream(int streamId, ErrorCode errorCode)
+        throws IOException {
+      if (closed) throw new IOException("closed");
+      if (errorCode.spdyRstCode == -1) throw new IllegalArgumentException();
+      int flags = 0;
+      int type = TYPE_RST_STREAM;
+      int length = 8;
+      sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+      sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
+      sink.writeInt(streamId & 0x7fffffff);
+      sink.writeInt(errorCode.spdyRstCode);
+      sink.flush();
+    }
+
+    @Override public synchronized void data(boolean outFinished, int streamId, Buffer source)
+        throws IOException {
+      data(outFinished, streamId, source, (int) source.size());
+    }
+
+    @Override public synchronized void data(boolean outFinished, int streamId, Buffer source,
+        int byteCount) throws IOException {
+      int flags = (outFinished ? FLAG_FIN : 0);
+      sendDataFrame(streamId, flags, source, byteCount);
+    }
+
+    void sendDataFrame(int streamId, int flags, Buffer buffer, int byteCount)
+        throws IOException {
+      if (closed) throw new IOException("closed");
+      if (byteCount > 0xffffffL) {
+        throw new IllegalArgumentException("FRAME_TOO_LARGE max size is 16Mib: " + byteCount);
+      }
+      sink.writeInt(streamId & 0x7fffffff);
+      sink.writeInt((flags & 0xff) << 24 | byteCount & 0xffffff);
+      if (byteCount > 0) {
+        sink.write(buffer, byteCount);
+      }
+    }
+
+    private void writeNameValueBlockToBuffer(List<Header> headerBlock) throws IOException {
+      if (headerBlockBuffer.size() != 0) throw new IllegalStateException();
+      headerBlockOut.writeInt(headerBlock.size());
+      for (int i = 0, size = headerBlock.size(); i < size; i++) {
+        ByteString name = headerBlock.get(i).name;
+        headerBlockOut.writeInt(name.size());
+        headerBlockOut.write(name);
+        ByteString value = headerBlock.get(i).value;
+        headerBlockOut.writeInt(value.size());
+        headerBlockOut.write(value);
+      }
+      headerBlockOut.flush();
+    }
+
+    @Override public synchronized void settings(Settings settings) throws IOException {
+      if (closed) throw new IOException("closed");
+      int type = TYPE_SETTINGS;
+      int flags = 0;
+      int size = settings.size();
+      int length = 4 + size * 8;
+      sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+      sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
+      sink.writeInt(size);
+      for (int i = 0; i <= Settings.COUNT; i++) {
+        if (!settings.isSet(i)) continue;
+        int settingsFlags = settings.flags(i);
+        sink.writeInt((settingsFlags & 0xff) << 24 | (i & 0xffffff));
+        sink.writeInt(settings.get(i));
+      }
+      sink.flush();
+    }
+
+    @Override public synchronized void ping(boolean reply, int payload1, int payload2)
+        throws IOException {
+      if (closed) throw new IOException("closed");
+      boolean payloadIsReply = client != ((payload1 & 1) == 1);
+      if (reply != payloadIsReply) throw new IllegalArgumentException("payload != reply");
+      int type = TYPE_PING;
+      int flags = 0;
+      int length = 4;
+      sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+      sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
+      sink.writeInt(payload1);
+      sink.flush();
+    }
+
+    @Override public synchronized void goAway(int lastGoodStreamId, ErrorCode errorCode,
+        byte[] ignored) throws IOException {
+      if (closed) throw new IOException("closed");
+      if (errorCode.spdyGoAwayCode == -1) {
+        throw new IllegalArgumentException("errorCode.spdyGoAwayCode == -1");
+      }
+      int type = TYPE_GOAWAY;
+      int flags = 0;
+      int length = 8;
+      sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+      sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
+      sink.writeInt(lastGoodStreamId);
+      sink.writeInt(errorCode.spdyGoAwayCode);
+      sink.flush();
+    }
+
+    @Override public synchronized void windowUpdate(int streamId, long increment)
+        throws IOException {
+      if (closed) throw new IOException("closed");
+      if (increment == 0 || increment > 0x7fffffffL) {
+        throw new IllegalArgumentException(
+            "windowSizeIncrement must be between 1 and 0x7fffffff: " + increment);
+      }
+      int type = TYPE_WINDOW_UPDATE;
+      int flags = 0;
+      int length = 8;
+      sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+      sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
+      sink.writeInt(streamId);
+      sink.writeInt((int) increment);
+      sink.flush();
+    }
+
+    @Override public synchronized void close() throws IOException {
+      closed = true;
+      Util.closeAll(sink, headerBlockOut);
+    }
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/SpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/SpdyConnection.java
new file mode 100644
index 000000000..52f924f14
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/SpdyConnection.java
@@ -0,0 +1,874 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+import com.koushikdutta.async.http.Protocol;
+import com.koushikdutta.async.http.spdy.okhttp.internal.NamedRunnable;
+import com.koushikdutta.async.http.spdy.okhttp.internal.Util;
+import com.koushikdutta.async.http.spdy.okio.Buffer;
+import com.koushikdutta.async.http.spdy.okio.BufferedSource;
+import com.koushikdutta.async.http.spdy.okio.ByteString;
+import com.koushikdutta.async.http.spdy.okio.Okio;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+
+import static com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Settings.DEFAULT_INITIAL_WINDOW_SIZE;
+
+/**
+ * A socket connection to a remote peer. A connection hosts streams which can
+ * send and receive data.
+ *
+ * <p>Many methods in this API are <strong>synchronous:</strong> the call is
+ * completed before the method returns. This is typical for Java but atypical
+ * for SPDY. This is motivated by exception transparency: an IOException that
+ * was triggered by a certain caller can be caught and handled by that caller.
+ */
+public final class SpdyConnection implements Closeable {
+
+  // Internal state of this connection is guarded by 'this'. No blocking
+  // operations may be performed while holding this lock!
+  //
+  // Socket writes are guarded by frameWriter.
+  //
+  // Socket reads are unguarded but are only made by the reader thread.
+  //
+  // Certain operations (like SYN_STREAM) need to synchronize on both the
+  // frameWriter (to do blocking I/O) and this (to create streams). Such
+  // operations must synchronize on 'this' last. This ensures that we never
+  // wait for a blocking operation while holding 'this'.
+
+  private static final ExecutorService executor = new ThreadPoolExecutor(0,
+      Integer.MAX_VALUE, 60, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(),
+      Util.threadFactory("OkHttp SpdyConnection", true));
+
+  /** The protocol variant, like {@link com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Spdy3}. */
+  final Protocol protocol;
+
+  /** True if this peer initiated the connection. */
+  final boolean client;
+
+  /**
+   * User code to run in response to an incoming stream. Callbacks must not be
+   * run on the callback executor.
+   */
+  private final IncomingStreamHandler handler;
+  private final Map<Integer, SpdyStream> streams = new HashMap<Integer, SpdyStream>();
+  private final String hostName;
+  private int lastGoodStreamId;
+  private int nextStreamId;
+  private boolean shutdown;
+  private long idleStartTimeNs = System.nanoTime();
+
+  /** Ensures push promise callbacks events are sent in order per stream. */
+  private final ExecutorService pushExecutor;
+
+  /** Lazily-created map of in-flight pings awaiting a response. Guarded by this. */
+  private Map<Integer, Ping> pings;
+  /** User code to run in response to push promise events. */
+  private final PushObserver pushObserver;
+  private int nextPingId;
+
+  /**
+   * The total number of bytes consumed by the application, but not yet
+   * acknowledged by sending a {@code WINDOW_UPDATE} frame on this connection.
+   */
+  // Visible for testing
+  long unacknowledgedBytesRead = 0;
+
+  /**
+   * Count of bytes that can be written on the connection before receiving a
+   * window update.
+   */
+  // Visible for testing
+  long bytesLeftInWriteWindow;
+
+  /** Settings we communicate to the peer. */
+  // TODO: Do we want to dynamically adjust settings, or KISS and only set once?
+  final Settings okHttpSettings = new Settings();
+      // okHttpSettings.set(Settings.MAX_CONCURRENT_STREAMS, 0, max);
+  private static final int OKHTTP_CLIENT_WINDOW_SIZE = 16 * 1024 * 1024;
+
+  /** Settings we receive from the peer. */
+  // TODO: MWS will need to guard on this setting before attempting to push.
+  final Settings peerSettings = new Settings();
+
+  private boolean receivedInitialPeerSettings = false;
+  final Variant variant;
+  final Socket socket;
+  final FrameWriter frameWriter;
+  final long maxFrameSize;
+
+  // Visible for testing
+  final Reader readerRunnable;
+
+  private SpdyConnection(Builder builder) throws IOException {
+    protocol = builder.protocol;
+    pushObserver = builder.pushObserver;
+    client = builder.client;
+    handler = builder.handler;
+    // http://tools.ietf.org/html/draft-ietf-httpbis-http2-13#section-5.1.1
+    nextStreamId = builder.client ? 1 : 2;
+    if (builder.client && protocol == Protocol.HTTP_2) {
+      nextStreamId += 2; // In HTTP/2, 1 on client is reserved for Upgrade.
+    }
+
+    nextPingId = builder.client ? 1 : 2;
+
+    // Flow control was designed more for servers, or proxies than edge clients.
+    // If we are a client, set the flow control window to 16MiB.  This avoids
+    // thrashing window updates every 64KiB, yet small enough to avoid blowing
+    // up the heap.
+    if (builder.client) {
+      okHttpSettings.set(Settings.INITIAL_WINDOW_SIZE, 0, OKHTTP_CLIENT_WINDOW_SIZE);
+    }
+
+    hostName = builder.hostName;
+
+    if (protocol == Protocol.HTTP_2) {
+      variant = new Http20Draft13();
+      // Like newSingleThreadExecutor, except lazy creates the thread.
+      pushExecutor = new ThreadPoolExecutor(0, 1,
+          0L, TimeUnit.MILLISECONDS,
+          new LinkedBlockingQueue<Runnable>(),
+          Util.threadFactory(String.format("OkHttp %s Push Observer", hostName), true));
+      // 1 less than SPDY http://tools.ietf.org/html/draft-ietf-httpbis-http2-13#section-6.9.2
+      peerSettings.set(Settings.INITIAL_WINDOW_SIZE, 0, 65535);
+    } else if (protocol == Protocol.SPDY_3) {
+      variant = new Spdy3();
+      pushExecutor = null;
+    } else {
+      throw new AssertionError(protocol);
+    }
+    bytesLeftInWriteWindow = peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE);
+    socket = builder.socket;
+    frameWriter = variant.newWriter(Okio.buffer(Okio.sink(builder.socket)), client);
+    maxFrameSize = variant.maxFrameSize();
+
+    readerRunnable = new Reader();
+    new Thread(readerRunnable).start(); // Not a daemon thread.
+  }
+
+  /** The protocol as selected using NPN or ALPN. */
+  public Protocol getProtocol() {
+    return protocol;
+  }
+
+  /**
+   * Returns the number of {@link SpdyStream#isOpen() open streams} on this
+   * connection.
+   */
+  public synchronized int openStreamCount() {
+    return streams.size();
+  }
+
+  synchronized SpdyStream getStream(int id) {
+    return streams.get(id);
+  }
+
+  synchronized SpdyStream removeStream(int streamId) {
+    SpdyStream stream = streams.remove(streamId);
+    if (stream != null && streams.isEmpty()) {
+      setIdle(true);
+    }
+    return stream;
+  }
+
+  private synchronized void setIdle(boolean value) {
+    idleStartTimeNs = value ? System.nanoTime() : Long.MAX_VALUE;
+  }
+
+  /** Returns true if this connection is idle. */
+  public synchronized boolean isIdle() {
+    return idleStartTimeNs != Long.MAX_VALUE;
+  }
+
+  /**
+   * Returns the time in ns when this connection became idle or Long.MAX_VALUE
+   * if connection is not idle.
+   */
+  public synchronized long getIdleStartTimeNs() {
+    return idleStartTimeNs;
+  }
+
+  /**
+   * Returns a new server-initiated stream.
+   *
+   * @param associatedStreamId the stream that triggered the sender to create
+   *     this stream.
+   * @param out true to create an output stream that we can use to send data
+   *     to the remote peer. Corresponds to {@code FLAG_FIN}.
+   */
+  public SpdyStream pushStream(int associatedStreamId, List<Header> requestHeaders, boolean out)
+      throws IOException {
+    if (client) throw new IllegalStateException("Client cannot push requests.");
+    if (protocol != Protocol.HTTP_2) throw new IllegalStateException("protocol != HTTP_2");
+    return newStream(associatedStreamId, requestHeaders, out, false);
+  }
+
+  /**
+   * Returns a new locally-initiated stream.
+   *
+   * @param out true to create an output stream that we can use to send data to the remote peer.
+   *     Corresponds to {@code FLAG_FIN}.
+   * @param in true to create an input stream that the remote peer can use to send data to us.
+   *     Corresponds to {@code FLAG_UNIDIRECTIONAL}.
+   */
+  public SpdyStream newStream(List<Header> requestHeaders, boolean out, boolean in)
+      throws IOException {
+    return newStream(0, requestHeaders, out, in);
+  }
+
+  private SpdyStream newStream(int associatedStreamId, List<Header> requestHeaders, boolean out,
+      boolean in) throws IOException {
+    boolean outFinished = !out;
+    boolean inFinished = !in;
+    SpdyStream stream;
+    int streamId;
+
+    synchronized (frameWriter) {
+      synchronized (this) {
+        if (shutdown) {
+          throw new IOException("shutdown");
+        }
+        streamId = nextStreamId;
+        nextStreamId += 2;
+        stream = new SpdyStream(streamId, this, outFinished, inFinished, requestHeaders);
+        if (stream.isOpen()) {
+          streams.put(streamId, stream);
+          setIdle(false);
+        }
+      }
+      if (associatedStreamId == 0) {
+        frameWriter.synStream(outFinished, inFinished, streamId, associatedStreamId,
+            requestHeaders);
+      } else if (client) {
+        throw new IllegalArgumentException("client streams shouldn't have associated stream IDs");
+      } else { // HTTP/2 has a PUSH_PROMISE frame.
+        frameWriter.pushPromise(associatedStreamId, streamId, requestHeaders);
+      }
+    }
+
+    if (!out) {
+      frameWriter.flush();
+    }
+
+    return stream;
+  }
+
+  void writeSynReply(int streamId, boolean outFinished, List<Header> alternating)
+      throws IOException {
+    frameWriter.synReply(outFinished, streamId, alternating);
+  }
+
+  /**
+   * Callers of this method are not thread safe, and sometimes on application
+   * threads.  Most often, this method will be called to send a buffer worth of
+   * data to the peer.
+   * <p>
+   * Writes are subject to the write window of the stream and the connection.
+   * Until there is a window sufficient to send {@code byteCount}, the caller
+   * will block.  For example, a user of {@code HttpURLConnection} who flushes
+   * more bytes to the output stream than the connection's write window will
+   * block.
+   * <p>
+   * Zero {@code byteCount} writes are not subject to flow control and
+   * will not block.  The only use case for zero {@code byteCount} is closing
+   * a flushed output stream.
+   */
+  public void writeData(int streamId, boolean outFinished, Buffer buffer, long byteCount)
+      throws IOException {
+    if (byteCount == 0) { // Empty data frames are not flow-controlled.
+      frameWriter.data(outFinished, streamId, buffer, 0);
+      return;
+    }
+
+    while (byteCount > 0) {
+      int toWrite;
+      synchronized (SpdyConnection.this) {
+        try {
+          while (bytesLeftInWriteWindow <= 0) {
+            SpdyConnection.this.wait(); // Wait until we receive a WINDOW_UPDATE.
+          }
+        } catch (InterruptedException e) {
+          throw new InterruptedIOException();
+        }
+
+        toWrite = (int) Math.min(Math.min(byteCount, bytesLeftInWriteWindow), maxFrameSize);
+        bytesLeftInWriteWindow -= toWrite;
+      }
+
+      byteCount -= toWrite;
+      frameWriter.data(outFinished && byteCount == 0, streamId, buffer, toWrite);
+    }
+  }
+
+  /**
+   * {@code delta} will be negative if a settings frame initial window is
+   * smaller than the last.
+   */
+  void addBytesToWriteWindow(long delta) {
+    bytesLeftInWriteWindow += delta;
+    if (delta > 0) SpdyConnection.this.notifyAll();
+  }
+
+  void writeSynResetLater(final int streamId, final ErrorCode errorCode) {
+    executor.submit(new NamedRunnable("OkHttp %s stream %d", hostName, streamId) {
+      @Override public void execute() {
+        try {
+          writeSynReset(streamId, errorCode);
+        } catch (IOException ignored) {
+        }
+      }
+    });
+  }
+
+  void writeSynReset(int streamId, ErrorCode statusCode) throws IOException {
+    frameWriter.rstStream(streamId, statusCode);
+  }
+
+  void writeWindowUpdateLater(final int streamId, final long unacknowledgedBytesRead) {
+    executor.submit(new NamedRunnable("OkHttp Window Update %s stream %d", hostName, streamId) {
+      @Override public void execute() {
+        try {
+          frameWriter.windowUpdate(streamId, unacknowledgedBytesRead);
+        } catch (IOException ignored) {
+        }
+      }
+    });
+  }
+
+  /**
+   * Sends a ping frame to the peer. Use the returned object to await the
+   * ping's response and observe its round trip time.
+   */
+  public Ping ping() throws IOException {
+    Ping ping = new Ping();
+    int pingId;
+    synchronized (this) {
+      if (shutdown) {
+        throw new IOException("shutdown");
+      }
+      pingId = nextPingId;
+      nextPingId += 2;
+      if (pings == null) pings = new HashMap<Integer, Ping>();
+      pings.put(pingId, ping);
+    }
+    writePing(false, pingId, 0x4f4b6f6b /* ASCII "OKok" */, ping);
+    return ping;
+  }
+
+  private void writePingLater(
+      final boolean reply, final int payload1, final int payload2, final Ping ping) {
+    executor.submit(new NamedRunnable("OkHttp %s ping %08x%08x",
+        hostName, payload1, payload2) {
+      @Override public void execute() {
+        try {
+          writePing(reply, payload1, payload2, ping);
+        } catch (IOException ignored) {
+        }
+      }
+    });
+  }
+
+  private void writePing(boolean reply, int payload1, int payload2, Ping ping) throws IOException {
+    synchronized (frameWriter) {
+      // Observe the sent time immediately before performing I/O.
+      if (ping != null) ping.send();
+      frameWriter.ping(reply, payload1, payload2);
+    }
+  }
+
+  private synchronized Ping removePing(int id) {
+    return pings != null ? pings.remove(id) : null;
+  }
+
+  public void flush() throws IOException {
+    frameWriter.flush();
+  }
+
+  /**
+   * Degrades this connection such that new streams can neither be created
+   * locally, nor accepted from the remote peer. Existing streams are not
+   * impacted. This is intended to permit an endpoint to gracefully stop
+   * accepting new requests without harming previously established streams.
+   */
+  public void shutdown(ErrorCode statusCode) throws IOException {
+    synchronized (frameWriter) {
+      int lastGoodStreamId;
+      synchronized (this) {
+        if (shutdown) {
+          return;
+        }
+        shutdown = true;
+        lastGoodStreamId = this.lastGoodStreamId;
+      }
+      // TODO: propagate exception message into debugData
+      frameWriter.goAway(lastGoodStreamId, statusCode, Util.EMPTY_BYTE_ARRAY);
+    }
+  }
+
+  /**
+   * Closes this connection. This cancels all open streams and unanswered
+   * pings. It closes the underlying input and output streams and shuts down
+   * internal executor services.
+   */
+  @Override public void close() throws IOException {
+    close(ErrorCode.NO_ERROR, ErrorCode.CANCEL);
+  }
+
+  private void close(ErrorCode connectionCode, ErrorCode streamCode) throws IOException {
+    assert (!Thread.holdsLock(this));
+    IOException thrown = null;
+    try {
+      shutdown(connectionCode);
+    } catch (IOException e) {
+      thrown = e;
+    }
+
+    SpdyStream[] streamsToClose = null;
+    Ping[] pingsToCancel = null;
+    synchronized (this) {
+      if (!streams.isEmpty()) {
+        streamsToClose = streams.values().toArray(new SpdyStream[streams.size()]);
+        streams.clear();
+        setIdle(false);
+      }
+      if (pings != null) {
+        pingsToCancel = pings.values().toArray(new Ping[pings.size()]);
+        pings = null;
+      }
+    }
+
+    if (streamsToClose != null) {
+      for (SpdyStream stream : streamsToClose) {
+        try {
+          stream.close(streamCode);
+        } catch (IOException e) {
+          if (thrown != null) thrown = e;
+        }
+      }
+    }
+
+    if (pingsToCancel != null) {
+      for (Ping ping : pingsToCancel) {
+        ping.cancel();
+      }
+    }
+
+    // Close the writer to release its resources (such as deflaters).
+    try {
+      frameWriter.close();
+    } catch (IOException e) {
+      if (thrown == null) thrown = e;
+    }
+
+    // Close the socket to break out the reader thread, which will clean up after itself.
+    try {
+      socket.close();
+    } catch (IOException e) {
+      thrown = e;
+    }
+
+    if (thrown != null) throw thrown;
+  }
+
+  /**
+   * Sends a connection header if the current variant requires it. This should
+   * be called after {@link Builder#build} for all new connections.
+   */
+  public void sendConnectionPreface() throws IOException {
+    frameWriter.connectionPreface();
+    frameWriter.settings(okHttpSettings);
+    int windowSize = okHttpSettings.getInitialWindowSize(Settings.DEFAULT_INITIAL_WINDOW_SIZE);
+    if (windowSize != Settings.DEFAULT_INITIAL_WINDOW_SIZE) {
+      frameWriter.windowUpdate(0, windowSize - Settings.DEFAULT_INITIAL_WINDOW_SIZE);
+    }
+  }
+
+  public static class Builder {
+    private String hostName;
+    private Socket socket;
+    private IncomingStreamHandler handler = IncomingStreamHandler.REFUSE_INCOMING_STREAMS;
+    private Protocol protocol = Protocol.SPDY_3;
+    private PushObserver pushObserver = PushObserver.CANCEL;
+    private boolean client;
+
+    public Builder(boolean client, Socket socket) throws IOException {
+      this(((InetSocketAddress) socket.getRemoteSocketAddress()).getHostName(), client, socket);
+    }
+
+    /**
+     * @param client true if this peer initiated the connection; false if this
+     *     peer accepted the connection.
+     */
+    public Builder(String hostName, boolean client, Socket socket) throws IOException {
+      this.hostName = hostName;
+      this.client = client;
+      this.socket = socket;
+    }
+
+    public Builder handler(IncomingStreamHandler handler) {
+      this.handler = handler;
+      return this;
+    }
+
+    public Builder protocol(Protocol protocol) {
+      this.protocol = protocol;
+      return this;
+    }
+
+    public Builder pushObserver(PushObserver pushObserver) {
+      this.pushObserver = pushObserver;
+      return this;
+    }
+
+    public SpdyConnection build() throws IOException {
+      return new SpdyConnection(this);
+    }
+  }
+
+  /**
+   * Methods in this class must not lock FrameWriter.  If a method needs to
+   * write a frame, create an async task to do so.
+   */
+  class Reader extends NamedRunnable implements FrameReader.Handler {
+    FrameReader frameReader;
+
+    private Reader() {
+      super("OkHttp %s", hostName);
+    }
+
+    @Override protected void execute() {
+      ErrorCode connectionErrorCode = ErrorCode.INTERNAL_ERROR;
+      ErrorCode streamErrorCode = ErrorCode.INTERNAL_ERROR;
+      try {
+        frameReader = variant.newReader(Okio.buffer(Okio.source(socket)), client);
+        if (!client) {
+          frameReader.readConnectionPreface();
+        }
+        while (frameReader.nextFrame(this)) {
+        }
+        connectionErrorCode = ErrorCode.NO_ERROR;
+        streamErrorCode = ErrorCode.CANCEL;
+      } catch (IOException e) {
+        connectionErrorCode = ErrorCode.PROTOCOL_ERROR;
+        streamErrorCode = ErrorCode.PROTOCOL_ERROR;
+      } finally {
+        try {
+          close(connectionErrorCode, streamErrorCode);
+        } catch (IOException ignored) {
+        }
+        Util.closeQuietly(frameReader);
+      }
+    }
+
+    @Override public void data(boolean inFinished, int streamId, BufferedSource source, int length)
+        throws IOException {
+      if (pushedStream(streamId)) {
+        pushDataLater(streamId, source, length, inFinished);
+        return;
+      }
+      SpdyStream dataStream = getStream(streamId);
+      if (dataStream == null) {
+        writeSynResetLater(streamId, ErrorCode.INVALID_STREAM);
+        source.skip(length);
+        return;
+      }
+      dataStream.receiveData(source, length);
+      if (inFinished) {
+        dataStream.receiveFin();
+      }
+    }
+
+    @Override public void headers(boolean outFinished, boolean inFinished, int streamId,
+        int associatedStreamId, List<Header> headerBlock, HeadersMode headersMode) {
+      if (pushedStream(streamId)) {
+        pushHeadersLater(streamId, headerBlock, inFinished);
+        return;
+      }
+      SpdyStream stream;
+      synchronized (SpdyConnection.this) {
+        // If we're shutdown, don't bother with this stream.
+        if (shutdown) return;
+
+        stream = getStream(streamId);
+
+        if (stream == null) {
+          // The headers claim to be for an existing stream, but we don't have one.
+          if (headersMode.failIfStreamAbsent()) {
+            writeSynResetLater(streamId, ErrorCode.INVALID_STREAM);
+            return;
+          }
+
+          // If the stream ID is less than the last created ID, assume it's already closed.
+          if (streamId <= lastGoodStreamId) return;
+
+          // If the stream ID is in the client's namespace, assume it's already closed.
+          if (streamId % 2 == nextStreamId % 2) return;
+
+          // Create a stream.
+          final SpdyStream newStream = new SpdyStream(streamId, SpdyConnection.this, outFinished,
+              inFinished, headerBlock);
+          lastGoodStreamId = streamId;
+          streams.put(streamId, newStream);
+          executor.submit(new NamedRunnable("OkHttp %s stream %d", hostName, streamId) {
+            @Override public void execute() {
+              try {
+                handler.receive(newStream);
+              } catch (IOException e) {
+                throw new RuntimeException(e);
+              }
+            }
+          });
+          return;
+        }
+      }
+
+      // The headers claim to be for a new stream, but we already have one.
+      if (headersMode.failIfStreamPresent()) {
+        stream.closeLater(ErrorCode.PROTOCOL_ERROR);
+        removeStream(streamId);
+        return;
+      }
+
+      // Update an existing stream.
+      stream.receiveHeaders(headerBlock, headersMode);
+      if (inFinished) stream.receiveFin();
+    }
+
+    @Override public void rstStream(int streamId, ErrorCode errorCode) {
+      if (pushedStream(streamId)) {
+        pushResetLater(streamId, errorCode);
+        return;
+      }
+      SpdyStream rstStream = removeStream(streamId);
+      if (rstStream != null) {
+        rstStream.receiveRstStream(errorCode);
+      }
+    }
+
+    @Override public void settings(boolean clearPrevious, Settings newSettings) {
+      long delta = 0;
+      SpdyStream[] streamsToNotify = null;
+      synchronized (SpdyConnection.this) {
+        int priorWriteWindowSize = peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE);
+        if (clearPrevious) peerSettings.clear();
+        peerSettings.merge(newSettings);
+        if (getProtocol() == Protocol.HTTP_2) {
+          ackSettingsLater();
+        }
+        int peerInitialWindowSize = peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE);
+        if (peerInitialWindowSize != -1 && peerInitialWindowSize != priorWriteWindowSize) {
+          delta = peerInitialWindowSize - priorWriteWindowSize;
+          if (!receivedInitialPeerSettings) {
+            addBytesToWriteWindow(delta);
+            receivedInitialPeerSettings = true;
+          }
+          if (!streams.isEmpty()) {
+            streamsToNotify = streams.values().toArray(new SpdyStream[streams.size()]);
+          }
+        }
+      }
+      if (streamsToNotify != null && delta != 0) {
+        for (SpdyStream stream : streams.values()) {
+          synchronized (stream) {
+            stream.addBytesToWriteWindow(delta);
+          }
+        }
+      }
+    }
+
+    private void ackSettingsLater() {
+      executor.submit(new NamedRunnable("OkHttp %s ACK Settings", hostName) {
+        @Override public void execute() {
+          try {
+            frameWriter.ackSettings();
+          } catch (IOException ignored) {
+          }
+        }
+      });
+    }
+
+    @Override public void ackSettings() {
+      // TODO: If we don't get this callback after sending settings to the peer, SETTINGS_TIMEOUT.
+    }
+
+    @Override public void ping(boolean reply, int payload1, int payload2) {
+      if (reply) {
+        Ping ping = removePing(payload1);
+        if (ping != null) {
+          ping.receive();
+        }
+      } else {
+        // Send a reply to a client ping if this is a server and vice versa.
+        writePingLater(true, payload1, payload2, null);
+      }
+    }
+
+    @Override public void goAway(int lastGoodStreamId, ErrorCode errorCode, ByteString debugData) {
+      if (debugData.size() > 0) { // TODO: log the debugData
+      }
+      synchronized (SpdyConnection.this) {
+        shutdown = true;
+
+        // Fail all streams created after the last good stream ID.
+        for (Iterator<Map.Entry<Integer, SpdyStream>> i = streams.entrySet().iterator();
+            i.hasNext(); ) {
+          Map.Entry<Integer, SpdyStream> entry = i.next();
+          int streamId = entry.getKey();
+          if (streamId > lastGoodStreamId && entry.getValue().isLocallyInitiated()) {
+            entry.getValue().receiveRstStream(ErrorCode.REFUSED_STREAM);
+            i.remove();
+          }
+        }
+      }
+    }
+
+    @Override public void windowUpdate(int streamId, long windowSizeIncrement) {
+      if (streamId == 0) {
+        synchronized (SpdyConnection.this) {
+          bytesLeftInWriteWindow += windowSizeIncrement;
+          SpdyConnection.this.notifyAll();
+        }
+      } else {
+        SpdyStream stream = getStream(streamId);
+        if (stream != null) {
+          synchronized (stream) {
+            stream.addBytesToWriteWindow(windowSizeIncrement);
+          }
+        }
+      }
+    }
+
+    @Override public void priority(int streamId, int streamDependency, int weight,
+        boolean exclusive) {
+      // TODO: honor priority.
+    }
+
+    @Override
+    public void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders) {
+      pushRequestLater(promisedStreamId, requestHeaders);
+    }
+
+    @Override public void alternateService(int streamId, String origin, ByteString protocol,
+        String host, int port, long maxAge) {
+      // TODO: register alternate service.
+    }
+  }
+
+  /** Even, positive numbered streams are pushed streams in HTTP/2. */
+  private boolean pushedStream(int streamId) {
+    return protocol == Protocol.HTTP_2 && streamId != 0 && (streamId & 1) == 0;
+  }
+
+  // Guarded by this.
+  private final Set<Integer> currentPushRequests = new LinkedHashSet<Integer>();
+
+  private void pushRequestLater(final int streamId, final List<Header> requestHeaders) {
+    synchronized (this) {
+      if (currentPushRequests.contains(streamId)) {
+        writeSynResetLater(streamId, ErrorCode.PROTOCOL_ERROR);
+        return;
+      }
+      currentPushRequests.add(streamId);
+    }
+    pushExecutor.submit(new NamedRunnable("OkHttp %s Push Request[%s]", hostName, streamId) {
+      @Override public void execute() {
+        boolean cancel = pushObserver.onRequest(streamId, requestHeaders);
+        try {
+          if (cancel) {
+            frameWriter.rstStream(streamId, ErrorCode.CANCEL);
+            synchronized (SpdyConnection.this) {
+              currentPushRequests.remove(streamId);
+            }
+          }
+        } catch (IOException ignored) {
+        }
+      }
+    });
+  }
+
+  private void pushHeadersLater(final int streamId, final List<Header> requestHeaders,
+      final boolean inFinished) {
+    pushExecutor.submit(new NamedRunnable("OkHttp %s Push Headers[%s]", hostName, streamId) {
+      @Override public void execute() {
+        boolean cancel = pushObserver.onHeaders(streamId, requestHeaders, inFinished);
+        try {
+          if (cancel) frameWriter.rstStream(streamId, ErrorCode.CANCEL);
+          if (cancel || inFinished) {
+            synchronized (SpdyConnection.this) {
+              currentPushRequests.remove(streamId);
+            }
+          }
+        } catch (IOException ignored) {
+        }
+      }
+    });
+  }
+
+  /**
+   * Eagerly reads {@code byteCount} bytes from the source before launching a background task to
+   * process the data.  This avoids corrupting the stream.
+   */
+  private void pushDataLater(final int streamId, final BufferedSource source, final int byteCount,
+      final boolean inFinished) throws IOException {
+    final Buffer buffer = new Buffer();
+    source.require(byteCount); // Eagerly read the frame before firing client thread.
+    source.read(buffer, byteCount);
+    if (buffer.size() != byteCount) throw new IOException(buffer.size() + " != " + byteCount);
+    pushExecutor.submit(new NamedRunnable("OkHttp %s Push Data[%s]", hostName, streamId) {
+      @Override public void execute() {
+        try {
+          boolean cancel = pushObserver.onData(streamId, buffer, byteCount, inFinished);
+          if (cancel) frameWriter.rstStream(streamId, ErrorCode.CANCEL);
+          if (cancel || inFinished) {
+            synchronized (SpdyConnection.this) {
+              currentPushRequests.remove(streamId);
+            }
+          }
+        } catch (IOException ignored) {
+        }
+      }
+    });
+  }
+
+  private void pushResetLater(final int streamId, final ErrorCode errorCode) {
+    pushExecutor.submit(new NamedRunnable("OkHttp %s Push Reset[%s]", hostName, streamId) {
+      @Override public void execute() {
+        pushObserver.onReset(streamId, errorCode);
+        synchronized (SpdyConnection.this) {
+          currentPushRequests.remove(streamId);
+        }
+      }
+    });
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/SpdyStream.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/SpdyStream.java
new file mode 100644
index 000000000..db1a487f6
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/SpdyStream.java
@@ -0,0 +1,577 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+import com.koushikdutta.async.http.spdy.okio.AsyncTimeout;
+import com.koushikdutta.async.http.spdy.okio.Buffer;
+import com.koushikdutta.async.http.spdy.okio.BufferedSource;
+import com.koushikdutta.async.http.spdy.okio.Sink;
+import com.koushikdutta.async.http.spdy.okio.Source;
+import com.koushikdutta.async.http.spdy.okio.Timeout;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Settings.DEFAULT_INITIAL_WINDOW_SIZE;
+
+/** A logical bidirectional stream. */
+public final class SpdyStream {
+  // Internal state is guarded by this. No long-running or potentially
+  // blocking operations are performed while the lock is held.
+
+  /**
+   * The total number of bytes consumed by the application (with {@link
+   * SpdyDataSource#read}), but not yet acknowledged by sending a {@code
+   * WINDOW_UPDATE} frame on this stream.
+   */
+  // Visible for testing
+  long unacknowledgedBytesRead = 0;
+
+  /**
+   * Count of bytes that can be written on the stream before receiving a
+   * window update. Even if this is positive, writes will block until there
+   * available bytes in {@code connection.bytesLeftInWriteWindow}.
+   */
+  // guarded by this
+  long bytesLeftInWriteWindow;
+
+  private final int id;
+  private final SpdyConnection connection;
+  private long readTimeoutMillis = 0;
+
+  /** Headers sent by the stream initiator. Immutable and non null. */
+  private final List<Header> requestHeaders;
+
+  /** Headers sent in the stream reply. Null if reply is either not sent or not sent yet. */
+  private List<Header> responseHeaders;
+
+  private final SpdyDataSource source;
+  final SpdyDataSink sink;
+  private final SpdyTimeout readTimeout = new SpdyTimeout();
+  private final SpdyTimeout writeTimeout = new SpdyTimeout();
+
+  /**
+   * The reason why this stream was abnormally closed. If there are multiple
+   * reasons to abnormally close this stream (such as both peers closing it
+   * near-simultaneously) then this is the first reason known to this peer.
+   */
+  private ErrorCode errorCode = null;
+
+  SpdyStream(int id, SpdyConnection connection, boolean outFinished, boolean inFinished,
+      List<Header> requestHeaders) {
+    if (connection == null) throw new NullPointerException("connection == null");
+    if (requestHeaders == null) throw new NullPointerException("requestHeaders == null");
+    this.id = id;
+    this.connection = connection;
+    this.bytesLeftInWriteWindow =
+        connection.peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE);
+    this.source = new SpdyDataSource(
+        connection.okHttpSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE));
+    this.sink = new SpdyDataSink();
+    this.source.finished = inFinished;
+    this.sink.finished = outFinished;
+    this.requestHeaders = requestHeaders;
+  }
+
+  public int getId() {
+    return id;
+  }
+
+  /**
+   * Returns true if this stream is open. A stream is open until either:
+   * <ul>
+   * <li>A {@code SYN_RESET} frame abnormally terminates the stream.
+   * <li>Both input and output streams have transmitted all data and
+   * headers.
+   * </ul>
+   * Note that the input stream may continue to yield data even after a stream
+   * reports itself as not open. This is because input data is buffered.
+   */
+  public synchronized boolean isOpen() {
+    if (errorCode != null) {
+      return false;
+    }
+    if ((source.finished || source.closed)
+        && (sink.finished || sink.closed)
+        && responseHeaders != null) {
+      return false;
+    }
+    return true;
+  }
+
+  /** Returns true if this stream was created by this peer. */
+  public boolean isLocallyInitiated() {
+    boolean streamIsClient = ((id & 1) == 1);
+    return connection.client == streamIsClient;
+  }
+
+  public SpdyConnection getConnection() {
+    return connection;
+  }
+
+  public List<Header> getRequestHeaders() {
+    return requestHeaders;
+  }
+
+  /**
+   * Returns the stream's response headers, blocking if necessary if they
+   * have not been received yet.
+   */
+  public synchronized List<Header> getResponseHeaders() throws IOException {
+    readTimeout.enter();
+    try {
+      while (responseHeaders == null && errorCode == null) {
+        waitForIo();
+      }
+    } finally {
+      readTimeout.exitAndThrowIfTimedOut();
+    }
+    if (responseHeaders != null) return responseHeaders;
+    throw new IOException("stream was reset: " + errorCode);
+  }
+
+  /**
+   * Returns the reason why this stream was closed, or null if it closed
+   * normally or has not yet been closed.
+   */
+  public synchronized ErrorCode getErrorCode() {
+    return errorCode;
+  }
+
+  /**
+   * Sends a reply to an incoming stream.
+   *
+   * @param out true to create an output stream that we can use to send data
+   * to the remote peer. Corresponds to {@code FLAG_FIN}.
+   */
+  public void reply(List<Header> responseHeaders, boolean out) throws IOException {
+    assert (!Thread.holdsLock(SpdyStream.this));
+    boolean outFinished = false;
+    synchronized (this) {
+      if (responseHeaders == null) {
+        throw new NullPointerException("responseHeaders == null");
+      }
+      if (this.responseHeaders != null) {
+        throw new IllegalStateException("reply already sent");
+      }
+      this.responseHeaders = responseHeaders;
+      if (!out) {
+        this.sink.finished = true;
+        outFinished = true;
+      }
+    }
+    connection.writeSynReply(id, outFinished, responseHeaders);
+
+    if (outFinished) {
+      connection.flush();
+    }
+  }
+
+  public Timeout readTimeout() {
+    return readTimeout;
+  }
+
+  public Timeout writeTimeout() {
+    return writeTimeout;
+  }
+
+  /** Returns a source that reads data from the peer. */
+  public Source getSource() {
+    return source;
+  }
+
+  /**
+   * Returns a sink that can be used to write data to the peer.
+   *
+   * @throws IllegalStateException if this stream was initiated by the peer
+   *     and a {@link #reply} has not yet been sent.
+   */
+  public Sink getSink() {
+    synchronized (this) {
+      if (responseHeaders == null && !isLocallyInitiated()) {
+        throw new IllegalStateException("reply before requesting the sink");
+      }
+    }
+    return sink;
+  }
+
+  /**
+   * Abnormally terminate this stream. This blocks until the {@code RST_STREAM}
+   * frame has been transmitted.
+   */
+  public void close(ErrorCode rstStatusCode) throws IOException {
+    if (!closeInternal(rstStatusCode)) {
+      return; // Already closed.
+    }
+    connection.writeSynReset(id, rstStatusCode);
+  }
+
+  /**
+   * Abnormally terminate this stream. This enqueues a {@code RST_STREAM}
+   * frame and returns immediately.
+   */
+  public void closeLater(ErrorCode errorCode) {
+    if (!closeInternal(errorCode)) {
+      return; // Already closed.
+    }
+    connection.writeSynResetLater(id, errorCode);
+  }
+
+  /** Returns true if this stream was closed. */
+  private boolean closeInternal(ErrorCode errorCode) {
+    assert (!Thread.holdsLock(this));
+    synchronized (this) {
+      if (this.errorCode != null) {
+        return false;
+      }
+      if (source.finished && sink.finished) {
+        return false;
+      }
+      this.errorCode = errorCode;
+      notifyAll();
+    }
+    connection.removeStream(id);
+    return true;
+  }
+
+  void receiveHeaders(List<Header> headers, HeadersMode headersMode) {
+    assert (!Thread.holdsLock(SpdyStream.this));
+    ErrorCode errorCode = null;
+    boolean open = true;
+    synchronized (this) {
+      if (responseHeaders == null) {
+        if (headersMode.failIfHeadersAbsent()) {
+          errorCode = ErrorCode.PROTOCOL_ERROR;
+        } else {
+          responseHeaders = headers;
+          open = isOpen();
+          notifyAll();
+        }
+      } else {
+        if (headersMode.failIfHeadersPresent()) {
+          errorCode = ErrorCode.STREAM_IN_USE;
+        } else {
+          List<Header> newHeaders = new ArrayList<Header>();
+          newHeaders.addAll(responseHeaders);
+          newHeaders.addAll(headers);
+          this.responseHeaders = newHeaders;
+        }
+      }
+    }
+    if (errorCode != null) {
+      closeLater(errorCode);
+    } else if (!open) {
+      connection.removeStream(id);
+    }
+  }
+
+  void receiveData(BufferedSource in, int length) throws IOException {
+    assert (!Thread.holdsLock(SpdyStream.this));
+    this.source.receive(in, length);
+  }
+
+  void receiveFin() {
+    assert (!Thread.holdsLock(SpdyStream.this));
+    boolean open;
+    synchronized (this) {
+      this.source.finished = true;
+      open = isOpen();
+      notifyAll();
+    }
+    if (!open) {
+      connection.removeStream(id);
+    }
+  }
+
+  synchronized void receiveRstStream(ErrorCode errorCode) {
+    if (this.errorCode == null) {
+      this.errorCode = errorCode;
+      notifyAll();
+    }
+  }
+
+  /**
+   * A source that reads the incoming data frames of a stream. Although this
+   * class uses synchronization to safely receive incoming data frames, it is
+   * not intended for use by multiple readers.
+   */
+  private final class SpdyDataSource implements Source {
+    /** Buffer to receive data from the network into. Only accessed by the reader thread. */
+    private final Buffer receiveBuffer = new Buffer();
+
+    /** Buffer with readable data. Guarded by SpdyStream.this. */
+    private final Buffer readBuffer = new Buffer();
+
+    /** Maximum number of bytes to buffer before reporting a flow control error. */
+    private final long maxByteCount;
+
+    /** True if the caller has closed this stream. */
+    private boolean closed;
+
+    /**
+     * True if either side has cleanly shut down this stream. We will
+     * receive no more bytes beyond those already in the buffer.
+     */
+    private boolean finished;
+
+    private SpdyDataSource(long maxByteCount) {
+      this.maxByteCount = maxByteCount;
+    }
+
+    @Override public long read(Buffer sink, long byteCount)
+        throws IOException {
+      if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
+
+      long read;
+      synchronized (SpdyStream.this) {
+        waitUntilReadable();
+        checkNotClosed();
+        if (readBuffer.size() == 0) return -1; // This source is exhausted.
+
+        // Move bytes from the read buffer into the caller's buffer.
+        read = readBuffer.read(sink, Math.min(byteCount, readBuffer.size()));
+
+        // Flow control: notify the peer that we're ready for more data!
+        unacknowledgedBytesRead += read;
+        if (unacknowledgedBytesRead
+            >= connection.okHttpSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE) / 2) {
+          connection.writeWindowUpdateLater(id, unacknowledgedBytesRead);
+          unacknowledgedBytesRead = 0;
+        }
+      }
+
+      // Update connection.unacknowledgedBytesRead outside the stream lock.
+      synchronized (connection) { // Multiple application threads may hit this section.
+        connection.unacknowledgedBytesRead += read;
+        if (connection.unacknowledgedBytesRead
+            >= connection.okHttpSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE) / 2) {
+          connection.writeWindowUpdateLater(0, connection.unacknowledgedBytesRead);
+          connection.unacknowledgedBytesRead = 0;
+        }
+      }
+
+      return read;
+    }
+
+    /** Returns once the source is either readable or finished. */
+    private void waitUntilReadable() throws IOException {
+      readTimeout.enter();
+      try {
+        while (readBuffer.size() == 0 && !finished && !closed && errorCode == null) {
+          waitForIo();
+        }
+      } finally {
+        readTimeout.exitAndThrowIfTimedOut();
+      }
+    }
+
+    void receive(BufferedSource in, long byteCount) throws IOException {
+      assert (!Thread.holdsLock(SpdyStream.this));
+
+      while (byteCount > 0) {
+        boolean finished;
+        boolean flowControlError;
+        synchronized (SpdyStream.this) {
+          finished = this.finished;
+          flowControlError = byteCount + readBuffer.size() > maxByteCount;
+        }
+
+        // If the peer sends more data than we can handle, discard it and close the connection.
+        if (flowControlError) {
+          in.skip(byteCount);
+          closeLater(ErrorCode.FLOW_CONTROL_ERROR);
+          return;
+        }
+
+        // Discard data received after the stream is finished. It's probably a benign race.
+        if (finished) {
+          in.skip(byteCount);
+          return;
+        }
+
+        // Fill the receive buffer without holding any locks.
+        long read = in.read(receiveBuffer, byteCount);
+        if (read == -1) throw new EOFException();
+        byteCount -= read;
+
+        // Move the received data to the read buffer to the reader can read it.
+        synchronized (SpdyStream.this) {
+          boolean wasEmpty = readBuffer.size() == 0;
+          readBuffer.writeAll(receiveBuffer);
+          if (wasEmpty) {
+            SpdyStream.this.notifyAll();
+          }
+        }
+      }
+    }
+
+    @Override public Timeout timeout() {
+      return readTimeout;
+    }
+
+    @Override public void close() throws IOException {
+      synchronized (SpdyStream.this) {
+        closed = true;
+        readBuffer.clear();
+        SpdyStream.this.notifyAll();
+      }
+      cancelStreamIfNecessary();
+    }
+
+    private void checkNotClosed() throws IOException {
+      if (closed) {
+        throw new IOException("stream closed");
+      }
+      if (errorCode != null) {
+        throw new IOException("stream was reset: " + errorCode);
+      }
+    }
+  }
+
+  private void cancelStreamIfNecessary() throws IOException {
+    assert (!Thread.holdsLock(SpdyStream.this));
+    boolean open;
+    boolean cancel;
+    synchronized (this) {
+      cancel = !source.finished && source.closed && (sink.finished || sink.closed);
+      open = isOpen();
+    }
+    if (cancel) {
+      // RST this stream to prevent additional data from being sent. This
+      // is safe because the input stream is closed (we won't use any
+      // further bytes) and the output stream is either finished or closed
+      // (so RSTing both streams doesn't cause harm).
+      SpdyStream.this.close(ErrorCode.CANCEL);
+    } else if (!open) {
+      connection.removeStream(id);
+    }
+  }
+
+  /**
+   * A sink that writes outgoing data frames of a stream. This class is not
+   * thread safe.
+   */
+  final class SpdyDataSink implements Sink {
+    private boolean closed;
+
+    /**
+     * True if either side has cleanly shut down this stream. We shall send
+     * no more bytes.
+     */
+    private boolean finished;
+
+    @Override public void write(Buffer source, long byteCount) throws IOException {
+      assert (!Thread.holdsLock(SpdyStream.this));
+      while (byteCount > 0) {
+        long toWrite;
+        synchronized (SpdyStream.this) {
+          writeTimeout.enter();
+          try {
+            while (bytesLeftInWriteWindow <= 0 && !finished && !closed && errorCode == null) {
+              waitForIo(); // Wait until we receive a WINDOW_UPDATE.
+            }
+          } finally {
+            writeTimeout.exitAndThrowIfTimedOut();
+          }
+
+          checkOutNotClosed(); // Kick out if the stream was reset or closed while waiting.
+          toWrite = Math.min(bytesLeftInWriteWindow, byteCount);
+          bytesLeftInWriteWindow -= toWrite;
+        }
+
+        byteCount -= toWrite;
+        connection.writeData(id, false, source, toWrite);
+      }
+    }
+
+    @Override public void flush() throws IOException {
+      assert (!Thread.holdsLock(SpdyStream.this));
+      synchronized (SpdyStream.this) {
+        checkOutNotClosed();
+      }
+      connection.flush();
+    }
+
+    @Override public Timeout timeout() {
+      return writeTimeout;
+    }
+
+    @Override public void close() throws IOException {
+      assert (!Thread.holdsLock(SpdyStream.this));
+      synchronized (SpdyStream.this) {
+        if (closed) return;
+      }
+      if (!sink.finished) {
+        connection.writeData(id, true, null, 0);
+      }
+      synchronized (SpdyStream.this) {
+        closed = true;
+      }
+      connection.flush();
+      cancelStreamIfNecessary();
+    }
+  }
+
+  /**
+   * {@code delta} will be negative if a settings frame initial window is
+   * smaller than the last.
+   */
+  void addBytesToWriteWindow(long delta) {
+    bytesLeftInWriteWindow += delta;
+    if (delta > 0) SpdyStream.this.notifyAll();
+  }
+
+  private void checkOutNotClosed() throws IOException {
+    if (sink.closed) {
+      throw new IOException("stream closed");
+    } else if (sink.finished) {
+      throw new IOException("stream finished");
+    } else if (errorCode != null) {
+      throw new IOException("stream was reset: " + errorCode);
+    }
+  }
+
+  /**
+   * Like {@link #wait}, but throws an {@code InterruptedIOException} when
+   * interrupted instead of the more awkward {@link InterruptedException}.
+   */
+  private void waitForIo() throws InterruptedIOException {
+    try {
+      wait();
+    } catch (InterruptedException e) {
+      throw new InterruptedIOException();
+    }
+  }
+
+  /**
+   * The Okio timeout watchdog will call {@link #timedOut} if the timeout is
+   * reached. In that case we close the stream (asynchronously) which will
+   * notify the waiting thread.
+   */
+  class SpdyTimeout extends AsyncTimeout {
+    @Override protected void timedOut() {
+      closeLater(ErrorCode.CANCEL);
+    }
+
+    public void exitAndThrowIfTimedOut() throws InterruptedIOException {
+      if (exit()) throw new InterruptedIOException("timeout");
+    }
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Variant.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Variant.java
new file mode 100644
index 000000000..56994d177
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Variant.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2013 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+
+import com.koushikdutta.async.http.Protocol;
+import com.koushikdutta.async.http.spdy.okio.BufferedSink;
+import com.koushikdutta.async.http.spdy.okio.BufferedSource;
+
+/** A version and dialect of the framed socket protocol. */
+public interface Variant {
+
+  /** The protocol as selected using NPN or ALPN. */
+  Protocol getProtocol();
+
+  /**
+   * @param client true if this is the HTTP client's reader, reading frames from a server.
+   */
+  FrameReader newReader(BufferedSource source, boolean client);
+
+  /**
+   * @param client true if this is the HTTP client's writer, writing frames to a server.
+   */
+  FrameWriter newWriter(BufferedSink sink, boolean client);
+
+  int maxFrameSize();
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/AsyncTimeout.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/AsyncTimeout.java
new file mode 100644
index 000000000..b0b46ff59
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/AsyncTimeout.java
@@ -0,0 +1,318 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+
+/**
+ * This timeout uses a background thread to take action exactly when the timeout
+ * occurs. Use this to implement timeouts where they aren't supported natively,
+ * such as to sockets that are blocked on writing.
+ *
+ * <p>Subclasses should override {@link #timedOut} to take action when a timeout
+ * occurs. This method will be invoked by the shared watchdog thread so it
+ * should not do any long-running operations. Otherwise we risk starving other
+ * timeouts from being triggered.
+ *
+ * <p>Use {@link #sink} and {@link #source} to apply this timeout to a stream.
+ * The returned value will apply the timeout to each operation on the wrapped
+ * stream.
+ *
+ * <p>Callers should call {@link #enter} before doing work that is subject to
+ * timeouts, and {@link #exit} afterwards. The return value of {@link #exit}
+ * indicates whether a timeout was triggered. Note that the call to {@link
+ * #timedOut} is asynchronous, and may be called after {@link #exit}.
+ */
+public class AsyncTimeout extends Timeout {
+  /**
+   * The watchdog thread processes a linked list of pending timeouts, sorted in
+   * the order to be triggered. This class synchronizes on AsyncTimeout.class.
+   * This lock guards the queue.
+   *
+   * <p>Head's 'next' points to the first element of the linked list. The first
+   * element is the next node to time out, or null if the queue is empty. The
+   * head is null until the watchdog thread is started.
+   */
+  private static AsyncTimeout head;
+
+  /** True if this node is currently in the queue. */
+  private boolean inQueue;
+
+  /** The next node in the linked list. */
+  private AsyncTimeout next;
+
+  /** If scheduled, this is the time that the watchdog should time this out. */
+  private long timeoutAt;
+
+  public final void enter() {
+    if (inQueue) throw new IllegalStateException("Unbalanced enter/exit");
+    long timeoutNanos = timeoutNanos();
+    boolean hasDeadline = hasDeadline();
+    if (timeoutNanos == 0 && !hasDeadline) {
+      return; // No timeout and no deadline? Don't bother with the queue.
+    }
+    inQueue = true;
+    scheduleTimeout(this, timeoutNanos, hasDeadline);
+  }
+
+  private static synchronized void scheduleTimeout(
+      AsyncTimeout node, long timeoutNanos, boolean hasDeadline) {
+    // Start the watchdog thread and create the head node when the first timeout is scheduled.
+    if (head == null) {
+      head = new AsyncTimeout();
+      new Watchdog().start();
+    }
+
+    long now = System.nanoTime();
+    if (timeoutNanos != 0 && hasDeadline) {
+      // Compute the earliest event; either timeout or deadline. Because nanoTime can wrap around,
+      // Math.min() is undefined for absolute values, but meaningful for relative ones.
+      node.timeoutAt = now + Math.min(timeoutNanos, node.deadlineNanoTime() - now);
+    } else if (timeoutNanos != 0) {
+      node.timeoutAt = now + timeoutNanos;
+    } else if (hasDeadline) {
+      node.timeoutAt = node.deadlineNanoTime();
+    } else {
+      throw new AssertionError();
+    }
+
+    // Insert the node in sorted order.
+    long remainingNanos = node.remainingNanos(now);
+    for (AsyncTimeout prev = head; true; prev = prev.next) {
+      if (prev.next == null || remainingNanos < prev.next.remainingNanos(now)) {
+        node.next = prev.next;
+        prev.next = node;
+        if (prev == head) {
+          AsyncTimeout.class.notify(); // Wake up the watchdog when inserting at the front.
+        }
+        break;
+      }
+    }
+  }
+
+  /** Returns true if the timeout occurred. */
+  public final boolean exit() {
+    if (!inQueue) return false;
+    inQueue = false;
+    return cancelScheduledTimeout(this);
+  }
+
+  /** Returns true if the timeout occurred. */
+  private static synchronized boolean cancelScheduledTimeout(AsyncTimeout node) {
+    // Remove the node from the linked list.
+    for (AsyncTimeout prev = head; prev != null; prev = prev.next) {
+      if (prev.next == node) {
+        prev.next = node.next;
+        node.next = null;
+        return false;
+      }
+    }
+
+    // The node wasn't found in the linked list: it must have timed out!
+    return true;
+  }
+
+  /**
+   * Returns the amount of time left until the time out. This will be negative
+   * if the timeout has elapsed and the timeout should occur immediately.
+   */
+  private long remainingNanos(long now) {
+    return timeoutAt - now;
+  }
+
+  /**
+   * Invoked by the watchdog thread when the time between calls to {@link
+   * #enter()} and {@link #exit()} has exceeded the timeout.
+   */
+  protected void timedOut() {
+  }
+
+  /**
+   * Returns a new sink that delegates to {@code sink}, using this to implement
+   * timeouts. This works best if {@link #timedOut} is overridden to interrupt
+   * {@code sink}'s current operation.
+   */
+  public final Sink sink(final Sink sink) {
+    return new Sink() {
+      @Override public void write(Buffer source, long byteCount) throws IOException {
+        boolean throwOnTimeout = false;
+        enter();
+        try {
+          sink.write(source, byteCount);
+          throwOnTimeout = true;
+        } catch (IOException e) {
+          throw exit(e);
+        } finally {
+          exit(throwOnTimeout);
+        }
+      }
+
+      @Override public void flush() throws IOException {
+        boolean throwOnTimeout = false;
+        enter();
+        try {
+          sink.flush();
+          throwOnTimeout = true;
+        } catch (IOException e) {
+          throw exit(e);
+        } finally {
+          exit(throwOnTimeout);
+        }
+      }
+
+      @Override public void close() throws IOException {
+        boolean throwOnTimeout = false;
+        enter();
+        try {
+          sink.close();
+          throwOnTimeout = true;
+        } catch (IOException e) {
+          throw exit(e);
+        } finally {
+          exit(throwOnTimeout);
+        }
+      }
+
+      @Override public Timeout timeout() {
+        return AsyncTimeout.this;
+      }
+
+      @Override public String toString() {
+        return "AsyncTimeout.sink(" + sink + ")";
+      }
+    };
+  }
+
+  /**
+   * Returns a new source that delegates to {@code source}, using this to
+   * implement timeouts. This works best if {@link #timedOut} is overridden to
+   * interrupt {@code sink}'s current operation.
+   */
+  public final Source source(final Source source) {
+    return new Source() {
+      @Override public long read(Buffer sink, long byteCount) throws IOException {
+        boolean throwOnTimeout = false;
+        enter();
+        try {
+          long result = source.read(sink, byteCount);
+          throwOnTimeout = true;
+          return result;
+        } catch (IOException e) {
+          throw exit(e);
+        } finally {
+          exit(throwOnTimeout);
+        }
+      }
+
+      @Override public void close() throws IOException {
+        boolean throwOnTimeout = false;
+        try {
+          source.close();
+          throwOnTimeout = true;
+        } catch (IOException e) {
+          throw exit(e);
+        } finally {
+          exit(throwOnTimeout);
+        }
+      }
+
+      @Override public Timeout timeout() {
+        return AsyncTimeout.this;
+      }
+
+      @Override public String toString() {
+        return "AsyncTimeout.source(" + source + ")";
+      }
+    };
+  }
+
+  /**
+   * Throws an InterruptedIOException if {@code throwOnTimeout} is true and a
+   * timeout occurred.
+   */
+  final void exit(boolean throwOnTimeout) throws IOException {
+    boolean timedOut = exit();
+    if (timedOut && throwOnTimeout) throw new InterruptedIOException("timeout");
+  }
+
+  /**
+   * Returns either {@code cause} or an InterruptedIOException that's caused by
+   * {@code cause} if a timeout occurred.
+   */
+  final IOException exit(IOException cause) throws IOException {
+    if (!exit()) return cause;
+    InterruptedIOException e = new InterruptedIOException("timeout");
+    e.initCause(cause);
+    return e;
+  }
+
+  private static final class Watchdog extends Thread {
+    public Watchdog() {
+      super("Okio Watchdog");
+      setDaemon(true);
+    }
+
+    public void run() {
+      while (true) {
+        try {
+          AsyncTimeout timedOut = awaitTimeout();
+
+          // Didn't find a node to interrupt. Try again.
+          if (timedOut == null) continue;
+
+          // Close the timed out node.
+          timedOut.timedOut();
+        } catch (InterruptedException ignored) {
+        }
+      }
+    }
+  }
+
+  /**
+   * Removes and returns the node at the head of the list, waiting for it to
+   * time out if necessary. Returns null if the situation changes while waiting:
+   * either a newer node is inserted at the head, or the node being waited on
+   * has been removed.
+   */
+  private static synchronized AsyncTimeout awaitTimeout() throws InterruptedException {
+    // Get the next eligible node.
+    AsyncTimeout node = head.next;
+
+    // The queue is empty. Wait for something to be enqueued.
+    if (node == null) {
+      AsyncTimeout.class.wait();
+      return null;
+    }
+
+    long waitNanos = node.remainingNanos(System.nanoTime());
+
+    // The head of the queue hasn't timed out yet. Await that.
+    if (waitNanos > 0) {
+      // Waiting is made complicated by the fact that we work in nanoseconds,
+      // but the API wants (millis, nanos) in two arguments.
+      long waitMillis = waitNanos / 1000000L;
+      waitNanos -= (waitMillis * 1000000L);
+      AsyncTimeout.class.wait(waitMillis, (int) waitNanos);
+      return null;
+    }
+
+    // The head of the queue has timed out. Remove it.
+    head.next = node.next;
+    node.next = null;
+    return node;
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Base64.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Base64.java
new file mode 100644
index 000000000..c0a6571f2
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Base64.java
@@ -0,0 +1,147 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * @author Alexander Y. Kleymenov
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+import java.io.UnsupportedEncodingException;
+
+final class Base64 {
+  private Base64() {
+  }
+
+  public static byte[] decode(String in) {
+    // Ignore trailing '=' padding and whitespace from the input.
+    int limit = in.length();
+    for (; limit > 0; limit--) {
+      char c = in.charAt(limit - 1);
+      if (c != '=' && c != '\n' && c != '\r' && c != ' ' && c != '\t') {
+        break;
+      }
+    }
+
+    // If the input includes whitespace, this output array will be longer than necessary.
+    byte[] out = new byte[(int) (limit * 6L / 8L)];
+    int outCount = 0;
+    int inCount = 0;
+
+    int word = 0;
+    for (int pos = 0; pos < limit; pos++) {
+      char c = in.charAt(pos);
+
+      int bits;
+      if (c >= 'A' && c <= 'Z') {
+        // char ASCII value
+        //  A    65    0
+        //  Z    90    25 (ASCII - 65)
+        bits = c - 65;
+      } else if (c >= 'a' && c <= 'z') {
+        // char ASCII value
+        //  a    97    26
+        //  z    122   51 (ASCII - 71)
+        bits = c - 71;
+      } else if (c >= '0' && c <= '9') {
+        // char ASCII value
+        //  0    48    52
+        //  9    57    61 (ASCII + 4)
+        bits = c + 4;
+      } else if (c == '+') {
+        bits = 62;
+      } else if (c == '/') {
+        bits = 63;
+      } else if (c == '\n' || c == '\r' || c == ' ' || c == '\t') {
+        continue;
+      } else {
+        return null;
+      }
+
+      // Append this char's 6 bits to the word.
+      word = (word << 6) | (byte) bits;
+
+      // For every 4 chars of input, we accumulate 24 bits of output. Emit 3 bytes.
+      inCount++;
+      if (inCount % 4 == 0) {
+        out[outCount++] = (byte) (word >> 16);
+        out[outCount++] = (byte) (word >> 8);
+        out[outCount++] = (byte) word;
+      }
+    }
+
+    int lastWordChars = inCount % 4;
+    if (lastWordChars == 1) {
+      // We read 1 char followed by "===". But 6 bits is a truncated byte! Fail.
+      return null;
+    } else if (lastWordChars == 2) {
+      // We read 2 chars followed by "==". Emit 1 byte with 8 of those 12 bits.
+      word = word << 12;
+      out[outCount++] = (byte) (word >> 16);
+    } else if (lastWordChars == 3) {
+      // We read 3 chars, followed by "=". Emit 2 bytes for 16 of those 18 bits.
+      word = word << 6;
+      out[outCount++] = (byte) (word >> 16);
+      out[outCount++] = (byte) (word >> 8);
+    }
+
+    // If we sized our out array perfectly, we're done.
+    if (outCount == out.length) return out;
+
+    // Copy the decoded bytes to a new, right-sized array.
+    byte[] prefix = new byte[outCount];
+    System.arraycopy(out, 0, prefix, 0, outCount);
+    return prefix;
+  }
+
+  private static final byte[] MAP = new byte[] {
+      'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+      'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+      'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4',
+      '5', '6', '7', '8', '9', '+', '/'
+  };
+
+  public static String encode(byte[] in) {
+    int length = (in.length + 2) * 4 / 3;
+    byte[] out = new byte[length];
+    int index = 0, end = in.length - in.length % 3;
+    for (int i = 0; i < end; i += 3) {
+      out[index++] = MAP[(in[i] & 0xff) >> 2];
+      out[index++] = MAP[((in[i] & 0x03) << 4) | ((in[i + 1] & 0xff) >> 4)];
+      out[index++] = MAP[((in[i + 1] & 0x0f) << 2) | ((in[i + 2] & 0xff) >> 6)];
+      out[index++] = MAP[(in[i + 2] & 0x3f)];
+    }
+    switch (in.length % 3) {
+      case 1:
+        out[index++] = MAP[(in[end] & 0xff) >> 2];
+        out[index++] = MAP[(in[end] & 0x03) << 4];
+        out[index++] = '=';
+        out[index++] = '=';
+        break;
+      case 2:
+        out[index++] = MAP[(in[end] & 0xff) >> 2];
+        out[index++] = MAP[((in[end] & 0x03) << 4) | ((in[end + 1] & 0xff) >> 4)];
+        out[index++] = MAP[((in[end + 1] & 0x0f) << 2)];
+        out[index++] = '=';
+        break;
+    }
+    try {
+      return new String(out, 0, index, "US-ASCII");
+    } catch (UnsupportedEncodingException e) {
+      throw new AssertionError(e);
+    }
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Buffer.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Buffer.java
new file mode 100644
index 000000000..4ac22b15e
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Buffer.java
@@ -0,0 +1,911 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static com.koushikdutta.async.http.spdy.okhttp.internal.Util.checkOffsetAndCount;
+import static com.koushikdutta.async.http.spdy.okio.Util.reverseBytesLong;
+
+/**
+ * A collection of bytes in memory.
+ *
+ * <p><strong>Moving data from one buffer to another is fast.</strong> Instead
+ * of copying bytes from one place in memory to another, this class just changes
+ * ownership of the underlying byte arrays.
+ *
+ * <p><strong>This buffer grows with your data.</strong> Just like ArrayList,
+ * each buffer starts small. It consumes only the memory it needs to.
+ *
+ * <p><strong>This buffer pools its byte arrays.</strong> When you allocate a
+ * byte array in Java, the runtime must zero-fill the requested array before
+ * returning it to you. Even if you're going to write over that space anyway.
+ * This class avoids zero-fill and GC churn by pooling byte arrays.
+ */
+public final class Buffer implements BufferedSource, BufferedSink, Cloneable {
+  Segment head;
+  long size;
+
+  public Buffer() {
+  }
+
+  /** Returns the number of bytes currently in this buffer. */
+  public long size() {
+    return size;
+  }
+
+  @Override public Buffer buffer() {
+    return this;
+  }
+
+  @Override public OutputStream outputStream() {
+    return new OutputStream() {
+      @Override public void write(int b) {
+        writeByte((byte) b);
+      }
+
+      @Override public void write(byte[] data, int offset, int byteCount) {
+        Buffer.this.write(data, offset, byteCount);
+      }
+
+      @Override public void flush() {
+      }
+
+      @Override public void close() {
+      }
+
+      @Override public String toString() {
+        return this + ".outputStream()";
+      }
+    };
+  }
+
+  @Override public Buffer emitCompleteSegments() {
+    return this; // Nowhere to emit to!
+  }
+
+  @Override public boolean exhausted() {
+    return size == 0;
+  }
+
+  @Override public void require(long byteCount) throws EOFException {
+    if (this.size < byteCount) throw new EOFException();
+  }
+
+  @Override public InputStream inputStream() {
+    return new InputStream() {
+      @Override public int read() {
+        if (size > 0) return readByte() & 0xff;
+        return -1;
+      }
+
+      @Override public int read(byte[] sink, int offset, int byteCount) {
+        return Buffer.this.read(sink, offset, byteCount);
+      }
+
+      @Override public int available() {
+        return (int) Math.min(size, Integer.MAX_VALUE);
+      }
+
+      @Override public void close() {
+      }
+
+      @Override public String toString() {
+        return Buffer.this + ".inputStream()";
+      }
+    };
+  }
+
+  /** Copy the contents of this to {@code out}. */
+  public Buffer copyTo(OutputStream out) throws IOException {
+    return copyTo(out, 0, size);
+  }
+
+  /**
+   * Copy {@code byteCount} bytes from this, starting at {@code offset}, to
+   * {@code out}.
+   */
+  public Buffer copyTo(OutputStream out, long offset, long byteCount) throws IOException {
+    if (out == null) throw new IllegalArgumentException("out == null");
+    checkOffsetAndCount(size, offset, byteCount);
+    if (byteCount == 0) return this;
+
+    // Skip segments that we aren't copying from.
+    Segment s = head;
+    for (; offset >= (s.limit - s.pos); s = s.next) {
+      offset -= (s.limit - s.pos);
+    }
+
+    // Copy from one segment at a time.
+    for (; byteCount > 0; s = s.next) {
+      int pos = (int) (s.pos + offset);
+      int toWrite = (int) Math.min(s.limit - pos, byteCount);
+      out.write(s.data, pos, toWrite);
+      byteCount -= toWrite;
+      offset = 0;
+    }
+
+    return this;
+  }
+
+  /** Write the contents of this to {@code out}. */
+  public Buffer writeTo(OutputStream out) throws IOException {
+    return writeTo(out, size);
+  }
+
+  /** Write {@code byteCount} bytes from this to {@code out}. */
+  public Buffer writeTo(OutputStream out, long byteCount) throws IOException {
+    if (out == null) throw new IllegalArgumentException("out == null");
+    checkOffsetAndCount(size, 0, byteCount);
+
+    Segment s = head;
+    while (byteCount > 0) {
+      int toCopy = (int) Math.min(byteCount, s.limit - s.pos);
+      out.write(s.data, s.pos, toCopy);
+
+      s.pos += toCopy;
+      size -= toCopy;
+      byteCount -= toCopy;
+
+      if (s.pos == s.limit) {
+        Segment toRecycle = s;
+        head = s = toRecycle.pop();
+        SegmentPool.getInstance().recycle(toRecycle);
+      }
+    }
+
+    return this;
+  }
+
+  /** Read and exhaust bytes from {@code in} to this. */
+  public Buffer readFrom(InputStream in) throws IOException {
+    readFrom(in, Long.MAX_VALUE, true);
+    return this;
+  }
+
+  /** Read {@code byteCount} bytes from {@code in} to this. */
+  public Buffer readFrom(InputStream in, long byteCount) throws IOException {
+    if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
+    readFrom(in, byteCount, false);
+    return this;
+  }
+
+  private void readFrom(InputStream in, long byteCount, boolean forever) throws IOException {
+    if (in == null) throw new IllegalArgumentException("in == null");
+    while (byteCount > 0 || forever) {
+      Segment tail = writableSegment(1);
+      int maxToCopy = (int) Math.min(byteCount, Segment.SIZE - tail.limit);
+      int bytesRead = in.read(tail.data, tail.limit, maxToCopy);
+      if (bytesRead == -1) {
+        if (forever) return;
+        throw new EOFException();
+      }
+      tail.limit += bytesRead;
+      size += bytesRead;
+      byteCount -= bytesRead;
+    }
+  }
+
+  /**
+   * Returns the number of bytes in segments that are not writable. This is the
+   * number of bytes that can be flushed immediately to an underlying sink
+   * without harming throughput.
+   */
+  public long completeSegmentByteCount() {
+    long result = size;
+    if (result == 0) return 0;
+
+    // Omit the tail if it's still writable.
+    Segment tail = head.prev;
+    if (tail.limit < Segment.SIZE) {
+      result -= tail.limit - tail.pos;
+    }
+
+    return result;
+  }
+
+  @Override public byte readByte() {
+    if (size == 0) throw new IllegalStateException("size == 0");
+
+    Segment segment = head;
+    int pos = segment.pos;
+    int limit = segment.limit;
+
+    byte[] data = segment.data;
+    byte b = data[pos++];
+    size -= 1;
+
+    if (pos == limit) {
+      head = segment.pop();
+      SegmentPool.getInstance().recycle(segment);
+    } else {
+      segment.pos = pos;
+    }
+
+    return b;
+  }
+
+  /** Returns the byte at {@code pos}. */
+  public byte getByte(long pos) {
+    checkOffsetAndCount(size, pos, 1);
+    for (Segment s = head; true; s = s.next) {
+      int segmentByteCount = s.limit - s.pos;
+      if (pos < segmentByteCount) return s.data[s.pos + (int) pos];
+      pos -= segmentByteCount;
+    }
+  }
+
+  @Override public short readShort() {
+    if (size < 2) throw new IllegalStateException("size < 2: " + size);
+
+    Segment segment = head;
+    int pos = segment.pos;
+    int limit = segment.limit;
+
+    // If the short is split across multiple segments, delegate to readByte().
+    if (limit - pos < 2) {
+      int s = (readByte() & 0xff) << 8
+          |   (readByte() & 0xff);
+      return (short) s;
+    }
+
+    byte[] data = segment.data;
+    int s = (data[pos++] & 0xff) << 8
+        |   (data[pos++] & 0xff);
+    size -= 2;
+
+    if (pos == limit) {
+      head = segment.pop();
+      SegmentPool.getInstance().recycle(segment);
+    } else {
+      segment.pos = pos;
+    }
+
+    return (short) s;
+  }
+
+  @Override public int readInt() {
+    if (size < 4) throw new IllegalStateException("size < 4: " + size);
+
+    Segment segment = head;
+    int pos = segment.pos;
+    int limit = segment.limit;
+
+    // If the int is split across multiple segments, delegate to readByte().
+    if (limit - pos < 4) {
+      return (readByte() & 0xff) << 24
+          |  (readByte() & 0xff) << 16
+          |  (readByte() & 0xff) <<  8
+          |  (readByte() & 0xff);
+    }
+
+    byte[] data = segment.data;
+    int i = (data[pos++] & 0xff) << 24
+        |   (data[pos++] & 0xff) << 16
+        |   (data[pos++] & 0xff) <<  8
+        |   (data[pos++] & 0xff);
+    size -= 4;
+
+    if (pos == limit) {
+      head = segment.pop();
+      SegmentPool.getInstance().recycle(segment);
+    } else {
+      segment.pos = pos;
+    }
+
+    return i;
+  }
+
+  @Override public long readLong() {
+    if (size < 8) throw new IllegalStateException("size < 8: " + size);
+
+    Segment segment = head;
+    int pos = segment.pos;
+    int limit = segment.limit;
+
+    // If the long is split across multiple segments, delegate to readInt().
+    if (limit - pos < 8) {
+      return (readInt() & 0xffffffffL) << 32
+          |  (readInt() & 0xffffffffL);
+    }
+
+    byte[] data = segment.data;
+    long v = (data[pos++] & 0xffL) << 56
+        |    (data[pos++] & 0xffL) << 48
+        |    (data[pos++] & 0xffL) << 40
+        |    (data[pos++] & 0xffL) << 32
+        |    (data[pos++] & 0xffL) << 24
+        |    (data[pos++] & 0xffL) << 16
+        |    (data[pos++] & 0xffL) <<  8
+        |    (data[pos++] & 0xffL);
+    size -= 8;
+
+    if (pos == limit) {
+      head = segment.pop();
+      SegmentPool.getInstance().recycle(segment);
+    } else {
+      segment.pos = pos;
+    }
+
+    return v;
+  }
+
+  @Override public short readShortLe() {
+    return Util.reverseBytesShort(readShort());
+  }
+
+  @Override public int readIntLe() {
+    return Util.reverseBytesInt(readInt());
+  }
+
+  @Override public long readLongLe() {
+    return Util.reverseBytesLong(readLong());
+  }
+
+  @Override public ByteString readByteString() {
+    return new ByteString(readByteArray());
+  }
+
+  @Override public ByteString readByteString(long byteCount) throws EOFException {
+    return new ByteString(readByteArray(byteCount));
+  }
+
+  @Override public void readFully(Buffer sink, long byteCount) throws EOFException {
+    if (size < byteCount) {
+      sink.write(this, size); // Exhaust ourselves.
+      throw new EOFException();
+    }
+    sink.write(this, byteCount);
+  }
+
+  @Override public long readAll(Sink sink) throws IOException {
+    long byteCount = size;
+    if (byteCount > 0) {
+      sink.write(this, byteCount);
+    }
+    return byteCount;
+  }
+
+  @Override public String readUtf8() {
+    try {
+      return readString(size, Util.UTF_8);
+    } catch (EOFException e) {
+      throw new AssertionError(e);
+    }
+  }
+
+  @Override public String readUtf8(long byteCount) throws EOFException {
+    return readString(byteCount, Util.UTF_8);
+  }
+
+  @Override public String readString(Charset charset) {
+    try {
+      return readString(size, charset);
+    } catch (EOFException e) {
+      throw new AssertionError(e);
+    }
+  }
+
+  @Override public String readString(long byteCount, Charset charset) throws EOFException {
+    checkOffsetAndCount(size, 0, byteCount);
+    if (charset == null) throw new IllegalArgumentException("charset == null");
+    if (byteCount > Integer.MAX_VALUE) {
+      throw new IllegalArgumentException("byteCount > Integer.MAX_VALUE: " + byteCount);
+    }
+    if (byteCount == 0) return "";
+
+    Segment head = this.head;
+    if (head.pos + byteCount > head.limit) {
+      // If the string spans multiple segments, delegate to readBytes().
+      return new String(readByteArray(byteCount), charset);
+    }
+
+    String result = new String(head.data, head.pos, (int) byteCount, charset);
+    head.pos += byteCount;
+    size -= byteCount;
+
+    if (head.pos == head.limit) {
+      this.head = head.pop();
+      SegmentPool.getInstance().recycle(head);
+    }
+
+    return result;
+  }
+
+  @Override public String readUtf8Line() throws EOFException {
+    long newline = indexOf((byte) '\n');
+
+    if (newline == -1) {
+      return size != 0 ? readUtf8(size) : null;
+    }
+
+    return readUtf8Line(newline);
+  }
+
+  @Override public String readUtf8LineStrict() throws EOFException {
+    long newline = indexOf((byte) '\n');
+    if (newline == -1) throw new EOFException();
+    return readUtf8Line(newline);
+  }
+
+  String readUtf8Line(long newline) throws EOFException {
+    if (newline > 0 && getByte(newline - 1) == '\r') {
+      // Read everything until '\r\n', then skip the '\r\n'.
+      String result = readUtf8((newline - 1));
+      skip(2);
+      return result;
+
+    } else {
+      // Read everything until '\n', then skip the '\n'.
+      String result = readUtf8(newline);
+      skip(1);
+      return result;
+    }
+  }
+
+  @Override public byte[] readByteArray() {
+    try {
+      return readByteArray(size);
+    } catch (EOFException e) {
+      throw new AssertionError(e);
+    }
+  }
+
+  @Override public byte[] readByteArray(long byteCount) throws EOFException {
+    checkOffsetAndCount(this.size, 0, byteCount);
+    if (byteCount > Integer.MAX_VALUE) {
+      throw new IllegalArgumentException("byteCount > Integer.MAX_VALUE: " + byteCount);
+    }
+
+    byte[] result = new byte[(int) byteCount];
+    readFully(result);
+    return result;
+  }
+
+  @Override public int read(byte[] sink) {
+    return read(sink, 0, sink.length);
+  }
+
+  @Override public void readFully(byte[] sink) throws EOFException {
+    int offset = 0;
+    while (offset < sink.length) {
+      int read = read(sink, offset, sink.length - offset);
+      if (read == -1) throw new EOFException();
+      offset += read;
+    }
+  }
+
+  @Override public int read(byte[] sink, int offset, int byteCount) {
+    checkOffsetAndCount(sink.length, offset, byteCount);
+
+    Segment s = this.head;
+    if (s == null) return -1;
+    int toCopy = Math.min(byteCount, s.limit - s.pos);
+    System.arraycopy(s.data, s.pos, sink, offset, toCopy);
+
+    s.pos += toCopy;
+    this.size -= toCopy;
+
+    if (s.pos == s.limit) {
+      this.head = s.pop();
+      SegmentPool.getInstance().recycle(s);
+    }
+
+    return toCopy;
+  }
+
+  /**
+   * Discards all bytes in this buffer. Calling this method when you're done
+   * with a buffer will return its segments to the pool.
+   */
+  public void clear() {
+    try {
+      skip(size);
+    } catch (EOFException e) {
+      throw new AssertionError(e);
+    }
+  }
+
+  /** Discards {@code byteCount} bytes from the head of this buffer. */
+  @Override public void skip(long byteCount) throws EOFException {
+    while (byteCount > 0) {
+      if (head == null) throw new EOFException();
+
+      int toSkip = (int) Math.min(byteCount, head.limit - head.pos);
+      size -= toSkip;
+      byteCount -= toSkip;
+      head.pos += toSkip;
+
+      if (head.pos == head.limit) {
+        Segment toRecycle = head;
+        head = toRecycle.pop();
+        SegmentPool.getInstance().recycle(toRecycle);
+      }
+    }
+  }
+
+  @Override public Buffer write(ByteString byteString) {
+    if (byteString == null) throw new IllegalArgumentException("byteString == null");
+    return write(byteString.data, 0, byteString.data.length);
+  }
+
+  @Override public Buffer writeUtf8(String string) {
+    if (string == null) throw new IllegalArgumentException("string == null");
+    // TODO: inline UTF-8 encoding to save allocating a byte[]?
+    return writeString(string, Util.UTF_8);
+  }
+
+  @Override public Buffer writeString(String string, Charset charset) {
+    if (string == null) throw new IllegalArgumentException("string == null");
+    if (charset == null) throw new IllegalArgumentException("charset == null");
+    byte[] data = string.getBytes(charset);
+    return write(data, 0, data.length);
+  }
+
+  @Override public Buffer write(byte[] source) {
+    if (source == null) throw new IllegalArgumentException("source == null");
+    return write(source, 0, source.length);
+  }
+
+  @Override public Buffer write(byte[] source, int offset, int byteCount) {
+    if (source == null) throw new IllegalArgumentException("source == null");
+    checkOffsetAndCount(source.length, offset, byteCount);
+
+    int limit = offset + byteCount;
+    while (offset < limit) {
+      Segment tail = writableSegment(1);
+
+      int toCopy = Math.min(limit - offset, Segment.SIZE - tail.limit);
+      System.arraycopy(source, offset, tail.data, tail.limit, toCopy);
+
+      offset += toCopy;
+      tail.limit += toCopy;
+    }
+
+    this.size += byteCount;
+    return this;
+  }
+
+  @Override public long writeAll(Source source) throws IOException {
+    if (source == null) throw new IllegalArgumentException("source == null");
+    long totalBytesRead = 0;
+    for (long readCount; (readCount = source.read(this, Segment.SIZE)) != -1; ) {
+      totalBytesRead += readCount;
+    }
+    return totalBytesRead;
+  }
+
+  @Override public Buffer writeByte(int b) {
+    Segment tail = writableSegment(1);
+    tail.data[tail.limit++] = (byte) b;
+    size += 1;
+    return this;
+  }
+
+  @Override public Buffer writeShort(int s) {
+    Segment tail = writableSegment(2);
+    byte[] data = tail.data;
+    int limit = tail.limit;
+    data[limit++] = (byte) ((s >>> 8) & 0xff);
+    data[limit++] = (byte)  (s        & 0xff);
+    tail.limit = limit;
+    size += 2;
+    return this;
+  }
+
+  @Override public Buffer writeShortLe(int s) {
+    return writeShort(Util.reverseBytesShort((short) s));
+  }
+
+  @Override public Buffer writeInt(int i) {
+    Segment tail = writableSegment(4);
+    byte[] data = tail.data;
+    int limit = tail.limit;
+    data[limit++] = (byte) ((i >>> 24) & 0xff);
+    data[limit++] = (byte) ((i >>> 16) & 0xff);
+    data[limit++] = (byte) ((i >>>  8) & 0xff);
+    data[limit++] = (byte)  (i         & 0xff);
+    tail.limit = limit;
+    size += 4;
+    return this;
+  }
+
+  @Override public Buffer writeIntLe(int i) {
+    return writeInt(Util.reverseBytesInt(i));
+  }
+
+  @Override public Buffer writeLong(long v) {
+    Segment tail = writableSegment(8);
+    byte[] data = tail.data;
+    int limit = tail.limit;
+    data[limit++] = (byte) ((v >>> 56L) & 0xff);
+    data[limit++] = (byte) ((v >>> 48L) & 0xff);
+    data[limit++] = (byte) ((v >>> 40L) & 0xff);
+    data[limit++] = (byte) ((v >>> 32L) & 0xff);
+    data[limit++] = (byte) ((v >>> 24L) & 0xff);
+    data[limit++] = (byte) ((v >>> 16L) & 0xff);
+    data[limit++] = (byte) ((v >>>  8L) & 0xff);
+    data[limit++] = (byte)  (v          & 0xff);
+    tail.limit = limit;
+    size += 8;
+    return this;
+  }
+
+  @Override public Buffer writeLongLe(long v) {
+    return writeLong(reverseBytesLong(v));
+  }
+
+  /**
+   * Returns a tail segment that we can write at least {@code minimumCapacity}
+   * bytes to, creating it if necessary.
+   */
+  Segment writableSegment(int minimumCapacity) {
+    if (minimumCapacity < 1 || minimumCapacity > Segment.SIZE) throw new IllegalArgumentException();
+
+    if (head == null) {
+      head = SegmentPool.getInstance().take(); // Acquire a first segment.
+      return head.next = head.prev = head;
+    }
+
+    Segment tail = head.prev;
+    if (tail.limit + minimumCapacity > Segment.SIZE) {
+      tail = tail.push(SegmentPool.getInstance().take()); // Append a new empty segment to fill up.
+    }
+    return tail;
+  }
+
+  @Override public void write(Buffer source, long byteCount) {
+    // Move bytes from the head of the source buffer to the tail of this buffer
+    // while balancing two conflicting goals: don't waste CPU and don't waste
+    // memory.
+    //
+    //
+    // Don't waste CPU (ie. don't copy data around).
+    //
+    // Copying large amounts of data is expensive. Instead, we prefer to
+    // reassign entire segments from one buffer to the other.
+    //
+    //
+    // Don't waste memory.
+    //
+    // As an invariant, adjacent pairs of segments in a buffer should be at
+    // least 50% full, except for the head segment and the tail segment.
+    //
+    // The head segment cannot maintain the invariant because the application is
+    // consuming bytes from this segment, decreasing its level.
+    //
+    // The tail segment cannot maintain the invariant because the application is
+    // producing bytes, which may require new nearly-empty tail segments to be
+    // appended.
+    //
+    //
+    // Moving segments between buffers
+    //
+    // When writing one buffer to another, we prefer to reassign entire segments
+    // over copying bytes into their most compact form. Suppose we have a buffer
+    // with these segment levels [91%, 61%]. If we append a buffer with a
+    // single [72%] segment, that yields [91%, 61%, 72%]. No bytes are copied.
+    //
+    // Or suppose we have a buffer with these segment levels: [100%, 2%], and we
+    // want to append it to a buffer with these segment levels [99%, 3%]. This
+    // operation will yield the following segments: [100%, 2%, 99%, 3%]. That
+    // is, we do not spend time copying bytes around to achieve more efficient
+    // memory use like [100%, 100%, 4%].
+    //
+    // When combining buffers, we will compact adjacent buffers when their
+    // combined level doesn't exceed 100%. For example, when we start with
+    // [100%, 40%] and append [30%, 80%], the result is [100%, 70%, 80%].
+    //
+    //
+    // Splitting segments
+    //
+    // Occasionally we write only part of a source buffer to a sink buffer. For
+    // example, given a sink [51%, 91%], we may want to write the first 30% of
+    // a source [92%, 82%] to it. To simplify, we first transform the source to
+    // an equivalent buffer [30%, 62%, 82%] and then move the head segment,
+    // yielding sink [51%, 91%, 30%] and source [62%, 82%].
+
+    if (source == null) throw new IllegalArgumentException("source == null");
+    if (source == this) throw new IllegalArgumentException("source == this");
+    checkOffsetAndCount(source.size, 0, byteCount);
+
+    while (byteCount > 0) {
+      // Is a prefix of the source's head segment all that we need to move?
+      if (byteCount < (source.head.limit - source.head.pos)) {
+        Segment tail = head != null ? head.prev : null;
+        if (tail == null || byteCount + (tail.limit - tail.pos) > Segment.SIZE) {
+          // We're going to need another segment. Split the source's head
+          // segment in two, then move the first of those two to this buffer.
+          source.head = source.head.split((int) byteCount);
+        } else {
+          // Our existing segments are sufficient. Move bytes from source's head to our tail.
+          source.head.writeTo(tail, (int) byteCount);
+          source.size -= byteCount;
+          this.size += byteCount;
+          return;
+        }
+      }
+
+      // Remove the source's head segment and append it to our tail.
+      Segment segmentToMove = source.head;
+      long movedByteCount = segmentToMove.limit - segmentToMove.pos;
+      source.head = segmentToMove.pop();
+      if (head == null) {
+        head = segmentToMove;
+        head.next = head.prev = head;
+      } else {
+        Segment tail = head.prev;
+        tail = tail.push(segmentToMove);
+        tail.compact();
+      }
+      source.size -= movedByteCount;
+      this.size += movedByteCount;
+      byteCount -= movedByteCount;
+    }
+  }
+
+  @Override public long read(Buffer sink, long byteCount) {
+    if (sink == null) throw new IllegalArgumentException("sink == null");
+    if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
+    if (this.size == 0) return -1L;
+    if (byteCount > this.size) byteCount = this.size;
+    sink.write(this, byteCount);
+    return byteCount;
+  }
+
+  @Override public long indexOf(byte b) {
+    return indexOf(b, 0);
+  }
+
+  /**
+   * Returns the index of {@code b} in this at or beyond {@code fromIndex}, or
+   * -1 if this buffer does not contain {@code b} in that range.
+   */
+  public long indexOf(byte b, long fromIndex) {
+    if (fromIndex < 0) throw new IllegalArgumentException("fromIndex < 0");
+
+    Segment s = head;
+    if (s == null) return -1L;
+    long offset = 0L;
+    do {
+      int segmentByteCount = s.limit - s.pos;
+      if (fromIndex >= segmentByteCount) {
+        fromIndex -= segmentByteCount;
+      } else {
+        byte[] data = s.data;
+        for (long pos = s.pos + fromIndex, limit = s.limit; pos < limit; pos++) {
+          if (data[(int) pos] == b) return offset + pos - s.pos;
+        }
+        fromIndex = 0;
+      }
+      offset += segmentByteCount;
+      s = s.next;
+    } while (s != head);
+    return -1L;
+  }
+
+  @Override public void flush() {
+  }
+
+  @Override public void close() {
+  }
+
+  @Override public Timeout timeout() {
+    return Timeout.NONE;
+  }
+
+  /** For testing. This returns the sizes of the segments in this buffer. */
+  List<Integer> segmentSizes() {
+    if (head == null) return Collections.emptyList();
+    List<Integer> result = new ArrayList<Integer>();
+    result.add(head.limit - head.pos);
+    for (Segment s = head.next; s != head; s = s.next) {
+      result.add(s.limit - s.pos);
+    }
+    return result;
+  }
+
+  @Override public boolean equals(Object o) {
+    if (this == o) return true;
+    if (!(o instanceof Buffer)) return false;
+    Buffer that = (Buffer) o;
+    if (size != that.size) return false;
+    if (size == 0) return true; // Both buffers are empty.
+
+    Segment sa = this.head;
+    Segment sb = that.head;
+    int posA = sa.pos;
+    int posB = sb.pos;
+
+    for (long pos = 0, count; pos < size; pos += count) {
+      count = Math.min(sa.limit - posA, sb.limit - posB);
+
+      for (int i = 0; i < count; i++) {
+        if (sa.data[posA++] != sb.data[posB++]) return false;
+      }
+
+      if (posA == sa.limit) {
+        sa = sa.next;
+        posA = sa.pos;
+      }
+
+      if (posB == sb.limit) {
+        sb = sb.next;
+        posB = sb.pos;
+      }
+    }
+
+    return true;
+  }
+
+  @Override public int hashCode() {
+    Segment s = head;
+    if (s == null) return 0;
+    int result = 1;
+    do {
+      for (int pos = s.pos, limit = s.limit; pos < limit; pos++) {
+        result = 31 * result + s.data[pos];
+      }
+      s = s.next;
+    } while (s != head);
+    return result;
+  }
+
+  @Override public String toString() {
+    if (size == 0) {
+      return "Buffer[size=0]";
+    }
+
+    if (size <= 16) {
+      ByteString data = clone().readByteString();
+      return String.format("Buffer[size=%s data=%s]", size, data.hex());
+    }
+
+    try {
+      MessageDigest md5 = MessageDigest.getInstance("MD5");
+      md5.update(head.data, head.pos, head.limit - head.pos);
+      for (Segment s = head.next; s != head; s = s.next) {
+        md5.update(s.data, s.pos, s.limit - s.pos);
+      }
+      return String.format("Buffer[size=%s md5=%s]",
+          size, ByteString.of(md5.digest()).hex());
+    } catch (NoSuchAlgorithmException e) {
+      throw new AssertionError();
+    }
+  }
+
+  /** Returns a deep copy of this buffer. */
+  @Override public Buffer clone() {
+    Buffer result = new Buffer();
+    if (size == 0) return result;
+
+    result.write(head.data, head.pos, head.limit - head.pos);
+    for (Segment s = head.next; s != head; s = s.next) {
+      result.write(s.data, s.pos, s.limit - s.pos);
+    }
+
+    return result;
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/BufferedSink.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/BufferedSink.java
new file mode 100644
index 000000000..777840389
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/BufferedSink.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+
+/**
+ * A sink that keeps a buffer internally so that callers can do small writes
+ * without a performance penalty.
+ */
+public interface BufferedSink extends Sink {
+  /** Returns this sink's internal buffer. */
+  Buffer buffer();
+
+  BufferedSink write(ByteString byteString) throws IOException;
+
+  /**
+   * Like {@link java.io.OutputStream#write(byte[])}, this writes a complete byte array to
+   * this sink.
+   */
+  BufferedSink write(byte[] source) throws IOException;
+
+  /**
+   * Like {@link java.io.OutputStream#write(byte[], int, int)}, this writes {@code byteCount}
+   * bytes of {@code source}, starting at {@code offset}.
+   */
+  BufferedSink write(byte[] source, int offset, int byteCount) throws IOException;
+
+  /**
+   * Removes all bytes from {@code source} and appends them to this. Returns the
+   * number of bytes read which will be 0 if {@code source} is exhausted.
+   */
+  long writeAll(Source source) throws IOException;
+
+  /** Encodes {@code string} in UTF-8 and writes it to this sink. */
+  BufferedSink writeUtf8(String string) throws IOException;
+
+  /** Encodes {@code string} in {@code charset} and writes it to this sink. */
+  BufferedSink writeString(String string, Charset charset) throws IOException;
+
+  /** Writes a byte to this sink. */
+  BufferedSink writeByte(int b) throws IOException;
+
+  /** Writes a big-endian short to this sink using two bytes. */
+  BufferedSink writeShort(int s) throws IOException;
+
+  /** Writes a little-endian short to this sink using two bytes. */
+  BufferedSink writeShortLe(int s) throws IOException;
+
+  /** Writes a big-endian int to this sink using four bytes. */
+  BufferedSink writeInt(int i) throws IOException;
+
+  /** Writes a little-endian int to this sink using four bytes. */
+  BufferedSink writeIntLe(int i) throws IOException;
+
+  /** Writes a big-endian long to this sink using eight bytes. */
+  BufferedSink writeLong(long v) throws IOException;
+
+  /** Writes a little-endian long to this sink using eight bytes. */
+  BufferedSink writeLongLe(long v) throws IOException;
+
+  /** Writes complete segments to this sink. Like {@link #flush}, but weaker. */
+  BufferedSink emitCompleteSegments() throws IOException;
+
+  /** Returns an output stream that writes to this sink. */
+  OutputStream outputStream();
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/BufferedSource.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/BufferedSource.java
new file mode 100644
index 000000000..af0129488
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/BufferedSource.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+
+/**
+ * A source that keeps a buffer internally so that callers can do small reads
+ * without a performance penalty. It also allows clients to read ahead,
+ * buffering as much as necessary before consuming input.
+ */
+public interface BufferedSource extends Source {
+  /** Returns this source's internal buffer. */
+  Buffer buffer();
+
+  /**
+   * Returns true if there are no more bytes in this source. This will block
+   * until there are bytes to read or the source is definitely exhausted.
+   */
+  boolean exhausted() throws IOException;
+
+  /**
+   * Returns when the buffer contains at least {@code byteCount} bytes. Throws
+   * an {@link java.io.EOFException} if the source is exhausted before the
+   * required bytes can be read.
+   */
+  void require(long byteCount) throws IOException;
+
+  /** Removes a byte from this source and returns it. */
+  byte readByte() throws IOException;
+
+  /** Removes two bytes from this source and returns a big-endian short. */
+  short readShort() throws IOException;
+
+  /** Removes two bytes from this source and returns a little-endian short. */
+  short readShortLe() throws IOException;
+
+  /** Removes four bytes from this source and returns a big-endian int. */
+  int readInt() throws IOException;
+
+  /** Removes four bytes from this source and returns a little-endian int. */
+  int readIntLe() throws IOException;
+
+  /** Removes eight bytes from this source and returns a big-endian long. */
+  long readLong() throws IOException;
+
+  /** Removes eight bytes from this source and returns a little-endian long. */
+  long readLongLe() throws IOException;
+
+  /**
+   * Reads and discards {@code byteCount} bytes from this source. Throws an
+   * {@link java.io.EOFException} if the source is exhausted before the
+   * requested bytes can be skipped.
+   */
+  void skip(long byteCount) throws IOException;
+
+  /** Removes all bytes bytes from this and returns them as a byte string. */
+  ByteString readByteString() throws IOException;
+
+  /** Removes {@code byteCount} bytes from this and returns them as a byte string. */
+  ByteString readByteString(long byteCount) throws IOException;
+
+  /** Removes all bytes from this and returns them as a byte array. */
+  byte[] readByteArray() throws IOException;
+
+  /** Removes {@code byteCount} bytes from this and returns them as a byte array. */
+  byte[] readByteArray(long byteCount) throws IOException;
+
+  /**
+   * Removes up to {@code sink.length} bytes from this and copies them into {@code sink}.
+   * Returns the number of bytes read, or -1 if this source is exhausted.
+   */
+  int read(byte[] sink) throws IOException;
+
+  /**
+   * Removes exactly {@code sink.length} bytes from this and copies them into {@code sink}.
+   * Throws an {@link java.io.EOFException} if the requested number of bytes cannot be read.
+   */
+  void readFully(byte[] sink) throws IOException;
+
+  /**
+   * Removes up to {@code byteCount} bytes from this and copies them into {@code sink} at
+   * {@code offset}. Returns the number of bytes read, or -1 if this source is exhausted.
+   */
+  int read(byte[] sink, int offset, int byteCount) throws IOException;
+
+  /**
+   * Removes exactly {@code byteCount} bytes from this and appends them to
+   * {@code sink}. Throws an {@link java.io.EOFException} if the requested
+   * number of bytes cannot be read.
+   */
+  void readFully(Buffer sink, long byteCount) throws IOException;
+
+  /**
+   * Removes all bytes from this and appends them to {@code sink}. Returns the
+   * total number of bytes written to {@code sink} which will be 0 if this is
+   * exhausted.
+   */
+  long readAll(Sink sink) throws IOException;
+
+  /** Removes all bytes from this, decodes them as UTF-8, and returns the string. */
+  String readUtf8() throws IOException;
+
+  /**
+   * Removes {@code byteCount} bytes from this, decodes them as UTF-8, and
+   * returns the string.
+   */
+  String readUtf8(long byteCount) throws IOException;
+
+  /**
+   * Removes and returns characters up to but not including the next line break.
+   * A line break is either {@code "\n"} or {@code "\r\n"}; these characters are
+   * not included in the result.
+   *
+   * <p><strong>On the end of the stream this method returns null,</strong> just
+   * like {@link java.io.BufferedReader}. If the source doesn't end with a line
+   * break then an implicit line break is assumed. Null is returned once the
+   * source is exhausted. Use this for human-generated data, where a trailing
+   * line break is optional.
+   */
+  String readUtf8Line() throws IOException;
+
+  /**
+   * Removes and returns characters up to but not including the next line break.
+   * A line break is either {@code "\n"} or {@code "\r\n"}; these characters are
+   * not included in the result.
+   *
+   * <p><strong>On the end of the stream this method throws.</strong> Every call
+   * must consume either '\r\n' or '\n'. If these characters are absent in the
+   * stream, an {@link java.io.EOFException} is thrown. Use this for
+   * machine-generated data where a missing line break implies truncated input.
+   */
+  String readUtf8LineStrict() throws IOException;
+
+  /**
+   * Removes all bytes from this, decodes them as {@code charset}, and returns
+   * the string.
+   */
+  String readString(Charset charset) throws IOException;
+
+  /**
+   * Removes {@code byteCount} bytes from this, decodes them as {@code charset},
+   * and returns the string.
+   */
+  String readString(long byteCount, Charset charset) throws IOException;
+
+  /**
+   * Returns the index of {@code b} in the buffer, refilling it if necessary
+   * until it is found. This reads an unbounded number of bytes into the buffer.
+   * Returns -1 if the stream is exhausted before the requested byte is found.
+   */
+  long indexOf(byte b) throws IOException;
+
+  /** Returns an input stream that reads from this source. */
+  InputStream inputStream();
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/ByteString.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/ByteString.java
new file mode 100644
index 000000000..c029e1ee8
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/ByteString.java
@@ -0,0 +1,283 @@
+/*
+ * Copyright 2014 Square Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
+import static com.koushikdutta.async.http.spdy.okio.Util.checkOffsetAndCount;
+
+/**
+ * An immutable sequence of bytes.
+ *
+ * <p><strong>Full disclosure:</strong> this class provides untrusted input and
+ * output streams with raw access to the underlying byte array. A hostile
+ * stream implementation could keep a reference to the mutable byte string,
+ * violating the immutable guarantee of this class. For this reason a byte
+ * string's immutability guarantee cannot be relied upon for security in applets
+ * and other environments that run both trusted and untrusted code in the same
+ * process.
+ */
+public final class ByteString implements Serializable {
+  private static final char[] HEX_DIGITS =
+      { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+  private static final long serialVersionUID = 1L;
+
+  /** A singleton empty {@code ByteString}. */
+  public static final ByteString EMPTY = ByteString.of();
+
+  final byte[] data;
+  private transient int hashCode; // Lazily computed; 0 if unknown.
+  private transient String utf8; // Lazily computed.
+
+  ByteString(byte[] data) {
+    this.data = data; // Trusted internal constructor doesn't clone data.
+  }
+
+  /**
+   * Returns a new byte string containing a clone of the bytes of {@code data}.
+   */
+  public static ByteString of(byte... data) {
+    if (data == null) throw new IllegalArgumentException("data == null");
+    return new ByteString(data.clone());
+  }
+
+  /**
+   * Returns a new byte string containing a copy of {@code byteCount} bytes of {@code data} starting
+   * at {@code offset}.
+   */
+  public static ByteString of(byte[] data, int offset, int byteCount) {
+    if (data == null) throw new IllegalArgumentException("data == null");
+    checkOffsetAndCount(data.length, offset, byteCount);
+
+    byte[] copy = new byte[byteCount];
+    System.arraycopy(data, offset, copy, 0, byteCount);
+    return new ByteString(copy);
+  }
+
+  /** Returns a new byte string containing the {@code UTF-8} bytes of {@code s}. */
+  public static ByteString encodeUtf8(String s) {
+    if (s == null) throw new IllegalArgumentException("s == null");
+    ByteString byteString = new ByteString(s.getBytes(Util.UTF_8));
+    byteString.utf8 = s;
+    return byteString;
+  }
+
+  /** Constructs a new {@code String} by decoding the bytes as {@code UTF-8}. */
+  public String utf8() {
+    String result = utf8;
+    // We don't care if we double-allocate in racy code.
+    return result != null ? result : (utf8 = new String(data, Util.UTF_8));
+  }
+
+  /**
+   * Returns this byte string encoded as <a
+   * href="http://www.ietf.org/rfc/rfc2045.txt">Base64</a>. In violation of the
+   * RFC, the returned string does not wrap lines at 76 columns.
+   */
+  public String base64() {
+    return Base64.encode(data);
+  }
+
+  /**
+   * Decodes the Base64-encoded bytes and returns their value as a byte string.
+   * Returns null if {@code base64} is not a Base64-encoded sequence of bytes.
+   */
+  public static ByteString decodeBase64(String base64) {
+    if (base64 == null) throw new IllegalArgumentException("base64 == null");
+    byte[] decoded = Base64.decode(base64);
+    return decoded != null ? new ByteString(decoded) : null;
+  }
+
+  /** Returns this byte string encoded in hexadecimal. */
+  public String hex() {
+    char[] result = new char[data.length * 2];
+    int c = 0;
+    for (byte b : data) {
+      result[c++] = HEX_DIGITS[(b >> 4) & 0xf];
+      result[c++] = HEX_DIGITS[b & 0xf];
+    }
+    return new String(result);
+  }
+
+  /** Decodes the hex-encoded bytes and returns their value a byte string. */
+  public static ByteString decodeHex(String hex) {
+    if (hex == null) throw new IllegalArgumentException("hex == null");
+    if (hex.length() % 2 != 0) throw new IllegalArgumentException("Unexpected hex string: " + hex);
+
+    byte[] result = new byte[hex.length() / 2];
+    for (int i = 0; i < result.length; i++) {
+      int d1 = decodeHexDigit(hex.charAt(i * 2)) << 4;
+      int d2 = decodeHexDigit(hex.charAt(i * 2 + 1));
+      result[i] = (byte) (d1 + d2);
+    }
+    return of(result);
+  }
+
+  private static int decodeHexDigit(char c) {
+    if (c >= '0' && c <= '9') return c - '0';
+    if (c >= 'a' && c <= 'f') return c - 'a' + 10;
+    if (c >= 'A' && c <= 'F') return c - 'A' + 10;
+    throw new IllegalArgumentException("Unexpected hex digit: " + c);
+  }
+
+  /**
+   * Reads {@code count} bytes from {@code in} and returns the result.
+   *
+   * @throws java.io.EOFException if {@code in} has fewer than {@code count}
+   *     bytes to read.
+   */
+  public static ByteString read(InputStream in, int byteCount) throws IOException {
+    if (in == null) throw new IllegalArgumentException("in == null");
+    if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
+
+    byte[] result = new byte[byteCount];
+    for (int offset = 0, read; offset < byteCount; offset += read) {
+      read = in.read(result, offset, byteCount - offset);
+      if (read == -1) throw new EOFException();
+    }
+    return new ByteString(result);
+  }
+
+  /**
+   * Returns a byte string equal to this byte string, but with the bytes 'A'
+   * through 'Z' replaced with the corresponding byte in 'a' through 'z'.
+   * Returns this byte string if it contains no bytes in 'A' through 'Z'.
+   */
+  public ByteString toAsciiLowercase() {
+    // Search for an uppercase character. If we don't find one, return this.
+    for (int i = 0; i < data.length; i++) {
+      byte c = data[i];
+      if (c < 'A' || c > 'Z') continue;
+
+      // If we reach this point, this string is not not lowercase. Create and
+      // return a new byte string.
+      byte[] lowercase = data.clone();
+      lowercase[i++] = (byte) (c - ('A' - 'a'));
+      for (; i < lowercase.length; i++) {
+        c = lowercase[i];
+        if (c < 'A' || c > 'Z') continue;
+        lowercase[i] = (byte) (c - ('A' - 'a'));
+      }
+      return new ByteString(lowercase);
+    }
+    return this;
+  }
+
+  /**
+   * Returns a byte string equal to this byte string, but with the bytes 'a'
+   * through 'z' replaced with the corresponding byte in 'A' through 'Z'.
+   * Returns this byte string if it contains no bytes in 'a' through 'z'.
+   */
+  public ByteString toAsciiUppercase() {
+    // Search for an lowercase character. If we don't find one, return this.
+    for (int i = 0; i < data.length; i++) {
+      byte c = data[i];
+      if (c < 'a' || c > 'z') continue;
+
+      // If we reach this point, this string is not not uppercase. Create and
+      // return a new byte string.
+      byte[] lowercase = data.clone();
+      lowercase[i++] = (byte) (c - ('a' - 'A'));
+      for (; i < lowercase.length; i++) {
+        c = lowercase[i];
+        if (c < 'a' || c > 'z') continue;
+        lowercase[i] = (byte) (c - ('a' - 'A'));
+      }
+      return new ByteString(lowercase);
+    }
+    return this;
+  }
+
+  /** Returns the byte at {@code pos}. */
+  public byte getByte(int pos) {
+    return data[pos];
+  }
+
+  /**
+   * Returns the number of bytes in this ByteString.
+   */
+  public int size() {
+    return data.length;
+  }
+
+  /**
+   * Returns a byte array containing a copy of the bytes in this {@code ByteString}.
+   */
+  public byte[] toByteArray() {
+    return data.clone();
+  }
+
+  /** Writes the contents of this byte string to {@code out}. */
+  public void write(OutputStream out) throws IOException {
+    if (out == null) throw new IllegalArgumentException("out == null");
+    out.write(data);
+  }
+
+  @Override public boolean equals(Object o) {
+    return o == this || o instanceof ByteString && Arrays.equals(((ByteString) o).data, data);
+  }
+
+  @Override public int hashCode() {
+    int result = hashCode;
+    return result != 0 ? result : (hashCode = Arrays.hashCode(data));
+  }
+
+  @Override public String toString() {
+    if (data.length == 0) {
+      return "ByteString[size=0]";
+    }
+
+    if (data.length <= 16) {
+      return String.format("ByteString[size=%s data=%s]", data.length, hex());
+    }
+
+    try {
+      return String.format("ByteString[size=%s md5=%s]", data.length,
+          ByteString.of(MessageDigest.getInstance("MD5").digest(data)).hex());
+    } catch (NoSuchAlgorithmException e) {
+      throw new AssertionError();
+    }
+  }
+
+  private void readObject(ObjectInputStream in) throws IOException {
+    int dataLength = in.readInt();
+    ByteString byteString = ByteString.read(in, dataLength);
+    try {
+      Field field = ByteString.class.getDeclaredField("data");
+      field.setAccessible(true);
+      field.set(this, byteString.data);
+    } catch (NoSuchFieldException e) {
+      throw new AssertionError();
+    } catch (IllegalAccessException e) {
+      throw new AssertionError();
+    }
+  }
+
+  private void writeObject(ObjectOutputStream out) throws IOException {
+    out.writeInt(data.length);
+    out.write(data);
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/DeflaterSink.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/DeflaterSink.java
new file mode 100644
index 000000000..960ee80c3
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/DeflaterSink.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+import java.io.IOException;
+import java.util.zip.Deflater;
+
+import static com.koushikdutta.async.http.spdy.okio.Util.checkOffsetAndCount;
+
+/**
+ * A sink that uses <a href="http://tools.ietf.org/html/rfc1951">DEFLATE</a> to
+ * compress data written to another source.
+ *
+ * <h3>Sync flush</h3>
+ * Aggressive flushing of this stream may result in reduced compression. Each
+ * call to {@link #flush} immediately compresses all currently-buffered data;
+ * this early compression may be less effective than compression performed
+ * without flushing.
+ *
+ * <p>This is equivalent to using {@link java.util.zip.Deflater} with the sync flush option.
+ * This class does not offer any partial flush mechanism. For best performance,
+ * only call {@link #flush} when application behavior requires it.
+ */
+public final class DeflaterSink implements Sink {
+  private final BufferedSink sink;
+  private final Deflater deflater;
+  private boolean closed;
+
+  public DeflaterSink(Sink sink, Deflater deflater) {
+    this(Okio.buffer(sink), deflater);
+  }
+
+  /**
+   * This package-private constructor shares a buffer with its trusted caller.
+   * In general we can't share a BufferedSource because the deflater holds input
+   * bytes until they are inflated.
+   */
+  DeflaterSink(BufferedSink sink, Deflater deflater) {
+    if (sink == null) throw new IllegalArgumentException("source == null");
+    if (deflater == null) throw new IllegalArgumentException("inflater == null");
+    this.sink = sink;
+    this.deflater = deflater;
+  }
+
+  @Override public void write(Buffer source, long byteCount)
+      throws IOException {
+    checkOffsetAndCount(source.size, 0, byteCount);
+    while (byteCount > 0) {
+      // Share bytes from the head segment of 'source' with the deflater.
+      Segment head = source.head;
+      int toDeflate = (int) Math.min(byteCount, head.limit - head.pos);
+      deflater.setInput(head.data, head.pos, toDeflate);
+
+      // Deflate those bytes into sink.
+      deflate(false);
+
+      // Mark those bytes as read.
+      source.size -= toDeflate;
+      head.pos += toDeflate;
+      if (head.pos == head.limit) {
+        source.head = head.pop();
+        SegmentPool.getInstance().recycle(head);
+      }
+
+      byteCount -= toDeflate;
+    }
+  }
+
+  private void deflate(boolean syncFlush) throws IOException {
+    Buffer buffer = sink.buffer();
+    while (true) {
+      Segment s = buffer.writableSegment(1);
+
+      // The 4-parameter overload of deflate() doesn't exist in the RI until
+      // Java 1.7, and is public (although with @hide) on Android since 2.3.
+      // The @hide tag means that this code won't compile against the Android
+      // 2.3 SDK, but it will run fine there.
+      int deflated = syncFlush
+          ? deflater.deflate(s.data, s.limit, Segment.SIZE - s.limit, Deflater.SYNC_FLUSH)
+          : deflater.deflate(s.data, s.limit, Segment.SIZE - s.limit);
+
+      if (deflated > 0) {
+        s.limit += deflated;
+        buffer.size += deflated;
+        sink.emitCompleteSegments();
+      } else if (deflater.needsInput()) {
+        return;
+      }
+    }
+  }
+
+  @Override public void flush() throws IOException {
+    deflate(true);
+    sink.flush();
+  }
+
+  void finishDeflate() throws IOException {
+    deflater.finish();
+    deflate(false);
+  }
+
+  @Override public void close() throws IOException {
+    if (closed) return;
+
+    // Emit deflated data to the underlying sink. If this fails, we still need
+    // to close the deflater and the sink; otherwise we risk leaking resources.
+    Throwable thrown = null;
+    try {
+      finishDeflate();
+    } catch (Throwable e) {
+      thrown = e;
+    }
+
+    try {
+      deflater.end();
+    } catch (Throwable e) {
+      if (thrown == null) thrown = e;
+    }
+
+    try {
+      sink.close();
+    } catch (Throwable e) {
+      if (thrown == null) thrown = e;
+    }
+    closed = true;
+
+    if (thrown != null) Util.sneakyRethrow(thrown);
+  }
+
+  @Override public Timeout timeout() {
+    return sink.timeout();
+  }
+
+  @Override public String toString() {
+    return "DeflaterSink(" + sink + ")";
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/ForwardingSource.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/ForwardingSource.java
new file mode 100644
index 000000000..5e48dfd54
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/ForwardingSource.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+import java.io.IOException;
+
+/** A {@link Source} which forwards calls to another. Useful for subclassing. */
+public abstract class ForwardingSource implements Source {
+  private final Source delegate;
+
+  public ForwardingSource(Source delegate) {
+    if (delegate == null) throw new IllegalArgumentException("delegate == null");
+    this.delegate = delegate;
+  }
+
+  /** {@link Source} to which this instance is delegating. */
+  public final Source delegate() {
+    return delegate;
+  }
+
+  @Override public long read(Buffer sink, long byteCount) throws IOException {
+    return delegate.read(sink, byteCount);
+  }
+
+  @Override public Timeout timeout() {
+    return delegate.timeout();
+  }
+
+  @Override public void close() throws IOException {
+    delegate.close();
+  }
+
+  @Override public String toString() {
+    return getClass().getSimpleName() + "(" + delegate.toString() + ")";
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/InflaterSource.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/InflaterSource.java
new file mode 100644
index 000000000..ce50796f3
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/InflaterSource.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.util.zip.DataFormatException;
+import java.util.zip.Inflater;
+
+/**
+ * A source that uses <a href="http://tools.ietf.org/html/rfc1951">DEFLATE</a>
+ * to decompress data read from another source.
+ */
+public final class InflaterSource implements Source {
+  private final BufferedSource source;
+  private final Inflater inflater;
+
+  /**
+   * When we call Inflater.setInput(), the inflater keeps our byte array until
+   * it needs input again. This tracks how many bytes the inflater is currently
+   * holding on to.
+   */
+  private int bufferBytesHeldByInflater;
+  private boolean closed;
+
+  public InflaterSource(Source source, Inflater inflater) {
+    this(Okio.buffer(source), inflater);
+  }
+
+  /**
+   * This package-private constructor shares a buffer with its trusted caller.
+   * In general we can't share a BufferedSource because the inflater holds input
+   * bytes until they are inflated.
+   */
+  InflaterSource(BufferedSource source, Inflater inflater) {
+    if (source == null) throw new IllegalArgumentException("source == null");
+    if (inflater == null) throw new IllegalArgumentException("inflater == null");
+    this.source = source;
+    this.inflater = inflater;
+  }
+
+  @Override public long read(
+      Buffer sink, long byteCount) throws IOException {
+    if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
+    if (closed) throw new IllegalStateException("closed");
+    if (byteCount == 0) return 0;
+
+    while (true) {
+      boolean sourceExhausted = refill();
+
+      // Decompress the inflater's compressed data into the sink.
+      try {
+        Segment tail = sink.writableSegment(1);
+        int bytesInflated = inflater.inflate(tail.data, tail.limit, Segment.SIZE - tail.limit);
+        if (bytesInflated > 0) {
+          tail.limit += bytesInflated;
+          sink.size += bytesInflated;
+          return bytesInflated;
+        }
+        if (inflater.finished() || inflater.needsDictionary()) {
+          releaseInflatedBytes();
+          return -1;
+        }
+        if (sourceExhausted) throw new EOFException("source exhausted prematurely");
+      } catch (DataFormatException e) {
+        throw new IOException(e);
+      }
+    }
+  }
+
+  /**
+   * Refills the inflater with compressed data if it needs input. (And only if
+   * it needs input). Returns true if the inflater required input but the source
+   * was exhausted.
+   */
+  public boolean refill() throws IOException {
+    if (!inflater.needsInput()) return false;
+
+    releaseInflatedBytes();
+    if (inflater.getRemaining() != 0) throw new IllegalStateException("?"); // TODO: possible?
+
+    // If there are compressed bytes in the source, assign them to the inflater.
+    if (source.exhausted()) return true;
+
+    // Assign buffer bytes to the inflater.
+    byte[] data = source.readByteArray();
+    bufferBytesHeldByInflater = data.length;
+    inflater.setInput(data, 0, bufferBytesHeldByInflater);
+    return false;
+  }
+
+  /** When the inflater has processed compressed data, remove it from the buffer. */
+  private void releaseInflatedBytes() throws IOException {
+    if (bufferBytesHeldByInflater == 0) return;
+    int toRelease = bufferBytesHeldByInflater - inflater.getRemaining();
+    bufferBytesHeldByInflater -= toRelease;
+    source.skip(toRelease);
+  }
+
+  @Override public Timeout timeout() {
+    return source.timeout();
+  }
+
+  @Override public void close() throws IOException {
+    if (closed) return;
+    inflater.end();
+    closed = true;
+    source.close();
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Okio.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Okio.java
new file mode 100644
index 000000000..4aa579443
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Okio.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static com.koushikdutta.async.http.spdy.okio.Util.checkOffsetAndCount;
+
+/** Essential APIs for working with Okio. */
+public final class Okio {
+  private static final Logger logger = Logger.getLogger(Okio.class.getName());
+
+  private Okio() {
+  }
+
+  /**
+   * Returns a new source that buffers reads from {@code source}. The returned
+   * source will perform bulk reads into its in-memory buffer. Use this wherever
+   * you read a source to get an ergonomic and efficient access to data.
+   */
+  public static BufferedSource buffer(Source source) {
+    if (source == null) throw new IllegalArgumentException("source == null");
+    return new RealBufferedSource(source);
+  }
+
+  /**
+   * Returns a new sink that buffers writes to {@code sink}. The returned sink
+   * will batch writes to {@code sink}. Use this wherever you write to a sink to
+   * get an ergonomic and efficient access to data.
+   */
+  public static BufferedSink buffer(Sink sink) {
+    if (sink == null) throw new IllegalArgumentException("sink == null");
+    return new RealBufferedSink(sink);
+  }
+
+  /** Returns a sink that writes to {@code out}. */
+  public static Sink sink(final OutputStream out) {
+    return sink(out, new Timeout());
+  }
+
+  private static Sink sink(final OutputStream out, final Timeout timeout) {
+    if (out == null) throw new IllegalArgumentException("out == null");
+    if (timeout == null) throw new IllegalArgumentException("timeout == null");
+
+    return new Sink() {
+      @Override public void write(Buffer source, long byteCount) throws IOException {
+        checkOffsetAndCount(source.size, 0, byteCount);
+        while (byteCount > 0) {
+          timeout.throwIfReached();
+          Segment head = source.head;
+          int toCopy = (int) Math.min(byteCount, head.limit - head.pos);
+          out.write(head.data, head.pos, toCopy);
+
+          head.pos += toCopy;
+          byteCount -= toCopy;
+          source.size -= toCopy;
+
+          if (head.pos == head.limit) {
+            source.head = head.pop();
+            SegmentPool.getInstance().recycle(head);
+          }
+        }
+      }
+
+      @Override public void flush() throws IOException {
+        out.flush();
+      }
+
+      @Override public void close() throws IOException {
+        out.close();
+      }
+
+      @Override public Timeout timeout() {
+        return timeout;
+      }
+
+      @Override public String toString() {
+        return "sink(" + out + ")";
+      }
+    };
+  }
+
+  /**
+   * Returns a sink that writes to {@code socket}. Prefer this over {@link
+   * #sink(java.io.OutputStream)} because this method honors timeouts. When the socket
+   * write times out, the socket is asynchronously closed by a watchdog thread.
+   */
+  public static Sink sink(final Socket socket) throws IOException {
+    if (socket == null) throw new IllegalArgumentException("socket == null");
+    AsyncTimeout timeout = timeout(socket);
+    Sink sink = sink(socket.getOutputStream(), timeout);
+    return timeout.sink(sink);
+  }
+
+  /** Returns a source that reads from {@code in}. */
+  public static Source source(final InputStream in) {
+    return source(in, new Timeout());
+  }
+
+  private static Source source(final InputStream in, final Timeout timeout) {
+    if (in == null) throw new IllegalArgumentException("in == null");
+    if (timeout == null) throw new IllegalArgumentException("timeout == null");
+
+    return new Source() {
+      @Override public long read(Buffer sink, long byteCount) throws IOException {
+        if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
+        timeout.throwIfReached();
+        Segment tail = sink.writableSegment(1);
+        int maxToCopy = (int) Math.min(byteCount, Segment.SIZE - tail.limit);
+        int bytesRead = in.read(tail.data, tail.limit, maxToCopy);
+        if (bytesRead == -1) return -1;
+        tail.limit += bytesRead;
+        sink.size += bytesRead;
+        return bytesRead;
+      }
+
+      @Override public void close() throws IOException {
+        in.close();
+      }
+
+      @Override public Timeout timeout() {
+        return timeout;
+      }
+
+      @Override public String toString() {
+        return "source(" + in + ")";
+      }
+    };
+  }
+
+  /** Returns a source that reads from {@code file}. */
+  public static Source source(File file) throws FileNotFoundException {
+    if (file == null) throw new IllegalArgumentException("file == null");
+    return source(new FileInputStream(file));
+  }
+
+  /** Returns a sink that writes to {@code file}. */
+  public static Sink sink(File file) throws FileNotFoundException {
+    if (file == null) throw new IllegalArgumentException("file == null");
+    return sink(new FileOutputStream(file));
+  }
+
+  /** Returns a sink that appends to {@code file}. */
+  public static Sink appendingSink(File file) throws FileNotFoundException {
+    if (file == null) throw new IllegalArgumentException("file == null");
+    return sink(new FileOutputStream(file, true));
+  }
+
+  /**
+   * Returns a source that reads from {@code socket}. Prefer this over {@link
+   * #source(java.io.InputStream)} because this method honors timeouts. When the socket
+   * read times out, the socket is asynchronously closed by a watchdog thread.
+   */
+  public static Source source(final Socket socket) throws IOException {
+    if (socket == null) throw new IllegalArgumentException("socket == null");
+    AsyncTimeout timeout = timeout(socket);
+    Source source = source(socket.getInputStream(), timeout);
+    return timeout.source(source);
+  }
+
+  private static AsyncTimeout timeout(final Socket socket) {
+    return new AsyncTimeout() {
+      @Override protected void timedOut() {
+        try {
+          socket.close();
+        } catch (Exception e) {
+          logger.log(Level.WARNING, "Failed to close timed out socket " + socket, e);
+        }
+      }
+    };
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/RealBufferedSink.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/RealBufferedSink.java
new file mode 100644
index 000000000..8e393ca42
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/RealBufferedSink.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+
+final class RealBufferedSink implements BufferedSink {
+  public final Buffer buffer;
+  public final Sink sink;
+  private boolean closed;
+
+  public RealBufferedSink(Sink sink, Buffer buffer) {
+    if (sink == null) throw new IllegalArgumentException("sink == null");
+    this.buffer = buffer;
+    this.sink = sink;
+  }
+
+  public RealBufferedSink(Sink sink) {
+    this(sink, new Buffer());
+  }
+
+  @Override public Buffer buffer() {
+    return buffer;
+  }
+
+  @Override public void write(Buffer source, long byteCount)
+      throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    buffer.write(source, byteCount);
+    emitCompleteSegments();
+  }
+
+  @Override public BufferedSink write(ByteString byteString) throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    buffer.write(byteString);
+    return emitCompleteSegments();
+  }
+
+  @Override public BufferedSink writeUtf8(String string) throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    buffer.writeUtf8(string);
+    return emitCompleteSegments();
+  }
+
+  @Override public BufferedSink writeString(String string, Charset charset) throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    buffer.writeString(string, charset);
+    return emitCompleteSegments();
+  }
+
+  @Override public BufferedSink write(byte[] source) throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    buffer.write(source);
+    return emitCompleteSegments();
+  }
+
+  @Override public BufferedSink write(byte[] source, int offset, int byteCount) throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    buffer.write(source, offset, byteCount);
+    return emitCompleteSegments();
+  }
+
+  @Override public long writeAll(Source source) throws IOException {
+    if (source == null) throw new IllegalArgumentException("source == null");
+    long totalBytesRead = 0;
+    for (long readCount; (readCount = source.read(buffer, Segment.SIZE)) != -1; ) {
+      totalBytesRead += readCount;
+      emitCompleteSegments();
+    }
+    return totalBytesRead;
+  }
+
+  @Override public BufferedSink writeByte(int b) throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    buffer.writeByte(b);
+    return emitCompleteSegments();
+  }
+
+  @Override public BufferedSink writeShort(int s) throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    buffer.writeShort(s);
+    return emitCompleteSegments();
+  }
+
+  @Override public BufferedSink writeShortLe(int s) throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    buffer.writeShortLe(s);
+    return emitCompleteSegments();
+  }
+
+  @Override public BufferedSink writeInt(int i) throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    buffer.writeInt(i);
+    return emitCompleteSegments();
+  }
+
+  @Override public BufferedSink writeIntLe(int i) throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    buffer.writeIntLe(i);
+    return emitCompleteSegments();
+  }
+
+  @Override public BufferedSink writeLong(long v) throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    buffer.writeLong(v);
+    return emitCompleteSegments();
+  }
+
+  @Override public BufferedSink writeLongLe(long v) throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    buffer.writeLongLe(v);
+    return emitCompleteSegments();
+  }
+
+  @Override public BufferedSink emitCompleteSegments() throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    long byteCount = buffer.completeSegmentByteCount();
+    if (byteCount > 0) sink.write(buffer, byteCount);
+    return this;
+  }
+
+  @Override public OutputStream outputStream() {
+    return new OutputStream() {
+      @Override public void write(int b) throws IOException {
+        if (closed) throw new IOException("closed");
+        buffer.writeByte((byte) b);
+        emitCompleteSegments();
+      }
+
+      @Override public void write(byte[] data, int offset, int byteCount) throws IOException {
+        if (closed) throw new IOException("closed");
+        buffer.write(data, offset, byteCount);
+        emitCompleteSegments();
+      }
+
+      @Override public void flush() throws IOException {
+        // For backwards compatibility, a flush() on a closed stream is a no-op.
+        if (!closed) {
+          RealBufferedSink.this.flush();
+        }
+      }
+
+      @Override public void close() throws IOException {
+        RealBufferedSink.this.close();
+      }
+
+      @Override public String toString() {
+        return RealBufferedSink.this + ".outputStream()";
+      }
+    };
+  }
+
+  @Override public void flush() throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    if (buffer.size > 0) {
+      sink.write(buffer, buffer.size);
+    }
+    sink.flush();
+  }
+
+  @Override public void close() throws IOException {
+    if (closed) return;
+
+    // Emit buffered data to the underlying sink. If this fails, we still need
+    // to close the sink; otherwise we risk leaking resources.
+    Throwable thrown = null;
+    try {
+      if (buffer.size > 0) {
+        sink.write(buffer, buffer.size);
+      }
+    } catch (Throwable e) {
+      thrown = e;
+    }
+
+    try {
+      sink.close();
+    } catch (Throwable e) {
+      if (thrown == null) thrown = e;
+    }
+    closed = true;
+
+    if (thrown != null) Util.sneakyRethrow(thrown);
+  }
+
+  @Override public Timeout timeout() {
+    return sink.timeout();
+  }
+
+  @Override public String toString() {
+    return "buffer(" + sink + ")";
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/RealBufferedSource.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/RealBufferedSource.java
new file mode 100644
index 000000000..0397efdd0
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/RealBufferedSource.java
@@ -0,0 +1,301 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+
+import static com.koushikdutta.async.http.spdy.okio.Util.checkOffsetAndCount;
+
+final class RealBufferedSource implements BufferedSource {
+  public final Buffer buffer;
+  public final Source source;
+  private boolean closed;
+
+  public RealBufferedSource(Source source, Buffer buffer) {
+    if (source == null) throw new IllegalArgumentException("source == null");
+    this.buffer = buffer;
+    this.source = source;
+  }
+
+  public RealBufferedSource(Source source) {
+    this(source, new Buffer());
+  }
+
+  @Override public Buffer buffer() {
+    return buffer;
+  }
+
+  @Override public long read(Buffer sink, long byteCount) throws IOException {
+    if (sink == null) throw new IllegalArgumentException("sink == null");
+    if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
+    if (closed) throw new IllegalStateException("closed");
+
+    if (buffer.size == 0) {
+      long read = source.read(buffer, Segment.SIZE);
+      if (read == -1) return -1;
+    }
+
+    long toRead = Math.min(byteCount, buffer.size);
+    return buffer.read(sink, toRead);
+  }
+
+  @Override public boolean exhausted() throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    return buffer.exhausted() && source.read(buffer, Segment.SIZE) == -1;
+  }
+
+  @Override public void require(long byteCount) throws IOException {
+    if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
+    if (closed) throw new IllegalStateException("closed");
+    while (buffer.size < byteCount) {
+      if (source.read(buffer, Segment.SIZE) == -1) throw new EOFException();
+    }
+  }
+
+  @Override public byte readByte() throws IOException {
+    require(1);
+    return buffer.readByte();
+  }
+
+  @Override public ByteString readByteString() throws IOException {
+    buffer.writeAll(source);
+    return buffer.readByteString();
+  }
+
+  @Override public ByteString readByteString(long byteCount) throws IOException {
+    require(byteCount);
+    return buffer.readByteString(byteCount);
+  }
+
+  @Override public byte[] readByteArray() throws IOException {
+    buffer.writeAll(source);
+    return buffer.readByteArray();
+  }
+
+  @Override public byte[] readByteArray(long byteCount) throws IOException {
+    require(byteCount);
+    return buffer.readByteArray(byteCount);
+  }
+
+  @Override public int read(byte[] sink) throws IOException {
+    return read(sink, 0, sink.length);
+  }
+
+  @Override public void readFully(byte[] sink) throws IOException {
+    try {
+      require(sink.length);
+    } catch (EOFException e) {
+      // The underlying source is exhausted. Copy the bytes we got before rethrowing.
+      int offset = 0;
+      while (buffer.size > 0) {
+        int read = buffer.read(sink, offset, (int) buffer.size - offset);
+        if (read == -1) throw new AssertionError();
+        offset += read;
+      }
+      throw e;
+    }
+    buffer.readFully(sink);
+  }
+
+  @Override public int read(byte[] sink, int offset, int byteCount) throws IOException {
+    checkOffsetAndCount(sink.length, offset, byteCount);
+
+    if (buffer.size == 0) {
+      long read = source.read(buffer, Segment.SIZE);
+      if (read == -1) return -1;
+    }
+
+    int toRead = (int) Math.min(byteCount, buffer.size);
+    return buffer.read(sink, offset, toRead);
+  }
+
+  @Override public void readFully(Buffer sink, long byteCount) throws IOException {
+    try {
+      require(byteCount);
+    } catch (EOFException e) {
+      // The underlying source is exhausted. Copy the bytes we got before rethrowing.
+      sink.writeAll(buffer);
+      throw e;
+    }
+    buffer.readFully(sink, byteCount);
+  }
+
+  @Override public long readAll(Sink sink) throws IOException {
+    if (sink == null) throw new IllegalArgumentException("sink == null");
+
+    long totalBytesWritten = 0;
+    while (source.read(buffer, Segment.SIZE) != -1) {
+      long emitByteCount = buffer.completeSegmentByteCount();
+      if (emitByteCount > 0) {
+        totalBytesWritten += emitByteCount;
+        sink.write(buffer, emitByteCount);
+      }
+    }
+    if (buffer.size() > 0) {
+      totalBytesWritten += buffer.size();
+      sink.write(buffer, buffer.size());
+    }
+    return totalBytesWritten;
+  }
+
+  @Override public String readUtf8() throws IOException {
+    buffer.writeAll(source);
+    return buffer.readUtf8();
+  }
+
+  @Override public String readUtf8(long byteCount) throws IOException {
+    require(byteCount);
+    return buffer.readUtf8(byteCount);
+  }
+
+  @Override public String readString(Charset charset) throws IOException {
+    if (charset == null) throw new IllegalArgumentException("charset == null");
+
+    buffer.writeAll(source);
+    return buffer.readString(charset);
+  }
+
+  @Override public String readString(long byteCount, Charset charset) throws IOException {
+    require(byteCount);
+    if (charset == null) throw new IllegalArgumentException("charset == null");
+    return buffer.readString(byteCount, charset);
+  }
+
+  @Override public String readUtf8Line() throws IOException {
+    long newline = indexOf((byte) '\n');
+
+    if (newline == -1) {
+      return buffer.size != 0 ? readUtf8(buffer.size) : null;
+    }
+
+    return buffer.readUtf8Line(newline);
+  }
+
+  @Override public String readUtf8LineStrict() throws IOException {
+    long newline = indexOf((byte) '\n');
+    if (newline == -1L) throw new EOFException();
+    return buffer.readUtf8Line(newline);
+  }
+
+  @Override public short readShort() throws IOException {
+    require(2);
+    return buffer.readShort();
+  }
+
+  @Override public short readShortLe() throws IOException {
+    require(2);
+    return buffer.readShortLe();
+  }
+
+  @Override public int readInt() throws IOException {
+    require(4);
+    return buffer.readInt();
+  }
+
+  @Override public int readIntLe() throws IOException {
+    require(4);
+    return buffer.readIntLe();
+  }
+
+  @Override public long readLong() throws IOException {
+    require(8);
+    return buffer.readLong();
+  }
+
+  @Override public long readLongLe() throws IOException {
+    require(8);
+    return buffer.readLongLe();
+  }
+
+  @Override public void skip(long byteCount) throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    while (byteCount > 0) {
+      if (buffer.size == 0 && source.read(buffer, Segment.SIZE) == -1) {
+        throw new EOFException();
+      }
+      long toSkip = Math.min(byteCount, buffer.size());
+      buffer.skip(toSkip);
+      byteCount -= toSkip;
+    }
+  }
+
+  @Override public long indexOf(byte b) throws IOException {
+    if (closed) throw new IllegalStateException("closed");
+    long start = 0;
+    long index;
+    while ((index = buffer.indexOf(b, start)) == -1) {
+      start = buffer.size;
+      if (source.read(buffer, Segment.SIZE) == -1) return -1L;
+    }
+    return index;
+  }
+
+  @Override public InputStream inputStream() {
+    return new InputStream() {
+      @Override public int read() throws IOException {
+        if (closed) throw new IOException("closed");
+        if (buffer.size == 0) {
+          long count = source.read(buffer, Segment.SIZE);
+          if (count == -1) return -1;
+        }
+        return buffer.readByte() & 0xff;
+      }
+
+      @Override public int read(byte[] data, int offset, int byteCount) throws IOException {
+        if (closed) throw new IOException("closed");
+        checkOffsetAndCount(data.length, offset, byteCount);
+
+        if (buffer.size == 0) {
+          long count = source.read(buffer, Segment.SIZE);
+          if (count == -1) return -1;
+        }
+
+        return buffer.read(data, offset, byteCount);
+      }
+
+      @Override public int available() throws IOException {
+        if (closed) throw new IOException("closed");
+        return (int) Math.min(buffer.size, Integer.MAX_VALUE);
+      }
+
+      @Override public void close() throws IOException {
+        RealBufferedSource.this.close();
+      }
+
+      @Override public String toString() {
+        return RealBufferedSource.this + ".inputStream()";
+      }
+    };
+  }
+
+  @Override public void close() throws IOException {
+    if (closed) return;
+    closed = true;
+    source.close();
+    buffer.clear();
+  }
+
+  @Override public Timeout timeout() {
+    return source.timeout();
+  }
+
+  @Override public String toString() {
+    return "buffer(" + source + ")";
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Segment.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Segment.java
new file mode 100644
index 000000000..501343a2d
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Segment.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+/**
+ * A segment of a buffer.
+ *
+ * <p>Each segment in a buffer is a circularly-linked list node referencing
+ * the following and preceding segments in the buffer.
+ *
+ * <p>Each segment in the pool is a singly-linked list node referencing the rest
+ * of segments in the pool.
+ */
+public final class Segment {
+  /** The size of all segments in bytes. */
+  // TODO: Using fixed-size segments makes pooling easier. But it harms memory
+  //       efficiency and encourages copying. Try variable sized segments?
+  // TODO: Is 2 KiB a good default segment size?
+  static final int SIZE = 2048;
+
+  final byte[] data = new byte[SIZE];
+
+  /** The next byte of application data byte to read in this segment. */
+  int pos;
+
+  /** The first byte of available data ready to be written to. */
+  int limit;
+
+  /** Next segment in a linked or circularly-linked list. */
+  Segment next;
+
+  /** Previous segment in a circularly-linked list. */
+  Segment prev;
+
+  /**
+   * Removes this segment of a circularly-linked list and returns its successor.
+   * Returns null if the list is now empty.
+   */
+  public Segment pop() {
+    Segment result = next != this ? next : null;
+    prev.next = next;
+    next.prev = prev;
+    next = null;
+    prev = null;
+    return result;
+  }
+
+  /**
+   * Appends {@code segment} after this segment in the circularly-linked list.
+   * Returns the pushed segment.
+   */
+  public Segment push(Segment segment) {
+    segment.prev = this;
+    segment.next = next;
+    next.prev = segment;
+    next = segment;
+    return segment;
+  }
+
+  /**
+   * Splits this head of a circularly-linked list into two segments. The first
+   * segment contains the data in {@code [pos..pos+byteCount)}. The second
+   * segment contains the data in {@code [pos+byteCount..limit)}. This can be
+   * useful when moving partial segments from one buffer to another.
+   *
+   * <p>Returns the new head of the circularly-linked list.
+   */
+  public Segment split(int byteCount) {
+    int aSize = byteCount;
+    int bSize = (limit - pos) - byteCount;
+    if (aSize <= 0 || bSize <= 0) throw new IllegalArgumentException();
+
+    // Which side of the split is larger? We want to copy as few bytes as possible.
+    if (aSize < bSize) {
+      // Create a segment of size 'aSize' before this segment.
+      Segment before = SegmentPool.getInstance().take();
+      System.arraycopy(data, pos, before.data, before.pos, aSize);
+      pos += aSize;
+      before.limit += aSize;
+      prev.push(before);
+      return before;
+    } else {
+      // Create a new segment of size 'bSize' after this segment.
+      Segment after = SegmentPool.getInstance().take();
+      System.arraycopy(data, pos + aSize, after.data, after.pos, bSize);
+      limit -= bSize;
+      after.limit += bSize;
+      push(after);
+      return this;
+    }
+  }
+
+  /**
+   * Call this when the tail and its predecessor may both be less than half
+   * full. This will copy data so that segments can be recycled.
+   */
+  public void compact() {
+    if (prev == this) throw new IllegalStateException();
+    if ((prev.limit - prev.pos) + (limit - pos) > SIZE) return; // Cannot compact.
+    writeTo(prev, limit - pos);
+    pop();
+    SegmentPool.getInstance().recycle(this);
+  }
+
+  /** Moves {@code byteCount} bytes from this segment to {@code sink}. */
+  // TODO: if sink has fewer bytes than this, it may be cheaper to reverse the
+  //       direction of the copy and swap the segments!
+  public void writeTo(Segment sink, int byteCount) {
+    if (byteCount + (sink.limit - sink.pos) > SIZE) throw new IllegalArgumentException();
+
+    if (sink.limit + byteCount > SIZE) {
+      // We can't fit byteCount bytes at the sink's current position. Compact sink first.
+      System.arraycopy(sink.data, sink.pos, sink.data, 0, sink.limit - sink.pos);
+      sink.limit -= sink.pos;
+      sink.pos = 0;
+    }
+
+    System.arraycopy(data, pos, sink.data, sink.limit, byteCount);
+    sink.limit += byteCount;
+    pos += byteCount;
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/SegmentPool.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/SegmentPool.java
new file mode 100644
index 000000000..f410c8c23
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/SegmentPool.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+/**
+ * A collection of unused segments, necessary to avoid GC churn and zero-fill.
+ * This pool is a thread-safe static singleton.
+ */
+public final class SegmentPool {
+  private static final SegmentPool INSTANCE = new SegmentPool();
+    public static SegmentPool getInstance() {
+        return INSTANCE;
+    }
+
+  /** The maximum number of bytes to pool. */
+  // TODO: Is 64 KiB a good maximum size? Do we ever have that many idle segments?
+  static final long MAX_SIZE = 64 * 1024; // 64 KiB.
+
+  /** Singly-linked list of segments. */
+  private Segment next;
+
+  /** Total bytes in this pool. */
+  long byteCount;
+
+  private SegmentPool() {
+  }
+
+  Segment take() {
+    synchronized (this) {
+      if (next != null) {
+        Segment result = next;
+        next = result.next;
+        result.next = null;
+        byteCount -= Segment.SIZE;
+        return result;
+      }
+    }
+    return new Segment(); // Pool is empty. Don't zero-fill while holding a lock.
+  }
+
+  void recycle(Segment segment) {
+    if (segment.next != null || segment.prev != null) throw new IllegalArgumentException();
+    synchronized (this) {
+      if (byteCount + Segment.SIZE > MAX_SIZE) return; // Pool is full.
+      byteCount += Segment.SIZE;
+      segment.next = next;
+      segment.pos = segment.limit = 0;
+      next = segment;
+    }
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Sink.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Sink.java
new file mode 100644
index 000000000..d1e3cc626
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Sink.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+import java.io.Closeable;
+import java.io.IOException;
+
+/**
+ * Receives a stream of bytes. Use this interface to write data wherever it's
+ * needed: to the network, storage, or a buffer in memory. Sinks may be layered
+ * to transform received data, such as to compress, encrypt, throttle, or add
+ * protocol framing.
+ *
+ * <p>Most application code shouldn't operate on a sink directly, but rather
+ * {@link BufferedSink} which is both more efficient and more convenient. Use
+ * {@link Okio#buffer(com.koushikdutta.async.http.spdy.okio.Sink)} to wrap any sink with a buffer.
+ *
+ * <p>Sinks are easy to test: just use an {@link Buffer} in your tests, and
+ * read from it to confirm it received the data that was expected.
+ *
+ * <h3>Comparison with OutputStream</h3>
+ * This interface is functionally equivalent to {@link java.io.OutputStream}.
+ *
+ * <p>{@code OutputStream} requires multiple layers when emitted data is
+ * heterogeneous: a {@code DataOutputStream} for primitive values, a {@code
+ * BufferedOutputStream} for buffering, and {@code OutputStreamWriter} for
+ * charset encoding. This class uses {@code BufferedSink} for all of the above.
+ *
+ * <p>Sink is also easier to layer: there is no {@linkplain
+ * java.io.OutputStream#write(int) single-byte write} method that is awkward to
+ * implement efficiently.
+ *
+ * <h3>Interop with OutputStream</h3>
+ * Use {@link Okio#sink} to adapt an {@code OutputStream} to a sink. Use {@link
+ * BufferedSink#outputStream} to adapt a sink to an {@code OutputStream}.
+ */
+public interface Sink extends Closeable {
+  /** Removes {@code byteCount} bytes from {@code source} and appends them to this. */
+  void write(Buffer source, long byteCount) throws IOException;
+
+  /** Pushes all buffered bytes to their final destination. */
+  void flush() throws IOException;
+
+  /** Returns the timeout for this sink. */
+  Timeout timeout();
+
+  /**
+   * Pushes all buffered bytes to their final destination and releases the
+   * resources held by this sink. It is an error to write a closed sink. It is
+   * safe to close a sink more than once.
+   */
+  @Override void close() throws IOException;
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Source.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Source.java
new file mode 100644
index 000000000..4f4132252
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Source.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+import java.io.Closeable;
+import java.io.IOException;
+
+/**
+ * Supplies a stream of bytes. Use this interface to read data from wherever
+ * it's located: from the network, storage, or a buffer in memory. Sources may
+ * be layered to transform supplied data, such as to decompress, decrypt, or
+ * remove protocol framing.
+ *
+ * <p>Most applications shouldn't operate on a source directly, but rather
+ * {@link BufferedSource} which is both more efficient and more convenient. Use
+ * {@link Okio#buffer(com.koushikdutta.async.http.spdy.okio.Source)} to wrap any source with a buffer.
+ *
+ * <p>Sources are easy to test: just use an {@link Buffer} in your tests, and
+ * fill it with the data your application is to read.
+ *
+ * <h3>Comparison with InputStream</h3>
+ * This interface is functionally equivalent to {@link java.io.InputStream}.
+ *
+ * <p>{@code InputStream} requires multiple layers when consumed data is
+ * heterogeneous: a {@code DataInputStream} for primitive values, a {@code
+ * BufferedInputStream} for buffering, and {@code InputStreamReader} for
+ * strings. This class uses {@code BufferedSource} for all of the above.
+ *
+ * <p>Source avoids the impossible-to-implement {@linkplain
+ * java.io.InputStream#available available()} method. Instead callers specify
+ * how many bytes they {@link BufferedSource#require require}.
+ *
+ * <p>Source omits the unsafe-to-compose {@linkplain java.io.InputStream#mark
+ * mark and reset} state that's tracked by {@code InputStream}; callers instead
+ * just buffer what they need.
+ *
+ * <p>When implementing a source, you need not worry about the {@linkplain
+ * java.io.InputStream#read single-byte read} method that is awkward to
+ * implement efficiently and that returns one of 257 possible values.
+ *
+ * <p>And source has a stronger {@code skip} method: {@link BufferedSource#skip}
+ * won't return prematurely.
+ *
+ * <h3>Interop with InputStream</h3>
+ * Use {@link Okio#source} to adapt an {@code InputStream} to a source. Use
+ * {@link BufferedSource#inputStream} to adapt a source to an {@code
+ * InputStream}.
+ */
+public interface Source extends Closeable {
+  /**
+   * Removes at least 1, and up to {@code byteCount} bytes from this and appends
+   * them to {@code sink}. Returns the number of bytes read, or -1 if this
+   * source is exhausted.
+   */
+  long read(Buffer sink, long byteCount) throws IOException;
+
+  /** Returns the timeout for this source. */
+  Timeout timeout();
+
+  /**
+   * Closes this source and releases the resources held by this source. It is an
+   * error to read a closed source. It is safe to close a source more than once.
+   */
+  @Override void close() throws IOException;
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Timeout.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Timeout.java
new file mode 100644
index 000000000..3a307e8d7
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Timeout.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A policy on how much time to spend on a task before giving up. When a task
+ * times out, it is left in an unspecified state and should be abandoned. For
+ * example, if reading from a source times out, that source should be closed and
+ * the read should be retried later. If writing to a sink times out, the same
+ * rules apply: close the sink and retry later.
+ *
+ * <h3>Timeouts and Deadlines</h3>
+ * This class offers two complementary controls to define a timeout policy.
+ *
+ * <p><strong>Timeouts</strong> specify the maximum time to wait for a single
+ * operation to complete. Timeouts are typically used to detect problems like
+ * network partitions. For example, if a remote peer doesn't return <i>any</i>
+ * data for ten seconds, we may assume that the peer is unavailable.
+ *
+ * <p><strong>Deadlines</strong> specify the maximum time to spend on a job,
+ * composed of one or more operations. Use deadlines to set an upper bound on
+ * the time invested on a job. For example, a battery-conscious app may limit
+ * how much time it spends preloading content.
+ */
+public class Timeout {
+  /**
+   * An empty timeout that neither tracks nor detects timeouts. Use this when
+   * timeouts aren't necessary, such as in implementations whose operations
+   * do not block.
+   */
+  public static final Timeout NONE = new Timeout() {
+    @Override public Timeout timeout(long timeout, TimeUnit unit) {
+      return this;
+    }
+
+    @Override public Timeout deadlineNanoTime(long deadlineNanoTime) {
+      return this;
+    }
+
+    @Override public void throwIfReached() throws IOException {
+    }
+  };
+
+  /**
+   * True if {@code deadlineNanoTime} is defined. There is no equivalent to null
+   * or 0 for {@link System#nanoTime}.
+   */
+  private boolean hasDeadline;
+  private long deadlineNanoTime;
+  private long timeoutNanos;
+
+  public Timeout() {
+  }
+
+  /**
+   * Wait at most {@code timeout} time before aborting an operation. Using a
+   * per-operation timeout means that as long as forward progress is being made,
+   * no sequence of operations will fail.
+   *
+   * <p>If {@code timeout == 0}, operations will run indefinitely. (Operating
+   * system timeouts may still apply.)
+   */
+  public Timeout timeout(long timeout, TimeUnit unit) {
+    if (timeout < 0) throw new IllegalArgumentException("timeout < 0: " + timeout);
+    if (unit == null) throw new IllegalArgumentException("unit == null");
+    this.timeoutNanos = unit.toNanos(timeout);
+    return this;
+  }
+
+  /** Returns the timeout in nanoseconds, or {@code 0} for no timeout. */
+  public long timeoutNanos() {
+    return timeoutNanos;
+  }
+
+  /** Returns true if a deadline is enabled. */
+  public boolean hasDeadline() {
+    return hasDeadline;
+  }
+
+  /**
+   * Returns the {@linkplain System#nanoTime() nano time} when the deadline will
+   * be reached.
+   *
+   * @throws IllegalStateException if no deadline is set.
+   */
+  public long deadlineNanoTime() {
+    if (!hasDeadline) throw new IllegalStateException("No deadline");
+    return deadlineNanoTime;
+  }
+
+  /**
+   * Sets the {@linkplain System#nanoTime() nano time} when the deadline will be
+   * reached. All operations must complete before this time. Use a deadline to
+   * set a maximum bound on the time spent on a sequence of operations.
+   */
+  public Timeout deadlineNanoTime(long deadlineNanoTime) {
+    this.hasDeadline = true;
+    this.deadlineNanoTime = deadlineNanoTime;
+    return this;
+  }
+
+  /** Set a deadline of now plus {@code duration} time. */
+  public final Timeout deadline(long duration, TimeUnit unit) {
+    if (duration <= 0) throw new IllegalArgumentException("duration <= 0: " + duration);
+    if (unit == null) throw new IllegalArgumentException("unit == null");
+    return deadlineNanoTime(System.nanoTime() + unit.toNanos(duration));
+  }
+
+  /** Clears the timeout. Operating system timeouts may still apply. */
+  public Timeout clearTimeout() {
+    this.timeoutNanos = 0;
+    return this;
+  }
+
+  /** Clears the deadline. */
+  public Timeout clearDeadline() {
+    this.hasDeadline = false;
+    return this;
+  }
+
+  /**
+   * Throws an {@link java.io.IOException} if the deadline has been reached or if the
+   * current thread has been interrupted. This method doesn't detect timeouts;
+   * that should be implemented to asynchronously abort an in-progress
+   * operation.
+   */
+  public void throwIfReached() throws IOException {
+    if (Thread.interrupted()) {
+      throw new InterruptedIOException();
+    }
+
+    if (hasDeadline && System.nanoTime() > deadlineNanoTime) {
+      throw new IOException("deadline reached");
+    }
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Util.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Util.java
new file mode 100644
index 000000000..14775e85a
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Util.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy.okio;
+
+import java.nio.charset.Charset;
+
+final class Util {
+  /** A cheap and type-safe constant for the UTF-8 Charset. */
+  public static final Charset UTF_8 = Charset.forName("UTF-8");
+
+  private Util() {
+  }
+
+  public static void checkOffsetAndCount(long size, long offset, long byteCount) {
+    if ((offset | byteCount) < 0 || offset > size || size - offset < byteCount) {
+      throw new ArrayIndexOutOfBoundsException(
+          String.format("size=%s offset=%s byteCount=%s", size, offset, byteCount));
+    }
+  }
+
+  public static short reverseBytesShort(short s) {
+    int i = s & 0xffff;
+    int reversed = (i & 0xff00) >>> 8
+        |          (i & 0x00ff)  << 8;
+    return (short) reversed;
+  }
+
+  public static int reverseBytesInt(int i) {
+    return (i & 0xff000000) >>> 24
+        |  (i & 0x00ff0000) >>>  8
+        |  (i & 0x0000ff00)  <<  8
+        |  (i & 0x000000ff)  << 24;
+  }
+
+  public static long reverseBytesLong(long v) {
+    return (v & 0xff00000000000000L) >>> 56
+        |  (v & 0x00ff000000000000L) >>> 40
+        |  (v & 0x0000ff0000000000L) >>> 24
+        |  (v & 0x000000ff00000000L) >>>  8
+        |  (v & 0x00000000ff000000L)  <<  8
+        |  (v & 0x0000000000ff0000L)  << 24
+        |  (v & 0x000000000000ff00L)  << 40
+        |  (v & 0x00000000000000ffL)  << 56;
+  }
+
+  /**
+   * Throws {@code t}, even if the declared throws clause doesn't permit it.
+   * This is a terrible – but terribly convenient – hack that makes it easy to
+   * catch and rethrow exceptions after cleanup. See Java Puzzlers #43.
+   */
+  public static void sneakyRethrow(Throwable t) {
+    Util.<Error>sneakyThrow2(t);
+  }
+
+  @SuppressWarnings("unchecked")
+  private static <T extends Throwable> void sneakyThrow2(Throwable t) throws T {
+    throw (T) t;
+  }
+}

From 7ce289952764e8a8a7a85c4f43658e06b369ac98 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 24 Jul 2014 19:42:25 -0700
Subject: [PATCH 045/399] decouple the http transport from the client. prep for
 spdy.

---
 .../async/http/AsyncHttpClient.java           | 58 +++++++------
 .../async/http/AsyncHttpClientMiddleware.java | 18 +++-
 .../async/http/AsyncHttpResponse.java         |  3 -
 .../async/http/AsyncHttpResponseImpl.java     | 85 +++++++++----------
 .../async/http/AsyncSocketMiddleware.java     |  2 +-
 .../async/http/HttpTransportMiddleware.java   | 81 ++++++++++++++++++
 .../com/koushikdutta/async/http/Protocol.java |  2 +
 .../http/cache/ResponseCacheMiddleware.java   | 10 +--
 8 files changed, 177 insertions(+), 82 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 313a9fa10..fb13811dc 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -66,11 +66,13 @@ public void insertMiddleware(AsyncHttpClientMiddleware middleware) {
 
     AsyncSSLSocketMiddleware sslSocketMiddleware;
     AsyncSocketMiddleware socketMiddleware;
+    HttpTransportMiddleware httpTransportMiddleware;
     AsyncServer mServer;
     public AsyncHttpClient(AsyncServer server) {
         mServer = server;
         insertMiddleware(socketMiddleware = new AsyncSocketMiddleware(this));
         insertMiddleware(sslSocketMiddleware = new AsyncSSLSocketMiddleware(this));
+        insertMiddleware(httpTransportMiddleware = new HttpTransportMiddleware());
     }
 
 
@@ -274,7 +276,7 @@ protected void onRequestCompleted(Exception ex) {
                         if (cancel.isCancelled())
                             return;
                         // 5) after request is sent, set a header timeout
-                        if (cancel.timeoutRunnable != null && data.headers == null) {
+                        if (cancel.timeoutRunnable != null && mHeaders == null) {
                             mServer.removeAllCallbacks(cancel.scheduled);
                             cancel.scheduled = mServer.postDelayed(cancel.timeoutRunnable, getTimeoutRemaining(request));
                         }
@@ -282,14 +284,12 @@ protected void onRequestCompleted(Exception ex) {
 
                     @Override
                     public void setDataEmitter(DataEmitter emitter) {
-                        data.response = this;
                         data.bodyEmitter = emitter;
                         synchronized (mMiddleware) {
                             for (AsyncHttpClientMiddleware middleware: mMiddleware) {
                                 middleware.onBodyDecoder(data);
                             }
                         }
-                        mHeaders = data.headers;
 
                         super.setDataEmitter(data.bodyEmitter);
 
@@ -333,31 +333,25 @@ public void setDataEmitter(DataEmitter emitter) {
                     }
 
                     protected void onHeadersReceived() {
-                        try {
-                            if (cancel.isCancelled())
-                                return;
+                        super.onHeadersReceived();
+                        if (cancel.isCancelled())
+                            return;
 
-                            // 7) on headers, cancel timeout
-                            if (cancel.timeoutRunnable != null)
-                                mServer.removeAllCallbacks(cancel.scheduled);
+                        // 7) on headers, cancel timeout
+                        if (cancel.timeoutRunnable != null)
+                            mServer.removeAllCallbacks(cancel.scheduled);
 
-                            // allow the middleware to massage the headers before the body is decoded
-                            request.logv("Received headers:\n" + toString());
+                        // allow the middleware to massage the headers before the body is decoded
+                        request.logv("Received headers:\n" + toString());
 
-                            data.headers = mHeaders;
-                            synchronized (mMiddleware) {
-                                for (AsyncHttpClientMiddleware middleware: mMiddleware) {
-                                    middleware.onHeadersReceived(data);
-                                }
+                        synchronized (mMiddleware) {
+                            for (AsyncHttpClientMiddleware middleware: mMiddleware) {
+                                middleware.onHeadersReceived(data);
                             }
-                            mHeaders = data.headers;
-
-                            // drop through, and setDataEmitter will be called for the body decoder.
-                            // headers will be further massaged in there.
-                        }
-                        catch (Exception ex) {
-                            reportConnectedCompleted(cancel, ex, null, request, callback);
                         }
+
+                        // drop through, and setDataEmitter will be called for the body decoder.
+                        // headers will be further massaged in there.
                     }
 
                     @Override
@@ -390,7 +384,6 @@ protected void report(Exception ex) {
                         }
                     }
 
-
                     @Override
                     public AsyncSocket detachSocket() {
                         request.logd("Detaching socket");
@@ -406,7 +399,24 @@ public AsyncSocket detachSocket() {
                     }
                 };
 
+                data.sendHeadersCallback = new CompletedCallback() {
+                    @Override
+                    public void onCompleted(Exception ex) {
+                        if (ex != null)
+                            ret.report(ex);
+                        else
+                            ret.onHeadersSent();
+                    }
+                };
+                data.response = ret;
                 ret.setSocket(socket);
+
+                synchronized (mMiddleware) {
+                    for (AsyncHttpClientMiddleware middleware: mMiddleware) {
+                        if (middleware.sendHeaders(data))
+                            break;
+                    }
+                }
             }
         };
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
index c706e536f..b19819914 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
@@ -2,6 +2,7 @@
 
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.DataEmitter;
+import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.future.Cancellable;
@@ -12,6 +13,19 @@
  * inspect, manipulate, and handle http requests.
  */
 public interface AsyncHttpClientMiddleware {
+    public interface ResponseHead  {
+        public String protocol();
+        public String message();
+        public int code();
+        public ResponseHead protocol(String protocol);
+        public ResponseHead message(String message);
+        public ResponseHead code(int code);
+        public Headers headers();
+        public ResponseHead headers(Headers headers);
+        public DataSink sink();
+        public ResponseHead sink(DataSink sink);
+    }
+
     public static class OnRequestData {
         public UntypedHashtable state = new UntypedHashtable();
         public AsyncHttpRequest request;
@@ -25,15 +39,15 @@ public static class GetSocketData extends OnRequestData {
 
     public static class SendHeaderData extends GetSocketData {
         public AsyncSocket socket;
+        public ResponseHead response;
         public CompletedCallback sendHeadersCallback;
     }
 
     public static class OnHeadersReceivedData extends SendHeaderData {
-        public Headers headers;
+//        public Headers headers;
     }
 
     public static class OnBodyData extends OnHeadersReceivedData {
-        public AsyncHttpResponse response;
         public DataEmitter bodyEmitter;
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
index e7713952c..fa3b71005 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
@@ -8,9 +8,6 @@ public interface AsyncHttpResponse extends DataEmitter {
     public String protocol();
     public String message();
     public int code();
-    public AsyncHttpResponse protocol(String protocol);
-    public AsyncHttpResponse message(String message);
-    public AsyncHttpResponse code(int code);
     public Headers headers();
     public AsyncSocket detachSocket();
     public AsyncHttpRequest getRequest();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index fca047354..fa2bb11f5 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -18,7 +18,7 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 
-abstract class AsyncHttpResponseImpl extends FilteredDataEmitter implements AsyncSocket, AsyncHttpResponse {
+abstract class AsyncHttpResponseImpl extends FilteredDataEmitter implements AsyncSocket, AsyncHttpResponse, AsyncHttpClientMiddleware.ResponseHead {
     private AsyncHttpRequestBody mWriter;
     
     public AsyncSocket getSocket() {
@@ -32,59 +32,31 @@ public AsyncHttpRequest getRequest() {
 
     void setSocket(AsyncSocket exchange) {
         mSocket = exchange;
-        
         if (mSocket == null)
             return;
 
-        mWriter = mRequest.getBody();
-        if (mWriter != null) {
-            if (mRequest.getHeaders().get("Content-Type") == null)
-                mRequest.getHeaders().set("Content-Type", mWriter.getContentType());
-            if (mWriter.length() >= 0) {
-                mRequest.getHeaders().set("Content-Length", String.valueOf(mWriter.length()));
-                mSink = mSocket;
-            }
-            else {
-                mRequest.getHeaders().set("Transfer-Encoding", "Chunked");
-                mSink = new ChunkedOutputFilter(mSocket);
-            }
-        }
-        else {
-            mSink = mSocket;
-        }
-
         mSocket.setEndCallback(mReporter);
-        mSocket.setClosedCallback(new CompletedCallback() {
-            @Override
-            public void onCompleted(Exception ex) {
-                // TODO: do we care? throw if socket is still writing or something?
-            }
-        });
 
-        String rl = mRequest.getRequestLine().toString();
-        String rs = mRequest.getHeaders().toPrefixString(rl);
-        mRequest.logv("\n" + rs);
-        Util.writeAll(exchange, rs.getBytes(), new CompletedCallback() {
-            @Override
-            public void onCompleted(Exception ex) {
-                if (mWriter != null) {
-                    mWriter.write(mRequest, AsyncHttpResponseImpl.this, new CompletedCallback() {
-                        @Override
-                        public void onCompleted(Exception ex) {
-                            onRequestCompleted(ex);
-                        }
-                    });
-                } else {
-                    onRequestCompleted(null);
-                }
-            }
-        });
+        mWriter = mRequest.getBody();
 
         LineEmitter liner = new LineEmitter();
         exchange.setDataCallback(liner);
         liner.setLineCallback(mHeaderCallback);
     }
 
+    protected void onHeadersSent() {
+        if (mWriter != null) {
+            mWriter.write(mRequest, AsyncHttpResponseImpl.this, new CompletedCallback() {
+                @Override
+                public void onCompleted(Exception ex) {
+                    onRequestCompleted(ex);
+                }
+            });
+        } else {
+            onRequestCompleted(null);
+        }
+    }
+
     protected void onRequestCompleted(Exception ex) {
     }
     
@@ -100,7 +72,8 @@ public void onCompleted(Exception error) {
         }
     };
 
-    protected abstract void onHeadersReceived();
+    protected void onHeadersReceived() {
+    }
 
     StringCallback mHeaderCallback = new StringCallback() {
         private Headers mRawHeaders = new Headers();
@@ -179,6 +152,12 @@ public Headers headers() {
         return mHeaders;
     }
 
+    @Override
+    public AsyncHttpClientMiddleware.ResponseHead headers(Headers headers) {
+        mHeaders = headers;
+        return this;
+    }
+
     int code;
     @Override
     public int code() {
@@ -186,19 +165,19 @@ public int code() {
     }
 
     @Override
-    public AsyncHttpResponse code(int code) {
+    public AsyncHttpClientMiddleware.ResponseHead code(int code) {
         this.code = code;
         return this;
     }
 
     @Override
-    public AsyncHttpResponse protocol(String protocol) {
+    public AsyncHttpClientMiddleware.ResponseHead protocol(String protocol) {
         this.protocol = protocol;
         return this;
     }
 
     @Override
-    public AsyncHttpResponse message(String message) {
+    public AsyncHttpClientMiddleware.ResponseHead message(String message) {
         this.message = message;
         return this;
     }
@@ -232,6 +211,18 @@ private void assertContent() {
     }
 
     DataSink mSink;
+
+    @Override
+    public DataSink sink() {
+        return mSink;
+    }
+
+    @Override
+    public AsyncHttpClientMiddleware.ResponseHead sink(DataSink sink) {
+        mSink = sink;
+        return this;
+    }
+
     @Override
     public void write(ByteBufferList bb) {
         assertContent();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index 37ffe5cc6..5c11684de 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -358,7 +358,7 @@ public void onRequestComplete(final OnRequestCompleteData data) {
                 data.socket.close();
                 return;
             }
-            if (!HttpUtil.isKeepAlive(data.response.protocol(), data.headers)
+            if (!HttpUtil.isKeepAlive(data.response.protocol(), data.response.headers())
                 || !HttpUtil.isKeepAlive(Protocol.HTTP_1_1, data.request.getHeaders())) {
                 data.request.logv("closing out socket (not keep alive)");
                 data.socket.close();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
new file mode 100644
index 000000000..1ca6b5ae0
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
@@ -0,0 +1,81 @@
+package com.koushikdutta.async.http;
+
+import com.koushikdutta.async.Util;
+import com.koushikdutta.async.callback.CompletedCallback;
+import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
+import com.koushikdutta.async.http.filter.ChunkedOutputFilter;
+
+/**
+ * Created by koush on 7/24/14.
+ */
+public class HttpTransportMiddleware extends SimpleMiddleware {
+
+    @Override
+    public boolean sendHeaders(final SendHeaderData data) {
+        Protocol p = Protocol.get(data.protocol);
+        if (p != null && p != Protocol.HTTP_1_0 && p != Protocol.HTTP_1_1)
+            return super.sendHeaders(data);
+
+        AsyncHttpRequest request = data.request;
+        AsyncHttpRequestBody requestBody = data.request.getBody();
+
+        if (requestBody != null) {
+            if (request.getHeaders().get("Content-Type") == null)
+                request.getHeaders().set("Content-Type", requestBody.getContentType());
+            if (requestBody.length() >= 0) {
+                request.getHeaders().set("Content-Length", String.valueOf(requestBody.length()));
+                data.response.sink(data.socket);
+            } else {
+                request.getHeaders().set("Transfer-Encoding", "Chunked");
+                data.response.sink(new ChunkedOutputFilter(data.socket));
+            }
+        }
+
+        String rl = request.getRequestLine().toString();
+        String rs = request.getHeaders().toPrefixString(rl);
+        request.logv("\n" + rs);
+
+        Util.writeAll(data.socket, rs.getBytes(), new CompletedCallback() {
+            @Override
+            public void onCompleted(Exception ex) {
+                data.sendHeadersCallback.onCompleted(ex);
+            }
+        });
+
+//        LineEmitter.StringCallback headerCallback = new LineEmitter.StringCallback() {
+//            Headers mRawHeaders = new Headers();
+//            String statusLine;
+//
+//            @Override
+//            public void onStringAvailable(String s) {
+//                try {
+//                    if (statusLine == null) {
+//                        statusLine = s;
+//                    }
+//                    else if (!"\r".equals(s)) {
+//                        mRawHeaders.addLine(s);
+//                    }
+//                    else {
+//                        String[] parts = statusLine.split(" ", 3);
+//                        if (parts.length != 3)
+//                            throw new Exception(new IOException("Not HTTP"));
+//
+//                        data.response.headers(mRawHeaders);
+//                        data.response.protocol(parts[0]);
+//                        data.response.code(Integer.parseInt(parts[1]));
+//                        data.response.message(parts[2]);
+//                        data.sendHeadersCallback.onCompleted(null);
+//                    }
+//                }
+//                catch (Exception ex) {
+//                    data.sendHeadersCallback.onCompleted(ex);
+//                }
+//            }
+//        };
+//
+//        LineEmitter liner = new LineEmitter();
+//        data.socket.setDataCallback(liner);
+//        liner.setLineCallback(headerCallback);
+        return true;
+    }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Protocol.java b/AndroidAsync/src/com/koushikdutta/async/http/Protocol.java
index 8e5a46c46..46134280c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Protocol.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Protocol.java
@@ -75,6 +75,8 @@ public enum Protocol {
      * Returns the protocol identified by {@code protocol}.
      */
     public static Protocol get(String protocol) {
+        if (protocol == null)
+            return null;
         return protocols.get(protocol.toLowerCase());
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index 447c81b05..57e389574 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -216,25 +216,25 @@ public int getCacheStoreCount() {
     public void onBodyDecoder(OnBodyData data) {
         CachedSocket cached = com.koushikdutta.async.Util.getWrappedSocket(data.socket, CachedSocket.class);
         if (cached != null) {
-            data.headers.set(SERVED_FROM, CACHE);
+            data.response.headers().set(SERVED_FROM, CACHE);
             return;
         }
 
         CacheData cacheData = data.state.get("cache-data");
-        RawHeaders rh = RawHeaders.fromMultimap(data.headers.getMultiMap());
+        RawHeaders rh = RawHeaders.fromMultimap(data.response.headers().getMultiMap());
+        rh.removeAll("Content-Length");
         rh.setStatusLine(String.format("%s %s %s", data.response.protocol(), data.response.code(), data.response.message()));
         ResponseHeaders networkResponse = new ResponseHeaders(data.request.getUri(), rh);
         data.state.put("response-headers", networkResponse);
         if (cacheData != null) {
             if (cacheData.cachedResponseHeaders.validate(networkResponse)) {
                 data.request.logi("Serving response from conditional cache");
-                data.headers.removeAll("Content-Length");
                 ResponseHeaders combined = cacheData.cachedResponseHeaders.combine(networkResponse);
-                data.headers = new Headers(combined.getHeaders().toMultimap());
+                data.response.headers(new Headers(combined.getHeaders().toMultimap()));
                 data.response.code(combined.getHeaders().getResponseCode());
                 data.response.message(combined.getHeaders().getResponseMessage());
 
-                data.headers.set(SERVED_FROM, CONDITIONAL_CACHE);
+                data.response.headers().set(SERVED_FROM, CONDITIONAL_CACHE);
                 conditionalCacheHitCount++;
 
                 CachedBodyEmitter bodySpewer = new CachedBodyEmitter(cacheData.candidate, cacheData.contentLength);

From 893442cba5cc5c20ea0be7953860513ab7e4e325 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 24 Jul 2014 22:52:56 -0700
Subject: [PATCH 046/399] finished up transport refactor... time for some spdy.

---
 .../async/http/AsyncHttpClient.java           | 297 +++++++++---------
 .../async/http/AsyncHttpClientMiddleware.java |  14 +-
 .../async/http/AsyncHttpResponseImpl.java     |  68 +---
 .../async/http/HttpTransportMiddleware.java   |  98 +++---
 .../async/http/SimpleMiddleware.java          |   2 +-
 .../async/http/spdy/HttpTransport.java        |  15 -
 6 files changed, 237 insertions(+), 257 deletions(-)
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/HttpTransport.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index fb13811dc..ee4f8054c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -160,7 +160,7 @@ private void reportConnectedCompleted(FutureAsyncHttpResponse cancel, Exception
         }
         if (complete) {
             callback.onConnectCompleted(ex, response);
-            assert ex != null || response.getSocket() == null || response.getDataCallback() != null || response.isPaused();
+            assert ex != null || response.socket() == null || response.getDataCallback() != null || response.isPaused();
             return;
         }
 
@@ -266,174 +266,189 @@ public void onConnectCompleted(Exception ex, AsyncSocket socket) {
                     return;
                 }
 
-                // 4) wait for request to be sent fully
-                // and
-                // 6) wait for headers
-                final AsyncHttpResponseImpl ret = new AsyncHttpResponseImpl(request) {
-                    @Override
-                    protected void onRequestCompleted(Exception ex) {
-                        request.logv("request completed");
-                        if (cancel.isCancelled())
-                            return;
-                        // 5) after request is sent, set a header timeout
-                        if (cancel.timeoutRunnable != null && mHeaders == null) {
-                            mServer.removeAllCallbacks(cancel.scheduled);
-                            cancel.scheduled = mServer.postDelayed(cancel.timeoutRunnable, getTimeoutRemaining(request));
-                        }
-                    }
+                executeSocket(request, redirectCount, cancel, callback, data);
+            }
+        };
 
-                    @Override
-                    public void setDataEmitter(DataEmitter emitter) {
-                        data.bodyEmitter = emitter;
-                        synchronized (mMiddleware) {
-                            for (AsyncHttpClientMiddleware middleware: mMiddleware) {
-                                middleware.onBodyDecoder(data);
-                            }
-                        }
+        // set up the system default proxy and connect
+        setupAndroidProxy(request);
 
-                        super.setDataEmitter(data.bodyEmitter);
-
-                        Headers headers = mHeaders;
-                        int responseCode = code();
-                        if ((responseCode == HttpURLConnection.HTTP_MOVED_PERM || responseCode == HttpURLConnection.HTTP_MOVED_TEMP || responseCode == 307) && request.getFollowRedirect()) {
-                            String location = headers.get("Location");
-                            Uri redirect;
-                            try {
-                                redirect = Uri.parse(location);
-                                if (redirect.getScheme() == null) {
-                                    redirect = Uri.parse(new URL(new URL(uri.toString()), location).toString());
-                                }
-                            }
-                            catch (Exception e) {
-                                reportConnectedCompleted(cancel, e, this, request, callback);
-                                return;
-                            }
-                            final String method = request.getMethod().equals(AsyncHttpHead.METHOD) ? AsyncHttpHead.METHOD : AsyncHttpGet.METHOD;
-                            AsyncHttpRequest newReq = new AsyncHttpRequest(redirect, method);
-                            newReq.executionTime = request.executionTime;
-                            newReq.logLevel = request.logLevel;
-                            newReq.LOGTAG = request.LOGTAG;
-                            newReq.proxyHost = request.proxyHost;
-                            newReq.proxyPort = request.proxyPort;
-                            setupAndroidProxy(newReq);
-                            copyHeader(request, newReq, "User-Agent");
-                            copyHeader(request, newReq, "Range");
-                            request.logi("Redirecting");
-                            newReq.logi("Redirected");
-                            execute(newReq, redirectCount + 1, cancel, callback);
-
-                            setDataCallback(new NullDataCallback());
-                            return;
-                        }
+        synchronized (mMiddleware) {
+            for (AsyncHttpClientMiddleware middleware: mMiddleware) {
+                Cancellable socketCancellable = middleware.getSocket(data);
+                if (socketCancellable != null) {
+                    data.socketCancellable = socketCancellable;
+                    cancel.setParent(socketCancellable);
+                    return;
+                }
+            }
+        }
+        reportConnectedCompleted(cancel, new IllegalArgumentException("invalid uri"), null, request, callback);
+    }
 
-                        request.logv("Final (post cache response) headers:\n" + toString());
+    private void executeSocket(final AsyncHttpRequest request, final int redirectCount,
+                               final FutureAsyncHttpResponse cancel, final HttpConnectCallback callback,
+                               final OnRequestCompleteData data) {
+        // 4) wait for request to be sent fully
+        // and
+        // 6) wait for headers
+        final AsyncHttpResponseImpl ret = new AsyncHttpResponseImpl(request) {
+            @Override
+            protected void onRequestCompleted(Exception ex) {
+                request.logv("request completed");
+                if (cancel.isCancelled())
+                    return;
+                // 5) after request is sent, set a header timeout
+                if (cancel.timeoutRunnable != null && mHeaders == null) {
+                    mServer.removeAllCallbacks(cancel.scheduled);
+                    cancel.scheduled = mServer.postDelayed(cancel.timeoutRunnable, getTimeoutRemaining(request));
+                }
+            }
 
-                        // at this point the headers are done being modified
-                        reportConnectedCompleted(cancel, null, this, request, callback);
+            @Override
+            public void setDataEmitter(DataEmitter emitter) {
+                data.bodyEmitter = emitter;
+                synchronized (mMiddleware) {
+                    for (AsyncHttpClientMiddleware middleware: mMiddleware) {
+                        middleware.onBodyDecoder(data);
                     }
+                }
 
-                    protected void onHeadersReceived() {
-                        super.onHeadersReceived();
-                        if (cancel.isCancelled())
-                            return;
+                super.setDataEmitter(data.bodyEmitter);
 
-                        // 7) on headers, cancel timeout
-                        if (cancel.timeoutRunnable != null)
-                            mServer.removeAllCallbacks(cancel.scheduled);
+                Headers headers = mHeaders;
+                int responseCode = code();
+                if ((responseCode == HttpURLConnection.HTTP_MOVED_PERM || responseCode == HttpURLConnection.HTTP_MOVED_TEMP || responseCode == 307) && request.getFollowRedirect()) {
+                    String location = headers.get("Location");
+                    Uri redirect;
+                    try {
+                        redirect = Uri.parse(location);
+                        if (redirect.getScheme() == null) {
+                            redirect = Uri.parse(new URL(new URL(request.getUri().toString()), location).toString());
+                        }
+                    }
+                    catch (Exception e) {
+                        reportConnectedCompleted(cancel, e, this, request, callback);
+                        return;
+                    }
+                    final String method = request.getMethod().equals(AsyncHttpHead.METHOD) ? AsyncHttpHead.METHOD : AsyncHttpGet.METHOD;
+                    AsyncHttpRequest newReq = new AsyncHttpRequest(redirect, method);
+                    newReq.executionTime = request.executionTime;
+                    newReq.logLevel = request.logLevel;
+                    newReq.LOGTAG = request.LOGTAG;
+                    newReq.proxyHost = request.proxyHost;
+                    newReq.proxyPort = request.proxyPort;
+                    setupAndroidProxy(newReq);
+                    copyHeader(request, newReq, "User-Agent");
+                    copyHeader(request, newReq, "Range");
+                    request.logi("Redirecting");
+                    newReq.logi("Redirected");
+                    execute(newReq, redirectCount + 1, cancel, callback);
+
+                    setDataCallback(new NullDataCallback());
+                    return;
+                }
 
-                        // allow the middleware to massage the headers before the body is decoded
-                        request.logv("Received headers:\n" + toString());
+                request.logv("Final (post cache response) headers:\n" + toString());
 
-                        synchronized (mMiddleware) {
-                            for (AsyncHttpClientMiddleware middleware: mMiddleware) {
-                                middleware.onHeadersReceived(data);
-                            }
-                        }
+                // at this point the headers are done being modified
+                reportConnectedCompleted(cancel, null, this, request, callback);
+            }
 
-                        // drop through, and setDataEmitter will be called for the body decoder.
-                        // headers will be further massaged in there.
-                    }
+            protected void onHeadersReceived() {
+                super.onHeadersReceived();
+                if (cancel.isCancelled())
+                    return;
 
-                    @Override
-                    protected void report(Exception ex) {
-                        if (ex != null)
-                            request.loge("exception during response", ex);
-                        if (cancel.isCancelled())
-                            return;
-                        if (ex instanceof AsyncSSLException) {
-                            request.loge("SSL Exception", ex);
-                            AsyncSSLException ase = (AsyncSSLException)ex;
-                            request.onHandshakeException(ase);
-                            if (ase.getIgnore())
-                                return;
-                        }
-                        final AsyncSocket socket = getSocket();
-                        if (socket == null)
-                            return;
-                        super.report(ex);
-                        if (!socket.isOpen() || ex != null) {
-                            if (headers() == null && ex != null)
-                                reportConnectedCompleted(cancel, ex, null, request, callback);
-                        }
+                // 7) on headers, cancel timeout
+                if (cancel.timeoutRunnable != null)
+                    mServer.removeAllCallbacks(cancel.scheduled);
 
-                        data.exception = ex;
-                        synchronized (mMiddleware) {
-                            for (AsyncHttpClientMiddleware middleware: mMiddleware) {
-                                middleware.onRequestComplete(data);
-                            }
-                        }
-                    }
+                // allow the middleware to massage the headers before the body is decoded
+                request.logv("Received headers:\n" + toString());
 
-                    @Override
-                    public AsyncSocket detachSocket() {
-                        request.logd("Detaching socket");
-                        AsyncSocket socket = getSocket();
-                        if (socket == null)
-                            return null;
-                        socket.setWriteableCallback(null);
-                        socket.setClosedCallback(null);
-                        socket.setEndCallback(null);
-                        socket.setDataCallback(null);
-                        setSocket(null);
-                        return socket;
+                synchronized (mMiddleware) {
+                    for (AsyncHttpClientMiddleware middleware: mMiddleware) {
+                        middleware.onHeadersReceived(data);
                     }
-                };
+                }
 
-                data.sendHeadersCallback = new CompletedCallback() {
-                    @Override
-                    public void onCompleted(Exception ex) {
-                        if (ex != null)
-                            ret.report(ex);
-                        else
-                            ret.onHeadersSent();
-                    }
-                };
-                data.response = ret;
-                ret.setSocket(socket);
+                // drop through, and setDataEmitter will be called for the body decoder.
+                // headers will be further massaged in there.
+            }
+
+            @Override
+            protected void report(Exception ex) {
+                if (ex != null)
+                    request.loge("exception during response", ex);
+                if (cancel.isCancelled())
+                    return;
+                if (ex instanceof AsyncSSLException) {
+                    request.loge("SSL Exception", ex);
+                    AsyncSSLException ase = (AsyncSSLException)ex;
+                    request.onHandshakeException(ase);
+                    if (ase.getIgnore())
+                        return;
+                }
+                final AsyncSocket socket = socket();
+                if (socket == null)
+                    return;
+                super.report(ex);
+                if (!socket.isOpen() || ex != null) {
+                    if (headers() == null && ex != null)
+                        reportConnectedCompleted(cancel, ex, null, request, callback);
+                }
 
+                data.exception = ex;
                 synchronized (mMiddleware) {
                     for (AsyncHttpClientMiddleware middleware: mMiddleware) {
-                        if (middleware.sendHeaders(data))
-                            break;
+                        middleware.onRequestComplete(data);
                     }
                 }
             }
+
+            @Override
+            public AsyncSocket detachSocket() {
+                request.logd("Detaching socket");
+                AsyncSocket socket = socket();
+                if (socket == null)
+                    return null;
+                socket.setWriteableCallback(null);
+                socket.setClosedCallback(null);
+                socket.setEndCallback(null);
+                socket.setDataCallback(null);
+                setSocket(null);
+                return socket;
+            }
         };
 
-        // set up the system default proxy and connect
-        setupAndroidProxy(request);
+        data.sendHeadersCallback = new CompletedCallback() {
+            @Override
+            public void onCompleted(Exception ex) {
+                if (ex != null)
+                    ret.report(ex);
+                else
+                    ret.onHeadersSent();
+            }
+        };
+        data.receiveHeadersCallback = new CompletedCallback() {
+            @Override
+            public void onCompleted(Exception ex) {
+                if (ex != null)
+                    ret.report(ex);
+                else
+                    ret.onHeadersReceived();
+            }
+        };
+        data.response = ret;
+        ret.setSocket(data.socket);
 
         synchronized (mMiddleware) {
             for (AsyncHttpClientMiddleware middleware: mMiddleware) {
-                Cancellable socketCancellable = middleware.getSocket(data);
-                if (socketCancellable != null) {
-                    data.socketCancellable = socketCancellable;
-                    cancel.setParent(socketCancellable);
-                    return;
-                }
+                if (middleware.exchangeHeaders(data))
+                    break;
             }
         }
-        reportConnectedCompleted(cancel, new IllegalArgumentException("invalid uri"), null, request, callback);
     }
 
     public static abstract class RequestCallbackBase<T> implements RequestCallback<T> {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
index b19819914..edce25dda 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
@@ -14,6 +14,7 @@
  */
 public interface AsyncHttpClientMiddleware {
     public interface ResponseHead  {
+        public AsyncSocket socket();
         public String protocol();
         public String message();
         public int code();
@@ -24,6 +25,8 @@ public interface ResponseHead  {
         public ResponseHead headers(Headers headers);
         public DataSink sink();
         public ResponseHead sink(DataSink sink);
+        public DataEmitter emitter();
+        public ResponseHead emitter(DataEmitter emitter);
     }
 
     public static class OnRequestData {
@@ -37,14 +40,14 @@ public static class GetSocketData extends OnRequestData {
         public String protocol;
     }
 
-    public static class SendHeaderData extends GetSocketData {
+    public static class ExchangeHeaderData extends GetSocketData {
         public AsyncSocket socket;
         public ResponseHead response;
         public CompletedCallback sendHeadersCallback;
+        public CompletedCallback receiveHeadersCallback;
     }
 
-    public static class OnHeadersReceivedData extends SendHeaderData {
-//        public Headers headers;
+    public static class OnHeadersReceivedData extends ExchangeHeaderData {
     }
 
     public static class OnBodyData extends OnHeadersReceivedData {
@@ -69,11 +72,12 @@ public static class OnRequestCompleteData extends OnBodyData {
     public Cancellable getSocket(GetSocketData data);
 
     /**
-     * Called before the headers are sent via the socket
+     * Called before when the headers are sent and received via the socket.
+     * Implementers return true to denote they will manage header exchange.
      * @param data
      * @return
      */
-    public boolean sendHeaders(SendHeaderData data);
+    public boolean exchangeHeaders(ExchangeHeaderData data);
 
     /**
      * Called once the headers have been received via the socket
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index fa2bb11f5..7938b935e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -19,9 +19,7 @@
 import java.nio.charset.Charset;
 
 abstract class AsyncHttpResponseImpl extends FilteredDataEmitter implements AsyncSocket, AsyncHttpResponse, AsyncHttpClientMiddleware.ResponseHead {
-    private AsyncHttpRequestBody mWriter;
-    
-    public AsyncSocket getSocket() {
+    public AsyncSocket socket() {
         return mSocket;
     }
 
@@ -36,17 +34,12 @@ void setSocket(AsyncSocket exchange) {
             return;
 
         mSocket.setEndCallback(mReporter);
-
-        mWriter = mRequest.getBody();
-
-        LineEmitter liner = new LineEmitter();
-        exchange.setDataCallback(liner);
-        liner.setLineCallback(mHeaderCallback);
     }
 
     protected void onHeadersSent() {
-        if (mWriter != null) {
-            mWriter.write(mRequest, AsyncHttpResponseImpl.this, new CompletedCallback() {
+        AsyncHttpRequestBody requestBody = mRequest.getBody();
+        if (requestBody != null) {
+            requestBody.write(mRequest, AsyncHttpResponseImpl.this, new CompletedCallback() {
                 @Override
                 public void onCompleted(Exception ex) {
                     onRequestCompleted(ex);
@@ -75,48 +68,17 @@ public void onCompleted(Exception error) {
     protected void onHeadersReceived() {
     }
 
-    StringCallback mHeaderCallback = new StringCallback() {
-        private Headers mRawHeaders = new Headers();
-        private String statusLine;
-        @Override
-        public void onStringAvailable(String s) {
-            try {
-                if (statusLine == null) {
-                    statusLine = s;
-                }
-                else if (!"\r".equals(s)) {
-                    mRawHeaders.addLine(s);
-                }
-                else {
-                    String[] parts = statusLine.split(" ", 3);
-                    if (parts.length != 3)
-                        throw new Exception(new IOException("Not HTTP"));
-
-                    protocol = parts[0];
-                    code = Integer.parseInt(parts[1]);
-                    message = parts[2];
-                    mHeaders = mRawHeaders;
-                    onHeadersReceived();
-                    // socket may get detached after headers (websocket)
-                    if (mSocket == null)
-                        return;
-                    DataEmitter emitter;
-                    // HEAD requests must not return any data. They still may
-                    // return content length, etc, which will confuse the body decoder
-                    if (AsyncHttpHead.METHOD.equalsIgnoreCase(mRequest.getMethod())) {
-                        emitter = HttpUtil.EndEmitter.create(getServer(), null);
-                    }
-                    else {
-                        emitter = HttpUtil.getBodyDecoder(mSocket, Protocol.get(protocol), mHeaders, false);
-                    }
-                    setDataEmitter(emitter);
-                }
-            }
-            catch (Exception ex) {
-                report(ex);
-            }
-        }
-    };
+
+    @Override
+    public DataEmitter emitter() {
+        return getDataEmitter();
+    }
+
+    @Override
+    public AsyncHttpClientMiddleware.ResponseHead emitter(DataEmitter emitter) {
+        setDataEmitter(emitter);
+        return this;
+    }
 
     @Override
     protected void report(Exception e) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
index 1ca6b5ae0..837ca925f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
@@ -1,20 +1,23 @@
 package com.koushikdutta.async.http;
 
+import com.koushikdutta.async.AsyncSocket;
+import com.koushikdutta.async.DataEmitter;
+import com.koushikdutta.async.LineEmitter;
 import com.koushikdutta.async.Util;
-import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 import com.koushikdutta.async.http.filter.ChunkedOutputFilter;
 
+import java.io.IOException;
+
 /**
  * Created by koush on 7/24/14.
  */
 public class HttpTransportMiddleware extends SimpleMiddleware {
-
     @Override
-    public boolean sendHeaders(final SendHeaderData data) {
+    public boolean exchangeHeaders(final ExchangeHeaderData data) {
         Protocol p = Protocol.get(data.protocol);
         if (p != null && p != Protocol.HTTP_1_0 && p != Protocol.HTTP_1_1)
-            return super.sendHeaders(data);
+            return super.exchangeHeaders(data);
 
         AsyncHttpRequest request = data.request;
         AsyncHttpRequestBody requestBody = data.request.getBody();
@@ -35,47 +38,58 @@ public boolean sendHeaders(final SendHeaderData data) {
         String rs = request.getHeaders().toPrefixString(rl);
         request.logv("\n" + rs);
 
-        Util.writeAll(data.socket, rs.getBytes(), new CompletedCallback() {
+        Util.writeAll(data.socket, rs.getBytes(), data.sendHeadersCallback);
+
+        LineEmitter.StringCallback headerCallback = new LineEmitter.StringCallback() {
+            Headers mRawHeaders = new Headers();
+            String statusLine;
+
             @Override
-            public void onCompleted(Exception ex) {
-                data.sendHeadersCallback.onCompleted(ex);
+            public void onStringAvailable(String s) {
+                try {
+                    if (statusLine == null) {
+                        statusLine = s;
+                    }
+                    else if (!"\r".equals(s)) {
+                        mRawHeaders.addLine(s);
+                    }
+                    else {
+                        String[] parts = statusLine.split(" ", 3);
+                        if (parts.length != 3)
+                            throw new Exception(new IOException("Not HTTP"));
+
+                        data.response.headers(mRawHeaders);
+                        String protocol = parts[0];
+                        data.response.protocol(protocol);
+                        data.response.code(Integer.parseInt(parts[1]));
+                        data.response.message(parts[2]);
+                        data.receiveHeadersCallback.onCompleted(null);
+
+                        // socket may get detached after headers (websocket)
+                        AsyncSocket socket = data.response.socket();
+                        if (socket == null)
+                            return;
+                        DataEmitter emitter;
+                        // HEAD requests must not return any data. They still may
+                        // return content length, etc, which will confuse the body decoder
+                        if (AsyncHttpHead.METHOD.equalsIgnoreCase(data.request.getMethod())) {
+                            emitter = HttpUtil.EndEmitter.create(socket.getServer(), null);
+                        }
+                        else {
+                            emitter = HttpUtil.getBodyDecoder(socket, Protocol.get(protocol), mRawHeaders, false);
+                        }
+                        data.response.emitter(emitter);
+                    }
+                }
+                catch (Exception ex) {
+                    data.receiveHeadersCallback.onCompleted(ex);
+                }
             }
-        });
+        };
 
-//        LineEmitter.StringCallback headerCallback = new LineEmitter.StringCallback() {
-//            Headers mRawHeaders = new Headers();
-//            String statusLine;
-//
-//            @Override
-//            public void onStringAvailable(String s) {
-//                try {
-//                    if (statusLine == null) {
-//                        statusLine = s;
-//                    }
-//                    else if (!"\r".equals(s)) {
-//                        mRawHeaders.addLine(s);
-//                    }
-//                    else {
-//                        String[] parts = statusLine.split(" ", 3);
-//                        if (parts.length != 3)
-//                            throw new Exception(new IOException("Not HTTP"));
-//
-//                        data.response.headers(mRawHeaders);
-//                        data.response.protocol(parts[0]);
-//                        data.response.code(Integer.parseInt(parts[1]));
-//                        data.response.message(parts[2]);
-//                        data.sendHeadersCallback.onCompleted(null);
-//                    }
-//                }
-//                catch (Exception ex) {
-//                    data.sendHeadersCallback.onCompleted(ex);
-//                }
-//            }
-//        };
-//
-//        LineEmitter liner = new LineEmitter();
-//        data.socket.setDataCallback(liner);
-//        liner.setLineCallback(headerCallback);
+        LineEmitter liner = new LineEmitter();
+        data.socket.setDataCallback(liner);
+        liner.setLineCallback(headerCallback);
         return true;
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java
index 7fe545d86..242fdabbc 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java
@@ -25,7 +25,7 @@ public void onRequestComplete(OnRequestCompleteData data) {
     }
 
     @Override
-    public boolean sendHeaders(SendHeaderData data) {
+    public boolean exchangeHeaders(ExchangeHeaderData data) {
         return false;
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/HttpTransport.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/HttpTransport.java
deleted file mode 100644
index 0d017bba6..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/HttpTransport.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.koushikdutta.async.http.spdy;
-
-import com.koushikdutta.async.http.AsyncHttpClientMiddleware;
-import com.koushikdutta.async.http.SimpleMiddleware;
-
-/**
- * Created by koush on 7/19/14.
- */
-public class HttpTransport extends SimpleMiddleware {
-    @Override
-    public boolean sendHeaders(SendHeaderData data) {
-        return super.sendHeaders(data);
-    }
-
-}

From f9ac08876bac04052cce8b78fd05e5cf5fe2fe0e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 26 Jul 2014 19:27:30 -0700
Subject: [PATCH 047/399] spdy is working

---
 .../src/com/koushikdutta/async/Util.java      |  22 ++
 .../async/http/AsyncSSLSocketMiddleware.java  |  12 +-
 .../async/http/spdy/AsyncSpdyConnection.java  | 260 ++++++++++++++----
 .../async/http/spdy/ByteBufferListSink.java   |  52 ++++
 .../async/http/spdy/ByteBufferListSource.java | 170 ++----------
 .../async/http/spdy/SpdyMiddleware.java       | 137 ++++++++-
 .../async/http/spdy/SpdyTransport.java        |  61 ++++
 .../okhttp/internal/spdy/FrameReader.java     |   2 +-
 .../okhttp/internal/spdy/Http20Draft13.java   |   8 +-
 .../spdy/okhttp/internal/spdy/Settings.java   |   4 +-
 .../http/spdy/okhttp/internal/spdy/Spdy3.java |  12 +-
 .../async/http/spdy/okio/Buffer.java          |   4 +-
 .../async/http/spdy/okio/InflaterSource.java  | 160 +++++------
 .../async/http/spdy/okio/Segment.java         |   6 +-
 .../async/http/spdy/okio/SegmentPool.java     |   2 +-
 15 files changed, 607 insertions(+), 305 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSink.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/Util.java b/AndroidAsync/src/com/koushikdutta/async/Util.java
index 5dc0359bc..5e2666224 100644
--- a/AndroidAsync/src/com/koushikdutta/async/Util.java
+++ b/AndroidAsync/src/com/koushikdutta/async/Util.java
@@ -222,4 +222,26 @@ public static DataEmitter getWrappedDataEmitter(DataEmitter emitter, Class wrapp
         }
         return null;
     }
+
+    public static void end(DataEmitter emitter, Exception e) {
+        if (emitter == null)
+            return;
+        end(emitter.getEndCallback(), e);
+    }
+
+    public static void end(CompletedCallback end, Exception e) {
+        if (end != null)
+            end.onCompleted(e);
+    }
+
+    public static void writable(DataSink emitter) {
+        if (emitter == null)
+            return;
+        writable(emitter.getWriteableCallback());
+    }
+
+    public static void writable(WritableCallback writable) {
+        if (writable != null)
+            writable.onWriteable();
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
index 59fa0f7c6..01f3fbeec 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
@@ -68,7 +68,7 @@ protected SSLEngine createConfiguredSSLEngine(String host, int port) {
         return sslEngine;
     }
 
-    protected AsyncSSLSocketWrapper.HandshakeCallback createHandshakeCallback(final ConnectCallback callback) {
+    protected AsyncSSLSocketWrapper.HandshakeCallback createHandshakeCallback(GetSocketData data, final ConnectCallback callback) {
         return new AsyncSSLSocketWrapper.HandshakeCallback() {
             @Override
             public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
@@ -77,15 +77,15 @@ public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
         };
     }
 
-    protected void tryHandshake(final ConnectCallback callback, AsyncSocket socket, final Uri uri, final int port) {
+    protected void tryHandshake(AsyncSocket socket, GetSocketData data, final Uri uri, final int port, final ConnectCallback callback) {
         AsyncSSLSocketWrapper.handshake(socket, uri.getHost(), port,
         createConfiguredSSLEngine(uri.getHost(), port),
         trustManagers, hostnameVerifier, true,
-        createHandshakeCallback(callback));
+        createHandshakeCallback(data, callback));
     }
 
     @Override
-    protected ConnectCallback wrapCallback(GetSocketData data, final Uri uri, final int port, final boolean proxied, final ConnectCallback callback) {
+    protected ConnectCallback wrapCallback(final GetSocketData data, final Uri uri, final int port, final boolean proxied, final ConnectCallback callback) {
         return new ConnectCallback() {
             @Override
             public void onConnectCompleted(Exception ex, final AsyncSocket socket) {
@@ -95,7 +95,7 @@ public void onConnectCompleted(Exception ex, final AsyncSocket socket) {
                 }
 
                 if (!proxied) {
-                    tryHandshake(callback, socket, uri, port);
+                    tryHandshake(socket, data, uri, port, callback);
                     return;
                 }
 
@@ -127,7 +127,7 @@ public void onStringAvailable(String s) {
                                     socket.setDataCallback(null);
                                     socket.setEndCallback(null);
                                     if (TextUtils.isEmpty(s.trim())) {
-                                        tryHandshake(callback, socket, uri, port);
+                                        tryHandshake(socket, data, uri, port, callback);
                                     }
                                     else {
                                         callback.onConnectCompleted(new IOException("unknown second status line"), socket);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
index 18e856cf1..066f92a18 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
@@ -3,12 +3,15 @@
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.BufferedDataEmitter;
+import com.koushikdutta.async.BufferedDataSink;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
+import com.koushikdutta.async.future.SimpleFuture;
+import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.ErrorCode;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.FrameReader;
@@ -20,8 +23,12 @@
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Settings;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Spdy3;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Variant;
+import com.koushikdutta.async.http.spdy.okio.BufferedSink;
 import com.koushikdutta.async.http.spdy.okio.BufferedSource;
 import com.koushikdutta.async.http.spdy.okio.ByteString;
+import com.koushikdutta.async.http.spdy.okio.Okio;
+
+import junit.framework.Assert;
 
 import java.io.IOException;
 import java.util.Hashtable;
@@ -37,31 +44,126 @@
 public class AsyncSpdyConnection implements FrameReader.Handler {
     BufferedDataEmitter emitter;
     AsyncSocket socket;
+    BufferedDataSink bufferedSocket;
     FrameReader reader;
     FrameWriter writer;
     Variant variant;
-    SpdySocket zero = new SpdySocket(0, false, false, null);
+//    SpdySocket zero = new SpdySocket(0, false, false, null);
     ByteBufferListSource source = new ByteBufferListSource();
+    ByteBufferListSink sink = new ByteBufferListSink() {
+        @Override
+        public void flush() throws IOException {
+            AsyncSpdyConnection.this.flush();
+        }
+    };
+    BufferedSource bufferedSource;
+    BufferedSink bufferedSink;
     Hashtable<Integer, SpdySocket> sockets = new Hashtable<Integer, SpdySocket>();
     Protocol protocol;
     boolean client = true;
 
-    private class SpdySocket implements AsyncSocket {
+    public void flush() {
+        bufferedSocket.write(sink);
+    }
+
+    /**
+     * Returns a new locally-initiated stream.
+     *
+     * @param out true to create an output stream that we can use to send data to the remote peer.
+     *     Corresponds to {@code FLAG_FIN}.
+     * @param in true to create an input stream that the remote peer can use to send data to us.
+     *     Corresponds to {@code FLAG_UNIDIRECTIONAL}.
+     */
+    public SpdySocket newStream(List<Header> requestHeaders, boolean out, boolean in) throws IOException {
+        return newStream(0, requestHeaders, out, in);
+    }
+
+    private SpdySocket newStream(int associatedStreamId, List<Header> requestHeaders, boolean out,
+                                 boolean in) throws IOException {
+        boolean outFinished = !out;
+        boolean inFinished = !in;
+        SpdySocket socket;
+        int streamId;
+
+        if (shutdown) {
+            throw new IOException("shutdown");
+        }
+
+        streamId = nextStreamId;
+        nextStreamId += 2;
+        socket = new SpdySocket(streamId, outFinished, inFinished, requestHeaders);
+        if (socket.isOpen()) {
+            sockets.put(streamId, socket);
+//            setIdle(false);
+        }
+        if (associatedStreamId == 0) {
+            writer.synStream(outFinished, inFinished, streamId, associatedStreamId,
+            requestHeaders);
+        } else if (client) {
+            throw new IllegalArgumentException("client streams shouldn't have associated stream IDs");
+        } else { // HTTP/2 has a PUSH_PROMISE frame.
+            writer.pushPromise(associatedStreamId, streamId, requestHeaders);
+        }
+
+        if (!out) {
+            writer.flush();
+        }
+
+        return socket;
+    }
+
+    int totalWindowRead;
+    void updateWindowRead(int length) {
+        totalWindowRead += length;
+        if (totalWindowRead >= okHttpSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE) / 2) {
+            try {
+                writer.windowUpdate(0, totalWindowRead);
+            }
+            catch (IOException e) {
+                throw new AssertionError(e);
+            }
+            totalWindowRead = 0;
+        }
+    }
+
+    public class SpdySocket implements AsyncSocket {
         long bytesLeftInWriteWindow;
         WritableCallback writable;
         final int id;
         CompletedCallback closedCallback;
         CompletedCallback endCallback;
         DataCallback dataCallback;
-        ByteBufferList pending = new ByteBufferList();
+        ByteBufferListSink pending = new ByteBufferListSink();
+        SimpleFuture<List<Header>> headers = new SimpleFuture<List<Header>>();
+        boolean isOpen = true;
+        int totalWindowRead;
 
-        public SpdySocket(int id, boolean outFinished, boolean inFinished, List<Header> headerBlock) {
-            this.id = id;
+        public SimpleFuture<List<Header>> headers() {
+            return headers;
         }
 
-        private void report(Exception e) {
-            if (endCallback != null)
-                endCallback.onCompleted(e);
+        void updateWindowRead(int length) {
+            totalWindowRead += length;
+            if (totalWindowRead >= okHttpSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE) / 2) {
+                try {
+                    writer.windowUpdate(id, totalWindowRead);
+                }
+                catch (IOException e) {
+                    throw new AssertionError(e);
+                }
+                totalWindowRead = 0;
+            }
+            AsyncSpdyConnection.this.updateWindowRead(length);
+        }
+
+        public SpdySocket(int id, boolean outFinished, boolean inFinished, List<Header> headerBlock) {
+            this.id = id;
+            try {
+                writer.windowUpdate(id, DEFAULT_INITIAL_WINDOW_SIZE);
+            }
+            catch (IOException e) {
+                throw new AssertionError(e);
+            }
         }
 
         public boolean isLocallyInitiated() {
@@ -72,8 +174,8 @@ public boolean isLocallyInitiated() {
         public void addBytesToWriteWindow(long delta) {
             long prev = bytesLeftInWriteWindow;
             bytesLeftInWriteWindow += delta;
-            if (writable != null && bytesLeftInWriteWindow > 0 && prev <= 0)
-                writable.onWriteable();
+            if (bytesLeftInWriteWindow > 0 && prev <= 0)
+                Util.writable(writable);
         }
 
         @Override
@@ -109,7 +211,7 @@ public void resume() {
 
         @Override
         public void close() {
-
+            isOpen = false;
         }
 
         @Override
@@ -134,7 +236,7 @@ public String charset() {
 
         @Override
         public void write(ByteBufferList bb) {
-
+            System.out.println("writing!");
         }
 
         @Override
@@ -149,7 +251,7 @@ public WritableCallback getWriteableCallback() {
 
         @Override
         public boolean isOpen() {
-            return true;
+            return isOpen;
         }
 
         @Override
@@ -165,11 +267,20 @@ public void setClosedCallback(CompletedCallback handler) {
         public CompletedCallback getClosedCallback() {
             return closedCallback;
         }
+
+        public void receiveHeaders(List<Header> headers, HeadersMode headerMode) {
+            this.headers.setComplete(headers);
+        }
     }
 
+    final Settings okHttpSettings = new Settings();
+    private int nextPingId;
+    private static final int OKHTTP_CLIENT_WINDOW_SIZE = 16 * 1024 * 1024;
+
     public AsyncSpdyConnection(AsyncSocket socket, Protocol protocol) {
         this.protocol = protocol;
         this.socket = socket;
+        this.bufferedSocket = new BufferedDataSink(socket);
         emitter = new BufferedDataEmitter(socket);
         emitter.setDataCallback(callback);
 
@@ -179,24 +290,53 @@ public AsyncSpdyConnection(AsyncSocket socket, Protocol protocol) {
         else if (protocol == Protocol.HTTP_2) {
             variant = new Http20Draft13();
         }
-        reader = variant.newReader(source, true);
+        reader = variant.newReader(bufferedSource = Okio.buffer(source), true);
+        writer = variant.newWriter(bufferedSink = Okio.buffer(sink), true);
+
+        boolean client = true;
+        nextStreamId = client ? 1 : 2;
+        if (client && protocol == Protocol.HTTP_2) {
+            nextStreamId += 2; // In HTTP/2, 1 on client is reserved for Upgrade.
+        }
+        nextPingId = client ? 1 : 2;
+        // Flow control was designed more for servers, or proxies than edge clients.
+        // If we are a client, set the flow control window to 16MiB.  This avoids
+        // thrashing window updates every 64KiB, yet small enough to avoid blowing
+        // up the heap.
+        if (client) {
+            okHttpSettings.set(Settings.INITIAL_WINDOW_SIZE, 0, OKHTTP_CLIENT_WINDOW_SIZE);
+        }
     }
 
     DataCallback callback = new DataCallback() {
         @Override
         public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-            bb.get(source);
-            if (!reader.canProcessFrame(source))
-                return;
-            try {
-                reader.nextFrame(AsyncSpdyConnection.this);
-            }
-            catch (IOException e) {
-                throw new AssertionError(e);
+            int needed;
+            while ((needed = reader.canProcessFrame(bb)) > 0) {
+                bb.get(source, needed);
+                try {
+                    reader.nextFrame(AsyncSpdyConnection.this);
+                }
+                catch (IOException e) {
+                    throw new AssertionError(e);
+                }
             }
         }
     };
 
+    /**
+     * Sends a connection header if the current variant requires it. This should
+     * be called after {@link Builder#build} for all new connections.
+     */
+    public void sendConnectionPreface() throws IOException {
+        writer.connectionPreface();
+        writer.settings(okHttpSettings);
+        int windowSize = okHttpSettings.getInitialWindowSize(Settings.DEFAULT_INITIAL_WINDOW_SIZE);
+        if (windowSize != Settings.DEFAULT_INITIAL_WINDOW_SIZE) {
+            writer.windowUpdate(0, windowSize - Settings.DEFAULT_INITIAL_WINDOW_SIZE);
+        }
+    }
+
     /** Even, positive numbered streams are pushed streams in HTTP/2. */
     private boolean pushedStream(int streamId) {
         return protocol == Protocol.HTTP_2 && streamId != 0 && (streamId & 1) == 0;
@@ -215,12 +355,16 @@ public void data(boolean inFinished, int streamId, BufferedSource source, int le
             source.skip(length);
             return;
         }
-        if (source != this.source)
+        if (source != this.bufferedSource || this.source.remaining() + source.buffer().size() != length)
             throw new AssertionError();
-        this.source.get(socket.pending, length);
+        source.buffer().readAll(socket.pending);
+        this.source.get(socket.pending);
+        socket.updateWindowRead(length);
         Util.emitAllData(socket, socket.pending);
         if (inFinished) {
-            socket.report(null);
+            sockets.remove(streamId);
+            socket.close();
+            Util.end(socket, null);
         }
     }
 
@@ -228,7 +372,6 @@ public void data(boolean inFinished, int streamId, BufferedSource source, int le
     private int nextStreamId;
     @Override
     public void headers(boolean outFinished, boolean inFinished, int streamId, int associatedStreamId, List<Header> headerBlock, HeadersMode headersMode) {
-        /*
         if (pushedStream(streamId)) {
             throw new AssertionError("push");
 //            pushHeadersLater(streamId, headerBlock, inFinished);
@@ -258,25 +401,34 @@ public void headers(boolean outFinished, boolean inFinished, int streamId, int a
             // If the stream ID is in the client's namespace, assume it's already closed.
             if (streamId % 2 == nextStreamId % 2) return;
 
+            throw new AssertionError("unexpected receive stream");
+
             // Create a stream.
-            socket = new SpdySocket(streamId, outFinished, inFinished, headerBlock);
-            lastGoodStreamId = streamId;
-            sockets.put(streamId, socket);
-            handler.receive(newStream);
-            return;
+//            socket = new SpdySocket(streamId, outFinished, inFinished, headerBlock);
+//            lastGoodStreamId = streamId;
+//            sockets.put(streamId, socket);
+//            handler.receive(newStream);
+//            return;
         }
 
         // The headers claim to be for a new stream, but we already have one.
         if (headersMode.failIfStreamPresent()) {
-            stream.closeLater(ErrorCode.PROTOCOL_ERROR);
-            removeStream(streamId);
+            try {
+                writer.rstStream(streamId, ErrorCode.INVALID_STREAM);
+            }
+            catch (IOException e) {
+                throw new AssertionError(e);
+            }
+            sockets.remove(streamId);
             return;
         }
 
         // Update an existing stream.
-        stream.receiveHeaders(headerBlock, headersMode);
-        if (inFinished) stream.receiveFin();
-        */
+        socket.receiveHeaders(headerBlock, headersMode);
+        if (inFinished) {
+            sockets.remove(streamId);
+            Util.end(socket, null);
+        }
     }
 
     @Override
@@ -288,10 +440,11 @@ public void rstStream(int streamId, ErrorCode errorCode) {
         }
         SpdySocket rstStream = sockets.remove(streamId);
         if (rstStream != null) {
-            rstStream.report(new IOException(errorCode.toString()));
+            Util.end(rstStream, new IOException(errorCode.toString()));
         }
     }
 
+    long bytesLeftInWriteWindow;
     Settings peerSettings = new Settings();
     private boolean receivedInitialPeerSettings = false;
     @Override
@@ -310,7 +463,7 @@ public void settings(boolean clearPrevious, Settings settings) {
         if (peerInitialWindowSize != -1 && peerInitialWindowSize != priorWriteWindowSize) {
             delta = peerInitialWindowSize - priorWriteWindowSize;
             if (!receivedInitialPeerSettings) {
-                zero.addBytesToWriteWindow(delta);
+                addBytesToWriteWindow(delta);
                 receivedInitialPeerSettings = true;
             }
         }
@@ -319,8 +472,21 @@ public void settings(boolean clearPrevious, Settings settings) {
         }
     }
 
+    void addBytesToWriteWindow(long delta) {
+        bytesLeftInWriteWindow += delta;
+        for (SpdySocket socket: sockets.values()) {
+            Util.writable(socket);
+        }
+    }
+
     @Override
     public void ackSettings() {
+        try {
+            writer.ackSettings();
+        }
+        catch (IOException e) {
+            throw new AssertionError(e);
+        }
     }
 
     private Map<Integer, Ping> pings;
@@ -362,7 +528,7 @@ public void goAway(int lastGoodStreamId, ErrorCode errorCode, ByteString debugDa
             Map.Entry<Integer, SpdySocket> entry = i.next();
             int streamId = entry.getKey();
             if (streamId > lastGoodStreamId && entry.getValue().isLocallyInitiated()) {
-                entry.getValue().report(new IOException(ErrorCode.REFUSED_STREAM.toString()));
+                Util.end(entry.getValue(), new IOException(ErrorCode.REFUSED_STREAM.toString()));
                 i.remove();
             }
         }
@@ -370,25 +536,25 @@ public void goAway(int lastGoodStreamId, ErrorCode errorCode, ByteString debugDa
 
     @Override
     public void windowUpdate(int streamId, long windowSizeIncrement) {
-        System.out.println("fff");
-
+        if (streamId == 0) {
+            addBytesToWriteWindow(windowSizeIncrement);
+            return;
+        }
+        SpdySocket socket = sockets.get(streamId);
+        if (socket != null)
+            socket.addBytesToWriteWindow(windowSizeIncrement);
     }
 
     @Override
     public void priority(int streamId, int streamDependency, int weight, boolean exclusive) {
-        System.out.println("fff");
-
     }
 
     @Override
     public void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders) throws IOException {
-        System.out.println("fff");
-
+        throw new AssertionError("pushPromise");
     }
 
     @Override
     public void alternateService(int streamId, String origin, ByteString protocol, String host, int port, long maxAge) {
-        System.out.println("fff");
-
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSink.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSink.java
new file mode 100644
index 000000000..aa9da9a15
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSink.java
@@ -0,0 +1,52 @@
+package com.koushikdutta.async.http.spdy;
+
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.http.spdy.okio.Buffer;
+import com.koushikdutta.async.http.spdy.okio.Segment;
+import com.koushikdutta.async.http.spdy.okio.SegmentPool;
+import com.koushikdutta.async.http.spdy.okio.Sink;
+import com.koushikdutta.async.http.spdy.okio.Timeout;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+/**
+ * Created by koush on 7/25/14.
+ */
+public class ByteBufferListSink extends ByteBufferList implements Sink {
+    @Override
+    public void write(Buffer source, long byteCount) throws IOException {
+        Segment s = source.head;
+        while (byteCount > 0) {
+            int toCopy = (int) Math.min(byteCount, s.limit - s.pos);
+            ByteBuffer b = obtain(toCopy);
+            b.put(s.data, s.pos, toCopy);
+            b.flip();
+            add(b);
+
+            s.pos += toCopy;
+            source.size -= toCopy;
+            byteCount -= toCopy;
+
+            if (s.pos == s.limit) {
+                Segment toRecycle = s;
+                source.head = s = toRecycle.pop();
+                SegmentPool.getInstance().recycle(toRecycle);
+            }
+        }
+    }
+
+    @Override
+    public void flush() throws IOException {
+    }
+
+    @Override
+    public Timeout timeout() {
+        return Timeout.NONE;
+    }
+
+    @Override
+    public void close() throws IOException {
+        recycle();
+    }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSource.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSource.java
index 5d57c772d..13803b3be 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSource.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSource.java
@@ -2,173 +2,39 @@
 
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.http.spdy.okio.Buffer;
-import com.koushikdutta.async.http.spdy.okio.BufferedSource;
-import com.koushikdutta.async.http.spdy.okio.ByteString;
-import com.koushikdutta.async.http.spdy.okio.Sink;
+import com.koushikdutta.async.http.spdy.okio.Source;
 import com.koushikdutta.async.http.spdy.okio.Timeout;
-import com.koushikdutta.async.util.Charsets;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteOrder;
-import java.nio.charset.Charset;
+import java.nio.ByteBuffer;
 
 /**
- * Created by koush on 7/17/14.
+ * Created by koush on 7/25/14.
  */
-public class ByteBufferListSource extends ByteBufferList implements BufferedSource {
-    @Override
-    public Buffer buffer() {
-        return null;
-    }
-
-    @Override
-    public boolean exhausted() throws IOException {
-        return !hasRemaining();
-    }
-
-    @Override
-    public void require(long byteCount) throws IOException {
-        if (remaining() < byteCount)
-            throw new AssertionError("out of data");
-    }
-
-    @Override
-    public byte readByte() throws IOException {
-        return order(ByteOrder.BIG_ENDIAN).get();
-    }
-
-    @Override
-    public short readShort() throws IOException {
-        return order(ByteOrder.BIG_ENDIAN).getShort();
-    }
-
-    @Override
-    public short readShortLe() throws IOException {
-        return order(ByteOrder.LITTLE_ENDIAN).getShort();
-    }
-
-    @Override
-    public int readInt() throws IOException {
-        return order(ByteOrder.BIG_ENDIAN).getInt();
-    }
-
-    @Override
-    public int readIntLe() throws IOException {
-        return order(ByteOrder.LITTLE_ENDIAN).getInt();
-    }
-
-    @Override
-    public long readLong() throws IOException {
-        return order(ByteOrder.BIG_ENDIAN).getLong();
-    }
-
-    @Override
-    public long readLongLe() throws IOException {
-        return order(ByteOrder.LITTLE_ENDIAN).getLong();
-    }
-
-    @Override
-    public void skip(long byteCount) throws IOException {
-        if (byteCount > Integer.MAX_VALUE)
-            throw new AssertionError("too much skippy, use less peanut butter");
-        read(new byte[(int)byteCount]);
-    }
-
-    @Override
-    public ByteString readByteString() throws IOException {
-        return readByteString(remaining());
-    }
-
-    @Override
-    public ByteString readByteString(long byteCount) throws IOException {
-        return ByteString.of(readByteArray(byteCount));
-    }
-
-    @Override
-    public byte[] readByteArray() throws IOException {
-        return getAllByteArray();
-    }
-
-    @Override
-    public byte[] readByteArray(long byteCount) throws IOException {
-        byte[] ret = new byte[(int)byteCount];
-        get(ret);
-        return ret;
-    }
-
-    @Override
-    public int read(byte[] sink) throws IOException {
-        return read(sink, 0, sink.length);
-    }
-
-    @Override
-    public void readFully(byte[] sink) throws IOException {
-        read(sink, 0, sink.length);
-    }
-
-    @Override
-    public int read(byte[] sink, int offset, int byteCount) throws IOException {
-        get(sink, offset, byteCount);
-        return byteCount;
-    }
-
-    @Override
-    public void readFully(Buffer sink, long byteCount) throws IOException {
-        throw new AssertionError("not implemented");
-    }
-
-    @Override
-    public long readAll(Sink sink) throws IOException {
-        throw new AssertionError("not implemented");
-    }
-
-    @Override
-    public String readUtf8() throws IOException {
-        return readUtf8(remaining());
-    }
-
-    @Override
-    public String readUtf8(long byteCount) throws IOException {
-        return new String(readByteArray(byteCount), Charsets.UTF_8);
-    }
-
-    @Override
-    public String readUtf8Line() throws IOException {
-        throw new AssertionError("not implemented");
-    }
-
-    @Override
-    public String readUtf8LineStrict() throws IOException {
-        throw new AssertionError("not implemented");
-    }
-
-    @Override
-    public String readString(long byteCount, Charset charset) throws IOException {
-        return new String(readByteArray(byteCount), charset);
-    }
-
-    @Override
-    public long indexOf(byte b) throws IOException {
-        throw new AssertionError("not implemented");
-    }
-
-    @Override
-    public InputStream inputStream() {
-        throw new AssertionError("not implemented");
-    }
-
+public class ByteBufferListSource extends ByteBufferList implements Source {
     @Override
     public long read(Buffer sink, long byteCount) throws IOException {
-        throw new AssertionError("not implemented");
+        if (!hasRemaining())
+            throw new AssertionError("empty!");
+        int total = 0;
+        while (total < byteCount && hasRemaining()) {
+            ByteBuffer b = remove();
+            int toRead = (int)Math.min(byteCount - total, b.remaining());
+            total += toRead;
+            sink.write(b.array(), b.arrayOffset() + b.position(), toRead);
+            b.position(b.position() + toRead);
+            addFirst(b);
+        }
+        return total;
     }
 
     @Override
     public Timeout timeout() {
-        return null;
+        return Timeout.NONE;
     }
 
     @Override
     public void close() throws IOException {
+        recycle();
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 35d425782..3ebe80226 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -1,19 +1,32 @@
 package com.koushikdutta.async.http.spdy;
 
+import android.net.Uri;
+
 import com.koushikdutta.async.AsyncSSLSocket;
 import com.koushikdutta.async.AsyncSSLSocketWrapper;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.future.Cancellable;
+import com.koushikdutta.async.future.FutureCallback;
+import com.koushikdutta.async.future.SimpleCancellable;
+import com.koushikdutta.async.future.TransformFuture;
 import com.koushikdutta.async.http.AsyncHttpClient;
+import com.koushikdutta.async.http.AsyncHttpClientMiddleware;
 import com.koushikdutta.async.http.AsyncSSLEngineConfigurator;
 import com.koushikdutta.async.http.AsyncSSLSocketMiddleware;
+import com.koushikdutta.async.http.Headers;
+import com.koushikdutta.async.http.Multimap;
 import com.koushikdutta.async.http.Protocol;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Header;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.SpdyConnection;
 import com.koushikdutta.async.util.Charsets;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
@@ -41,8 +54,15 @@ static byte[] concatLengthPrefixed(Protocol... protocols) {
         return ret;
     }
 
+    private static String requestPath(Uri uri) {
+        String pathAndQuery = uri.getPath();
+        if (pathAndQuery == null) return "/";
+        if (!pathAndQuery.startsWith("/")) return "/" + pathAndQuery;
+        return pathAndQuery;
+    }
+
     @Override
-    protected AsyncSSLSocketWrapper.HandshakeCallback createHandshakeCallback(final ConnectCallback callback) {
+    protected AsyncSSLSocketWrapper.HandshakeCallback createHandshakeCallback(final GetSocketData data, final ConnectCallback callback) {
         return new AsyncSSLSocketWrapper.HandshakeCallback() {
             @Override
             public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
@@ -53,8 +73,23 @@ public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
                 try {
                     long ptr = (Long)sslNativePointer.get(socket.getSSLEngine());
                     byte[] proto = (byte[])nativeGetAlpnNegotiatedProtocol.invoke(null, ptr);
+                    if (proto == null) {
+                        callback.onConnectCompleted(null, socket);
+                        return;
+                    }
                     String protoString = new String(proto);
-                    AsyncSpdyConnection connection = new AsyncSpdyConnection(socket, Protocol.get(protoString));
+                    Protocol p = Protocol.get(protoString);
+                    if (p == null) {
+                        callback.onConnectCompleted(null, socket);
+                        return;
+                    }
+                    final AsyncSpdyConnection connection = new AsyncSpdyConnection(socket, Protocol.get(protoString));
+                    connection.sendConnectionPreface();
+                    connection.flush();
+
+                    connections.put(data.request.getUri().getHost(), connection);
+
+                    newSocket(data, connection, callback);
                 }
                 catch (Exception ex) {
                     socket.close();
@@ -64,6 +99,83 @@ public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
         };
     }
 
+    private void newSocket(GetSocketData data, final AsyncSpdyConnection connection, final ConnectCallback callback) {
+        final ArrayList<Header> headers = new ArrayList<Header>();
+        headers.add(new Header(Header.TARGET_METHOD, data.request.getMethod()));
+        headers.add(new Header(Header.TARGET_PATH, requestPath(data.request.getUri())));
+        String host = data.request.getHeaders().get("Host");
+        if (Protocol.SPDY_3 == connection.protocol) {
+            headers.add(new Header(Header.VERSION, "HTTP/1.1"));
+            headers.add(new Header(Header.TARGET_HOST, host));
+        } else if (Protocol.HTTP_2 == connection.protocol) {
+            headers.add(new Header(Header.TARGET_AUTHORITY, host)); // Optional in HTTP/2
+        } else {
+            throw new AssertionError();
+        }
+        headers.add(new Header(Header.TARGET_SCHEME, data.request.getUri().getScheme()));
+
+        Multimap mm = data.request.getHeaders().getMultiMap();
+        for (String key: mm.keySet()) {
+            if (SpdyTransport.isProhibitedHeader(connection.protocol, key))
+                continue;
+            for (String value: mm.get(key)) {
+                headers.add(new Header(key.toLowerCase(), value));
+            }
+        }
+
+        connection.socket.getServer().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    AsyncSpdyConnection.SpdySocket spdy = connection.newStream(headers, false, true);
+                    connection.flush();
+                    callback.onConnectCompleted(null, spdy);
+                }
+                catch (Exception e) {
+                    throw new AssertionError(e);
+                }
+            }
+        }, 1000);
+    }
+
+    @Override
+    public boolean exchangeHeaders(final ExchangeHeaderData data) {
+        if (!(data.socket instanceof AsyncSpdyConnection.SpdySocket))
+            return false;
+
+        // headers were already sent as part of the socket being opened.
+        data.sendHeadersCallback.onCompleted(null);
+
+        final AsyncSpdyConnection.SpdySocket spdySocket = (AsyncSpdyConnection.SpdySocket)data.socket;
+        spdySocket.headers()
+        .then(new TransformFuture<Headers, List<Header>>() {
+            @Override
+            protected void transform(List<Header> result) throws Exception {
+                Headers headers = new Headers();
+                for (Header header: result) {
+                    String key = header.name.utf8();
+                    String value = header.value.utf8();
+                    headers.add(key, value);
+                }
+                String status = headers.remove(Header.RESPONSE_STATUS.utf8());
+                String[] statusParts = status.split(" ", 2);
+                data.response.code(Integer.parseInt(statusParts[0]));
+                data.response.message(statusParts[1]);
+                data.response.protocol(headers.remove(Header.VERSION.utf8()));
+                data.response.headers(headers);
+                setComplete(headers);
+            }
+        })
+        .setCallback(new FutureCallback<Headers>() {
+            @Override
+            public void onCompleted(Exception e, Headers result) {
+                data.receiveHeadersCallback.onCompleted(e);
+                data.response.emitter(spdySocket);
+            }
+        });
+        return true;
+    }
+
     private void configure(SSLEngine engine, String host, int port) {
         if (!initialized) {
             initialized = true;
@@ -144,6 +256,7 @@ protected SSLEngine createConfiguredSSLEngine(String host, int port) {
     Field useSni;
     Method nativeGetNpnNegotiatedProtocol;
     Method nativeGetAlpnNegotiatedProtocol;
+    Hashtable<String, AsyncSpdyConnection> connections = new Hashtable<String, AsyncSpdyConnection>();
 
     @Override
     public void setSSLContext(SSLContext sslContext) {
@@ -153,6 +266,24 @@ public void setSSLContext(SSLContext sslContext) {
 
     @Override
     public Cancellable getSocket(GetSocketData data) {
-        return super.getSocket(data);
+        final Uri uri = data.request.getUri();
+        final int port = getSchemePort(data.request.getUri());
+        if (port == -1) {
+            return null;
+        }
+
+        // can we use an existing connection to satisfy this, or do we need a new one?
+        String host = uri.getHost();
+        AsyncSpdyConnection conn = connections.get(host);
+        if (conn == null || !conn.socket.isOpen()) {
+            connections.remove(host);
+            return super.getSocket(data);
+        }
+
+        newSocket(data, conn, data.connectCallback);
+
+        SimpleCancellable ret = new SimpleCancellable();
+        ret.setComplete();
+        return ret;
     }
 }
\ No newline at end of file
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
new file mode 100644
index 000000000..e915a0650
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License";
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.koushikdutta.async.http.spdy;
+
+
+import com.koushikdutta.async.http.Protocol;
+import com.koushikdutta.async.http.spdy.okhttp.internal.Util;
+import com.koushikdutta.async.http.spdy.okio.ByteString;
+
+import java.util.List;
+
+
+final class SpdyTransport {
+  /** See http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3-1#TOC-3.2.1-Request. */
+  private static final List<String> SPDY_3_PROHIBITED_HEADERS = Util.immutableList(
+  "accept-encoding",
+  "user-agent",
+  "accept",
+
+  "connection",
+  "host",
+  "keep-alive",
+  "proxy-connection",
+  "transfer-encoding");
+
+  /** See http://tools.ietf.org/html/draft-ietf-httpbis-http2-09#section-8.1.3. */
+  private static final List<String> HTTP_2_PROHIBITED_HEADERS = Util.immutableList(
+      "connection",
+      "host",
+      "keep-alive",
+      "proxy-connection",
+      "te",
+      "transfer-encoding",
+      "encoding",
+      "upgrade");
+
+  /** When true, this header should not be emitted or consumed. */
+  static boolean isProhibitedHeader(Protocol protocol, String name) {
+    if (protocol == Protocol.SPDY_3) {
+      return SPDY_3_PROHIBITED_HEADERS.contains(name.toLowerCase());
+    } else if (protocol == Protocol.HTTP_2) {
+      return HTTP_2_PROHIBITED_HEADERS.contains(name.toLowerCase());
+    } else {
+      throw new AssertionError(protocol);
+    }
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
index 5305f632e..19b6b77a0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
@@ -26,7 +26,7 @@
 
 /** Reads transport frames for SPDY/3 or HTTP/2. */
 public interface FrameReader extends Closeable {
-  boolean canProcessFrame(ByteBufferList bb);
+  int canProcessFrame(ByteBufferList bb);
   void readConnectionPreface() throws IOException;
   boolean nextFrame(Handler handler) throws IOException;
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java
index 88958ef15..1425cbb5d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java
@@ -96,14 +96,16 @@ static final class Reader implements FrameReader {
     final HpackDraft08.Reader hpackReader;
 
       @Override
-      public boolean canProcessFrame(ByteBufferList bb) {
+      public int canProcessFrame(ByteBufferList bb) {
           if (bb.remaining() < 4)
-              return false;
+              return 0;
           bb.order(ByteOrder.BIG_ENDIAN);
           int w1 = bb.peekInt();
 
           short length = (short) ((w1 & 0x3fff0000) >> 16); // 14-bit unsigned == MAX_FRAME_SIZE
-          return bb.remaining() >= 8 + length;
+          if  (bb.remaining() < 8 + length)
+              return 0;
+          return 8 + length;
       }
 
     Reader(BufferedSource source, int headerTableSize, boolean client) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Settings.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Settings.java
index 4b332f6c9..1b96f64a5 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Settings.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Settings.java
@@ -53,7 +53,7 @@ public final class Settings {
   /** spdy/3: Retransmission rate. Percentage */
   static final int DOWNLOAD_RETRANS_RATE = 6;
   /** Window size in bytes. */
-  static final int INITIAL_WINDOW_SIZE = 7;
+  public static final int INITIAL_WINDOW_SIZE = 7;
   /** spdy/3: Window size in bytes. */
   static final int CLIENT_CERTIFICATE_VECTOR_SIZE = 8;
   /** Flow control options. */
@@ -82,7 +82,7 @@ public void clear() {
     Arrays.fill(values, 0);
   }
 
-  Settings set(int id, int idFlags, int value) {
+  public Settings set(int id, int idFlags, int value) {
     if (id >= values.length) {
       return this; // Discard unknown settings.
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
index 72a3df2ba..fe1993528 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
@@ -128,15 +128,17 @@ static final class Reader implements FrameReader {
     }
 
       @Override
-      public boolean canProcessFrame(ByteBufferList bb) {
-          if (bb.remaining() < 8)
-              return false;
+      public int canProcessFrame(ByteBufferList bb) {
+          if (source.buffer().size() + bb.remaining() < 8)
+              return 0;
           ByteBuffer peek = ByteBuffer.wrap(bb.peekBytes(8)).order(ByteOrder.BIG_ENDIAN);
-          peek.getInt();
+          int w1 = peek.getInt();
           int w2 = peek.getInt();
 
           int length = (w2 & 0xffffff);
-          return bb.remaining() >= 8 + length;
+          if (bb.remaining() < 8 + length)
+              return 0;
+          return 8 + length;
       }
 
       /**
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Buffer.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Buffer.java
index 4ac22b15e..bb6852dc4 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Buffer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Buffer.java
@@ -45,8 +45,8 @@
  * This class avoids zero-fill and GC churn by pooling byte arrays.
  */
 public final class Buffer implements BufferedSource, BufferedSink, Cloneable {
-  Segment head;
-  long size;
+  public Segment head;
+  public long size;
 
   public Buffer() {
   }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/InflaterSource.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/InflaterSource.java
index ce50796f3..76f7cc031 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/InflaterSource.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/InflaterSource.java
@@ -25,99 +25,99 @@
  * to decompress data read from another source.
  */
 public final class InflaterSource implements Source {
-  private final BufferedSource source;
-  private final Inflater inflater;
+    private final BufferedSource source;
+    private final Inflater inflater;
 
-  /**
-   * When we call Inflater.setInput(), the inflater keeps our byte array until
-   * it needs input again. This tracks how many bytes the inflater is currently
-   * holding on to.
-   */
-  private int bufferBytesHeldByInflater;
-  private boolean closed;
+    /**
+     * When we call Inflater.setInput(), the inflater keeps our byte array until
+     * it needs input again. This tracks how many bytes the inflater is currently
+     * holding on to.
+     */
+    private int bufferBytesHeldByInflater;
+    private boolean closed;
 
-  public InflaterSource(Source source, Inflater inflater) {
-    this(Okio.buffer(source), inflater);
-  }
+    public InflaterSource(Source source, Inflater inflater) {
+        this(Okio.buffer(source), inflater);
+    }
 
-  /**
-   * This package-private constructor shares a buffer with its trusted caller.
-   * In general we can't share a BufferedSource because the inflater holds input
-   * bytes until they are inflated.
-   */
-  InflaterSource(BufferedSource source, Inflater inflater) {
-    if (source == null) throw new IllegalArgumentException("source == null");
-    if (inflater == null) throw new IllegalArgumentException("inflater == null");
-    this.source = source;
-    this.inflater = inflater;
-  }
+    /**
+     * This package-private constructor shares a buffer with its trusted caller.
+     * In general we can't share a BufferedSource because the inflater holds input
+     * bytes until they are inflated.
+     */
+    InflaterSource(BufferedSource source, Inflater inflater) {
+        if (source == null) throw new IllegalArgumentException("source == null");
+        if (inflater == null) throw new IllegalArgumentException("inflater == null");
+        this.source = source;
+        this.inflater = inflater;
+    }
 
-  @Override public long read(
-      Buffer sink, long byteCount) throws IOException {
-    if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
-    if (closed) throw new IllegalStateException("closed");
-    if (byteCount == 0) return 0;
+    @Override public long read(
+    Buffer sink, long byteCount) throws IOException {
+        if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
+        if (closed) throw new IllegalStateException("closed");
+        if (byteCount == 0) return 0;
 
-    while (true) {
-      boolean sourceExhausted = refill();
+        while (true) {
+            boolean sourceExhausted = refill();
 
-      // Decompress the inflater's compressed data into the sink.
-      try {
-        Segment tail = sink.writableSegment(1);
-        int bytesInflated = inflater.inflate(tail.data, tail.limit, Segment.SIZE - tail.limit);
-        if (bytesInflated > 0) {
-          tail.limit += bytesInflated;
-          sink.size += bytesInflated;
-          return bytesInflated;
+            // Decompress the inflater's compressed data into the sink.
+            try {
+                Segment tail = sink.writableSegment(1);
+                int bytesInflated = inflater.inflate(tail.data, tail.limit, Segment.SIZE - tail.limit);
+                if (bytesInflated > 0) {
+                    tail.limit += bytesInflated;
+                    sink.size += bytesInflated;
+                    return bytesInflated;
+                }
+                if (inflater.finished() || inflater.needsDictionary()) {
+                    releaseInflatedBytes();
+                    return -1;
+                }
+                if (sourceExhausted) throw new EOFException("source exhausted prematurely");
+            } catch (DataFormatException e) {
+                throw new IOException(e);
+            }
         }
-        if (inflater.finished() || inflater.needsDictionary()) {
-          releaseInflatedBytes();
-          return -1;
-        }
-        if (sourceExhausted) throw new EOFException("source exhausted prematurely");
-      } catch (DataFormatException e) {
-        throw new IOException(e);
-      }
     }
-  }
 
-  /**
-   * Refills the inflater with compressed data if it needs input. (And only if
-   * it needs input). Returns true if the inflater required input but the source
-   * was exhausted.
-   */
-  public boolean refill() throws IOException {
-    if (!inflater.needsInput()) return false;
+    /**
+     * Refills the inflater with compressed data if it needs input. (And only if
+     * it needs input). Returns true if the inflater required input but the source
+     * was exhausted.
+     */
+    public boolean refill() throws IOException {
+        if (!inflater.needsInput()) return false;
 
-    releaseInflatedBytes();
-    if (inflater.getRemaining() != 0) throw new IllegalStateException("?"); // TODO: possible?
+        releaseInflatedBytes();
+        if (inflater.getRemaining() != 0) throw new IllegalStateException("?"); // TODO: possible?
 
-    // If there are compressed bytes in the source, assign them to the inflater.
-    if (source.exhausted()) return true;
+        // If there are compressed bytes in the source, assign them to the inflater.
+        if (source.exhausted()) return true;
 
-    // Assign buffer bytes to the inflater.
-    byte[] data = source.readByteArray();
-    bufferBytesHeldByInflater = data.length;
-    inflater.setInput(data, 0, bufferBytesHeldByInflater);
-    return false;
-  }
+        // Assign buffer bytes to the inflater.
+        Segment head = source.buffer().head;
+        bufferBytesHeldByInflater = head.limit - head.pos;
+        inflater.setInput(head.data, head.pos, bufferBytesHeldByInflater);
+        return false;
+    }
 
-  /** When the inflater has processed compressed data, remove it from the buffer. */
-  private void releaseInflatedBytes() throws IOException {
-    if (bufferBytesHeldByInflater == 0) return;
-    int toRelease = bufferBytesHeldByInflater - inflater.getRemaining();
-    bufferBytesHeldByInflater -= toRelease;
-    source.skip(toRelease);
-  }
+    /** When the inflater has processed compressed data, remove it from the buffer. */
+    private void releaseInflatedBytes() throws IOException {
+        if (bufferBytesHeldByInflater == 0) return;
+        int toRelease = bufferBytesHeldByInflater - inflater.getRemaining();
+        bufferBytesHeldByInflater -= toRelease;
+        source.skip(toRelease);
+    }
 
-  @Override public Timeout timeout() {
-    return source.timeout();
-  }
+    @Override public Timeout timeout() {
+        return source.timeout();
+    }
 
-  @Override public void close() throws IOException {
-    if (closed) return;
-    inflater.end();
-    closed = true;
-    source.close();
-  }
+    @Override public void close() throws IOException {
+        if (closed) return;
+        inflater.end();
+        closed = true;
+        source.close();
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Segment.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Segment.java
index 501343a2d..9c289ef41 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Segment.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Segment.java
@@ -31,13 +31,13 @@ public final class Segment {
   // TODO: Is 2 KiB a good default segment size?
   static final int SIZE = 2048;
 
-  final byte[] data = new byte[SIZE];
+  public final byte[] data = new byte[SIZE];
 
   /** The next byte of application data byte to read in this segment. */
-  int pos;
+  public int pos;
 
   /** The first byte of available data ready to be written to. */
-  int limit;
+  public int limit;
 
   /** Next segment in a linked or circularly-linked list. */
   Segment next;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/SegmentPool.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/SegmentPool.java
index f410c8c23..58d362b90 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/SegmentPool.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/SegmentPool.java
@@ -51,7 +51,7 @@ Segment take() {
     return new Segment(); // Pool is empty. Don't zero-fill while holding a lock.
   }
 
-  void recycle(Segment segment) {
+  public void recycle(Segment segment) {
     if (segment.next != null || segment.prev != null) throw new IllegalArgumentException();
     synchronized (this) {
       if (byteCount + Segment.SIZE > MAX_SIZE) return; // Pool is full.

From e1531ed2de6fcb6215d384b1547ac1d8b167997a Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 27 Jul 2014 12:14:33 -0700
Subject: [PATCH 048/399] remove exception throwing.

---
 .../async/http/spdy/AsyncSpdyConnection.java  | 35 +++++++++++--------
 .../async/http/spdy/SpdyMiddleware.java       | 17 +++------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
index 066f92a18..7471615ad 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
@@ -74,19 +74,19 @@ public void flush() {
      * @param in true to create an input stream that the remote peer can use to send data to us.
      *     Corresponds to {@code FLAG_UNIDIRECTIONAL}.
      */
-    public SpdySocket newStream(List<Header> requestHeaders, boolean out, boolean in) throws IOException {
+    public SpdySocket newStream(List<Header> requestHeaders, boolean out, boolean in) {
         return newStream(0, requestHeaders, out, in);
     }
 
     private SpdySocket newStream(int associatedStreamId, List<Header> requestHeaders, boolean out,
-                                 boolean in) throws IOException {
+                                 boolean in) {
         boolean outFinished = !out;
         boolean inFinished = !in;
         SpdySocket socket;
         int streamId;
 
         if (shutdown) {
-            throw new IOException("shutdown");
+            return null;
         }
 
         streamId = nextStreamId;
@@ -96,20 +96,25 @@ private SpdySocket newStream(int associatedStreamId, List<Header> requestHeaders
             sockets.put(streamId, socket);
 //            setIdle(false);
         }
-        if (associatedStreamId == 0) {
-            writer.synStream(outFinished, inFinished, streamId, associatedStreamId,
-            requestHeaders);
-        } else if (client) {
-            throw new IllegalArgumentException("client streams shouldn't have associated stream IDs");
-        } else { // HTTP/2 has a PUSH_PROMISE frame.
-            writer.pushPromise(associatedStreamId, streamId, requestHeaders);
-        }
+        try {
+            if (associatedStreamId == 0) {
+                writer.synStream(outFinished, inFinished, streamId, associatedStreamId,
+                requestHeaders);
+            } else if (client) {
+                throw new IllegalArgumentException("client streams shouldn't have associated stream IDs");
+            } else { // HTTP/2 has a PUSH_PROMISE frame.
+                writer.pushPromise(associatedStreamId, streamId, requestHeaders);
+            }
 
-        if (!out) {
-            writer.flush();
-        }
+            if (!out) {
+                writer.flush();
+            }
 
-        return socket;
+            return socket;
+        }
+        catch (IOException e) {
+            throw new AssertionError(e);
+        }
     }
 
     int totalWindowRead;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 3ebe80226..83627c5c8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -100,6 +100,7 @@ public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
     }
 
     private void newSocket(GetSocketData data, final AsyncSpdyConnection connection, final ConnectCallback callback) {
+        data.request.logv("using spdy connection");
         final ArrayList<Header> headers = new ArrayList<Header>();
         headers.add(new Header(Header.TARGET_METHOD, data.request.getMethod()));
         headers.add(new Header(Header.TARGET_PATH, requestPath(data.request.getUri())));
@@ -123,19 +124,9 @@ private void newSocket(GetSocketData data, final AsyncSpdyConnection connection,
             }
         }
 
-        connection.socket.getServer().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    AsyncSpdyConnection.SpdySocket spdy = connection.newStream(headers, false, true);
-                    connection.flush();
-                    callback.onConnectCompleted(null, spdy);
-                }
-                catch (Exception e) {
-                    throw new AssertionError(e);
-                }
-            }
-        }, 1000);
+        AsyncSpdyConnection.SpdySocket spdy = connection.newStream(headers, false, true);
+        connection.flush();
+        callback.onConnectCompleted(null, spdy);
     }
 
     @Override

From 9e24bdf9a04b2d664424255bfba28965598a69cc Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 27 Jul 2014 12:21:15 -0700
Subject: [PATCH 049/399] remove leftover okhttp cruft.

---
 .../async/http/spdy/SpdyMiddleware.java       |   2 -
 .../spdy/okhttp/internal/NamedRunnable.java   |  40 -
 .../async/http/spdy/okhttp/internal/Util.java | 160 ----
 .../internal/spdy/IncomingStreamHandler.java  |  36 -
 .../http/spdy/okhttp/internal/spdy/Spdy3.java |   3 +-
 .../okhttp/internal/spdy/SpdyConnection.java  | 874 ------------------
 .../spdy/okhttp/internal/spdy/SpdyStream.java | 577 ------------
 7 files changed, 2 insertions(+), 1690 deletions(-)
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/NamedRunnable.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/IncomingStreamHandler.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/SpdyConnection.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/SpdyStream.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 83627c5c8..0e09fdd79 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -11,14 +11,12 @@
 import com.koushikdutta.async.future.SimpleCancellable;
 import com.koushikdutta.async.future.TransformFuture;
 import com.koushikdutta.async.http.AsyncHttpClient;
-import com.koushikdutta.async.http.AsyncHttpClientMiddleware;
 import com.koushikdutta.async.http.AsyncSSLEngineConfigurator;
 import com.koushikdutta.async.http.AsyncSSLSocketMiddleware;
 import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.Multimap;
 import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Header;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.SpdyConnection;
 import com.koushikdutta.async.util.Charsets;
 
 import java.lang.reflect.Field;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/NamedRunnable.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/NamedRunnable.java
deleted file mode 100644
index 9d9555162..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/NamedRunnable.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2013 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.koushikdutta.async.http.spdy.okhttp.internal;
-
-/**
- * Runnable implementation which always sets its thread name.
- */
-public abstract class NamedRunnable implements Runnable {
-  private final String name;
-
-  public NamedRunnable(String format, Object... args) {
-    this.name = String.format(format, args);
-  }
-
-  @Override public final void run() {
-    String oldName = Thread.currentThread().getName();
-    Thread.currentThread().setName(name);
-    try {
-      execute();
-    } finally {
-      Thread.currentThread().setName(oldName);
-    }
-  }
-
-  protected abstract void execute();
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/Util.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/Util.java
index a6e00f45a..63f2661aa 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/Util.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/Util.java
@@ -16,118 +16,21 @@
 
 package com.koushikdutta.async.http.spdy.okhttp.internal;
 
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Header;
-import com.koushikdutta.async.http.spdy.okio.Buffer;
-import com.koushikdutta.async.http.spdy.okio.ByteString;
-import com.koushikdutta.async.http.spdy.okio.Source;
-
 import java.io.Closeable;
-import java.io.File;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.URI;
-import java.net.URL;
-import java.nio.charset.Charset;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.ThreadFactory;
-
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
 /** Junk drawer of utility methods. */
 public final class Util {
-  public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
-  public static final String[] EMPTY_STRING_ARRAY = new String[0];
-
-  /** A cheap and type-safe constant for the US-ASCII Charset. */
-  public static final Charset US_ASCII = Charset.forName("US-ASCII");
-
-  /** A cheap and type-safe constant for the UTF-8 Charset. */
-  public static final Charset UTF_8 = Charset.forName("UTF-8");
-
-  private Util() {
-  }
-
-  public static int getEffectivePort(URI uri) {
-    return getEffectivePort(uri.getScheme(), uri.getPort());
-  }
-
-  public static int getEffectivePort(URL url) {
-    return getEffectivePort(url.getProtocol(), url.getPort());
-  }
-
-  private static int getEffectivePort(String scheme, int specifiedPort) {
-    return specifiedPort != -1 ? specifiedPort : getDefaultPort(scheme);
-  }
-
-  public static int getDefaultPort(String protocol) {
-    if ("http".equals(protocol)) return 80;
-    if ("https".equals(protocol)) return 443;
-    return -1;
-  }
-
   public static void checkOffsetAndCount(long arrayLength, long offset, long count) {
     if ((offset | count) < 0 || offset > arrayLength || arrayLength - offset < count) {
       throw new ArrayIndexOutOfBoundsException();
     }
   }
 
-  /** Returns true if two possibly-null objects are equal. */
-  public static boolean equal(Object a, Object b) {
-    return a == b || (a != null && a.equals(b));
-  }
-
-  /**
-   * Closes {@code closeable}, ignoring any checked exceptions. Does nothing
-   * if {@code closeable} is null.
-   */
-  public static void closeQuietly(Closeable closeable) {
-    if (closeable != null) {
-      try {
-        closeable.close();
-      } catch (RuntimeException rethrown) {
-        throw rethrown;
-      } catch (Exception ignored) {
-      }
-    }
-  }
-
-  /**
-   * Closes {@code socket}, ignoring any checked exceptions. Does nothing if
-   * {@code socket} is null.
-   */
-  public static void closeQuietly(Socket socket) {
-    if (socket != null) {
-      try {
-        socket.close();
-      } catch (RuntimeException rethrown) {
-        throw rethrown;
-      } catch (Exception ignored) {
-      }
-    }
-  }
-
-  /**
-   * Closes {@code serverSocket}, ignoring any checked exceptions. Does nothing if
-   * {@code serverSocket} is null.
-   */
-  public static void closeQuietly(ServerSocket serverSocket) {
-    if (serverSocket != null) {
-      try {
-        serverSocket.close();
-      } catch (RuntimeException rethrown) {
-        throw rethrown;
-      } catch (Exception ignored) {
-      }
-    }
-  }
-
   /**
    * Closes {@code a} and {@code b}. If either close fails, this completes
    * the other close and rethrows the first encountered exception.
@@ -151,51 +54,6 @@ public static void closeAll(Closeable a, Closeable b) throws IOException {
     throw new AssertionError(thrown);
   }
 
-  /**
-   * Deletes the contents of {@code dir}. Throws an IOException if any file
-   * could not be deleted, or if {@code dir} is not a readable directory.
-   */
-  public static void deleteContents(File dir) throws IOException {
-    File[] files = dir.listFiles();
-    if (files == null) {
-      throw new IOException("not a readable directory: " + dir);
-    }
-    for (File file : files) {
-      if (file.isDirectory()) {
-        deleteContents(file);
-      }
-      if (!file.delete()) {
-        throw new IOException("failed to delete file: " + file);
-      }
-    }
-  }
-
-  /** Reads until {@code in} is exhausted or the timeout has elapsed. */
-  public static boolean skipAll(Source in, int timeoutMillis) throws IOException {
-    // TODO: Implement deadlines everywhere so they can do this work.
-    long startNanos = System.nanoTime();
-    Buffer skipBuffer = new Buffer();
-    while (NANOSECONDS.toMillis(System.nanoTime() - startNanos) < timeoutMillis) {
-      long read = in.read(skipBuffer, 2048);
-      if (read == -1) return true; // Successfully exhausted the stream.
-      skipBuffer.clear();
-    }
-    return false; // Ran out of time.
-  }
-
-  /** Returns a 32 character string containing a hash of {@code s}. */
-  public static String hash(String s) {
-    try {
-      MessageDigest messageDigest = MessageDigest.getInstance("MD5");
-      byte[] md5bytes = messageDigest.digest(s.getBytes("UTF-8"));
-      return ByteString.of(md5bytes).hex();
-    } catch (NoSuchAlgorithmException e) {
-      throw new AssertionError(e);
-    } catch (UnsupportedEncodingException e) {
-      throw new AssertionError(e);
-    }
-  }
-
   /** Returns an immutable copy of {@code list}. */
   public static <T> List<T> immutableList(List<T> list) {
     return Collections.unmodifiableList(new ArrayList<T>(list));
@@ -205,22 +63,4 @@ public static <T> List<T> immutableList(List<T> list) {
   public static <T> List<T> immutableList(T... elements) {
     return Collections.unmodifiableList(Arrays.asList(elements.clone()));
   }
-
-  public static ThreadFactory threadFactory(final String name, final boolean daemon) {
-    return new ThreadFactory() {
-      @Override public Thread newThread(Runnable runnable) {
-        Thread result = new Thread(runnable, name);
-        result.setDaemon(daemon);
-        return result;
-      }
-    };
-  }
-
-  public static List<Header> headerEntries(String... elements) {
-    List<Header> result = new ArrayList<Header>(elements.length / 2);
-    for (int i = 0; i < elements.length; i += 2) {
-      result.add(new Header(elements[i], elements[i + 1]));
-    }
-    return result;
-  }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/IncomingStreamHandler.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/IncomingStreamHandler.java
deleted file mode 100644
index d36799f78..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/IncomingStreamHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
-
-import java.io.IOException;
-
-/** Listener to be notified when a connected peer creates a new stream. */
-public interface IncomingStreamHandler {
-  IncomingStreamHandler REFUSE_INCOMING_STREAMS = new IncomingStreamHandler() {
-    @Override public void receive(SpdyStream stream) throws IOException {
-      stream.close(ErrorCode.REFUSED_STREAM);
-    }
-  };
-
-  /**
-   * Handle a new stream from this connection's peer. Implementations should
-   * respond by either {@link SpdyStream#reply replying to the stream} or
-   * {@link SpdyStream#close closing it}. This response does not need to be
-   * synchronous.
-   */
-  void receive(SpdyStream stream) throws IOException;
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
index fe1993528..e38f3f01b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
@@ -24,6 +24,7 @@
 import com.koushikdutta.async.http.spdy.okio.ByteString;
 import com.koushikdutta.async.http.spdy.okio.DeflaterSink;
 import com.koushikdutta.async.http.spdy.okio.Okio;
+import com.koushikdutta.async.util.Charsets;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -94,7 +95,7 @@ public final class Spdy3 implements Variant {
           + "availableJan Feb Mar Apr May Jun Jul Aug Sept Oct Nov Dec 00:00:00 Mon, Tue, Wed, Th"
           + "u, Fri, Sat, Sun, GMTchunked,text/html,image/png,image/jpg,image/gif,application/xml"
           + ",application/xhtml+xml,text/plain,text/javascript,publicprivatemax-age=gzip,deflate,"
-          + "sdchcharset=utf-8charset=iso-8859-1,utf-,*,enq=0.").getBytes(Util.UTF_8.name());
+          + "sdchcharset=utf-8charset=iso-8859-1,utf-,*,enq=0.").getBytes(Charsets.UTF_8.name());
     } catch (UnsupportedEncodingException e) {
       throw new AssertionError();
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/SpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/SpdyConnection.java
deleted file mode 100644
index 52f924f14..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/SpdyConnection.java
+++ /dev/null
@@ -1,874 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
-
-import com.koushikdutta.async.http.Protocol;
-import com.koushikdutta.async.http.spdy.okhttp.internal.NamedRunnable;
-import com.koushikdutta.async.http.spdy.okhttp.internal.Util;
-import com.koushikdutta.async.http.spdy.okio.Buffer;
-import com.koushikdutta.async.http.spdy.okio.BufferedSource;
-import com.koushikdutta.async.http.spdy.okio.ByteString;
-import com.koushikdutta.async.http.spdy.okio.Okio;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-
-import static com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Settings.DEFAULT_INITIAL_WINDOW_SIZE;
-
-/**
- * A socket connection to a remote peer. A connection hosts streams which can
- * send and receive data.
- *
- * <p>Many methods in this API are <strong>synchronous:</strong> the call is
- * completed before the method returns. This is typical for Java but atypical
- * for SPDY. This is motivated by exception transparency: an IOException that
- * was triggered by a certain caller can be caught and handled by that caller.
- */
-public final class SpdyConnection implements Closeable {
-
-  // Internal state of this connection is guarded by 'this'. No blocking
-  // operations may be performed while holding this lock!
-  //
-  // Socket writes are guarded by frameWriter.
-  //
-  // Socket reads are unguarded but are only made by the reader thread.
-  //
-  // Certain operations (like SYN_STREAM) need to synchronize on both the
-  // frameWriter (to do blocking I/O) and this (to create streams). Such
-  // operations must synchronize on 'this' last. This ensures that we never
-  // wait for a blocking operation while holding 'this'.
-
-  private static final ExecutorService executor = new ThreadPoolExecutor(0,
-      Integer.MAX_VALUE, 60, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(),
-      Util.threadFactory("OkHttp SpdyConnection", true));
-
-  /** The protocol variant, like {@link com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Spdy3}. */
-  final Protocol protocol;
-
-  /** True if this peer initiated the connection. */
-  final boolean client;
-
-  /**
-   * User code to run in response to an incoming stream. Callbacks must not be
-   * run on the callback executor.
-   */
-  private final IncomingStreamHandler handler;
-  private final Map<Integer, SpdyStream> streams = new HashMap<Integer, SpdyStream>();
-  private final String hostName;
-  private int lastGoodStreamId;
-  private int nextStreamId;
-  private boolean shutdown;
-  private long idleStartTimeNs = System.nanoTime();
-
-  /** Ensures push promise callbacks events are sent in order per stream. */
-  private final ExecutorService pushExecutor;
-
-  /** Lazily-created map of in-flight pings awaiting a response. Guarded by this. */
-  private Map<Integer, Ping> pings;
-  /** User code to run in response to push promise events. */
-  private final PushObserver pushObserver;
-  private int nextPingId;
-
-  /**
-   * The total number of bytes consumed by the application, but not yet
-   * acknowledged by sending a {@code WINDOW_UPDATE} frame on this connection.
-   */
-  // Visible for testing
-  long unacknowledgedBytesRead = 0;
-
-  /**
-   * Count of bytes that can be written on the connection before receiving a
-   * window update.
-   */
-  // Visible for testing
-  long bytesLeftInWriteWindow;
-
-  /** Settings we communicate to the peer. */
-  // TODO: Do we want to dynamically adjust settings, or KISS and only set once?
-  final Settings okHttpSettings = new Settings();
-      // okHttpSettings.set(Settings.MAX_CONCURRENT_STREAMS, 0, max);
-  private static final int OKHTTP_CLIENT_WINDOW_SIZE = 16 * 1024 * 1024;
-
-  /** Settings we receive from the peer. */
-  // TODO: MWS will need to guard on this setting before attempting to push.
-  final Settings peerSettings = new Settings();
-
-  private boolean receivedInitialPeerSettings = false;
-  final Variant variant;
-  final Socket socket;
-  final FrameWriter frameWriter;
-  final long maxFrameSize;
-
-  // Visible for testing
-  final Reader readerRunnable;
-
-  private SpdyConnection(Builder builder) throws IOException {
-    protocol = builder.protocol;
-    pushObserver = builder.pushObserver;
-    client = builder.client;
-    handler = builder.handler;
-    // http://tools.ietf.org/html/draft-ietf-httpbis-http2-13#section-5.1.1
-    nextStreamId = builder.client ? 1 : 2;
-    if (builder.client && protocol == Protocol.HTTP_2) {
-      nextStreamId += 2; // In HTTP/2, 1 on client is reserved for Upgrade.
-    }
-
-    nextPingId = builder.client ? 1 : 2;
-
-    // Flow control was designed more for servers, or proxies than edge clients.
-    // If we are a client, set the flow control window to 16MiB.  This avoids
-    // thrashing window updates every 64KiB, yet small enough to avoid blowing
-    // up the heap.
-    if (builder.client) {
-      okHttpSettings.set(Settings.INITIAL_WINDOW_SIZE, 0, OKHTTP_CLIENT_WINDOW_SIZE);
-    }
-
-    hostName = builder.hostName;
-
-    if (protocol == Protocol.HTTP_2) {
-      variant = new Http20Draft13();
-      // Like newSingleThreadExecutor, except lazy creates the thread.
-      pushExecutor = new ThreadPoolExecutor(0, 1,
-          0L, TimeUnit.MILLISECONDS,
-          new LinkedBlockingQueue<Runnable>(),
-          Util.threadFactory(String.format("OkHttp %s Push Observer", hostName), true));
-      // 1 less than SPDY http://tools.ietf.org/html/draft-ietf-httpbis-http2-13#section-6.9.2
-      peerSettings.set(Settings.INITIAL_WINDOW_SIZE, 0, 65535);
-    } else if (protocol == Protocol.SPDY_3) {
-      variant = new Spdy3();
-      pushExecutor = null;
-    } else {
-      throw new AssertionError(protocol);
-    }
-    bytesLeftInWriteWindow = peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE);
-    socket = builder.socket;
-    frameWriter = variant.newWriter(Okio.buffer(Okio.sink(builder.socket)), client);
-    maxFrameSize = variant.maxFrameSize();
-
-    readerRunnable = new Reader();
-    new Thread(readerRunnable).start(); // Not a daemon thread.
-  }
-
-  /** The protocol as selected using NPN or ALPN. */
-  public Protocol getProtocol() {
-    return protocol;
-  }
-
-  /**
-   * Returns the number of {@link SpdyStream#isOpen() open streams} on this
-   * connection.
-   */
-  public synchronized int openStreamCount() {
-    return streams.size();
-  }
-
-  synchronized SpdyStream getStream(int id) {
-    return streams.get(id);
-  }
-
-  synchronized SpdyStream removeStream(int streamId) {
-    SpdyStream stream = streams.remove(streamId);
-    if (stream != null && streams.isEmpty()) {
-      setIdle(true);
-    }
-    return stream;
-  }
-
-  private synchronized void setIdle(boolean value) {
-    idleStartTimeNs = value ? System.nanoTime() : Long.MAX_VALUE;
-  }
-
-  /** Returns true if this connection is idle. */
-  public synchronized boolean isIdle() {
-    return idleStartTimeNs != Long.MAX_VALUE;
-  }
-
-  /**
-   * Returns the time in ns when this connection became idle or Long.MAX_VALUE
-   * if connection is not idle.
-   */
-  public synchronized long getIdleStartTimeNs() {
-    return idleStartTimeNs;
-  }
-
-  /**
-   * Returns a new server-initiated stream.
-   *
-   * @param associatedStreamId the stream that triggered the sender to create
-   *     this stream.
-   * @param out true to create an output stream that we can use to send data
-   *     to the remote peer. Corresponds to {@code FLAG_FIN}.
-   */
-  public SpdyStream pushStream(int associatedStreamId, List<Header> requestHeaders, boolean out)
-      throws IOException {
-    if (client) throw new IllegalStateException("Client cannot push requests.");
-    if (protocol != Protocol.HTTP_2) throw new IllegalStateException("protocol != HTTP_2");
-    return newStream(associatedStreamId, requestHeaders, out, false);
-  }
-
-  /**
-   * Returns a new locally-initiated stream.
-   *
-   * @param out true to create an output stream that we can use to send data to the remote peer.
-   *     Corresponds to {@code FLAG_FIN}.
-   * @param in true to create an input stream that the remote peer can use to send data to us.
-   *     Corresponds to {@code FLAG_UNIDIRECTIONAL}.
-   */
-  public SpdyStream newStream(List<Header> requestHeaders, boolean out, boolean in)
-      throws IOException {
-    return newStream(0, requestHeaders, out, in);
-  }
-
-  private SpdyStream newStream(int associatedStreamId, List<Header> requestHeaders, boolean out,
-      boolean in) throws IOException {
-    boolean outFinished = !out;
-    boolean inFinished = !in;
-    SpdyStream stream;
-    int streamId;
-
-    synchronized (frameWriter) {
-      synchronized (this) {
-        if (shutdown) {
-          throw new IOException("shutdown");
-        }
-        streamId = nextStreamId;
-        nextStreamId += 2;
-        stream = new SpdyStream(streamId, this, outFinished, inFinished, requestHeaders);
-        if (stream.isOpen()) {
-          streams.put(streamId, stream);
-          setIdle(false);
-        }
-      }
-      if (associatedStreamId == 0) {
-        frameWriter.synStream(outFinished, inFinished, streamId, associatedStreamId,
-            requestHeaders);
-      } else if (client) {
-        throw new IllegalArgumentException("client streams shouldn't have associated stream IDs");
-      } else { // HTTP/2 has a PUSH_PROMISE frame.
-        frameWriter.pushPromise(associatedStreamId, streamId, requestHeaders);
-      }
-    }
-
-    if (!out) {
-      frameWriter.flush();
-    }
-
-    return stream;
-  }
-
-  void writeSynReply(int streamId, boolean outFinished, List<Header> alternating)
-      throws IOException {
-    frameWriter.synReply(outFinished, streamId, alternating);
-  }
-
-  /**
-   * Callers of this method are not thread safe, and sometimes on application
-   * threads.  Most often, this method will be called to send a buffer worth of
-   * data to the peer.
-   * <p>
-   * Writes are subject to the write window of the stream and the connection.
-   * Until there is a window sufficient to send {@code byteCount}, the caller
-   * will block.  For example, a user of {@code HttpURLConnection} who flushes
-   * more bytes to the output stream than the connection's write window will
-   * block.
-   * <p>
-   * Zero {@code byteCount} writes are not subject to flow control and
-   * will not block.  The only use case for zero {@code byteCount} is closing
-   * a flushed output stream.
-   */
-  public void writeData(int streamId, boolean outFinished, Buffer buffer, long byteCount)
-      throws IOException {
-    if (byteCount == 0) { // Empty data frames are not flow-controlled.
-      frameWriter.data(outFinished, streamId, buffer, 0);
-      return;
-    }
-
-    while (byteCount > 0) {
-      int toWrite;
-      synchronized (SpdyConnection.this) {
-        try {
-          while (bytesLeftInWriteWindow <= 0) {
-            SpdyConnection.this.wait(); // Wait until we receive a WINDOW_UPDATE.
-          }
-        } catch (InterruptedException e) {
-          throw new InterruptedIOException();
-        }
-
-        toWrite = (int) Math.min(Math.min(byteCount, bytesLeftInWriteWindow), maxFrameSize);
-        bytesLeftInWriteWindow -= toWrite;
-      }
-
-      byteCount -= toWrite;
-      frameWriter.data(outFinished && byteCount == 0, streamId, buffer, toWrite);
-    }
-  }
-
-  /**
-   * {@code delta} will be negative if a settings frame initial window is
-   * smaller than the last.
-   */
-  void addBytesToWriteWindow(long delta) {
-    bytesLeftInWriteWindow += delta;
-    if (delta > 0) SpdyConnection.this.notifyAll();
-  }
-
-  void writeSynResetLater(final int streamId, final ErrorCode errorCode) {
-    executor.submit(new NamedRunnable("OkHttp %s stream %d", hostName, streamId) {
-      @Override public void execute() {
-        try {
-          writeSynReset(streamId, errorCode);
-        } catch (IOException ignored) {
-        }
-      }
-    });
-  }
-
-  void writeSynReset(int streamId, ErrorCode statusCode) throws IOException {
-    frameWriter.rstStream(streamId, statusCode);
-  }
-
-  void writeWindowUpdateLater(final int streamId, final long unacknowledgedBytesRead) {
-    executor.submit(new NamedRunnable("OkHttp Window Update %s stream %d", hostName, streamId) {
-      @Override public void execute() {
-        try {
-          frameWriter.windowUpdate(streamId, unacknowledgedBytesRead);
-        } catch (IOException ignored) {
-        }
-      }
-    });
-  }
-
-  /**
-   * Sends a ping frame to the peer. Use the returned object to await the
-   * ping's response and observe its round trip time.
-   */
-  public Ping ping() throws IOException {
-    Ping ping = new Ping();
-    int pingId;
-    synchronized (this) {
-      if (shutdown) {
-        throw new IOException("shutdown");
-      }
-      pingId = nextPingId;
-      nextPingId += 2;
-      if (pings == null) pings = new HashMap<Integer, Ping>();
-      pings.put(pingId, ping);
-    }
-    writePing(false, pingId, 0x4f4b6f6b /* ASCII "OKok" */, ping);
-    return ping;
-  }
-
-  private void writePingLater(
-      final boolean reply, final int payload1, final int payload2, final Ping ping) {
-    executor.submit(new NamedRunnable("OkHttp %s ping %08x%08x",
-        hostName, payload1, payload2) {
-      @Override public void execute() {
-        try {
-          writePing(reply, payload1, payload2, ping);
-        } catch (IOException ignored) {
-        }
-      }
-    });
-  }
-
-  private void writePing(boolean reply, int payload1, int payload2, Ping ping) throws IOException {
-    synchronized (frameWriter) {
-      // Observe the sent time immediately before performing I/O.
-      if (ping != null) ping.send();
-      frameWriter.ping(reply, payload1, payload2);
-    }
-  }
-
-  private synchronized Ping removePing(int id) {
-    return pings != null ? pings.remove(id) : null;
-  }
-
-  public void flush() throws IOException {
-    frameWriter.flush();
-  }
-
-  /**
-   * Degrades this connection such that new streams can neither be created
-   * locally, nor accepted from the remote peer. Existing streams are not
-   * impacted. This is intended to permit an endpoint to gracefully stop
-   * accepting new requests without harming previously established streams.
-   */
-  public void shutdown(ErrorCode statusCode) throws IOException {
-    synchronized (frameWriter) {
-      int lastGoodStreamId;
-      synchronized (this) {
-        if (shutdown) {
-          return;
-        }
-        shutdown = true;
-        lastGoodStreamId = this.lastGoodStreamId;
-      }
-      // TODO: propagate exception message into debugData
-      frameWriter.goAway(lastGoodStreamId, statusCode, Util.EMPTY_BYTE_ARRAY);
-    }
-  }
-
-  /**
-   * Closes this connection. This cancels all open streams and unanswered
-   * pings. It closes the underlying input and output streams and shuts down
-   * internal executor services.
-   */
-  @Override public void close() throws IOException {
-    close(ErrorCode.NO_ERROR, ErrorCode.CANCEL);
-  }
-
-  private void close(ErrorCode connectionCode, ErrorCode streamCode) throws IOException {
-    assert (!Thread.holdsLock(this));
-    IOException thrown = null;
-    try {
-      shutdown(connectionCode);
-    } catch (IOException e) {
-      thrown = e;
-    }
-
-    SpdyStream[] streamsToClose = null;
-    Ping[] pingsToCancel = null;
-    synchronized (this) {
-      if (!streams.isEmpty()) {
-        streamsToClose = streams.values().toArray(new SpdyStream[streams.size()]);
-        streams.clear();
-        setIdle(false);
-      }
-      if (pings != null) {
-        pingsToCancel = pings.values().toArray(new Ping[pings.size()]);
-        pings = null;
-      }
-    }
-
-    if (streamsToClose != null) {
-      for (SpdyStream stream : streamsToClose) {
-        try {
-          stream.close(streamCode);
-        } catch (IOException e) {
-          if (thrown != null) thrown = e;
-        }
-      }
-    }
-
-    if (pingsToCancel != null) {
-      for (Ping ping : pingsToCancel) {
-        ping.cancel();
-      }
-    }
-
-    // Close the writer to release its resources (such as deflaters).
-    try {
-      frameWriter.close();
-    } catch (IOException e) {
-      if (thrown == null) thrown = e;
-    }
-
-    // Close the socket to break out the reader thread, which will clean up after itself.
-    try {
-      socket.close();
-    } catch (IOException e) {
-      thrown = e;
-    }
-
-    if (thrown != null) throw thrown;
-  }
-
-  /**
-   * Sends a connection header if the current variant requires it. This should
-   * be called after {@link Builder#build} for all new connections.
-   */
-  public void sendConnectionPreface() throws IOException {
-    frameWriter.connectionPreface();
-    frameWriter.settings(okHttpSettings);
-    int windowSize = okHttpSettings.getInitialWindowSize(Settings.DEFAULT_INITIAL_WINDOW_SIZE);
-    if (windowSize != Settings.DEFAULT_INITIAL_WINDOW_SIZE) {
-      frameWriter.windowUpdate(0, windowSize - Settings.DEFAULT_INITIAL_WINDOW_SIZE);
-    }
-  }
-
-  public static class Builder {
-    private String hostName;
-    private Socket socket;
-    private IncomingStreamHandler handler = IncomingStreamHandler.REFUSE_INCOMING_STREAMS;
-    private Protocol protocol = Protocol.SPDY_3;
-    private PushObserver pushObserver = PushObserver.CANCEL;
-    private boolean client;
-
-    public Builder(boolean client, Socket socket) throws IOException {
-      this(((InetSocketAddress) socket.getRemoteSocketAddress()).getHostName(), client, socket);
-    }
-
-    /**
-     * @param client true if this peer initiated the connection; false if this
-     *     peer accepted the connection.
-     */
-    public Builder(String hostName, boolean client, Socket socket) throws IOException {
-      this.hostName = hostName;
-      this.client = client;
-      this.socket = socket;
-    }
-
-    public Builder handler(IncomingStreamHandler handler) {
-      this.handler = handler;
-      return this;
-    }
-
-    public Builder protocol(Protocol protocol) {
-      this.protocol = protocol;
-      return this;
-    }
-
-    public Builder pushObserver(PushObserver pushObserver) {
-      this.pushObserver = pushObserver;
-      return this;
-    }
-
-    public SpdyConnection build() throws IOException {
-      return new SpdyConnection(this);
-    }
-  }
-
-  /**
-   * Methods in this class must not lock FrameWriter.  If a method needs to
-   * write a frame, create an async task to do so.
-   */
-  class Reader extends NamedRunnable implements FrameReader.Handler {
-    FrameReader frameReader;
-
-    private Reader() {
-      super("OkHttp %s", hostName);
-    }
-
-    @Override protected void execute() {
-      ErrorCode connectionErrorCode = ErrorCode.INTERNAL_ERROR;
-      ErrorCode streamErrorCode = ErrorCode.INTERNAL_ERROR;
-      try {
-        frameReader = variant.newReader(Okio.buffer(Okio.source(socket)), client);
-        if (!client) {
-          frameReader.readConnectionPreface();
-        }
-        while (frameReader.nextFrame(this)) {
-        }
-        connectionErrorCode = ErrorCode.NO_ERROR;
-        streamErrorCode = ErrorCode.CANCEL;
-      } catch (IOException e) {
-        connectionErrorCode = ErrorCode.PROTOCOL_ERROR;
-        streamErrorCode = ErrorCode.PROTOCOL_ERROR;
-      } finally {
-        try {
-          close(connectionErrorCode, streamErrorCode);
-        } catch (IOException ignored) {
-        }
-        Util.closeQuietly(frameReader);
-      }
-    }
-
-    @Override public void data(boolean inFinished, int streamId, BufferedSource source, int length)
-        throws IOException {
-      if (pushedStream(streamId)) {
-        pushDataLater(streamId, source, length, inFinished);
-        return;
-      }
-      SpdyStream dataStream = getStream(streamId);
-      if (dataStream == null) {
-        writeSynResetLater(streamId, ErrorCode.INVALID_STREAM);
-        source.skip(length);
-        return;
-      }
-      dataStream.receiveData(source, length);
-      if (inFinished) {
-        dataStream.receiveFin();
-      }
-    }
-
-    @Override public void headers(boolean outFinished, boolean inFinished, int streamId,
-        int associatedStreamId, List<Header> headerBlock, HeadersMode headersMode) {
-      if (pushedStream(streamId)) {
-        pushHeadersLater(streamId, headerBlock, inFinished);
-        return;
-      }
-      SpdyStream stream;
-      synchronized (SpdyConnection.this) {
-        // If we're shutdown, don't bother with this stream.
-        if (shutdown) return;
-
-        stream = getStream(streamId);
-
-        if (stream == null) {
-          // The headers claim to be for an existing stream, but we don't have one.
-          if (headersMode.failIfStreamAbsent()) {
-            writeSynResetLater(streamId, ErrorCode.INVALID_STREAM);
-            return;
-          }
-
-          // If the stream ID is less than the last created ID, assume it's already closed.
-          if (streamId <= lastGoodStreamId) return;
-
-          // If the stream ID is in the client's namespace, assume it's already closed.
-          if (streamId % 2 == nextStreamId % 2) return;
-
-          // Create a stream.
-          final SpdyStream newStream = new SpdyStream(streamId, SpdyConnection.this, outFinished,
-              inFinished, headerBlock);
-          lastGoodStreamId = streamId;
-          streams.put(streamId, newStream);
-          executor.submit(new NamedRunnable("OkHttp %s stream %d", hostName, streamId) {
-            @Override public void execute() {
-              try {
-                handler.receive(newStream);
-              } catch (IOException e) {
-                throw new RuntimeException(e);
-              }
-            }
-          });
-          return;
-        }
-      }
-
-      // The headers claim to be for a new stream, but we already have one.
-      if (headersMode.failIfStreamPresent()) {
-        stream.closeLater(ErrorCode.PROTOCOL_ERROR);
-        removeStream(streamId);
-        return;
-      }
-
-      // Update an existing stream.
-      stream.receiveHeaders(headerBlock, headersMode);
-      if (inFinished) stream.receiveFin();
-    }
-
-    @Override public void rstStream(int streamId, ErrorCode errorCode) {
-      if (pushedStream(streamId)) {
-        pushResetLater(streamId, errorCode);
-        return;
-      }
-      SpdyStream rstStream = removeStream(streamId);
-      if (rstStream != null) {
-        rstStream.receiveRstStream(errorCode);
-      }
-    }
-
-    @Override public void settings(boolean clearPrevious, Settings newSettings) {
-      long delta = 0;
-      SpdyStream[] streamsToNotify = null;
-      synchronized (SpdyConnection.this) {
-        int priorWriteWindowSize = peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE);
-        if (clearPrevious) peerSettings.clear();
-        peerSettings.merge(newSettings);
-        if (getProtocol() == Protocol.HTTP_2) {
-          ackSettingsLater();
-        }
-        int peerInitialWindowSize = peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE);
-        if (peerInitialWindowSize != -1 && peerInitialWindowSize != priorWriteWindowSize) {
-          delta = peerInitialWindowSize - priorWriteWindowSize;
-          if (!receivedInitialPeerSettings) {
-            addBytesToWriteWindow(delta);
-            receivedInitialPeerSettings = true;
-          }
-          if (!streams.isEmpty()) {
-            streamsToNotify = streams.values().toArray(new SpdyStream[streams.size()]);
-          }
-        }
-      }
-      if (streamsToNotify != null && delta != 0) {
-        for (SpdyStream stream : streams.values()) {
-          synchronized (stream) {
-            stream.addBytesToWriteWindow(delta);
-          }
-        }
-      }
-    }
-
-    private void ackSettingsLater() {
-      executor.submit(new NamedRunnable("OkHttp %s ACK Settings", hostName) {
-        @Override public void execute() {
-          try {
-            frameWriter.ackSettings();
-          } catch (IOException ignored) {
-          }
-        }
-      });
-    }
-
-    @Override public void ackSettings() {
-      // TODO: If we don't get this callback after sending settings to the peer, SETTINGS_TIMEOUT.
-    }
-
-    @Override public void ping(boolean reply, int payload1, int payload2) {
-      if (reply) {
-        Ping ping = removePing(payload1);
-        if (ping != null) {
-          ping.receive();
-        }
-      } else {
-        // Send a reply to a client ping if this is a server and vice versa.
-        writePingLater(true, payload1, payload2, null);
-      }
-    }
-
-    @Override public void goAway(int lastGoodStreamId, ErrorCode errorCode, ByteString debugData) {
-      if (debugData.size() > 0) { // TODO: log the debugData
-      }
-      synchronized (SpdyConnection.this) {
-        shutdown = true;
-
-        // Fail all streams created after the last good stream ID.
-        for (Iterator<Map.Entry<Integer, SpdyStream>> i = streams.entrySet().iterator();
-            i.hasNext(); ) {
-          Map.Entry<Integer, SpdyStream> entry = i.next();
-          int streamId = entry.getKey();
-          if (streamId > lastGoodStreamId && entry.getValue().isLocallyInitiated()) {
-            entry.getValue().receiveRstStream(ErrorCode.REFUSED_STREAM);
-            i.remove();
-          }
-        }
-      }
-    }
-
-    @Override public void windowUpdate(int streamId, long windowSizeIncrement) {
-      if (streamId == 0) {
-        synchronized (SpdyConnection.this) {
-          bytesLeftInWriteWindow += windowSizeIncrement;
-          SpdyConnection.this.notifyAll();
-        }
-      } else {
-        SpdyStream stream = getStream(streamId);
-        if (stream != null) {
-          synchronized (stream) {
-            stream.addBytesToWriteWindow(windowSizeIncrement);
-          }
-        }
-      }
-    }
-
-    @Override public void priority(int streamId, int streamDependency, int weight,
-        boolean exclusive) {
-      // TODO: honor priority.
-    }
-
-    @Override
-    public void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders) {
-      pushRequestLater(promisedStreamId, requestHeaders);
-    }
-
-    @Override public void alternateService(int streamId, String origin, ByteString protocol,
-        String host, int port, long maxAge) {
-      // TODO: register alternate service.
-    }
-  }
-
-  /** Even, positive numbered streams are pushed streams in HTTP/2. */
-  private boolean pushedStream(int streamId) {
-    return protocol == Protocol.HTTP_2 && streamId != 0 && (streamId & 1) == 0;
-  }
-
-  // Guarded by this.
-  private final Set<Integer> currentPushRequests = new LinkedHashSet<Integer>();
-
-  private void pushRequestLater(final int streamId, final List<Header> requestHeaders) {
-    synchronized (this) {
-      if (currentPushRequests.contains(streamId)) {
-        writeSynResetLater(streamId, ErrorCode.PROTOCOL_ERROR);
-        return;
-      }
-      currentPushRequests.add(streamId);
-    }
-    pushExecutor.submit(new NamedRunnable("OkHttp %s Push Request[%s]", hostName, streamId) {
-      @Override public void execute() {
-        boolean cancel = pushObserver.onRequest(streamId, requestHeaders);
-        try {
-          if (cancel) {
-            frameWriter.rstStream(streamId, ErrorCode.CANCEL);
-            synchronized (SpdyConnection.this) {
-              currentPushRequests.remove(streamId);
-            }
-          }
-        } catch (IOException ignored) {
-        }
-      }
-    });
-  }
-
-  private void pushHeadersLater(final int streamId, final List<Header> requestHeaders,
-      final boolean inFinished) {
-    pushExecutor.submit(new NamedRunnable("OkHttp %s Push Headers[%s]", hostName, streamId) {
-      @Override public void execute() {
-        boolean cancel = pushObserver.onHeaders(streamId, requestHeaders, inFinished);
-        try {
-          if (cancel) frameWriter.rstStream(streamId, ErrorCode.CANCEL);
-          if (cancel || inFinished) {
-            synchronized (SpdyConnection.this) {
-              currentPushRequests.remove(streamId);
-            }
-          }
-        } catch (IOException ignored) {
-        }
-      }
-    });
-  }
-
-  /**
-   * Eagerly reads {@code byteCount} bytes from the source before launching a background task to
-   * process the data.  This avoids corrupting the stream.
-   */
-  private void pushDataLater(final int streamId, final BufferedSource source, final int byteCount,
-      final boolean inFinished) throws IOException {
-    final Buffer buffer = new Buffer();
-    source.require(byteCount); // Eagerly read the frame before firing client thread.
-    source.read(buffer, byteCount);
-    if (buffer.size() != byteCount) throw new IOException(buffer.size() + " != " + byteCount);
-    pushExecutor.submit(new NamedRunnable("OkHttp %s Push Data[%s]", hostName, streamId) {
-      @Override public void execute() {
-        try {
-          boolean cancel = pushObserver.onData(streamId, buffer, byteCount, inFinished);
-          if (cancel) frameWriter.rstStream(streamId, ErrorCode.CANCEL);
-          if (cancel || inFinished) {
-            synchronized (SpdyConnection.this) {
-              currentPushRequests.remove(streamId);
-            }
-          }
-        } catch (IOException ignored) {
-        }
-      }
-    });
-  }
-
-  private void pushResetLater(final int streamId, final ErrorCode errorCode) {
-    pushExecutor.submit(new NamedRunnable("OkHttp %s Push Reset[%s]", hostName, streamId) {
-      @Override public void execute() {
-        pushObserver.onReset(streamId, errorCode);
-        synchronized (SpdyConnection.this) {
-          currentPushRequests.remove(streamId);
-        }
-      }
-    });
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/SpdyStream.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/SpdyStream.java
deleted file mode 100644
index db1a487f6..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/SpdyStream.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
-
-import com.koushikdutta.async.http.spdy.okio.AsyncTimeout;
-import com.koushikdutta.async.http.spdy.okio.Buffer;
-import com.koushikdutta.async.http.spdy.okio.BufferedSource;
-import com.koushikdutta.async.http.spdy.okio.Sink;
-import com.koushikdutta.async.http.spdy.okio.Source;
-import com.koushikdutta.async.http.spdy.okio.Timeout;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Settings.DEFAULT_INITIAL_WINDOW_SIZE;
-
-/** A logical bidirectional stream. */
-public final class SpdyStream {
-  // Internal state is guarded by this. No long-running or potentially
-  // blocking operations are performed while the lock is held.
-
-  /**
-   * The total number of bytes consumed by the application (with {@link
-   * SpdyDataSource#read}), but not yet acknowledged by sending a {@code
-   * WINDOW_UPDATE} frame on this stream.
-   */
-  // Visible for testing
-  long unacknowledgedBytesRead = 0;
-
-  /**
-   * Count of bytes that can be written on the stream before receiving a
-   * window update. Even if this is positive, writes will block until there
-   * available bytes in {@code connection.bytesLeftInWriteWindow}.
-   */
-  // guarded by this
-  long bytesLeftInWriteWindow;
-
-  private final int id;
-  private final SpdyConnection connection;
-  private long readTimeoutMillis = 0;
-
-  /** Headers sent by the stream initiator. Immutable and non null. */
-  private final List<Header> requestHeaders;
-
-  /** Headers sent in the stream reply. Null if reply is either not sent or not sent yet. */
-  private List<Header> responseHeaders;
-
-  private final SpdyDataSource source;
-  final SpdyDataSink sink;
-  private final SpdyTimeout readTimeout = new SpdyTimeout();
-  private final SpdyTimeout writeTimeout = new SpdyTimeout();
-
-  /**
-   * The reason why this stream was abnormally closed. If there are multiple
-   * reasons to abnormally close this stream (such as both peers closing it
-   * near-simultaneously) then this is the first reason known to this peer.
-   */
-  private ErrorCode errorCode = null;
-
-  SpdyStream(int id, SpdyConnection connection, boolean outFinished, boolean inFinished,
-      List<Header> requestHeaders) {
-    if (connection == null) throw new NullPointerException("connection == null");
-    if (requestHeaders == null) throw new NullPointerException("requestHeaders == null");
-    this.id = id;
-    this.connection = connection;
-    this.bytesLeftInWriteWindow =
-        connection.peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE);
-    this.source = new SpdyDataSource(
-        connection.okHttpSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE));
-    this.sink = new SpdyDataSink();
-    this.source.finished = inFinished;
-    this.sink.finished = outFinished;
-    this.requestHeaders = requestHeaders;
-  }
-
-  public int getId() {
-    return id;
-  }
-
-  /**
-   * Returns true if this stream is open. A stream is open until either:
-   * <ul>
-   * <li>A {@code SYN_RESET} frame abnormally terminates the stream.
-   * <li>Both input and output streams have transmitted all data and
-   * headers.
-   * </ul>
-   * Note that the input stream may continue to yield data even after a stream
-   * reports itself as not open. This is because input data is buffered.
-   */
-  public synchronized boolean isOpen() {
-    if (errorCode != null) {
-      return false;
-    }
-    if ((source.finished || source.closed)
-        && (sink.finished || sink.closed)
-        && responseHeaders != null) {
-      return false;
-    }
-    return true;
-  }
-
-  /** Returns true if this stream was created by this peer. */
-  public boolean isLocallyInitiated() {
-    boolean streamIsClient = ((id & 1) == 1);
-    return connection.client == streamIsClient;
-  }
-
-  public SpdyConnection getConnection() {
-    return connection;
-  }
-
-  public List<Header> getRequestHeaders() {
-    return requestHeaders;
-  }
-
-  /**
-   * Returns the stream's response headers, blocking if necessary if they
-   * have not been received yet.
-   */
-  public synchronized List<Header> getResponseHeaders() throws IOException {
-    readTimeout.enter();
-    try {
-      while (responseHeaders == null && errorCode == null) {
-        waitForIo();
-      }
-    } finally {
-      readTimeout.exitAndThrowIfTimedOut();
-    }
-    if (responseHeaders != null) return responseHeaders;
-    throw new IOException("stream was reset: " + errorCode);
-  }
-
-  /**
-   * Returns the reason why this stream was closed, or null if it closed
-   * normally or has not yet been closed.
-   */
-  public synchronized ErrorCode getErrorCode() {
-    return errorCode;
-  }
-
-  /**
-   * Sends a reply to an incoming stream.
-   *
-   * @param out true to create an output stream that we can use to send data
-   * to the remote peer. Corresponds to {@code FLAG_FIN}.
-   */
-  public void reply(List<Header> responseHeaders, boolean out) throws IOException {
-    assert (!Thread.holdsLock(SpdyStream.this));
-    boolean outFinished = false;
-    synchronized (this) {
-      if (responseHeaders == null) {
-        throw new NullPointerException("responseHeaders == null");
-      }
-      if (this.responseHeaders != null) {
-        throw new IllegalStateException("reply already sent");
-      }
-      this.responseHeaders = responseHeaders;
-      if (!out) {
-        this.sink.finished = true;
-        outFinished = true;
-      }
-    }
-    connection.writeSynReply(id, outFinished, responseHeaders);
-
-    if (outFinished) {
-      connection.flush();
-    }
-  }
-
-  public Timeout readTimeout() {
-    return readTimeout;
-  }
-
-  public Timeout writeTimeout() {
-    return writeTimeout;
-  }
-
-  /** Returns a source that reads data from the peer. */
-  public Source getSource() {
-    return source;
-  }
-
-  /**
-   * Returns a sink that can be used to write data to the peer.
-   *
-   * @throws IllegalStateException if this stream was initiated by the peer
-   *     and a {@link #reply} has not yet been sent.
-   */
-  public Sink getSink() {
-    synchronized (this) {
-      if (responseHeaders == null && !isLocallyInitiated()) {
-        throw new IllegalStateException("reply before requesting the sink");
-      }
-    }
-    return sink;
-  }
-
-  /**
-   * Abnormally terminate this stream. This blocks until the {@code RST_STREAM}
-   * frame has been transmitted.
-   */
-  public void close(ErrorCode rstStatusCode) throws IOException {
-    if (!closeInternal(rstStatusCode)) {
-      return; // Already closed.
-    }
-    connection.writeSynReset(id, rstStatusCode);
-  }
-
-  /**
-   * Abnormally terminate this stream. This enqueues a {@code RST_STREAM}
-   * frame and returns immediately.
-   */
-  public void closeLater(ErrorCode errorCode) {
-    if (!closeInternal(errorCode)) {
-      return; // Already closed.
-    }
-    connection.writeSynResetLater(id, errorCode);
-  }
-
-  /** Returns true if this stream was closed. */
-  private boolean closeInternal(ErrorCode errorCode) {
-    assert (!Thread.holdsLock(this));
-    synchronized (this) {
-      if (this.errorCode != null) {
-        return false;
-      }
-      if (source.finished && sink.finished) {
-        return false;
-      }
-      this.errorCode = errorCode;
-      notifyAll();
-    }
-    connection.removeStream(id);
-    return true;
-  }
-
-  void receiveHeaders(List<Header> headers, HeadersMode headersMode) {
-    assert (!Thread.holdsLock(SpdyStream.this));
-    ErrorCode errorCode = null;
-    boolean open = true;
-    synchronized (this) {
-      if (responseHeaders == null) {
-        if (headersMode.failIfHeadersAbsent()) {
-          errorCode = ErrorCode.PROTOCOL_ERROR;
-        } else {
-          responseHeaders = headers;
-          open = isOpen();
-          notifyAll();
-        }
-      } else {
-        if (headersMode.failIfHeadersPresent()) {
-          errorCode = ErrorCode.STREAM_IN_USE;
-        } else {
-          List<Header> newHeaders = new ArrayList<Header>();
-          newHeaders.addAll(responseHeaders);
-          newHeaders.addAll(headers);
-          this.responseHeaders = newHeaders;
-        }
-      }
-    }
-    if (errorCode != null) {
-      closeLater(errorCode);
-    } else if (!open) {
-      connection.removeStream(id);
-    }
-  }
-
-  void receiveData(BufferedSource in, int length) throws IOException {
-    assert (!Thread.holdsLock(SpdyStream.this));
-    this.source.receive(in, length);
-  }
-
-  void receiveFin() {
-    assert (!Thread.holdsLock(SpdyStream.this));
-    boolean open;
-    synchronized (this) {
-      this.source.finished = true;
-      open = isOpen();
-      notifyAll();
-    }
-    if (!open) {
-      connection.removeStream(id);
-    }
-  }
-
-  synchronized void receiveRstStream(ErrorCode errorCode) {
-    if (this.errorCode == null) {
-      this.errorCode = errorCode;
-      notifyAll();
-    }
-  }
-
-  /**
-   * A source that reads the incoming data frames of a stream. Although this
-   * class uses synchronization to safely receive incoming data frames, it is
-   * not intended for use by multiple readers.
-   */
-  private final class SpdyDataSource implements Source {
-    /** Buffer to receive data from the network into. Only accessed by the reader thread. */
-    private final Buffer receiveBuffer = new Buffer();
-
-    /** Buffer with readable data. Guarded by SpdyStream.this. */
-    private final Buffer readBuffer = new Buffer();
-
-    /** Maximum number of bytes to buffer before reporting a flow control error. */
-    private final long maxByteCount;
-
-    /** True if the caller has closed this stream. */
-    private boolean closed;
-
-    /**
-     * True if either side has cleanly shut down this stream. We will
-     * receive no more bytes beyond those already in the buffer.
-     */
-    private boolean finished;
-
-    private SpdyDataSource(long maxByteCount) {
-      this.maxByteCount = maxByteCount;
-    }
-
-    @Override public long read(Buffer sink, long byteCount)
-        throws IOException {
-      if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
-
-      long read;
-      synchronized (SpdyStream.this) {
-        waitUntilReadable();
-        checkNotClosed();
-        if (readBuffer.size() == 0) return -1; // This source is exhausted.
-
-        // Move bytes from the read buffer into the caller's buffer.
-        read = readBuffer.read(sink, Math.min(byteCount, readBuffer.size()));
-
-        // Flow control: notify the peer that we're ready for more data!
-        unacknowledgedBytesRead += read;
-        if (unacknowledgedBytesRead
-            >= connection.okHttpSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE) / 2) {
-          connection.writeWindowUpdateLater(id, unacknowledgedBytesRead);
-          unacknowledgedBytesRead = 0;
-        }
-      }
-
-      // Update connection.unacknowledgedBytesRead outside the stream lock.
-      synchronized (connection) { // Multiple application threads may hit this section.
-        connection.unacknowledgedBytesRead += read;
-        if (connection.unacknowledgedBytesRead
-            >= connection.okHttpSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE) / 2) {
-          connection.writeWindowUpdateLater(0, connection.unacknowledgedBytesRead);
-          connection.unacknowledgedBytesRead = 0;
-        }
-      }
-
-      return read;
-    }
-
-    /** Returns once the source is either readable or finished. */
-    private void waitUntilReadable() throws IOException {
-      readTimeout.enter();
-      try {
-        while (readBuffer.size() == 0 && !finished && !closed && errorCode == null) {
-          waitForIo();
-        }
-      } finally {
-        readTimeout.exitAndThrowIfTimedOut();
-      }
-    }
-
-    void receive(BufferedSource in, long byteCount) throws IOException {
-      assert (!Thread.holdsLock(SpdyStream.this));
-
-      while (byteCount > 0) {
-        boolean finished;
-        boolean flowControlError;
-        synchronized (SpdyStream.this) {
-          finished = this.finished;
-          flowControlError = byteCount + readBuffer.size() > maxByteCount;
-        }
-
-        // If the peer sends more data than we can handle, discard it and close the connection.
-        if (flowControlError) {
-          in.skip(byteCount);
-          closeLater(ErrorCode.FLOW_CONTROL_ERROR);
-          return;
-        }
-
-        // Discard data received after the stream is finished. It's probably a benign race.
-        if (finished) {
-          in.skip(byteCount);
-          return;
-        }
-
-        // Fill the receive buffer without holding any locks.
-        long read = in.read(receiveBuffer, byteCount);
-        if (read == -1) throw new EOFException();
-        byteCount -= read;
-
-        // Move the received data to the read buffer to the reader can read it.
-        synchronized (SpdyStream.this) {
-          boolean wasEmpty = readBuffer.size() == 0;
-          readBuffer.writeAll(receiveBuffer);
-          if (wasEmpty) {
-            SpdyStream.this.notifyAll();
-          }
-        }
-      }
-    }
-
-    @Override public Timeout timeout() {
-      return readTimeout;
-    }
-
-    @Override public void close() throws IOException {
-      synchronized (SpdyStream.this) {
-        closed = true;
-        readBuffer.clear();
-        SpdyStream.this.notifyAll();
-      }
-      cancelStreamIfNecessary();
-    }
-
-    private void checkNotClosed() throws IOException {
-      if (closed) {
-        throw new IOException("stream closed");
-      }
-      if (errorCode != null) {
-        throw new IOException("stream was reset: " + errorCode);
-      }
-    }
-  }
-
-  private void cancelStreamIfNecessary() throws IOException {
-    assert (!Thread.holdsLock(SpdyStream.this));
-    boolean open;
-    boolean cancel;
-    synchronized (this) {
-      cancel = !source.finished && source.closed && (sink.finished || sink.closed);
-      open = isOpen();
-    }
-    if (cancel) {
-      // RST this stream to prevent additional data from being sent. This
-      // is safe because the input stream is closed (we won't use any
-      // further bytes) and the output stream is either finished or closed
-      // (so RSTing both streams doesn't cause harm).
-      SpdyStream.this.close(ErrorCode.CANCEL);
-    } else if (!open) {
-      connection.removeStream(id);
-    }
-  }
-
-  /**
-   * A sink that writes outgoing data frames of a stream. This class is not
-   * thread safe.
-   */
-  final class SpdyDataSink implements Sink {
-    private boolean closed;
-
-    /**
-     * True if either side has cleanly shut down this stream. We shall send
-     * no more bytes.
-     */
-    private boolean finished;
-
-    @Override public void write(Buffer source, long byteCount) throws IOException {
-      assert (!Thread.holdsLock(SpdyStream.this));
-      while (byteCount > 0) {
-        long toWrite;
-        synchronized (SpdyStream.this) {
-          writeTimeout.enter();
-          try {
-            while (bytesLeftInWriteWindow <= 0 && !finished && !closed && errorCode == null) {
-              waitForIo(); // Wait until we receive a WINDOW_UPDATE.
-            }
-          } finally {
-            writeTimeout.exitAndThrowIfTimedOut();
-          }
-
-          checkOutNotClosed(); // Kick out if the stream was reset or closed while waiting.
-          toWrite = Math.min(bytesLeftInWriteWindow, byteCount);
-          bytesLeftInWriteWindow -= toWrite;
-        }
-
-        byteCount -= toWrite;
-        connection.writeData(id, false, source, toWrite);
-      }
-    }
-
-    @Override public void flush() throws IOException {
-      assert (!Thread.holdsLock(SpdyStream.this));
-      synchronized (SpdyStream.this) {
-        checkOutNotClosed();
-      }
-      connection.flush();
-    }
-
-    @Override public Timeout timeout() {
-      return writeTimeout;
-    }
-
-    @Override public void close() throws IOException {
-      assert (!Thread.holdsLock(SpdyStream.this));
-      synchronized (SpdyStream.this) {
-        if (closed) return;
-      }
-      if (!sink.finished) {
-        connection.writeData(id, true, null, 0);
-      }
-      synchronized (SpdyStream.this) {
-        closed = true;
-      }
-      connection.flush();
-      cancelStreamIfNecessary();
-    }
-  }
-
-  /**
-   * {@code delta} will be negative if a settings frame initial window is
-   * smaller than the last.
-   */
-  void addBytesToWriteWindow(long delta) {
-    bytesLeftInWriteWindow += delta;
-    if (delta > 0) SpdyStream.this.notifyAll();
-  }
-
-  private void checkOutNotClosed() throws IOException {
-    if (sink.closed) {
-      throw new IOException("stream closed");
-    } else if (sink.finished) {
-      throw new IOException("stream finished");
-    } else if (errorCode != null) {
-      throw new IOException("stream was reset: " + errorCode);
-    }
-  }
-
-  /**
-   * Like {@link #wait}, but throws an {@code InterruptedIOException} when
-   * interrupted instead of the more awkward {@link InterruptedException}.
-   */
-  private void waitForIo() throws InterruptedIOException {
-    try {
-      wait();
-    } catch (InterruptedException e) {
-      throw new InterruptedIOException();
-    }
-  }
-
-  /**
-   * The Okio timeout watchdog will call {@link #timedOut} if the timeout is
-   * reached. In that case we close the stream (asynchronously) which will
-   * notify the waiting thread.
-   */
-  class SpdyTimeout extends AsyncTimeout {
-    @Override protected void timedOut() {
-      closeLater(ErrorCode.CANCEL);
-    }
-
-    public void exitAndThrowIfTimedOut() throws InterruptedIOException {
-      if (exit()) throw new InterruptedIOException("timeout");
-    }
-  }
-}

From 432c80258b0d164f291cbb30a08d994b11f77ce4 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 27 Jul 2014 19:53:50 -0700
Subject: [PATCH 050/399] refactor w/out framereader okio

---
 .../com/koushikdutta/async/PushParser.java    |   3 +-
 .../async/http/spdy/AsyncSpdyConnection.java  |  60 +-
 .../okhttp/internal/spdy/FrameReader.java     | 223 ++---
 .../okhttp/internal/spdy/HeaderReader.java    |  69 ++
 ...Draft13.java => Http20Draft13.java.ignore} |   1 +
 .../internal/spdy/NameValueBlockReader.java   | 119 ---
 .../http/spdy/okhttp/internal/spdy/Spdy3.java | 918 +++++++++---------
 .../spdy/okhttp/internal/spdy/Variant.java    |   4 +-
 8 files changed, 697 insertions(+), 700 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeaderReader.java
 rename AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/{Http20Draft13.java => Http20Draft13.java.ignore} (99%)
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/NameValueBlockReader.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/PushParser.java b/AndroidAsync/src/com/koushikdutta/async/PushParser.java
index e02ac7f93..51a79cc3f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/PushParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/PushParser.java
@@ -237,8 +237,9 @@ public void parsed(byte[] data) {
     private ArrayList<Object> args = new ArrayList<Object>();
     ByteOrder order = ByteOrder.BIG_ENDIAN;
 
-    public void setOrder(ByteOrder order) {
+    public PushParser setOrder(ByteOrder order) {
         this.order = order;
+        return this;
     }
 
     public PushParser(DataEmitter s) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
index 7471615ad..d9feaf708 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
@@ -5,31 +5,25 @@
 import com.koushikdutta.async.BufferedDataEmitter;
 import com.koushikdutta.async.BufferedDataSink;
 import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.future.SimpleFuture;
-import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.ErrorCode;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.FrameReader;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.FrameWriter;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Header;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.HeadersMode;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Http20Draft13;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Ping;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Settings;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Spdy3;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Variant;
 import com.koushikdutta.async.http.spdy.okio.BufferedSink;
-import com.koushikdutta.async.http.spdy.okio.BufferedSource;
 import com.koushikdutta.async.http.spdy.okio.ByteString;
 import com.koushikdutta.async.http.spdy.okio.Okio;
 
-import junit.framework.Assert;
-
 import java.io.IOException;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -42,21 +36,17 @@
  * Created by koush on 7/16/14.
  */
 public class AsyncSpdyConnection implements FrameReader.Handler {
-    BufferedDataEmitter emitter;
     AsyncSocket socket;
     BufferedDataSink bufferedSocket;
     FrameReader reader;
     FrameWriter writer;
     Variant variant;
-//    SpdySocket zero = new SpdySocket(0, false, false, null);
-    ByteBufferListSource source = new ByteBufferListSource();
     ByteBufferListSink sink = new ByteBufferListSink() {
         @Override
         public void flush() throws IOException {
             AsyncSpdyConnection.this.flush();
         }
     };
-    BufferedSource bufferedSource;
     BufferedSink bufferedSink;
     Hashtable<Integer, SpdySocket> sockets = new Hashtable<Integer, SpdySocket>();
     Protocol protocol;
@@ -286,16 +276,15 @@ public AsyncSpdyConnection(AsyncSocket socket, Protocol protocol) {
         this.protocol = protocol;
         this.socket = socket;
         this.bufferedSocket = new BufferedDataSink(socket);
-        emitter = new BufferedDataEmitter(socket);
-        emitter.setDataCallback(callback);
 
         if (protocol == Protocol.SPDY_3) {
             variant = new Spdy3();
         }
         else if (protocol == Protocol.HTTP_2) {
-            variant = new Http20Draft13();
+            throw new AssertionError("http20draft13");
+//            variant = new Http20Draft13();
         }
-        reader = variant.newReader(bufferedSource = Okio.buffer(source), true);
+        reader = variant.newReader(socket, this, true);
         writer = variant.newWriter(bufferedSink = Okio.buffer(sink), true);
 
         boolean client = true;
@@ -313,22 +302,6 @@ else if (protocol == Protocol.HTTP_2) {
         }
     }
 
-    DataCallback callback = new DataCallback() {
-        @Override
-        public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-            int needed;
-            while ((needed = reader.canProcessFrame(bb)) > 0) {
-                bb.get(source, needed);
-                try {
-                    reader.nextFrame(AsyncSpdyConnection.this);
-                }
-                catch (IOException e) {
-                    throw new AssertionError(e);
-                }
-            }
-        }
-    };
-
     /**
      * Sends a connection header if the current variant requires it. This should
      * be called after {@link Builder#build} for all new connections.
@@ -348,7 +321,7 @@ private boolean pushedStream(int streamId) {
     }
 
     @Override
-    public void data(boolean inFinished, int streamId, BufferedSource source, int length) throws IOException {
+    public void data(boolean inFinished, int streamId, ByteBufferList source) {
         if (pushedStream(streamId)) {
             throw new AssertionError("push");
 //            pushDataLater(streamId, source, length, inFinished);
@@ -356,14 +329,17 @@ public void data(boolean inFinished, int streamId, BufferedSource source, int le
         }
         SpdySocket socket = sockets.get(streamId);
         if (socket == null) {
-            writer.rstStream(streamId, ErrorCode.INVALID_STREAM);
-            source.skip(length);
+            try {
+                writer.rstStream(streamId, ErrorCode.INVALID_STREAM);
+            }
+            catch (IOException e) {
+                throw new AssertionError(e);
+            }
+            source.recycle();
             return;
         }
-        if (source != this.bufferedSource || this.source.remaining() + source.buffer().size() != length)
-            throw new AssertionError();
-        source.buffer().readAll(socket.pending);
-        this.source.get(socket.pending);
+        int length = source.remaining();
+        source.get(socket.pending);
         socket.updateWindowRead(length);
         Util.emitAllData(socket, socket.pending);
         if (inFinished) {
@@ -562,4 +538,14 @@ public void pushPromise(int streamId, int promisedStreamId, List<Header> request
     @Override
     public void alternateService(int streamId, String origin, ByteString protocol, String host, int port, long maxAge) {
     }
+
+    @Override
+    public void error(Exception e) {
+        socket.close();
+        for (Iterator<Map.Entry<Integer, SpdySocket>> i = sockets.entrySet().iterator(); i.hasNext();) {
+            Map.Entry<Integer, SpdySocket> entry = i.next();
+            Util.end(entry.getValue(), e);
+            i.remove();
+        }
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
index 19b6b77a0..3f457fb0c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
@@ -17,124 +17,129 @@
 package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
 
 import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.http.spdy.okio.BufferedSource;
 import com.koushikdutta.async.http.spdy.okio.ByteString;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.List;
 
-/** Reads transport frames for SPDY/3 or HTTP/2. */
+/**
+ * Reads transport frames for SPDY/3 or HTTP/2.
+ */
 public interface FrameReader extends Closeable {
-  int canProcessFrame(ByteBufferList bb);
-  void readConnectionPreface() throws IOException;
-  boolean nextFrame(Handler handler) throws IOException;
+    void readConnectionPreface() throws IOException;
+//  boolean nextFrame(Handler handler) throws IOException;
 
-  public interface Handler {
-    void data(boolean inFinished, int streamId, BufferedSource source, int length)
-        throws IOException;
+    public interface Handler {
+        void error(Exception e);
+
+        void data(boolean inFinished, int streamId, ByteBufferList bb);
+
+        /**
+         * Create or update incoming headers, creating the corresponding streams
+         * if necessary. Frames that trigger this are SPDY SYN_STREAM, HEADERS, and
+         * SYN_REPLY, and HTTP/2 HEADERS and PUSH_PROMISE.
+         *
+         * @param outFinished        true if the receiver should not send further frames.
+         * @param inFinished         true if the sender will not send further frames.
+         * @param streamId           the stream owning these headers.
+         * @param associatedStreamId the stream that triggered the sender to create
+         *                           this stream.
+         */
+        void headers(boolean outFinished, boolean inFinished, int streamId, int associatedStreamId,
+                     List<Header> headerBlock, HeadersMode headersMode);
+
+        void rstStream(int streamId, ErrorCode errorCode);
+
+        void settings(boolean clearPrevious, Settings settings);
+
+        /**
+         * HTTP/2 only.
+         */
+        void ackSettings();
+
+        /**
+         * Read a connection-level ping from the peer.  {@code ack} indicates this
+         * is a reply.  Payload parameters are different between SPDY/3 and HTTP/2.
+         * <p/>
+         * In SPDY/3, only the first {@code payload1} parameter is set.  If the
+         * reader is a client, it is an unsigned even number.  Likewise, a server
+         * will receive an odd number.
+         * <p/>
+         * In HTTP/2, both {@code payload1} and {@code payload2} parameters are
+         * set. The data is opaque binary, and there are no rules on the content.
+         */
+        void ping(boolean ack, int payload1, int payload2);
+
+        /**
+         * The peer tells us to stop creating streams.  It is safe to replay
+         * streams with {@code ID > lastGoodStreamId} on a new connection.  In-
+         * flight streams with {@code ID <= lastGoodStreamId} can only be replayed
+         * on a new connection if they are idempotent.
+         *
+         * @param lastGoodStreamId the last stream ID the peer processed before
+         *                         sending this message. If {@code lastGoodStreamId} is zero, the peer
+         *                         processed no frames.
+         * @param errorCode        reason for closing the connection.
+         * @param debugData        only valid for HTTP/2; opaque debug data to send.
+         */
+        void goAway(int lastGoodStreamId, ErrorCode errorCode, ByteString debugData);
+
+        /**
+         * Notifies that an additional {@code windowSizeIncrement} bytes can be
+         * sent on {@code streamId}, or the connection if {@code streamId} is zero.
+         */
+        void windowUpdate(int streamId, long windowSizeIncrement);
+
+        /**
+         * Called when reading a headers or priority frame. This may be used to
+         * change the stream's weight from the default (16) to a new value.
+         *
+         * @param streamId         stream which has a priority change.
+         * @param streamDependency the stream ID this stream is dependent on.
+         * @param weight           relative proportion of priority in [1..256].
+         * @param exclusive        inserts this stream ID as the sole child of
+         *                         {@code streamDependency}.
+         */
+        void priority(int streamId, int streamDependency, int weight, boolean exclusive);
 
-    /**
-     * Create or update incoming headers, creating the corresponding streams
-     * if necessary. Frames that trigger this are SPDY SYN_STREAM, HEADERS, and
-     * SYN_REPLY, and HTTP/2 HEADERS and PUSH_PROMISE.
-     *
-     * @param outFinished true if the receiver should not send further frames.
-     * @param inFinished true if the sender will not send further frames.
-     * @param streamId the stream owning these headers.
-     * @param associatedStreamId the stream that triggered the sender to create
-     *     this stream.
-     */
-    void headers(boolean outFinished, boolean inFinished, int streamId, int associatedStreamId,
-                 List<Header> headerBlock, HeadersMode headersMode);
-    void rstStream(int streamId, ErrorCode errorCode);
-    void settings(boolean clearPrevious, Settings settings);
-
-    /** HTTP/2 only. */
-    void ackSettings();
-
-    /**
-     *  Read a connection-level ping from the peer.  {@code ack} indicates this
-     *  is a reply.  Payload parameters are different between SPDY/3 and HTTP/2.
-     *  <p>
-     *  In SPDY/3, only the first {@code payload1} parameter is set.  If the
-     *  reader is a client, it is an unsigned even number.  Likewise, a server
-     *  will receive an odd number.
-     *  <p>
-     *  In HTTP/2, both {@code payload1} and {@code payload2} parameters are
-     *  set. The data is opaque binary, and there are no rules on the content.
-     */
-    void ping(boolean ack, int payload1, int payload2);
-
-    /**
-     * The peer tells us to stop creating streams.  It is safe to replay
-     * streams with {@code ID > lastGoodStreamId} on a new connection.  In-
-     * flight streams with {@code ID <= lastGoodStreamId} can only be replayed
-     * on a new connection if they are idempotent.
-     *
-     * @param lastGoodStreamId the last stream ID the peer processed before
-     *     sending this message. If {@code lastGoodStreamId} is zero, the peer
-     *     processed no frames.
-     * @param errorCode reason for closing the connection.
-     * @param debugData only valid for HTTP/2; opaque debug data to send.
-     */
-    void goAway(int lastGoodStreamId, ErrorCode errorCode, ByteString debugData);
-
-    /**
-     * Notifies that an additional {@code windowSizeIncrement} bytes can be
-     * sent on {@code streamId}, or the connection if {@code streamId} is zero.
-     */
-    void windowUpdate(int streamId, long windowSizeIncrement);
-
-    /**
-     * Called when reading a headers or priority frame. This may be used to
-     * change the stream's weight from the default (16) to a new value.
-     *
-     * @param streamId stream which has a priority change.
-     * @param streamDependency the stream ID this stream is dependent on.
-     * @param weight relative proportion of priority in [1..256].
-     * @param exclusive inserts this stream ID as the sole child of
-     *     {@code streamDependency}.
-     */
-    void priority(int streamId, int streamDependency, int weight, boolean exclusive);
-
-    /**
-     * HTTP/2 only. Receive a push promise header block.
-     * <p>
-     * A push promise contains all the headers that pertain to a server-initiated
-     * request, and a {@code promisedStreamId} to which response frames will be
-     * delivered. Push promise frames are sent as a part of the response to
-     * {@code streamId}.
-     *
-     * @param streamId client-initiated stream ID.  Must be an odd number.
-     * @param promisedStreamId server-initiated stream ID.  Must be an even
-     * number.
-     * @param requestHeaders minimally includes {@code :method}, {@code :scheme},
-     * {@code :authority}, and (@code :path}.
-     */
-    void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders)
+        /**
+         * HTTP/2 only. Receive a push promise header block.
+         * <p/>
+         * A push promise contains all the headers that pertain to a server-initiated
+         * request, and a {@code promisedStreamId} to which response frames will be
+         * delivered. Push promise frames are sent as a part of the response to
+         * {@code streamId}.
+         *
+         * @param streamId         client-initiated stream ID.  Must be an odd number.
+         * @param promisedStreamId server-initiated stream ID.  Must be an even
+         *                         number.
+         * @param requestHeaders   minimally includes {@code :method}, {@code :scheme},
+         *                         {@code :authority}, and (@code :path}.
+         */
+        void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders)
         throws IOException;
 
-    /**
-     * HTTP/2 only. Expresses that resources for the connection or a client-
-     * initiated stream are available from a different network location or
-     * protocol configuration.
-     *
-     * <p>See <a href="https://tools.ietf.org/html/draft-ietf-httpbis-alt-svc-01">alt-svc</a>
-     *
-     * @param streamId when a client-initiated stream ID (odd number), the
-     *     origin of this alternate service is the origin of the stream. When
-     *     zero, the origin is specified in the {@code origin} parameter.
-     * @param origin when present, the
-     *     <a href="http://tools.ietf.org/html/rfc6454">origin</a> is typically
-     *     represented as a combination of scheme, host and port. When empty,
-     *     the origin is that of the {@code streamId}.
-     * @param protocol an ALPN protocol, such as {@code h2}.
-     * @param host an IP address or hostname.
-     * @param port the IP port associated with the service.
-     * @param maxAge time in seconds that this alternative is considered fresh.
-     */
-    void alternateService(int streamId, String origin, ByteString protocol, String host, int port,
-                          long maxAge);
-  }
+        /**
+         * HTTP/2 only. Expresses that resources for the connection or a client-
+         * initiated stream are available from a different network location or
+         * protocol configuration.
+         * <p/>
+         * <p>See <a href="https://tools.ietf.org/html/draft-ietf-httpbis-alt-svc-01">alt-svc</a>
+         *
+         * @param streamId when a client-initiated stream ID (odd number), the
+         *                 origin of this alternate service is the origin of the stream. When
+         *                 zero, the origin is specified in the {@code origin} parameter.
+         * @param origin   when present, the
+         *                 <a href="http://tools.ietf.org/html/rfc6454">origin</a> is typically
+         *                 represented as a combination of scheme, host and port. When empty,
+         *                 the origin is that of the {@code streamId}.
+         * @param protocol an ALPN protocol, such as {@code h2}.
+         * @param host     an IP address or hostname.
+         * @param port     the IP port associated with the service.
+         * @param maxAge   time in seconds that this alternative is considered fresh.
+         */
+        void alternateService(int streamId, String origin, ByteString protocol, String host, int port,
+                              long maxAge);
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeaderReader.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeaderReader.java
new file mode 100644
index 000000000..618f7053b
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeaderReader.java
@@ -0,0 +1,69 @@
+package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.http.spdy.okio.ByteString;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.DataFormatException;
+import java.util.zip.Inflater;
+
+/**
+ * Created by koush on 7/27/14.
+ */
+public class HeaderReader {
+    Inflater inflater;
+    public HeaderReader() {
+        inflater = new Inflater() {
+            @Override public int inflate(byte[] buffer, int offset, int count)
+            throws DataFormatException {
+                int result = super.inflate(buffer, offset, count);
+                if (result == 0 && needsDictionary()) {
+                    setDictionary(Spdy3.DICTIONARY);
+                    result = super.inflate(buffer, offset, count);
+                }
+                return result;
+            }
+        };
+    }
+
+    public List<Header> readHeader(ByteBufferList bb, int length) throws IOException {
+        byte[] bytes = new byte[length];
+        bb.get(bytes);
+
+        inflater.setInput(bytes);
+
+        ByteBufferList source = new ByteBufferList().order(ByteOrder.BIG_ENDIAN);
+        while (!inflater.needsInput()) {
+            ByteBuffer b = ByteBufferList.obtain(8192);
+            try {
+                int read = inflater.inflate(b.array());
+                b.limit(read);
+                source.add(b);
+            }
+            catch (DataFormatException e) {
+                throw new IOException(e);
+            }
+        }
+
+        int numberOfPairs = source.getInt();
+        List<Header> entries = new ArrayList<Header>(numberOfPairs);
+        for (int i = 0; i < numberOfPairs; i++) {
+            ByteString name = readByteString(source).toAsciiLowercase();
+            ByteString values = readByteString(source);
+            if (name.size() == 0) throw new IOException("name.size == 0");
+            entries.add(new Header(name, values));
+        }
+        return entries;
+    }
+
+    private static ByteString readByteString(ByteBufferList source) {
+        int length = source.getInt();
+        byte[] bytes = new byte[length];
+        source.get(bytes);
+        return ByteString.of(bytes);
+    }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java.ignore
similarity index 99%
rename from AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java
rename to AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java.ignore
index 1425cbb5d..c2231970a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java.ignore
@@ -38,6 +38,7 @@
  * Read and write HTTP/2 v13 frames.
  * <p>http://tools.ietf.org/html/draft-ietf-httpbis-http2-13
  */
+
 public final class Http20Draft13 implements Variant {
   private static final Logger logger = Logger.getLogger(Http20Draft13.class.getName());
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/NameValueBlockReader.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/NameValueBlockReader.java
deleted file mode 100644
index adc15f898..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/NameValueBlockReader.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2013 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
-
-import com.koushikdutta.async.http.spdy.okio.Buffer;
-import com.koushikdutta.async.http.spdy.okio.BufferedSource;
-import com.koushikdutta.async.http.spdy.okio.ByteString;
-import com.koushikdutta.async.http.spdy.okio.ForwardingSource;
-import com.koushikdutta.async.http.spdy.okio.InflaterSource;
-import com.koushikdutta.async.http.spdy.okio.Okio;
-import com.koushikdutta.async.http.spdy.okio.Source;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.zip.DataFormatException;
-import java.util.zip.Inflater;
-
-/**
- * Reads a SPDY/3 Name/Value header block. This class is made complicated by the
- * requirement that we're strict with which bytes we put in the compressed bytes
- * buffer. We need to put all compressed bytes into that buffer -- but no other
- * bytes.
- */
-class NameValueBlockReader {
-  /** This source transforms compressed bytes into uncompressed bytes. */
-  private final InflaterSource inflaterSource;
-
-  /**
-   * How many compressed bytes must be read into inflaterSource before
-   * {@link #readNameValueBlock} returns.
-   */
-  private int compressedLimit;
-
-  /** This source holds inflated bytes. */
-  private final BufferedSource source;
-
-  public NameValueBlockReader(BufferedSource source) {
-    // Limit the inflater input stream to only those bytes in the Name/Value
-    // block. We cut the inflater off at its source because we can't predict the
-    // ratio of compressed bytes to uncompressed bytes.
-    Source throttleSource = new ForwardingSource(source) {
-      @Override public long read(Buffer sink, long byteCount) throws IOException {
-        if (compressedLimit == 0) return -1; // Out of data for the current block.
-        long read = super.read(sink, Math.min(byteCount, compressedLimit));
-        if (read == -1) return -1;
-        compressedLimit -= read;
-        return read;
-      }
-    };
-
-    // Subclass inflater to install a dictionary when it's needed.
-    Inflater inflater = new Inflater() {
-      @Override public int inflate(byte[] buffer, int offset, int count)
-          throws DataFormatException {
-        int result = super.inflate(buffer, offset, count);
-        if (result == 0 && needsDictionary()) {
-          setDictionary(Spdy3.DICTIONARY);
-          result = super.inflate(buffer, offset, count);
-        }
-        return result;
-      }
-    };
-
-    this.inflaterSource = new InflaterSource(throttleSource, inflater);
-    this.source = Okio.buffer(inflaterSource);
-  }
-
-  public List<Header> readNameValueBlock(int length) throws IOException {
-    this.compressedLimit += length;
-
-    int numberOfPairs = source.readInt();
-    if (numberOfPairs < 0) throw new IOException("numberOfPairs < 0: " + numberOfPairs);
-    if (numberOfPairs > 1024) throw new IOException("numberOfPairs > 1024: " + numberOfPairs);
-
-    List<Header> entries = new ArrayList<Header>(numberOfPairs);
-    for (int i = 0; i < numberOfPairs; i++) {
-      ByteString name = readByteString().toAsciiLowercase();
-      ByteString values = readByteString();
-      if (name.size() == 0) throw new IOException("name.size == 0");
-      entries.add(new Header(name, values));
-    }
-
-    doneReading();
-    return entries;
-  }
-
-  private ByteString readByteString() throws IOException {
-    int length = source.readInt();
-    return source.readByteString(length);
-  }
-
-  private void doneReading() throws IOException {
-    // Move any outstanding unread bytes into the inflater. One side-effect of
-    // deflate compression is that sometimes there are bytes remaining in the
-    // stream after we've consumed all of the content.
-    if (compressedLimit > 0) {
-      inflaterSource.refill();
-      if (compressedLimit != 0) throw new IOException("compressedLimit > 0: " + compressedLimit);
-    }
-  }
-
-  public void close() throws IOException {
-    source.close();
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
index e38f3f01b..2868ff225 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
@@ -16,11 +16,13 @@
 package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
 
 import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.DataEmitter;
+import com.koushikdutta.async.DataEmitterReader;
+import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.spdy.okhttp.internal.Util;
 import com.koushikdutta.async.http.spdy.okio.Buffer;
 import com.koushikdutta.async.http.spdy.okio.BufferedSink;
-import com.koushikdutta.async.http.spdy.okio.BufferedSource;
 import com.koushikdutta.async.http.spdy.okio.ByteString;
 import com.koushikdutta.async.http.spdy.okio.DeflaterSink;
 import com.koushikdutta.async.http.spdy.okio.Okio;
@@ -29,7 +31,6 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.ProtocolException;
-import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.List;
 import java.util.zip.Deflater;
@@ -41,477 +42,530 @@
  */
 public final class Spdy3 implements Variant {
 
-  @Override public Protocol getProtocol() {
-    return Protocol.SPDY_3;
-  }
-
-  static final int TYPE_DATA = 0x0;
-  static final int TYPE_SYN_STREAM = 0x1;
-  static final int TYPE_SYN_REPLY = 0x2;
-  static final int TYPE_RST_STREAM = 0x3;
-  static final int TYPE_SETTINGS = 0x4;
-  static final int TYPE_PING = 0x6;
-  static final int TYPE_GOAWAY = 0x7;
-  static final int TYPE_HEADERS = 0x8;
-  static final int TYPE_WINDOW_UPDATE = 0x9;
-
-  static final int FLAG_FIN = 0x1;
-  static final int FLAG_UNIDIRECTIONAL = 0x2;
-
-  static final int VERSION = 3;
-
-  static final byte[] DICTIONARY;
-  static {
-    try {
-      DICTIONARY = ("\u0000\u0000\u0000\u0007options\u0000\u0000\u0000\u0004hea"
-          + "d\u0000\u0000\u0000\u0004post\u0000\u0000\u0000\u0003put\u0000\u0000\u0000\u0006dele"
-          + "te\u0000\u0000\u0000\u0005trace\u0000\u0000\u0000\u0006accept\u0000\u0000\u0000"
-          + "\u000Eaccept-charset\u0000\u0000\u0000\u000Faccept-encoding\u0000\u0000\u0000\u000Fa"
-          + "ccept-language\u0000\u0000\u0000\raccept-ranges\u0000\u0000\u0000\u0003age\u0000"
-          + "\u0000\u0000\u0005allow\u0000\u0000\u0000\rauthorization\u0000\u0000\u0000\rcache-co"
-          + "ntrol\u0000\u0000\u0000\nconnection\u0000\u0000\u0000\fcontent-base\u0000\u0000"
-          + "\u0000\u0010content-encoding\u0000\u0000\u0000\u0010content-language\u0000\u0000"
-          + "\u0000\u000Econtent-length\u0000\u0000\u0000\u0010content-location\u0000\u0000\u0000"
-          + "\u000Bcontent-md5\u0000\u0000\u0000\rcontent-range\u0000\u0000\u0000\fcontent-type"
-          + "\u0000\u0000\u0000\u0004date\u0000\u0000\u0000\u0004etag\u0000\u0000\u0000\u0006expe"
-          + "ct\u0000\u0000\u0000\u0007expires\u0000\u0000\u0000\u0004from\u0000\u0000\u0000"
-          + "\u0004host\u0000\u0000\u0000\bif-match\u0000\u0000\u0000\u0011if-modified-since"
-          + "\u0000\u0000\u0000\rif-none-match\u0000\u0000\u0000\bif-range\u0000\u0000\u0000"
-          + "\u0013if-unmodified-since\u0000\u0000\u0000\rlast-modified\u0000\u0000\u0000\blocati"
-          + "on\u0000\u0000\u0000\fmax-forwards\u0000\u0000\u0000\u0006pragma\u0000\u0000\u0000"
-          + "\u0012proxy-authenticate\u0000\u0000\u0000\u0013proxy-authorization\u0000\u0000"
-          + "\u0000\u0005range\u0000\u0000\u0000\u0007referer\u0000\u0000\u0000\u000Bretry-after"
-          + "\u0000\u0000\u0000\u0006server\u0000\u0000\u0000\u0002te\u0000\u0000\u0000\u0007trai"
-          + "ler\u0000\u0000\u0000\u0011transfer-encoding\u0000\u0000\u0000\u0007upgrade\u0000"
-          + "\u0000\u0000\nuser-agent\u0000\u0000\u0000\u0004vary\u0000\u0000\u0000\u0003via"
-          + "\u0000\u0000\u0000\u0007warning\u0000\u0000\u0000\u0010www-authenticate\u0000\u0000"
-          + "\u0000\u0006method\u0000\u0000\u0000\u0003get\u0000\u0000\u0000\u0006status\u0000"
-          + "\u0000\u0000\u0006200 OK\u0000\u0000\u0000\u0007version\u0000\u0000\u0000\bHTTP/1.1"
-          + "\u0000\u0000\u0000\u0003url\u0000\u0000\u0000\u0006public\u0000\u0000\u0000\nset-coo"
-          + "kie\u0000\u0000\u0000\nkeep-alive\u0000\u0000\u0000\u0006origin100101201202205206300"
-          + "302303304305306307402405406407408409410411412413414415416417502504505203 Non-Authori"
-          + "tative Information204 No Content301 Moved Permanently400 Bad Request401 Unauthorized"
-          + "403 Forbidden404 Not Found500 Internal Server Error501 Not Implemented503 Service Un"
-          + "availableJan Feb Mar Apr May Jun Jul Aug Sept Oct Nov Dec 00:00:00 Mon, Tue, Wed, Th"
-          + "u, Fri, Sat, Sun, GMTchunked,text/html,image/png,image/jpg,image/gif,application/xml"
-          + ",application/xhtml+xml,text/plain,text/javascript,publicprivatemax-age=gzip,deflate,"
-          + "sdchcharset=utf-8charset=iso-8859-1,utf-,*,enq=0.").getBytes(Charsets.UTF_8.name());
-    } catch (UnsupportedEncodingException e) {
-      throw new AssertionError();
-    }
-  }
-
-  @Override public FrameReader newReader(BufferedSource source, boolean client) {
-    return new Reader(source, client);
-  }
-
-  @Override public FrameWriter newWriter(BufferedSink sink, boolean client) {
-    return new Writer(sink, client);
-  }
-
-  @Override public int maxFrameSize() {
-    return 16383;
-  }
-
-  /** Read spdy/3 frames. */
-  static final class Reader implements FrameReader {
-    private final BufferedSource source;
-    private final boolean client;
-    private final NameValueBlockReader headerBlockReader;
-
-    Reader(BufferedSource source, boolean client) {
-      this.source = source;
-      this.headerBlockReader = new NameValueBlockReader(this.source);
-      this.client = client;
+    @Override
+    public Protocol getProtocol() {
+        return Protocol.SPDY_3;
+    }
+
+    static final int TYPE_DATA = 0x0;
+    static final int TYPE_SYN_STREAM = 0x1;
+    static final int TYPE_SYN_REPLY = 0x2;
+    static final int TYPE_RST_STREAM = 0x3;
+    static final int TYPE_SETTINGS = 0x4;
+    static final int TYPE_PING = 0x6;
+    static final int TYPE_GOAWAY = 0x7;
+    static final int TYPE_HEADERS = 0x8;
+    static final int TYPE_WINDOW_UPDATE = 0x9;
+
+    static final int FLAG_FIN = 0x1;
+    static final int FLAG_UNIDIRECTIONAL = 0x2;
+
+    static final int VERSION = 3;
+
+    static final byte[] DICTIONARY;
+
+    static {
+        try {
+            DICTIONARY = ("\u0000\u0000\u0000\u0007options\u0000\u0000\u0000\u0004hea"
+            + "d\u0000\u0000\u0000\u0004post\u0000\u0000\u0000\u0003put\u0000\u0000\u0000\u0006dele"
+            + "te\u0000\u0000\u0000\u0005trace\u0000\u0000\u0000\u0006accept\u0000\u0000\u0000"
+            + "\u000Eaccept-charset\u0000\u0000\u0000\u000Faccept-encoding\u0000\u0000\u0000\u000Fa"
+            + "ccept-language\u0000\u0000\u0000\raccept-ranges\u0000\u0000\u0000\u0003age\u0000"
+            + "\u0000\u0000\u0005allow\u0000\u0000\u0000\rauthorization\u0000\u0000\u0000\rcache-co"
+            + "ntrol\u0000\u0000\u0000\nconnection\u0000\u0000\u0000\fcontent-base\u0000\u0000"
+            + "\u0000\u0010content-encoding\u0000\u0000\u0000\u0010content-language\u0000\u0000"
+            + "\u0000\u000Econtent-length\u0000\u0000\u0000\u0010content-location\u0000\u0000\u0000"
+            + "\u000Bcontent-md5\u0000\u0000\u0000\rcontent-range\u0000\u0000\u0000\fcontent-type"
+            + "\u0000\u0000\u0000\u0004date\u0000\u0000\u0000\u0004etag\u0000\u0000\u0000\u0006expe"
+            + "ct\u0000\u0000\u0000\u0007expires\u0000\u0000\u0000\u0004from\u0000\u0000\u0000"
+            + "\u0004host\u0000\u0000\u0000\bif-match\u0000\u0000\u0000\u0011if-modified-since"
+            + "\u0000\u0000\u0000\rif-none-match\u0000\u0000\u0000\bif-range\u0000\u0000\u0000"
+            + "\u0013if-unmodified-since\u0000\u0000\u0000\rlast-modified\u0000\u0000\u0000\blocati"
+            + "on\u0000\u0000\u0000\fmax-forwards\u0000\u0000\u0000\u0006pragma\u0000\u0000\u0000"
+            + "\u0012proxy-authenticate\u0000\u0000\u0000\u0013proxy-authorization\u0000\u0000"
+            + "\u0000\u0005range\u0000\u0000\u0000\u0007referer\u0000\u0000\u0000\u000Bretry-after"
+            + "\u0000\u0000\u0000\u0006server\u0000\u0000\u0000\u0002te\u0000\u0000\u0000\u0007trai"
+            + "ler\u0000\u0000\u0000\u0011transfer-encoding\u0000\u0000\u0000\u0007upgrade\u0000"
+            + "\u0000\u0000\nuser-agent\u0000\u0000\u0000\u0004vary\u0000\u0000\u0000\u0003via"
+            + "\u0000\u0000\u0000\u0007warning\u0000\u0000\u0000\u0010www-authenticate\u0000\u0000"
+            + "\u0000\u0006method\u0000\u0000\u0000\u0003get\u0000\u0000\u0000\u0006status\u0000"
+            + "\u0000\u0000\u0006200 OK\u0000\u0000\u0000\u0007version\u0000\u0000\u0000\bHTTP/1.1"
+            + "\u0000\u0000\u0000\u0003url\u0000\u0000\u0000\u0006public\u0000\u0000\u0000\nset-coo"
+            + "kie\u0000\u0000\u0000\nkeep-alive\u0000\u0000\u0000\u0006origin100101201202205206300"
+            + "302303304305306307402405406407408409410411412413414415416417502504505203 Non-Authori"
+            + "tative Information204 No Content301 Moved Permanently400 Bad Request401 Unauthorized"
+            + "403 Forbidden404 Not Found500 Internal Server Error501 Not Implemented503 Service Un"
+            + "availableJan Feb Mar Apr May Jun Jul Aug Sept Oct Nov Dec 00:00:00 Mon, Tue, Wed, Th"
+            + "u, Fri, Sat, Sun, GMTchunked,text/html,image/png,image/jpg,image/gif,application/xml"
+            + ",application/xhtml+xml,text/plain,text/javascript,publicprivatemax-age=gzip,deflate,"
+            + "sdchcharset=utf-8charset=iso-8859-1,utf-,*,enq=0.").getBytes(Charsets.UTF_8.name());
+        } catch (UnsupportedEncodingException e) {
+            throw new AssertionError();
+        }
     }
 
-    @Override public void readConnectionPreface() {
+    @Override
+    public FrameReader newReader(DataEmitter source, FrameReader.Handler handler, boolean client) {
+        return new Reader(source, handler, client);
     }
 
-      @Override
-      public int canProcessFrame(ByteBufferList bb) {
-          if (source.buffer().size() + bb.remaining() < 8)
-              return 0;
-          ByteBuffer peek = ByteBuffer.wrap(bb.peekBytes(8)).order(ByteOrder.BIG_ENDIAN);
-          int w1 = peek.getInt();
-          int w2 = peek.getInt();
-
-          int length = (w2 & 0xffffff);
-          if (bb.remaining() < 8 + length)
-              return 0;
-          return 8 + length;
-      }
-
-      /**
-     * Send the next frame to {@code handler}. Returns true unless there are no
-     * more frames on the stream.
-     */
-    @Override public boolean nextFrame(Handler handler) throws IOException {
-      int w1;
-      int w2;
-      try {
-        w1 = source.readInt();
-        w2 = source.readInt();
-      } catch (IOException e) {
-        return false; // This might be a normal socket close.
-      }
-
-      boolean control = (w1 & 0x80000000) != 0;
-      int flags = (w2 & 0xff000000) >>> 24;
-      int length = (w2 & 0xffffff);
-
-      if (control) {
-        int version = (w1 & 0x7fff0000) >>> 16;
-        int type = (w1 & 0xffff);
-
-        if (version != 3) {
-          throw new ProtocolException("version != 3: " + version);
-        }
-
-        switch (type) {
-          case TYPE_SYN_STREAM:
-            readSynStream(handler, flags, length);
-            return true;
-
-          case TYPE_SYN_REPLY:
-            readSynReply(handler, flags, length);
-            return true;
-
-          case TYPE_RST_STREAM:
-            readRstStream(handler, flags, length);
-            return true;
-
-          case TYPE_SETTINGS:
-            readSettings(handler, flags, length);
-            return true;
-
-          case TYPE_PING:
-            readPing(handler, flags, length);
-            return true;
-
-          case TYPE_GOAWAY:
-            readGoAway(handler, flags, length);
-            return true;
-
-          case TYPE_HEADERS:
-            readHeaders(handler, flags, length);
-            return true;
-
-          case TYPE_WINDOW_UPDATE:
-            readWindowUpdate(handler, flags, length);
-            return true;
-
-          default:
-            source.skip(length);
-            return true;
-        }
-      } else {
-        int streamId = w1 & 0x7fffffff;
-        boolean inFinished = (flags & FLAG_FIN) != 0;
-        handler.data(inFinished, streamId, source, length);
-        return true;
-      }
+    @Override
+    public FrameWriter newWriter(BufferedSink sink, boolean client) {
+        return new Writer(sink, client);
     }
 
-    private void readSynStream(Handler handler, int flags, int length) throws IOException {
-      int w1 = source.readInt();
-      int w2 = source.readInt();
-      int streamId = w1 & 0x7fffffff;
-      int associatedStreamId = w2 & 0x7fffffff;
-      source.readShort(); // int priority = (s3 & 0xe000) >>> 13; int slot = s3 & 0xff;
-      List<Header> headerBlock = headerBlockReader.readNameValueBlock(length - 10);
-
-      boolean inFinished = (flags & FLAG_FIN) != 0;
-      boolean outFinished = (flags & FLAG_UNIDIRECTIONAL) != 0;
-      handler.headers(outFinished, inFinished, streamId, associatedStreamId, headerBlock,
-          HeadersMode.SPDY_SYN_STREAM);
+    @Override
+    public int maxFrameSize() {
+        return 16383;
     }
 
-    private void readSynReply(Handler handler, int flags, int length) throws IOException {
-      int w1 = source.readInt();
-      int streamId = w1 & 0x7fffffff;
-      List<Header> headerBlock = headerBlockReader.readNameValueBlock(length - 4);
-      boolean inFinished = (flags & FLAG_FIN) != 0;
-      handler.headers(false, inFinished, streamId, -1, headerBlock, HeadersMode.SPDY_REPLY);
-    }
+    /**
+     * Read spdy/3 frames.
+     */
+    static final class Reader implements FrameReader {
+        private final HeaderReader headerReader = new HeaderReader();
+        private final DataEmitter emitter;
+        private final boolean client;
+        private final Handler handler;
+        private final DataEmitterReader reader;
+
+        Reader(DataEmitter emitter, Handler handler, boolean client) {
+            this.emitter = emitter;
+            this.handler = handler;
+            this.client = client;
+
+            reader = new DataEmitterReader();
+            parseFrameHeader();
+        }
 
-    private void readRstStream(Handler handler, int flags, int length) throws IOException {
-      if (length != 8) throw ioException("TYPE_RST_STREAM length: %d != 8", length);
-      int streamId = source.readInt() & 0x7fffffff;
-      int errorCodeInt = source.readInt();
-      ErrorCode errorCode = ErrorCode.fromSpdy3Rst(errorCodeInt);
-      if (errorCode == null) {
-        throw ioException("TYPE_RST_STREAM unexpected error code: %d", errorCodeInt);
-      }
-      handler.rstStream(streamId, errorCode);
-    }
+        private void parseFrameHeader() {
+            emitter.setDataCallback(reader);
+            reader.read(8, onFrame);
+        }
 
-    private void readHeaders(Handler handler, int flags, int length) throws IOException {
-      int w1 = source.readInt();
-      int streamId = w1 & 0x7fffffff;
-      List<Header> headerBlock = headerBlockReader.readNameValueBlock(length - 4);
-      handler.headers(false, false, streamId, -1, headerBlock, HeadersMode.SPDY_HEADERS);
-    }
+        int w1;
+        int w2;
+        int flags;
+        int length;
+        int streamId;
+        boolean inFinished;
+        private final DataCallback onFrame = new DataCallback() {
+            @Override
+            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+                bb.order(ByteOrder.BIG_ENDIAN);
+                w1 = bb.getInt();
+                w2 = bb.getInt();
+
+                boolean control = (w1 & 0x80000000) != 0;
+                flags = (w2 & 0xff000000) >>> 24;
+                length = (w2 & 0xffffff);
+
+                if (!control) {
+                    streamId = w1 & 0x7fffffff;
+                    inFinished = (flags & FLAG_FIN) != 0;
+                    emitter.setDataCallback(onDataFrame);
+                }
+                else {
+                    reader.read(length, onFullFrame);
+                }
+            }
+        };
+
+        private final DataCallback onDataFrame = new DataCallback() {
+            @Override
+            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+                int toRead = Math.min(bb.remaining(), length);
+                if (toRead < bb.remaining()) {
+                    ByteBufferList partial = new ByteBufferList();
+                    bb.get(partial, toRead);
+                    bb = partial;
+                }
+
+                length -= toRead;
+                handler.data(length == 0 && inFinished, streamId, bb);
+
+                if (length == 0)
+                    parseFrameHeader();
+            }
+        };
+
+        private final DataCallback onFullFrame = new DataCallback() {
+            @Override
+            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+                // queue up the next frame read
+                bb.order(ByteOrder.BIG_ENDIAN);
+
+                int version = (w1 & 0x7fff0000) >>> 16;
+                int type = (w1 & 0xffff);
+
+                try {
+                    if (version != 3) {
+                        throw new ProtocolException("version != 3: " + version);
+                    }
+
+                    switch (type) {
+                        case TYPE_SYN_STREAM:
+                            readSynStream(bb, flags, length);
+                            break;
+
+                        case TYPE_SYN_REPLY:
+                            readSynReply(bb, flags, length);
+                            break;
+
+                        case TYPE_RST_STREAM:
+                            readRstStream(bb, flags, length);
+                            break;
+
+                        case TYPE_SETTINGS:
+                            readSettings(bb, flags, length);
+                            break;
+
+                        case TYPE_PING:
+                            readPing(bb, flags, length);
+                            break;
+
+                        case TYPE_GOAWAY:
+                            readGoAway(bb, flags, length);
+                            break;
+
+                        case TYPE_HEADERS:
+                            readHeaders(bb, flags, length);
+                            break;
+
+                        case TYPE_WINDOW_UPDATE:
+                            readWindowUpdate(bb, flags, length);
+                            break;
+
+                        default:
+                            bb.recycle();
+                            break;
+                    }
+                    parseFrameHeader();
+                }
+                catch (IOException e) {
+                    handler.error(e);
+                }
+            }
+        };
+
+        @Override
+        public void readConnectionPreface() {
+        }
+        private void readSynStream(ByteBufferList source, int flags, int length) throws IOException {
+            int w1 = source.getInt();
+            int w2 = source.getInt();
+            int streamId = w1 & 0x7fffffff;
+            int associatedStreamId = w2 & 0x7fffffff;
+            source.getShort(); // int priority = (s3 & 0xe000) >>> 13; int slot = s3 & 0xff;
+            List<Header> headerBlock = headerReader.readHeader(source, length - 10);
+
+            boolean inFinished = (flags & FLAG_FIN) != 0;
+            boolean outFinished = (flags & FLAG_UNIDIRECTIONAL) != 0;
+            handler.headers(outFinished, inFinished, streamId, associatedStreamId, headerBlock,
+            HeadersMode.SPDY_SYN_STREAM);
+        }
 
-    private void readWindowUpdate(Handler handler, int flags, int length) throws IOException {
-      if (length != 8) throw ioException("TYPE_WINDOW_UPDATE length: %d != 8", length);
-      int w1 = source.readInt();
-      int w2 = source.readInt();
-      int streamId = w1 & 0x7fffffff;
-      long increment = w2 & 0x7fffffff;
-      if (increment == 0) throw ioException("windowSizeIncrement was 0", increment);
-      handler.windowUpdate(streamId, increment);
-    }
+        private void readSynReply(ByteBufferList source, int flags, int length) throws IOException {
+            int w1 = source.getInt();
+            int streamId = w1 & 0x7fffffff;
+            List<Header> headerBlock = headerReader.readHeader(source, length - 4);
+            boolean inFinished = (flags & FLAG_FIN) != 0;
+            handler.headers(false, inFinished, streamId, -1, headerBlock, HeadersMode.SPDY_REPLY);
+        }
 
-    private void readPing(Handler handler, int flags, int length) throws IOException {
-      if (length != 4) throw ioException("TYPE_PING length: %d != 4", length);
-      int id = source.readInt();
-      boolean ack = client == ((id & 1) == 1);
-      handler.ping(ack, id, 0);
-    }
+        private void readRstStream(ByteBufferList source, int flags, int length) throws IOException {
+            if (length != 8) throw ioException("TYPE_RST_STREAM length: %d != 8", length);
+            int streamId = source.getInt() & 0x7fffffff;
+            int errorCodeInt = source.getInt();
+            ErrorCode errorCode = ErrorCode.fromSpdy3Rst(errorCodeInt);
+            if (errorCode == null) {
+                throw ioException("TYPE_RST_STREAM unexpected error code: %d", errorCodeInt);
+            }
+            handler.rstStream(streamId, errorCode);
+        }
 
-    private void readGoAway(Handler handler, int flags, int length) throws IOException {
-      if (length != 8) throw ioException("TYPE_GOAWAY length: %d != 8", length);
-      int lastGoodStreamId = source.readInt() & 0x7fffffff;
-      int errorCodeInt = source.readInt();
-      ErrorCode errorCode = ErrorCode.fromSpdyGoAway(errorCodeInt);
-      if (errorCode == null) {
-        throw ioException("TYPE_GOAWAY unexpected error code: %d", errorCodeInt);
-      }
-      handler.goAway(lastGoodStreamId, errorCode, ByteString.EMPTY);
-    }
+        private void readHeaders(ByteBufferList source, int flags, int length) throws IOException {
+            int w1 = source.getInt();
+            int streamId = w1 & 0x7fffffff;
+            List<Header> headerBlock = headerReader.readHeader(source, length - 4);
+            handler.headers(false, false, streamId, -1, headerBlock, HeadersMode.SPDY_HEADERS);
+        }
 
-    private void readSettings(Handler handler, int flags, int length) throws IOException {
-      int numberOfEntries = source.readInt();
-      if (length != 4 + 8 * numberOfEntries) {
-        throw ioException("TYPE_SETTINGS length: %d != 4 + 8 * %d", length, numberOfEntries);
-      }
-      Settings settings = new Settings();
-      for (int i = 0; i < numberOfEntries; i++) {
-        int w1 = source.readInt();
-        int value = source.readInt();
-        int idFlags = (w1 & 0xff000000) >>> 24;
-        int id = w1 & 0xffffff;
-        settings.set(id, idFlags, value);
-      }
-      boolean clearPrevious = (flags & Settings.FLAG_CLEAR_PREVIOUSLY_PERSISTED_SETTINGS) != 0;
-      handler.settings(clearPrevious, settings);
-    }
+        private void readWindowUpdate(ByteBufferList source, int flags, int length) throws IOException {
+            if (length != 8) throw ioException("TYPE_WINDOW_UPDATE length: %d != 8", length);
+            int w1 = source.getInt();
+            int w2 = source.getInt();
+            int streamId = w1 & 0x7fffffff;
+            long increment = w2 & 0x7fffffff;
+            if (increment == 0) throw ioException("windowSizeIncrement was 0", increment);
+            handler.windowUpdate(streamId, increment);
+        }
 
-    private static IOException ioException(String message, Object... args) throws IOException {
-      throw new IOException(String.format(message, args));
-    }
+        private void readPing(ByteBufferList source, int flags, int length) throws IOException {
+            if (length != 4) throw ioException("TYPE_PING length: %d != 4", length);
+            int id = source.getInt();
+            boolean ack = client == ((id & 1) == 1);
+            handler.ping(ack, id, 0);
+        }
 
-    @Override public void close() throws IOException {
-      headerBlockReader.close();
-    }
-  }
-
-  /** Write spdy/3 frames. */
-  static final class Writer implements FrameWriter {
-    private final BufferedSink sink;
-    private final Buffer headerBlockBuffer;
-    private final BufferedSink headerBlockOut;
-    private final boolean client;
-    private boolean closed;
-
-    Writer(BufferedSink sink, boolean client) {
-      this.sink = sink;
-      this.client = client;
-
-      Deflater deflater = new Deflater();
-      deflater.setDictionary(DICTIONARY);
-      headerBlockBuffer = new Buffer();
-      headerBlockOut = Okio.buffer(new DeflaterSink(headerBlockBuffer, deflater));
-    }
+        private void readGoAway(ByteBufferList source, int flags, int length) throws IOException {
+            if (length != 8) throw ioException("TYPE_GOAWAY length: %d != 8", length);
+            int lastGoodStreamId = source.getInt() & 0x7fffffff;
+            int errorCodeInt = source.getInt();
+            ErrorCode errorCode = ErrorCode.fromSpdyGoAway(errorCodeInt);
+            if (errorCode == null) {
+                throw ioException("TYPE_GOAWAY unexpected error code: %d", errorCodeInt);
+            }
+            handler.goAway(lastGoodStreamId, errorCode, ByteString.EMPTY);
+        }
+
+        private void readSettings(ByteBufferList source, int flags, int length) throws IOException {
+            int numberOfEntries = source.getInt();
+            if (length != 4 + 8 * numberOfEntries) {
+                throw ioException("TYPE_SETTINGS length: %d != 4 + 8 * %d", length, numberOfEntries);
+            }
+            Settings settings = new Settings();
+            for (int i = 0; i < numberOfEntries; i++) {
+                int w1 = source.getInt();
+                int value = source.getInt();
+                int idFlags = (w1 & 0xff000000) >>> 24;
+                int id = w1 & 0xffffff;
+                settings.set(id, idFlags, value);
+            }
+            boolean clearPrevious = (flags & Settings.FLAG_CLEAR_PREVIOUSLY_PERSISTED_SETTINGS) != 0;
+            handler.settings(clearPrevious, settings);
+        }
+
+        private static IOException ioException(String message, Object... args) throws IOException {
+            throw new IOException(String.format(message, args));
+        }
 
-    @Override public void ackSettings() {
-      // Do nothing: no ACK for SPDY/3 settings.
+        @Override
+        public void close() throws IOException {
+        }
     }
 
-    @Override
-    public void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders)
+    /**
+     * Write spdy/3 frames.
+     */
+    static final class Writer implements FrameWriter {
+        private final BufferedSink sink;
+        private final Buffer headerBlockBuffer;
+        private final BufferedSink headerBlockOut;
+        private final boolean client;
+        private boolean closed;
+
+        Writer(BufferedSink sink, boolean client) {
+            this.sink = sink;
+            this.client = client;
+
+            Deflater deflater = new Deflater();
+            deflater.setDictionary(DICTIONARY);
+            headerBlockBuffer = new Buffer();
+            headerBlockOut = Okio.buffer(new DeflaterSink(headerBlockBuffer, deflater));
+        }
+
+        @Override
+        public void ackSettings() {
+            // Do nothing: no ACK for SPDY/3 settings.
+        }
+
+        @Override
+        public void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders)
         throws IOException {
-      // Do nothing: no push promise for SPDY/3.
-    }
+            // Do nothing: no push promise for SPDY/3.
+        }
 
-    @Override public synchronized void connectionPreface() {
-      // Do nothing: no connection preface for SPDY/3.
-    }
+        @Override
+        public synchronized void connectionPreface() {
+            // Do nothing: no connection preface for SPDY/3.
+        }
 
-    @Override public synchronized void flush() throws IOException {
-      if (closed) throw new IOException("closed");
-      sink.flush();
-    }
+        @Override
+        public synchronized void flush() throws IOException {
+            if (closed) throw new IOException("closed");
+            sink.flush();
+        }
 
-    @Override public synchronized void synStream(boolean outFinished, boolean inFinished,
-        int streamId, int associatedStreamId, List<Header> headerBlock)
+        @Override
+        public synchronized void synStream(boolean outFinished, boolean inFinished,
+                                           int streamId, int associatedStreamId, List<Header> headerBlock)
         throws IOException {
-      if (closed) throw new IOException("closed");
-      writeNameValueBlockToBuffer(headerBlock);
-      int length = (int) (10 + headerBlockBuffer.size());
-      int type = TYPE_SYN_STREAM;
-      int flags = (outFinished ? FLAG_FIN : 0) | (inFinished ? FLAG_UNIDIRECTIONAL : 0);
-
-      int unused = 0;
-      sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-      sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
-      sink.writeInt(streamId & 0x7fffffff);
-      sink.writeInt(associatedStreamId & 0x7fffffff);
-      sink.writeShort((unused & 0x7) << 13 | (unused & 0x1f) << 8 | (unused & 0xff));
-      sink.writeAll(headerBlockBuffer);
-      sink.flush();
-    }
+            if (closed) throw new IOException("closed");
+            writeNameValueBlockToBuffer(headerBlock);
+            int length = (int) (10 + headerBlockBuffer.size());
+            int type = TYPE_SYN_STREAM;
+            int flags = (outFinished ? FLAG_FIN : 0) | (inFinished ? FLAG_UNIDIRECTIONAL : 0);
+
+            int unused = 0;
+            sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+            sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
+            sink.writeInt(streamId & 0x7fffffff);
+            sink.writeInt(associatedStreamId & 0x7fffffff);
+            sink.writeShort((unused & 0x7) << 13 | (unused & 0x1f) << 8 | (unused & 0xff));
+            sink.writeAll(headerBlockBuffer);
+            sink.flush();
+        }
 
-    @Override public synchronized void synReply(boolean outFinished, int streamId,
-        List<Header> headerBlock) throws IOException {
-      if (closed) throw new IOException("closed");
-      writeNameValueBlockToBuffer(headerBlock);
-      int type = TYPE_SYN_REPLY;
-      int flags = (outFinished ? FLAG_FIN : 0);
-      int length = (int) (headerBlockBuffer.size() + 4);
-
-      sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-      sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
-      sink.writeInt(streamId & 0x7fffffff);
-      sink.writeAll(headerBlockBuffer);
-      sink.flush();
-    }
+        @Override
+        public synchronized void synReply(boolean outFinished, int streamId,
+                                          List<Header> headerBlock) throws IOException {
+            if (closed) throw new IOException("closed");
+            writeNameValueBlockToBuffer(headerBlock);
+            int type = TYPE_SYN_REPLY;
+            int flags = (outFinished ? FLAG_FIN : 0);
+            int length = (int) (headerBlockBuffer.size() + 4);
+
+            sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+            sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
+            sink.writeInt(streamId & 0x7fffffff);
+            sink.writeAll(headerBlockBuffer);
+            sink.flush();
+        }
 
-    @Override public synchronized void headers(int streamId, List<Header> headerBlock)
+        @Override
+        public synchronized void headers(int streamId, List<Header> headerBlock)
         throws IOException {
-      if (closed) throw new IOException("closed");
-      writeNameValueBlockToBuffer(headerBlock);
-      int flags = 0;
-      int type = TYPE_HEADERS;
-      int length = (int) (headerBlockBuffer.size() + 4);
-
-      sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-      sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
-      sink.writeInt(streamId & 0x7fffffff);
-      sink.writeAll(headerBlockBuffer);
-    }
+            if (closed) throw new IOException("closed");
+            writeNameValueBlockToBuffer(headerBlock);
+            int flags = 0;
+            int type = TYPE_HEADERS;
+            int length = (int) (headerBlockBuffer.size() + 4);
+
+            sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+            sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
+            sink.writeInt(streamId & 0x7fffffff);
+            sink.writeAll(headerBlockBuffer);
+        }
 
-    @Override public synchronized void rstStream(int streamId, ErrorCode errorCode)
+        @Override
+        public synchronized void rstStream(int streamId, ErrorCode errorCode)
         throws IOException {
-      if (closed) throw new IOException("closed");
-      if (errorCode.spdyRstCode == -1) throw new IllegalArgumentException();
-      int flags = 0;
-      int type = TYPE_RST_STREAM;
-      int length = 8;
-      sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-      sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
-      sink.writeInt(streamId & 0x7fffffff);
-      sink.writeInt(errorCode.spdyRstCode);
-      sink.flush();
-    }
+            if (closed) throw new IOException("closed");
+            if (errorCode.spdyRstCode == -1) throw new IllegalArgumentException();
+            int flags = 0;
+            int type = TYPE_RST_STREAM;
+            int length = 8;
+            sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+            sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
+            sink.writeInt(streamId & 0x7fffffff);
+            sink.writeInt(errorCode.spdyRstCode);
+            sink.flush();
+        }
 
-    @Override public synchronized void data(boolean outFinished, int streamId, Buffer source)
+        @Override
+        public synchronized void data(boolean outFinished, int streamId, Buffer source)
         throws IOException {
-      data(outFinished, streamId, source, (int) source.size());
-    }
+            data(outFinished, streamId, source, (int) source.size());
+        }
 
-    @Override public synchronized void data(boolean outFinished, int streamId, Buffer source,
-        int byteCount) throws IOException {
-      int flags = (outFinished ? FLAG_FIN : 0);
-      sendDataFrame(streamId, flags, source, byteCount);
-    }
+        @Override
+        public synchronized void data(boolean outFinished, int streamId, Buffer source,
+                                      int byteCount) throws IOException {
+            int flags = (outFinished ? FLAG_FIN : 0);
+            sendDataFrame(streamId, flags, source, byteCount);
+        }
 
-    void sendDataFrame(int streamId, int flags, Buffer buffer, int byteCount)
+        void sendDataFrame(int streamId, int flags, Buffer buffer, int byteCount)
         throws IOException {
-      if (closed) throw new IOException("closed");
-      if (byteCount > 0xffffffL) {
-        throw new IllegalArgumentException("FRAME_TOO_LARGE max size is 16Mib: " + byteCount);
-      }
-      sink.writeInt(streamId & 0x7fffffff);
-      sink.writeInt((flags & 0xff) << 24 | byteCount & 0xffffff);
-      if (byteCount > 0) {
-        sink.write(buffer, byteCount);
-      }
-    }
+            if (closed) throw new IOException("closed");
+            if (byteCount > 0xffffffL) {
+                throw new IllegalArgumentException("FRAME_TOO_LARGE max size is 16Mib: " + byteCount);
+            }
+            sink.writeInt(streamId & 0x7fffffff);
+            sink.writeInt((flags & 0xff) << 24 | byteCount & 0xffffff);
+            if (byteCount > 0) {
+                sink.write(buffer, byteCount);
+            }
+        }
 
-    private void writeNameValueBlockToBuffer(List<Header> headerBlock) throws IOException {
-      if (headerBlockBuffer.size() != 0) throw new IllegalStateException();
-      headerBlockOut.writeInt(headerBlock.size());
-      for (int i = 0, size = headerBlock.size(); i < size; i++) {
-        ByteString name = headerBlock.get(i).name;
-        headerBlockOut.writeInt(name.size());
-        headerBlockOut.write(name);
-        ByteString value = headerBlock.get(i).value;
-        headerBlockOut.writeInt(value.size());
-        headerBlockOut.write(value);
-      }
-      headerBlockOut.flush();
-    }
+        private void writeNameValueBlockToBuffer(List<Header> headerBlock) throws IOException {
+            if (headerBlockBuffer.size() != 0) throw new IllegalStateException();
+            headerBlockOut.writeInt(headerBlock.size());
+            for (int i = 0, size = headerBlock.size(); i < size; i++) {
+                ByteString name = headerBlock.get(i).name;
+                headerBlockOut.writeInt(name.size());
+                headerBlockOut.write(name);
+                ByteString value = headerBlock.get(i).value;
+                headerBlockOut.writeInt(value.size());
+                headerBlockOut.write(value);
+            }
+            headerBlockOut.flush();
+        }
 
-    @Override public synchronized void settings(Settings settings) throws IOException {
-      if (closed) throw new IOException("closed");
-      int type = TYPE_SETTINGS;
-      int flags = 0;
-      int size = settings.size();
-      int length = 4 + size * 8;
-      sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-      sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
-      sink.writeInt(size);
-      for (int i = 0; i <= Settings.COUNT; i++) {
-        if (!settings.isSet(i)) continue;
-        int settingsFlags = settings.flags(i);
-        sink.writeInt((settingsFlags & 0xff) << 24 | (i & 0xffffff));
-        sink.writeInt(settings.get(i));
-      }
-      sink.flush();
-    }
+        @Override
+        public synchronized void settings(Settings settings) throws IOException {
+            if (closed) throw new IOException("closed");
+            int type = TYPE_SETTINGS;
+            int flags = 0;
+            int size = settings.size();
+            int length = 4 + size * 8;
+            sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+            sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
+            sink.writeInt(size);
+            for (int i = 0; i <= Settings.COUNT; i++) {
+                if (!settings.isSet(i)) continue;
+                int settingsFlags = settings.flags(i);
+                sink.writeInt((settingsFlags & 0xff) << 24 | (i & 0xffffff));
+                sink.writeInt(settings.get(i));
+            }
+            sink.flush();
+        }
 
-    @Override public synchronized void ping(boolean reply, int payload1, int payload2)
+        @Override
+        public synchronized void ping(boolean reply, int payload1, int payload2)
         throws IOException {
-      if (closed) throw new IOException("closed");
-      boolean payloadIsReply = client != ((payload1 & 1) == 1);
-      if (reply != payloadIsReply) throw new IllegalArgumentException("payload != reply");
-      int type = TYPE_PING;
-      int flags = 0;
-      int length = 4;
-      sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-      sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
-      sink.writeInt(payload1);
-      sink.flush();
-    }
+            if (closed) throw new IOException("closed");
+            boolean payloadIsReply = client != ((payload1 & 1) == 1);
+            if (reply != payloadIsReply) throw new IllegalArgumentException("payload != reply");
+            int type = TYPE_PING;
+            int flags = 0;
+            int length = 4;
+            sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+            sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
+            sink.writeInt(payload1);
+            sink.flush();
+        }
 
-    @Override public synchronized void goAway(int lastGoodStreamId, ErrorCode errorCode,
-        byte[] ignored) throws IOException {
-      if (closed) throw new IOException("closed");
-      if (errorCode.spdyGoAwayCode == -1) {
-        throw new IllegalArgumentException("errorCode.spdyGoAwayCode == -1");
-      }
-      int type = TYPE_GOAWAY;
-      int flags = 0;
-      int length = 8;
-      sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-      sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
-      sink.writeInt(lastGoodStreamId);
-      sink.writeInt(errorCode.spdyGoAwayCode);
-      sink.flush();
-    }
+        @Override
+        public synchronized void goAway(int lastGoodStreamId, ErrorCode errorCode,
+                                        byte[] ignored) throws IOException {
+            if (closed) throw new IOException("closed");
+            if (errorCode.spdyGoAwayCode == -1) {
+                throw new IllegalArgumentException("errorCode.spdyGoAwayCode == -1");
+            }
+            int type = TYPE_GOAWAY;
+            int flags = 0;
+            int length = 8;
+            sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+            sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
+            sink.writeInt(lastGoodStreamId);
+            sink.writeInt(errorCode.spdyGoAwayCode);
+            sink.flush();
+        }
 
-    @Override public synchronized void windowUpdate(int streamId, long increment)
+        @Override
+        public synchronized void windowUpdate(int streamId, long increment)
         throws IOException {
-      if (closed) throw new IOException("closed");
-      if (increment == 0 || increment > 0x7fffffffL) {
-        throw new IllegalArgumentException(
-            "windowSizeIncrement must be between 1 and 0x7fffffff: " + increment);
-      }
-      int type = TYPE_WINDOW_UPDATE;
-      int flags = 0;
-      int length = 8;
-      sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-      sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
-      sink.writeInt(streamId);
-      sink.writeInt((int) increment);
-      sink.flush();
-    }
+            if (closed) throw new IOException("closed");
+            if (increment == 0 || increment > 0x7fffffffL) {
+                throw new IllegalArgumentException(
+                "windowSizeIncrement must be between 1 and 0x7fffffff: " + increment);
+            }
+            int type = TYPE_WINDOW_UPDATE;
+            int flags = 0;
+            int length = 8;
+            sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+            sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
+            sink.writeInt(streamId);
+            sink.writeInt((int) increment);
+            sink.flush();
+        }
 
-    @Override public synchronized void close() throws IOException {
-      closed = true;
-      Util.closeAll(sink, headerBlockOut);
+        @Override
+        public synchronized void close() throws IOException {
+            closed = true;
+            Util.closeAll(sink, headerBlockOut);
+        }
     }
-  }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Variant.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Variant.java
index 56994d177..eeb7c157e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Variant.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Variant.java
@@ -16,9 +16,9 @@
 package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
 
 
+import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.spdy.okio.BufferedSink;
-import com.koushikdutta.async.http.spdy.okio.BufferedSource;
 
 /** A version and dialect of the framed socket protocol. */
 public interface Variant {
@@ -29,7 +29,7 @@ public interface Variant {
   /**
    * @param client true if this is the HTTP client's reader, reading frames from a server.
    */
-  FrameReader newReader(BufferedSource source, boolean client);
+  FrameReader newReader(DataEmitter source, FrameReader.Handler handler, boolean client);
 
   /**
    * @param client true if this is the HTTP client's writer, writing frames to a server.

From 73481c3360e2ba7421c7ff61586b152f6dfeb75e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 28 Jul 2014 00:16:10 -0700
Subject: [PATCH 051/399] h2-13 refactor without okio. totally untested.

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml    |   1 -
 .../koushikdutta/async/ByteBufferList.java    |  14 +-
 .../async/http/spdy/AsyncSpdyConnection.java  |   4 +-
 .../okhttp/internal/spdy/FrameReader.java     |   4 +-
 .../okhttp/internal/spdy/HeaderReader.java    |   4 +-
 .../okhttp/internal/spdy/HpackDraft08.java    | 821 +++++++++---------
 .../internal/spdy/Http20Draft13.java.ignore   | 763 ----------------
 .../http/spdy/okhttp/internal/spdy/Spdy3.java |   8 +-
 8 files changed, 439 insertions(+), 1180 deletions(-)
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java.ignore

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index 83bc4a321..f88736b56 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -57,7 +57,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index a27f47100..84c33074b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -46,6 +46,12 @@ public void addAll(ByteBuffer... bb) {
             add(b);
     }
 
+    public byte[] getBytes(int length) {
+        byte[] ret = new byte[length];
+        get(ret);
+        return ret;
+    }
+
     public byte[] getAllByteArray() {
         // fast path to return the contents of the first and only byte buffer,
         // if that's what we're looking for. avoids allocation.
@@ -102,6 +108,11 @@ public byte[] peekBytes(int size) {
         return ret;
     }
 
+    public ByteBufferList skip(int length) {
+        get(null, 0, length);
+        return this;
+    }
+
     public int getInt() {
         int ret = read(4).getInt();
         remaining -= 4;
@@ -144,7 +155,8 @@ public void get(byte[] bytes, int offset, int length) {
         while (need > 0) {
             ByteBuffer b = mBuffers.peek();
             int read = Math.min(b.remaining(), need);
-            b.get(bytes, offset, read);
+            if (bytes != null)
+                b.get(bytes, offset, read);
             need -= read;
             offset += read;
             if (b.remaining() == 0) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
index d9feaf708..05a546ed6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
@@ -16,6 +16,7 @@
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.FrameWriter;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Header;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.HeadersMode;
+import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Http20Draft13;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Ping;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Settings;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Spdy3;
@@ -281,8 +282,7 @@ public AsyncSpdyConnection(AsyncSocket socket, Protocol protocol) {
             variant = new Spdy3();
         }
         else if (protocol == Protocol.HTTP_2) {
-            throw new AssertionError("http20draft13");
-//            variant = new Http20Draft13();
+            variant = new Http20Draft13();
         }
         reader = variant.newReader(socket, this, true);
         writer = variant.newWriter(bufferedSink = Okio.buffer(sink), true);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
index 3f457fb0c..087182126 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
@@ -26,8 +26,8 @@
 /**
  * Reads transport frames for SPDY/3 or HTTP/2.
  */
-public interface FrameReader extends Closeable {
-    void readConnectionPreface() throws IOException;
+public interface FrameReader {
+//    void readConnectionPreface() throws IOException;
 //  boolean nextFrame(Handler handler) throws IOException;
 
     public interface Handler {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeaderReader.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeaderReader.java
index 618f7053b..b4aa5dcbd 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeaderReader.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeaderReader.java
@@ -62,8 +62,6 @@ public List<Header> readHeader(ByteBufferList bb, int length) throws IOException
 
     private static ByteString readByteString(ByteBufferList source) {
         int length = source.getInt();
-        byte[] bytes = new byte[length];
-        source.get(bytes);
-        return ByteString.of(bytes);
+        return ByteString.of(source.getBytes(length));
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java
index 397736f71..f578cb225 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java
@@ -15,6 +15,7 @@
  */
 package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
 
+import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.http.spdy.okhttp.internal.BitArray;
 import com.koushikdutta.async.http.spdy.okio.Buffer;
 import com.koushikdutta.async.http.spdy.okio.BufferedSource;
@@ -32,460 +33,472 @@
 
 /**
  * Read and write HPACK v08.
- *
+ * <p/>
  * http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08
- *
+ * <p/>
  * This implementation uses an array for the header table with a bitset for
  * references.  Dynamic entries are added to the array, starting in the last
  * position moving forward.  When the array fills, it is doubled.
  */
 final class HpackDraft08 {
-  private static final int PREFIX_4_BITS = 0x0f;
-  private static final int PREFIX_6_BITS = 0x3f;
-  private static final int PREFIX_7_BITS = 0x7f;
-
-  private static final Header[] STATIC_HEADER_TABLE = new Header[] {
-      new Header(Header.TARGET_AUTHORITY, ""),
-      new Header(Header.TARGET_METHOD, "GET"),
-      new Header(Header.TARGET_METHOD, "POST"),
-      new Header(Header.TARGET_PATH, "/"),
-      new Header(Header.TARGET_PATH, "/index.html"),
-      new Header(Header.TARGET_SCHEME, "http"),
-      new Header(Header.TARGET_SCHEME, "https"),
-      new Header(Header.RESPONSE_STATUS, "200"),
-      new Header(Header.RESPONSE_STATUS, "204"),
-      new Header(Header.RESPONSE_STATUS, "206"),
-      new Header(Header.RESPONSE_STATUS, "304"),
-      new Header(Header.RESPONSE_STATUS, "400"),
-      new Header(Header.RESPONSE_STATUS, "404"),
-      new Header(Header.RESPONSE_STATUS, "500"),
-      new Header("accept-charset", ""),
-      new Header("accept-encoding", "gzip, deflate"),
-      new Header("accept-language", ""),
-      new Header("accept-ranges", ""),
-      new Header("accept", ""),
-      new Header("access-control-allow-origin", ""),
-      new Header("age", ""),
-      new Header("allow", ""),
-      new Header("authorization", ""),
-      new Header("cache-control", ""),
-      new Header("content-disposition", ""),
-      new Header("content-encoding", ""),
-      new Header("content-language", ""),
-      new Header("content-length", ""),
-      new Header("content-location", ""),
-      new Header("content-range", ""),
-      new Header("content-type", ""),
-      new Header("cookie", ""),
-      new Header("date", ""),
-      new Header("etag", ""),
-      new Header("expect", ""),
-      new Header("expires", ""),
-      new Header("from", ""),
-      new Header("host", ""),
-      new Header("if-match", ""),
-      new Header("if-modified-since", ""),
-      new Header("if-none-match", ""),
-      new Header("if-range", ""),
-      new Header("if-unmodified-since", ""),
-      new Header("last-modified", ""),
-      new Header("link", ""),
-      new Header("location", ""),
-      new Header("max-forwards", ""),
-      new Header("proxy-authenticate", ""),
-      new Header("proxy-authorization", ""),
-      new Header("range", ""),
-      new Header("referer", ""),
-      new Header("refresh", ""),
-      new Header("retry-after", ""),
-      new Header("server", ""),
-      new Header("set-cookie", ""),
-      new Header("strict-transport-security", ""),
-      new Header("transfer-encoding", ""),
-      new Header("user-agent", ""),
-      new Header("vary", ""),
-      new Header("via", ""),
-      new Header("www-authenticate", "")
-  };
-
-  private HpackDraft08() {
-  }
-
-  // http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08#section-3.2
-  static final class Reader {
-
-    private final List<Header> emittedHeaders = new ArrayList<Header>();
-    private final BufferedSource source;
-
-    private int maxHeaderTableByteCountSetting;
-    private int maxHeaderTableByteCount;
-    // Visible for testing.
-    Header[] headerTable = new Header[8];
-    // Array is populated back to front, so new entries always have lowest index.
-    int nextHeaderIndex = headerTable.length - 1;
-    int headerCount = 0;
+    private static final int PREFIX_4_BITS = 0x0f;
+    private static final int PREFIX_6_BITS = 0x3f;
+    private static final int PREFIX_7_BITS = 0x7f;
+
+    private static final Header[] STATIC_HEADER_TABLE = new Header[]{
+    new Header(Header.TARGET_AUTHORITY, ""),
+    new Header(Header.TARGET_METHOD, "GET"),
+    new Header(Header.TARGET_METHOD, "POST"),
+    new Header(Header.TARGET_PATH, "/"),
+    new Header(Header.TARGET_PATH, "/index.html"),
+    new Header(Header.TARGET_SCHEME, "http"),
+    new Header(Header.TARGET_SCHEME, "https"),
+    new Header(Header.RESPONSE_STATUS, "200"),
+    new Header(Header.RESPONSE_STATUS, "204"),
+    new Header(Header.RESPONSE_STATUS, "206"),
+    new Header(Header.RESPONSE_STATUS, "304"),
+    new Header(Header.RESPONSE_STATUS, "400"),
+    new Header(Header.RESPONSE_STATUS, "404"),
+    new Header(Header.RESPONSE_STATUS, "500"),
+    new Header("accept-charset", ""),
+    new Header("accept-encoding", "gzip, deflate"),
+    new Header("accept-language", ""),
+    new Header("accept-ranges", ""),
+    new Header("accept", ""),
+    new Header("access-control-allow-origin", ""),
+    new Header("age", ""),
+    new Header("allow", ""),
+    new Header("authorization", ""),
+    new Header("cache-control", ""),
+    new Header("content-disposition", ""),
+    new Header("content-encoding", ""),
+    new Header("content-language", ""),
+    new Header("content-length", ""),
+    new Header("content-location", ""),
+    new Header("content-range", ""),
+    new Header("content-type", ""),
+    new Header("cookie", ""),
+    new Header("date", ""),
+    new Header("etag", ""),
+    new Header("expect", ""),
+    new Header("expires", ""),
+    new Header("from", ""),
+    new Header("host", ""),
+    new Header("if-match", ""),
+    new Header("if-modified-since", ""),
+    new Header("if-none-match", ""),
+    new Header("if-range", ""),
+    new Header("if-unmodified-since", ""),
+    new Header("last-modified", ""),
+    new Header("link", ""),
+    new Header("location", ""),
+    new Header("max-forwards", ""),
+    new Header("proxy-authenticate", ""),
+    new Header("proxy-authorization", ""),
+    new Header("range", ""),
+    new Header("referer", ""),
+    new Header("refresh", ""),
+    new Header("retry-after", ""),
+    new Header("server", ""),
+    new Header("set-cookie", ""),
+    new Header("strict-transport-security", ""),
+    new Header("transfer-encoding", ""),
+    new Header("user-agent", ""),
+    new Header("vary", ""),
+    new Header("via", ""),
+    new Header("www-authenticate", "")
+    };
+
+    private HpackDraft08() {
+    }
 
-    /**
-     * Set bit positions indicate {@code headerTable[pos]} should be emitted.
-     */
-    // Using a BitArray as it has left-shift operator.
-    BitArray referencedHeaders = new BitArray.FixedCapacity();
+    // http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08#section-3.2
+    static final class Reader {
+
+        private final List<Header> emittedHeaders = new ArrayList<Header>();
+        private final ByteBufferList source = new ByteBufferList();
+
+        private int maxHeaderTableByteCountSetting;
+        private int maxHeaderTableByteCount;
+        // Visible for testing.
+        Header[] headerTable = new Header[8];
+        // Array is populated back to front, so new entries always have lowest index.
+        int nextHeaderIndex = headerTable.length - 1;
+        int headerCount = 0;
+
+        /**
+         * Set bit positions indicate {@code headerTable[pos]} should be emitted.
+         */
+        // Using a BitArray as it has left-shift operator.
+        BitArray referencedHeaders = new BitArray.FixedCapacity();
+
+        /**
+         * Set bit positions indicate {@code headerTable[pos]} was already emitted.
+         */
+        BitArray emittedReferencedHeaders = new BitArray.FixedCapacity();
+        int headerTableByteCount = 0;
+
+        Reader(int maxHeaderTableByteCountSetting) {
+            this.maxHeaderTableByteCountSetting = maxHeaderTableByteCountSetting;
+            this.maxHeaderTableByteCount = maxHeaderTableByteCountSetting;
+        }
 
-    /**
-     * Set bit positions indicate {@code headerTable[pos]} was already emitted.
-     */
-    BitArray emittedReferencedHeaders = new BitArray.FixedCapacity();
-    int headerTableByteCount = 0;
+        public void refill(ByteBufferList bb) {
+            bb.get(source);
+        }
 
-    Reader(int maxHeaderTableByteCountSetting, Source source) {
-      this.maxHeaderTableByteCountSetting = maxHeaderTableByteCountSetting;
-      this.maxHeaderTableByteCount = maxHeaderTableByteCountSetting;
-      this.source = Okio.buffer(source);
-    }
+        int maxHeaderTableByteCount() {
+            return maxHeaderTableByteCount;
+        }
 
-    int maxHeaderTableByteCount() {
-      return maxHeaderTableByteCount;
-    }
+        /**
+         * Called by the reader when the peer sent a new header table size setting.
+         * While this establishes the maximum header table size, the
+         * {@link #maxHeaderTableByteCount} set during processing may limit the
+         * table size to a smaller amount.
+         * <p> Evicts entries or clears the table as needed.
+         */
+        void maxHeaderTableByteCountSetting(int newMaxHeaderTableByteCountSetting) {
+            this.maxHeaderTableByteCountSetting = newMaxHeaderTableByteCountSetting;
+            this.maxHeaderTableByteCount = maxHeaderTableByteCountSetting;
+            adjustHeaderTableByteCount();
+        }
 
-    /**
-     * Called by the reader when the peer sent a new header table size setting.
-     * While this establishes the maximum header table size, the
-     * {@link #maxHeaderTableByteCount} set during processing may limit the
-     * table size to a smaller amount.
-     * <p> Evicts entries or clears the table as needed.
-     */
-    void maxHeaderTableByteCountSetting(int newMaxHeaderTableByteCountSetting) {
-      this.maxHeaderTableByteCountSetting = newMaxHeaderTableByteCountSetting;
-      this.maxHeaderTableByteCount = maxHeaderTableByteCountSetting;
-      adjustHeaderTableByteCount();
-    }
+        private void adjustHeaderTableByteCount() {
+            if (maxHeaderTableByteCount < headerTableByteCount) {
+                if (maxHeaderTableByteCount == 0) {
+                    clearHeaderTable();
+                } else {
+                    evictToRecoverBytes(headerTableByteCount - maxHeaderTableByteCount);
+                }
+            }
+        }
 
-    private void adjustHeaderTableByteCount() {
-      if (maxHeaderTableByteCount < headerTableByteCount) {
-        if (maxHeaderTableByteCount == 0) {
-          clearHeaderTable();
-        } else {
-          evictToRecoverBytes(headerTableByteCount - maxHeaderTableByteCount);
+        private void clearHeaderTable() {
+            clearReferenceSet();
+            Arrays.fill(headerTable, null);
+            nextHeaderIndex = headerTable.length - 1;
+            headerCount = 0;
+            headerTableByteCount = 0;
         }
-      }
-    }
 
-    private void clearHeaderTable() {
-      clearReferenceSet();
-      Arrays.fill(headerTable, null);
-      nextHeaderIndex = headerTable.length - 1;
-      headerCount = 0;
-      headerTableByteCount = 0;
-    }
+        /**
+         * Returns the count of entries evicted.
+         */
+        private int evictToRecoverBytes(int bytesToRecover) {
+            int entriesToEvict = 0;
+            if (bytesToRecover > 0) {
+                // determine how many headers need to be evicted.
+                for (int j = headerTable.length - 1; j >= nextHeaderIndex && bytesToRecover > 0; j--) {
+                    bytesToRecover -= headerTable[j].hpackSize;
+                    headerTableByteCount -= headerTable[j].hpackSize;
+                    headerCount--;
+                    entriesToEvict++;
+                }
+                referencedHeaders.shiftLeft(entriesToEvict);
+                emittedReferencedHeaders.shiftLeft(entriesToEvict);
+                System.arraycopy(headerTable, nextHeaderIndex + 1, headerTable,
+                nextHeaderIndex + 1 + entriesToEvict, headerCount);
+                nextHeaderIndex += entriesToEvict;
+            }
+            return entriesToEvict;
+        }
 
-    /** Returns the count of entries evicted. */
-    private int evictToRecoverBytes(int bytesToRecover) {
-      int entriesToEvict = 0;
-      if (bytesToRecover > 0) {
-        // determine how many headers need to be evicted.
-        for (int j = headerTable.length - 1; j >= nextHeaderIndex && bytesToRecover > 0; j--) {
-          bytesToRecover -= headerTable[j].hpackSize;
-          headerTableByteCount -= headerTable[j].hpackSize;
-          headerCount--;
-          entriesToEvict++;
+        /**
+         * Read {@code byteCount} bytes of headers from the source stream into the
+         * set of emitted headers. This implementation does not propagate the never
+         * indexed flag of a header.
+         */
+        void readHeaders() throws IOException {
+            while (source.hasRemaining()) {
+                int b = source.get() & 0xff;
+                if (b == 0x80) { // 10000000
+                    throw new IOException("index == 0");
+                } else if ((b & 0x80) == 0x80) { // 1NNNNNNN
+                    int index = readInt(b, PREFIX_7_BITS);
+                    readIndexedHeader(index - 1);
+                } else if (b == 0x40) { // 01000000
+                    readLiteralHeaderWithIncrementalIndexingNewName();
+                } else if ((b & 0x40) == 0x40) {  // 01NNNNNN
+                    int index = readInt(b, PREFIX_6_BITS);
+                    readLiteralHeaderWithIncrementalIndexingIndexedName(index - 1);
+                } else if ((b & 0x20) == 0x20) {  // 001NNNNN
+                    if ((b & 0x10) == 0x10) { // 0011NNNN
+                        if ((b & 0x0f) != 0)
+                            throw new IOException("Invalid header table state change " + b);
+                        clearReferenceSet(); // 00110000
+                    } else { // 0010NNNN
+                        maxHeaderTableByteCount = readInt(b, PREFIX_4_BITS);
+                        if (maxHeaderTableByteCount < 0
+                        || maxHeaderTableByteCount > maxHeaderTableByteCountSetting) {
+                            throw new IOException("Invalid header table byte count " + maxHeaderTableByteCount);
+                        }
+                        adjustHeaderTableByteCount();
+                    }
+                } else if (b == 0x10 || b == 0) { // 000?0000 - Ignore never indexed bit.
+                    readLiteralHeaderWithoutIndexingNewName();
+                } else { // 000?NNNN - Ignore never indexed bit.
+                    int index = readInt(b, PREFIX_4_BITS);
+                    readLiteralHeaderWithoutIndexingIndexedName(index - 1);
+                }
+            }
         }
-        referencedHeaders.shiftLeft(entriesToEvict);
-        emittedReferencedHeaders.shiftLeft(entriesToEvict);
-        System.arraycopy(headerTable, nextHeaderIndex + 1, headerTable,
-            nextHeaderIndex + 1 + entriesToEvict, headerCount);
-        nextHeaderIndex += entriesToEvict;
-      }
-      return entriesToEvict;
-    }
 
-    /**
-     * Read {@code byteCount} bytes of headers from the source stream into the
-     * set of emitted headers. This implementation does not propagate the never
-     * indexed flag of a header.
-     */
-    void readHeaders() throws IOException {
-      while (!source.exhausted()) {
-        int b = source.readByte() & 0xff;
-        if (b == 0x80) { // 10000000
-          throw new IOException("index == 0");
-        } else if ((b & 0x80) == 0x80) { // 1NNNNNNN
-          int index = readInt(b, PREFIX_7_BITS);
-          readIndexedHeader(index - 1);
-        } else if (b == 0x40) { // 01000000
-          readLiteralHeaderWithIncrementalIndexingNewName();
-        } else if ((b & 0x40) == 0x40) {  // 01NNNNNN
-          int index = readInt(b, PREFIX_6_BITS);
-          readLiteralHeaderWithIncrementalIndexingIndexedName(index - 1);
-        } else if ((b & 0x20) == 0x20) {  // 001NNNNN
-          if ((b & 0x10) == 0x10) { // 0011NNNN
-            if ((b & 0x0f) != 0) throw new IOException("Invalid header table state change " + b);
-            clearReferenceSet(); // 00110000
-          } else { // 0010NNNN
-            maxHeaderTableByteCount = readInt(b, PREFIX_4_BITS);
-            if (maxHeaderTableByteCount < 0
-                || maxHeaderTableByteCount > maxHeaderTableByteCountSetting) {
-              throw new IOException("Invalid header table byte count " + maxHeaderTableByteCount);
+        private void clearReferenceSet() {
+            referencedHeaders.clear();
+            emittedReferencedHeaders.clear();
+        }
+
+        void emitReferenceSet() {
+            for (int i = headerTable.length - 1; i != nextHeaderIndex; --i) {
+                if (referencedHeaders.get(i) && !emittedReferencedHeaders.get(i)) {
+                    emittedHeaders.add(headerTable[i]);
+                }
             }
-            adjustHeaderTableByteCount();
-          }
-        } else if (b == 0x10 || b == 0) { // 000?0000 - Ignore never indexed bit.
-          readLiteralHeaderWithoutIndexingNewName();
-        } else { // 000?NNNN - Ignore never indexed bit.
-          int index = readInt(b, PREFIX_4_BITS);
-          readLiteralHeaderWithoutIndexingIndexedName(index - 1);
         }
-      }
-    }
 
-    private void clearReferenceSet() {
-      referencedHeaders.clear();
-      emittedReferencedHeaders.clear();
-    }
+        /**
+         * Returns all headers emitted since they were last cleared, then clears the
+         * emitted headers.
+         */
+        List<Header> getAndReset() {
+            List<Header> result = new ArrayList<Header>(emittedHeaders);
+            emittedHeaders.clear();
+            emittedReferencedHeaders.clear();
+            return result;
+        }
 
-    void emitReferenceSet() {
-      for (int i = headerTable.length - 1; i != nextHeaderIndex; --i) {
-        if (referencedHeaders.get(i) && !emittedReferencedHeaders.get(i)) {
-          emittedHeaders.add(headerTable[i]);
+        private void readIndexedHeader(int index) throws IOException {
+            if (isStaticHeader(index)) {
+                index -= headerCount;
+                if (index > STATIC_HEADER_TABLE.length - 1) {
+                    throw new IOException("Header index too large " + (index + 1));
+                }
+                Header staticEntry = STATIC_HEADER_TABLE[index];
+                if (maxHeaderTableByteCount == 0) {
+                    emittedHeaders.add(staticEntry);
+                } else {
+                    insertIntoHeaderTable(-1, staticEntry);
+                }
+            } else {
+                int headerTableIndex = headerTableIndex(index);
+                if (!referencedHeaders.get(headerTableIndex)) { // When re-referencing, emit immediately.
+                    emittedHeaders.add(headerTable[headerTableIndex]);
+                    emittedReferencedHeaders.set(headerTableIndex);
+                }
+                referencedHeaders.toggle(headerTableIndex);
+            }
         }
-      }
-    }
 
-    /**
-     * Returns all headers emitted since they were last cleared, then clears the
-     * emitted headers.
-     */
-    List<Header> getAndReset() {
-      List<Header> result = new ArrayList<Header>(emittedHeaders);
-      emittedHeaders.clear();
-      emittedReferencedHeaders.clear();
-      return result;
-    }
+        // referencedHeaders is relative to nextHeaderIndex + 1.
+        private int headerTableIndex(int index) {
+            return nextHeaderIndex + 1 + index;
+        }
 
-    private void readIndexedHeader(int index) throws IOException {
-      if (isStaticHeader(index)) {
-        index -= headerCount;
-        if (index > STATIC_HEADER_TABLE.length - 1) {
-          throw new IOException("Header index too large " + (index + 1));
+        private void readLiteralHeaderWithoutIndexingIndexedName(int index) throws IOException {
+            ByteString name = getName(index);
+            ByteString value = readByteString();
+            emittedHeaders.add(new Header(name, value));
         }
-        Header staticEntry = STATIC_HEADER_TABLE[index];
-        if (maxHeaderTableByteCount == 0) {
-          emittedHeaders.add(staticEntry);
-        } else {
-          insertIntoHeaderTable(-1, staticEntry);
+
+        private void readLiteralHeaderWithoutIndexingNewName() throws IOException {
+            ByteString name = checkLowercase(readByteString());
+            ByteString value = readByteString();
+            emittedHeaders.add(new Header(name, value));
         }
-      } else {
-        int headerTableIndex = headerTableIndex(index);
-        if (!referencedHeaders.get(headerTableIndex)) { // When re-referencing, emit immediately.
-          emittedHeaders.add(headerTable[headerTableIndex]);
-          emittedReferencedHeaders.set(headerTableIndex);
+
+        private void readLiteralHeaderWithIncrementalIndexingIndexedName(int nameIndex)
+        throws IOException {
+            ByteString name = getName(nameIndex);
+            ByteString value = readByteString();
+            insertIntoHeaderTable(-1, new Header(name, value));
         }
-        referencedHeaders.toggle(headerTableIndex);
-      }
-    }
 
-    // referencedHeaders is relative to nextHeaderIndex + 1.
-    private int headerTableIndex(int index) {
-      return nextHeaderIndex + 1 + index;
-    }
+        private void readLiteralHeaderWithIncrementalIndexingNewName() throws IOException {
+            ByteString name = checkLowercase(readByteString());
+            ByteString value = readByteString();
+            insertIntoHeaderTable(-1, new Header(name, value));
+        }
 
-    private void readLiteralHeaderWithoutIndexingIndexedName(int index) throws IOException {
-      ByteString name = getName(index);
-      ByteString value = readByteString();
-      emittedHeaders.add(new Header(name, value));
-    }
+        private ByteString getName(int index) {
+            if (isStaticHeader(index)) {
+                return STATIC_HEADER_TABLE[index - headerCount].name;
+            } else {
+                return headerTable[headerTableIndex(index)].name;
+            }
+        }
 
-    private void readLiteralHeaderWithoutIndexingNewName() throws IOException {
-      ByteString name = checkLowercase(readByteString());
-      ByteString value = readByteString();
-      emittedHeaders.add(new Header(name, value));
-    }
+        private boolean isStaticHeader(int index) {
+            return index >= headerCount;
+        }
 
-    private void readLiteralHeaderWithIncrementalIndexingIndexedName(int nameIndex)
-        throws IOException {
-      ByteString name = getName(nameIndex);
-      ByteString value = readByteString();
-      insertIntoHeaderTable(-1, new Header(name, value));
-    }
+        /**
+         * index == -1 when new.
+         */
+        private void insertIntoHeaderTable(int index, Header entry) {
+            int delta = entry.hpackSize;
+            if (index != -1) { // Index -1 == new header.
+                delta -= headerTable[headerTableIndex(index)].hpackSize;
+            }
 
-    private void readLiteralHeaderWithIncrementalIndexingNewName() throws IOException {
-      ByteString name = checkLowercase(readByteString());
-      ByteString value = readByteString();
-      insertIntoHeaderTable(-1, new Header(name, value));
-    }
+            // if the new or replacement header is too big, drop all entries.
+            if (delta > maxHeaderTableByteCount) {
+                clearHeaderTable();
+                // emit the large header to the callback.
+                emittedHeaders.add(entry);
+                return;
+            }
 
-    private ByteString getName(int index) {
-      if (isStaticHeader(index)) {
-        return STATIC_HEADER_TABLE[index - headerCount].name;
-      } else {
-        return headerTable[headerTableIndex(index)].name;
-      }
-    }
+            // Evict headers to the required length.
+            int bytesToRecover = (headerTableByteCount + delta) - maxHeaderTableByteCount;
+            int entriesEvicted = evictToRecoverBytes(bytesToRecover);
+
+            if (index == -1) { // Adding a value to the header table.
+                if (headerCount + 1 > headerTable.length) { // Need to grow the header table.
+                    Header[] doubled = new Header[headerTable.length * 2];
+                    System.arraycopy(headerTable, 0, doubled, headerTable.length, headerTable.length);
+                    if (doubled.length == 64) {
+                        referencedHeaders = ((BitArray.FixedCapacity) referencedHeaders).toVariableCapacity();
+                        emittedReferencedHeaders =
+                        ((BitArray.FixedCapacity) emittedReferencedHeaders).toVariableCapacity();
+                    }
+                    referencedHeaders.shiftLeft(headerTable.length);
+                    emittedReferencedHeaders.shiftLeft(headerTable.length);
+                    nextHeaderIndex = headerTable.length - 1;
+                    headerTable = doubled;
+                }
+                index = nextHeaderIndex--;
+                referencedHeaders.set(index);
+                headerTable[index] = entry;
+                headerCount++;
+            } else { // Replace value at same position.
+                index += headerTableIndex(index) + entriesEvicted;
+                referencedHeaders.set(index);
+                headerTable[index] = entry;
+            }
+            headerTableByteCount += delta;
+        }
 
-    private boolean isStaticHeader(int index) {
-      return index >= headerCount;
-    }
+        private int readByte() throws IOException {
+            return source.get() & 0xff;
+        }
 
-    /** index == -1 when new. */
-    private void insertIntoHeaderTable(int index, Header entry) {
-      int delta = entry.hpackSize;
-      if (index != -1) { // Index -1 == new header.
-        delta -= headerTable[headerTableIndex(index)].hpackSize;
-      }
-
-      // if the new or replacement header is too big, drop all entries.
-      if (delta > maxHeaderTableByteCount) {
-        clearHeaderTable();
-        // emit the large header to the callback.
-        emittedHeaders.add(entry);
-        return;
-      }
-
-      // Evict headers to the required length.
-      int bytesToRecover = (headerTableByteCount + delta) - maxHeaderTableByteCount;
-      int entriesEvicted = evictToRecoverBytes(bytesToRecover);
-
-      if (index == -1) { // Adding a value to the header table.
-        if (headerCount + 1 > headerTable.length) { // Need to grow the header table.
-          Header[] doubled = new Header[headerTable.length * 2];
-          System.arraycopy(headerTable, 0, doubled, headerTable.length, headerTable.length);
-          if (doubled.length == 64) {
-            referencedHeaders = ((BitArray.FixedCapacity) referencedHeaders).toVariableCapacity();
-            emittedReferencedHeaders =
-                ((BitArray.FixedCapacity) emittedReferencedHeaders).toVariableCapacity();
-          }
-          referencedHeaders.shiftLeft(headerTable.length);
-          emittedReferencedHeaders.shiftLeft(headerTable.length);
-          nextHeaderIndex = headerTable.length - 1;
-          headerTable = doubled;
+        int readInt(int firstByte, int prefixMask) throws IOException {
+            int prefix = firstByte & prefixMask;
+            if (prefix < prefixMask) {
+                return prefix; // This was a single byte value.
+            }
+
+            // This is a multibyte value. Read 7 bits at a time.
+            int result = prefixMask;
+            int shift = 0;
+            while (true) {
+                int b = readByte();
+                if ((b & 0x80) != 0) { // Equivalent to (b >= 128) since b is in [0..255].
+                    result += (b & 0x7f) << shift;
+                    shift += 7;
+                } else {
+                    result += b << shift; // Last byte.
+                    break;
+                }
+            }
+            return result;
         }
-        index = nextHeaderIndex--;
-        referencedHeaders.set(index);
-        headerTable[index] = entry;
-        headerCount++;
-      } else { // Replace value at same position.
-        index += headerTableIndex(index) + entriesEvicted;
-        referencedHeaders.set(index);
-        headerTable[index] = entry;
-      }
-      headerTableByteCount += delta;
-    }
 
-    private int readByte() throws IOException {
-      return source.readByte() & 0xff;
+        /**
+         * Reads a potentially Huffman encoded byte string.
+         */
+        ByteString readByteString() throws IOException {
+            int firstByte = readByte();
+            boolean huffmanDecode = (firstByte & 0x80) == 0x80; // 1NNNNNNN
+            int length = readInt(firstByte, PREFIX_7_BITS);
+
+            if (huffmanDecode) {
+                return ByteString.of(Huffman.get().decode(source.getBytes(length)));
+            } else {
+                return ByteString.of(source.getBytes(length));
+            }
+        }
     }
 
-    int readInt(int firstByte, int prefixMask) throws IOException {
-      int prefix = firstByte & prefixMask;
-      if (prefix < prefixMask) {
-        return prefix; // This was a single byte value.
-      }
-
-      // This is a multibyte value. Read 7 bits at a time.
-      int result = prefixMask;
-      int shift = 0;
-      while (true) {
-        int b = readByte();
-        if ((b & 0x80) != 0) { // Equivalent to (b >= 128) since b is in [0..255].
-          result += (b & 0x7f) << shift;
-          shift += 7;
-        } else {
-          result += b << shift; // Last byte.
-          break;
+    private static final Map<ByteString, Integer> NAME_TO_FIRST_INDEX = nameToFirstIndex();
+
+    private static Map<ByteString, Integer> nameToFirstIndex() {
+        Map<ByteString, Integer> result = new LinkedHashMap<ByteString, Integer>(STATIC_HEADER_TABLE.length);
+        for (int i = 0; i < STATIC_HEADER_TABLE.length; i++) {
+            if (!result.containsKey(STATIC_HEADER_TABLE[i].name)) {
+                result.put(STATIC_HEADER_TABLE[i].name, i);
+            }
         }
-      }
-      return result;
+        return Collections.unmodifiableMap(result);
     }
 
-    /** Reads a potentially Huffman encoded byte string. */
-    ByteString readByteString() throws IOException {
-      int firstByte = readByte();
-      boolean huffmanDecode = (firstByte & 0x80) == 0x80; // 1NNNNNNN
-      int length = readInt(firstByte, PREFIX_7_BITS);
-
-      if (huffmanDecode) {
-        return ByteString.of(Huffman.get().decode(source.readByteArray(length)));
-      } else {
-        return source.readByteString(length);
-      }
-    }
-  }
+    static final class Writer {
+        private final Buffer out;
 
-  private static final Map<ByteString, Integer> NAME_TO_FIRST_INDEX = nameToFirstIndex();
+        Writer(Buffer out) {
+            this.out = out;
+        }
 
-  private static Map<ByteString, Integer> nameToFirstIndex() {
-    Map<ByteString, Integer> result = new LinkedHashMap<ByteString, Integer>(STATIC_HEADER_TABLE.length);
-    for (int i = 0; i < STATIC_HEADER_TABLE.length; i++) {
-      if (!result.containsKey(STATIC_HEADER_TABLE[i].name)) {
-        result.put(STATIC_HEADER_TABLE[i].name, i);
-      }
-    }
-    return Collections.unmodifiableMap(result);
-  }
+        /**
+         * This does not use "never indexed" semantics for sensitive headers.
+         */
+        // https://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08#section-4.3.3
+        void writeHeaders(List<Header> headerBlock) throws IOException {
+            // TODO: implement index tracking
+            for (int i = 0, size = headerBlock.size(); i < size; i++) {
+                ByteString name = headerBlock.get(i).name.toAsciiLowercase();
+                Integer staticIndex = NAME_TO_FIRST_INDEX.get(name);
+                if (staticIndex != null) {
+                    // Literal Header Field without Indexing - Indexed Name.
+                    writeInt(staticIndex + 1, PREFIX_4_BITS, 0);
+                    writeByteString(headerBlock.get(i).value);
+                } else {
+                    out.writeByte(0x00); // Literal Header without Indexing - New Name.
+                    writeByteString(name);
+                    writeByteString(headerBlock.get(i).value);
+                }
+            }
+        }
 
-  static final class Writer {
-    private final Buffer out;
+        // http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08#section-4.1.1
+        void writeInt(int value, int prefixMask, int bits) throws IOException {
+            // Write the raw value for a single byte value.
+            if (value < prefixMask) {
+                out.writeByte(bits | value);
+                return;
+            }
 
-    Writer(Buffer out) {
-      this.out = out;
-    }
+            // Write the mask to start a multibyte value.
+            out.writeByte(bits | prefixMask);
+            value -= prefixMask;
 
-    /** This does not use "never indexed" semantics for sensitive headers. */
-    // https://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08#section-4.3.3
-    void writeHeaders(List<Header> headerBlock) throws IOException {
-      // TODO: implement index tracking
-      for (int i = 0, size = headerBlock.size(); i < size; i++) {
-        ByteString name = headerBlock.get(i).name.toAsciiLowercase();
-        Integer staticIndex = NAME_TO_FIRST_INDEX.get(name);
-        if (staticIndex != null) {
-          // Literal Header Field without Indexing - Indexed Name.
-          writeInt(staticIndex + 1, PREFIX_4_BITS, 0);
-          writeByteString(headerBlock.get(i).value);
-        } else {
-          out.writeByte(0x00); // Literal Header without Indexing - New Name.
-          writeByteString(name);
-          writeByteString(headerBlock.get(i).value);
+            // Write 7 bits at a time 'til we're done.
+            while (value >= 0x80) {
+                int b = value & 0x7f;
+                out.writeByte(b | 0x80);
+                value >>>= 7;
+            }
+            out.writeByte(value);
         }
-      }
-    }
 
-    // http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08#section-4.1.1
-    void writeInt(int value, int prefixMask, int bits) throws IOException {
-      // Write the raw value for a single byte value.
-      if (value < prefixMask) {
-        out.writeByte(bits | value);
-        return;
-      }
-
-      // Write the mask to start a multibyte value.
-      out.writeByte(bits | prefixMask);
-      value -= prefixMask;
-
-      // Write 7 bits at a time 'til we're done.
-      while (value >= 0x80) {
-        int b = value & 0x7f;
-        out.writeByte(b | 0x80);
-        value >>>= 7;
-      }
-      out.writeByte(value);
+        void writeByteString(ByteString data) throws IOException {
+            writeInt(data.size(), PREFIX_7_BITS, 0);
+            out.write(data);
+        }
     }
 
-    void writeByteString(ByteString data) throws IOException {
-      writeInt(data.size(), PREFIX_7_BITS, 0);
-      out.write(data);
-    }
-  }
-
-  /**
-   * An HTTP/2 response cannot contain uppercase header characters and must
-   * be treated as malformed.
-   */
-  private static ByteString checkLowercase(ByteString name) throws IOException {
-    for (int i = 0, length = name.size(); i < length; i++) {
-      byte c = name.getByte(i);
-      if (c >= 'A' && c <= 'Z') {
-        throw new IOException("PROTOCOL_ERROR response malformed: mixed case name: " + name.utf8());
-      }
+    /**
+     * An HTTP/2 response cannot contain uppercase header characters and must
+     * be treated as malformed.
+     */
+    private static ByteString checkLowercase(ByteString name) throws IOException {
+        for (int i = 0, length = name.size(); i < length; i++) {
+            byte c = name.getByte(i);
+            if (c >= 'A' && c <= 'Z') {
+                throw new IOException("PROTOCOL_ERROR response malformed: mixed case name: " + name.utf8());
+            }
+        }
+        return name;
     }
-    return name;
-  }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java.ignore b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java.ignore
deleted file mode 100644
index c2231970a..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Http20Draft13.java.ignore
+++ /dev/null
@@ -1,763 +0,0 @@
-/*
- * Copyright (C) 2013 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
-
-import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.http.Protocol;
-import com.koushikdutta.async.http.spdy.okio.Buffer;
-import com.koushikdutta.async.http.spdy.okio.BufferedSink;
-import com.koushikdutta.async.http.spdy.okio.BufferedSource;
-import com.koushikdutta.async.http.spdy.okio.ByteString;
-import com.koushikdutta.async.http.spdy.okio.Source;
-import com.koushikdutta.async.http.spdy.okio.Timeout;
-
-import java.io.IOException;
-import java.nio.ByteOrder;
-import java.util.List;
-import java.util.logging.Logger;
-
-import static com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Http20Draft13.FrameLogger.formatHeader;
-import static com.koushikdutta.async.http.spdy.okio.ByteString.EMPTY;
-import static java.lang.String.format;
-import static java.util.logging.Level.FINE;
-
-/**
- * Read and write HTTP/2 v13 frames.
- * <p>http://tools.ietf.org/html/draft-ietf-httpbis-http2-13
- */
-
-public final class Http20Draft13 implements Variant {
-  private static final Logger logger = Logger.getLogger(Http20Draft13.class.getName());
-
-  @Override public Protocol getProtocol() {
-    return Protocol.HTTP_2;
-  }
-
-  private static final ByteString CONNECTION_PREFACE
-      = ByteString.encodeUtf8("PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n");
-
-  static final int MAX_FRAME_SIZE = 0x3fff; // 16383
-
-  static final byte TYPE_DATA = 0x0;
-  static final byte TYPE_HEADERS = 0x1;
-  static final byte TYPE_PRIORITY = 0x2;
-  static final byte TYPE_RST_STREAM = 0x3;
-  static final byte TYPE_SETTINGS = 0x4;
-  static final byte TYPE_PUSH_PROMISE = 0x5;
-  static final byte TYPE_PING = 0x6;
-  static final byte TYPE_GOAWAY = 0x7;
-  static final byte TYPE_WINDOW_UPDATE = 0x8;
-  static final byte TYPE_CONTINUATION = 0x9;
-
-  static final byte FLAG_NONE = 0x0;
-  static final byte FLAG_ACK = 0x1; // Used for settings and ping.
-  static final byte FLAG_END_STREAM = 0x1; // Used for headers and data.
-  static final byte FLAG_END_SEGMENT = 0x2;
-  static final byte FLAG_END_HEADERS = 0x4; // Used for headers and continuation.
-  static final byte FLAG_END_PUSH_PROMISE = 0x4;
-  static final byte FLAG_PADDED = 0x8; // Used for headers and data.
-  static final byte FLAG_PRIORITY = 0x20; // Used for headers.
-  static final byte FLAG_COMPRESSED = 0x20; // Used for data.
-
-  /**
-   * Creates a frame reader with max header table size of 4096 and data frame
-   * compression disabled.
-   */
-  @Override public FrameReader newReader(BufferedSource source, boolean client) {
-    return new Reader(source, 4096, client);
-  }
-
-  @Override public FrameWriter newWriter(BufferedSink sink, boolean client) {
-    return new Writer(sink, client);
-  }
-
-  @Override public int maxFrameSize() {
-    return MAX_FRAME_SIZE;
-  }
-
-  static final class Reader implements FrameReader {
-    private final BufferedSource source;
-    private final ContinuationSource continuation;
-    private final boolean client;
-
-    // Visible for testing.
-    final HpackDraft08.Reader hpackReader;
-
-      @Override
-      public int canProcessFrame(ByteBufferList bb) {
-          if (bb.remaining() < 4)
-              return 0;
-          bb.order(ByteOrder.BIG_ENDIAN);
-          int w1 = bb.peekInt();
-
-          short length = (short) ((w1 & 0x3fff0000) >> 16); // 14-bit unsigned == MAX_FRAME_SIZE
-          if  (bb.remaining() < 8 + length)
-              return 0;
-          return 8 + length;
-      }
-
-    Reader(BufferedSource source, int headerTableSize, boolean client) {
-      this.source = source;
-      this.client = client;
-      this.continuation = new ContinuationSource(this.source);
-      this.hpackReader = new HpackDraft08.Reader(headerTableSize, continuation);
-    }
-
-    @Override public void readConnectionPreface() throws IOException {
-      if (client) return; // Nothing to read; servers doesn't send a connection preface!
-      ByteString connectionPreface = source.readByteString(CONNECTION_PREFACE.size());
-      if (logger.isLoggable(FINE)) logger.fine(format("<< CONNECTION %s", connectionPreface.hex()));
-      if (!CONNECTION_PREFACE.equals(connectionPreface)) {
-        throw ioException("Expected a connection header but was %s", connectionPreface.utf8());
-      }
-    }
-
-    @Override public boolean nextFrame(Handler handler) throws IOException {
-      int w1;
-      int w2;
-      try {
-        w1 = source.readInt();
-        w2 = source.readInt();
-      } catch (IOException e) {
-        return false; // This might be a normal socket close.
-      }
-
-      // boolean r = (w1 & 0xc0000000) != 0; // Reserved: Ignore first 2 bits.
-      short length = (short) ((w1 & 0x3fff0000) >> 16); // 14-bit unsigned == MAX_FRAME_SIZE
-      byte type = (byte) ((w1 & 0xff00) >> 8);
-      byte flags = (byte) (w1 & 0xff);
-      // boolean r = (w2 & 0x80000000) != 0; // Reserved: Ignore first bit.
-      int streamId = (w2 & 0x7fffffff); // 31-bit opaque identifier.
-      if (logger.isLoggable(FINE)) logger.fine(formatHeader(true, streamId, length, type, flags));
-
-      switch (type) {
-        case TYPE_DATA:
-          readData(handler, length, flags, streamId);
-          break;
-
-        case TYPE_HEADERS:
-          readHeaders(handler, length, flags, streamId);
-          break;
-
-        case TYPE_PRIORITY:
-          readPriority(handler, length, flags, streamId);
-          break;
-
-        case TYPE_RST_STREAM:
-          readRstStream(handler, length, flags, streamId);
-          break;
-
-        case TYPE_SETTINGS:
-          readSettings(handler, length, flags, streamId);
-          break;
-
-        case TYPE_PUSH_PROMISE:
-          readPushPromise(handler, length, flags, streamId);
-          break;
-
-        case TYPE_PING:
-          readPing(handler, length, flags, streamId);
-          break;
-
-        case TYPE_GOAWAY:
-          readGoAway(handler, length, flags, streamId);
-          break;
-
-        case TYPE_WINDOW_UPDATE:
-          readWindowUpdate(handler, length, flags, streamId);
-          break;
-
-        default:
-          // Implementations MUST discard frames that have unknown or unsupported types.
-          source.skip(length);
-      }
-      return true;
-    }
-
-    private void readHeaders(Handler handler, short length, byte flags, int streamId)
-        throws IOException {
-      if (streamId == 0) throw ioException("PROTOCOL_ERROR: TYPE_HEADERS streamId == 0");
-
-      boolean endStream = (flags & FLAG_END_STREAM) != 0;
-
-      short padding = (flags & FLAG_PADDED) != 0 ? (short) (source.readByte() & 0xff) : 0;
-
-      if ((flags & FLAG_PRIORITY) != 0) {
-        readPriority(handler, streamId);
-        length -= 5; // account for above read.
-      }
-
-      length = lengthWithoutPadding(length, flags, padding);
-
-      List<Header> headerBlock = readHeaderBlock(length, padding, flags, streamId);
-
-      handler.headers(false, endStream, streamId, -1, headerBlock, HeadersMode.HTTP_20_HEADERS);
-    }
-
-    private List<Header> readHeaderBlock(short length, short padding, byte flags, int streamId)
-        throws IOException {
-      continuation.length = continuation.left = length;
-      continuation.padding = padding;
-      continuation.flags = flags;
-      continuation.streamId = streamId;
-
-      hpackReader.readHeaders();
-      hpackReader.emitReferenceSet();
-      // TODO: Concat multi-value headers with 0x0, except COOKIE, which uses 0x3B, 0x20.
-      // http://tools.ietf.org/html/draft-ietf-httpbis-http2-09#section-8.1.3
-      return hpackReader.getAndReset();
-    }
-
-    private void readData(Handler handler, short length, byte flags, int streamId)
-        throws IOException {
-      // TODO: checkState open or half-closed (local) or raise STREAM_CLOSED
-      boolean inFinished = (flags & FLAG_END_STREAM) != 0;
-      boolean gzipped = (flags & FLAG_COMPRESSED) != 0;
-      if (gzipped) {
-        throw ioException("PROTOCOL_ERROR: FLAG_COMPRESSED without SETTINGS_COMPRESS_DATA");
-      }
-
-      short padding = (flags & FLAG_PADDED) != 0 ? (short) (source.readByte() & 0xff) : 0;
-      length = lengthWithoutPadding(length, flags, padding);
-
-      handler.data(inFinished, streamId, source, length);
-      source.skip(padding);
-    }
-
-    private void readPriority(Handler handler, short length, byte flags, int streamId)
-        throws IOException {
-      if (length != 5) throw ioException("TYPE_PRIORITY length: %d != 5", length);
-      if (streamId == 0) throw ioException("TYPE_PRIORITY streamId == 0");
-      readPriority(handler, streamId);
-    }
-
-    private void readPriority(Handler handler, int streamId) throws IOException {
-      int w1 = source.readInt();
-      boolean exclusive = (w1 & 0x80000000) != 0;
-      int streamDependency = (w1 & 0x7fffffff);
-      int weight = (source.readByte() & 0xff) + 1;
-      handler.priority(streamId, streamDependency, weight, exclusive);
-    }
-
-    private void readRstStream(Handler handler, short length, byte flags, int streamId)
-        throws IOException {
-      if (length != 4) throw ioException("TYPE_RST_STREAM length: %d != 4", length);
-      if (streamId == 0) throw ioException("TYPE_RST_STREAM streamId == 0");
-      int errorCodeInt = source.readInt();
-      ErrorCode errorCode = ErrorCode.fromHttp2(errorCodeInt);
-      if (errorCode == null) {
-        throw ioException("TYPE_RST_STREAM unexpected error code: %d", errorCodeInt);
-      }
-      handler.rstStream(streamId, errorCode);
-    }
-
-    private void readSettings(Handler handler, short length, byte flags, int streamId)
-        throws IOException {
-      if (streamId != 0) throw ioException("TYPE_SETTINGS streamId != 0");
-      if ((flags & FLAG_ACK) != 0) {
-        if (length != 0) throw ioException("FRAME_SIZE_ERROR ack frame should be empty!");
-        handler.ackSettings();
-        return;
-      }
-
-      if (length % 6 != 0) throw ioException("TYPE_SETTINGS length %% 6 != 0: %s", length);
-      Settings settings = new Settings();
-      for (int i = 0; i < length; i += 6) {
-        short id = source.readShort();
-        int value = source.readInt();
-
-        switch (id) {
-          case 1: // SETTINGS_HEADER_TABLE_SIZE
-            break;
-          case 2: // SETTINGS_ENABLE_PUSH
-            if (value != 0 && value != 1) {
-              throw ioException("PROTOCOL_ERROR SETTINGS_ENABLE_PUSH != 0 or 1");
-            }
-            break;
-          case 3: // SETTINGS_MAX_CONCURRENT_STREAMS
-            id = 4; // Renumbered in draft 10.
-            break;
-          case 4: // SETTINGS_INITIAL_WINDOW_SIZE
-            id = 7; // Renumbered in draft 10.
-            if (value < 0) {
-              throw ioException("PROTOCOL_ERROR SETTINGS_INITIAL_WINDOW_SIZE > 2^31 - 1");
-            }
-            break;
-          case 5: // SETTINGS_COMPRESS_DATA
-            break;
-          default:
-            throw ioException("PROTOCOL_ERROR invalid settings id: %s", id);
-        }
-        settings.set(id, 0, value);
-      }
-      handler.settings(false, settings);
-      if (settings.getHeaderTableSize() >= 0) {
-        hpackReader.maxHeaderTableByteCountSetting(settings.getHeaderTableSize());
-      }
-    }
-
-    private void readPushPromise(Handler handler, short length, byte flags, int streamId)
-        throws IOException {
-      if (streamId == 0) {
-        throw ioException("PROTOCOL_ERROR: TYPE_PUSH_PROMISE streamId == 0");
-      }
-      short padding = (flags & FLAG_PADDED) != 0 ? (short) (source.readByte() & 0xff) : 0;
-      int promisedStreamId = source.readInt() & 0x7fffffff;
-      length -= 4; // account for above read.
-      length = lengthWithoutPadding(length, flags, padding);
-      List<Header> headerBlock = readHeaderBlock(length, padding, flags, streamId);
-      handler.pushPromise(streamId, promisedStreamId, headerBlock);
-    }
-
-    private void readPing(Handler handler, short length, byte flags, int streamId)
-        throws IOException {
-      if (length != 8) throw ioException("TYPE_PING length != 8: %s", length);
-      if (streamId != 0) throw ioException("TYPE_PING streamId != 0");
-      int payload1 = source.readInt();
-      int payload2 = source.readInt();
-      boolean ack = (flags & FLAG_ACK) != 0;
-      handler.ping(ack, payload1, payload2);
-    }
-
-    private void readGoAway(Handler handler, short length, byte flags, int streamId)
-        throws IOException {
-      if (length < 8) throw ioException("TYPE_GOAWAY length < 8: %s", length);
-      if (streamId != 0) throw ioException("TYPE_GOAWAY streamId != 0");
-      int lastStreamId = source.readInt();
-      int errorCodeInt = source.readInt();
-      int opaqueDataLength = length - 8;
-      ErrorCode errorCode = ErrorCode.fromHttp2(errorCodeInt);
-      if (errorCode == null) {
-        throw ioException("TYPE_GOAWAY unexpected error code: %d", errorCodeInt);
-      }
-      ByteString debugData = EMPTY;
-      if (opaqueDataLength > 0) { // Must read debug data in order to not corrupt the connection.
-        debugData = source.readByteString(opaqueDataLength);
-      }
-      handler.goAway(lastStreamId, errorCode, debugData);
-    }
-
-    private void readWindowUpdate(Handler handler, short length, byte flags, int streamId)
-        throws IOException {
-      if (length != 4) throw ioException("TYPE_WINDOW_UPDATE length !=4: %s", length);
-      long increment = (source.readInt() & 0x7fffffffL);
-      if (increment == 0) throw ioException("windowSizeIncrement was 0", increment);
-      handler.windowUpdate(streamId, increment);
-    }
-
-    @Override public void close() throws IOException {
-      source.close();
-    }
-  }
-
-  static final class Writer implements FrameWriter {
-    private final BufferedSink sink;
-    private final boolean client;
-    private final Buffer hpackBuffer;
-    private final HpackDraft08.Writer hpackWriter;
-    private boolean closed;
-
-    Writer(BufferedSink sink, boolean client) {
-      this.sink = sink;
-      this.client = client;
-      this.hpackBuffer = new Buffer();
-      this.hpackWriter = new HpackDraft08.Writer(hpackBuffer);
-    }
-
-    @Override public synchronized void flush() throws IOException {
-      if (closed) throw new IOException("closed");
-      sink.flush();
-    }
-
-    @Override public synchronized void ackSettings() throws IOException {
-      if (closed) throw new IOException("closed");
-      int length = 0;
-      byte type = TYPE_SETTINGS;
-      byte flags = FLAG_ACK;
-      int streamId = 0;
-      frameHeader(streamId, length, type, flags);
-      sink.flush();
-    }
-
-    @Override public synchronized void connectionPreface() throws IOException {
-      if (closed) throw new IOException("closed");
-      if (!client) return; // Nothing to write; servers don't send connection headers!
-      if (logger.isLoggable(FINE)) {
-        logger.fine(format(">> CONNECTION %s", CONNECTION_PREFACE.hex()));
-      }
-      sink.write(CONNECTION_PREFACE.toByteArray());
-      sink.flush();
-    }
-
-    @Override public synchronized void synStream(boolean outFinished, boolean inFinished,
-        int streamId, int associatedStreamId, List<Header> headerBlock)
-        throws IOException {
-      if (inFinished) throw new UnsupportedOperationException();
-      if (closed) throw new IOException("closed");
-      headers(outFinished, streamId, headerBlock);
-    }
-
-    @Override public synchronized void synReply(boolean outFinished, int streamId,
-        List<Header> headerBlock) throws IOException {
-      if (closed) throw new IOException("closed");
-      headers(outFinished, streamId, headerBlock);
-    }
-
-    @Override public synchronized void headers(int streamId, List<Header> headerBlock)
-        throws IOException {
-      if (closed) throw new IOException("closed");
-      headers(false, streamId, headerBlock);
-    }
-
-    @Override public synchronized void pushPromise(int streamId, int promisedStreamId,
-        List<Header> requestHeaders) throws IOException {
-      if (closed) throw new IOException("closed");
-      if (hpackBuffer.size() != 0) throw new IllegalStateException();
-      hpackWriter.writeHeaders(requestHeaders);
-
-      long byteCount = hpackBuffer.size();
-      int length = (int) Math.min(MAX_FRAME_SIZE - 4, byteCount);
-      byte type = TYPE_PUSH_PROMISE;
-      byte flags = byteCount == length ? FLAG_END_HEADERS : 0;
-      frameHeader(streamId, length + 4, type, flags);
-      sink.writeInt(promisedStreamId & 0x7fffffff);
-      sink.write(hpackBuffer, length);
-
-      if (byteCount > length) writeContinuationFrames(streamId, byteCount - length);
-    }
-
-    void headers(boolean outFinished, int streamId, List<Header> headerBlock) throws IOException {
-      if (closed) throw new IOException("closed");
-      if (hpackBuffer.size() != 0) throw new IllegalStateException();
-      hpackWriter.writeHeaders(headerBlock);
-
-      long byteCount = hpackBuffer.size();
-      int length = (int) Math.min(MAX_FRAME_SIZE, byteCount);
-      byte type = TYPE_HEADERS;
-      byte flags = byteCount == length ? FLAG_END_HEADERS : 0;
-      if (outFinished) flags |= FLAG_END_STREAM;
-      frameHeader(streamId, length, type, flags);
-      sink.write(hpackBuffer, length);
-
-      if (byteCount > length) writeContinuationFrames(streamId, byteCount - length);
-    }
-
-    private void writeContinuationFrames(int streamId, long byteCount) throws IOException {
-      while (byteCount > 0) {
-        int length = (int) Math.min(MAX_FRAME_SIZE, byteCount);
-        byteCount -= length;
-        frameHeader(streamId, length, TYPE_CONTINUATION, byteCount == 0 ? FLAG_END_HEADERS : 0);
-        sink.write(hpackBuffer, length);
-      }
-    }
-
-    @Override public synchronized void rstStream(int streamId, ErrorCode errorCode)
-        throws IOException {
-      if (closed) throw new IOException("closed");
-      if (errorCode.spdyRstCode == -1) throw new IllegalArgumentException();
-
-      int length = 4;
-      byte type = TYPE_RST_STREAM;
-      byte flags = FLAG_NONE;
-      frameHeader(streamId, length, type, flags);
-      sink.writeInt(errorCode.httpCode);
-      sink.flush();
-    }
-
-    @Override public synchronized void data(boolean outFinished, int streamId, Buffer source)
-        throws IOException {
-      data(outFinished, streamId, source, (int) source.size());
-    }
-
-    @Override public synchronized void data(boolean outFinished, int streamId, Buffer source,
-        int byteCount) throws IOException {
-      if (closed) throw new IOException("closed");
-      byte flags = FLAG_NONE;
-      if (outFinished) flags |= FLAG_END_STREAM;
-      dataFrame(streamId, flags, source, byteCount);
-    }
-
-    void dataFrame(int streamId, byte flags, Buffer buffer, int byteCount) throws IOException {
-      byte type = TYPE_DATA;
-      frameHeader(streamId, byteCount, type, flags);
-      if (byteCount > 0) {
-        sink.write(buffer, byteCount);
-      }
-    }
-
-    @Override public synchronized void settings(Settings settings) throws IOException {
-      if (closed) throw new IOException("closed");
-      int length = settings.size() * 6;
-      byte type = TYPE_SETTINGS;
-      byte flags = FLAG_NONE;
-      int streamId = 0;
-      frameHeader(streamId, length, type, flags);
-      for (int i = 0; i < Settings.COUNT; i++) {
-        if (!settings.isSet(i)) continue;
-        int id = i;
-        if (id == 4) id = 3; // SETTINGS_MAX_CONCURRENT_STREAMS renumbered.
-        else if (id == 7) id = 4; // SETTINGS_INITIAL_WINDOW_SIZE renumbered.
-        sink.writeShort(id);
-        sink.writeInt(settings.get(i));
-      }
-      sink.flush();
-    }
-
-    @Override public synchronized void ping(boolean ack, int payload1, int payload2)
-        throws IOException {
-      if (closed) throw new IOException("closed");
-      int length = 8;
-      byte type = TYPE_PING;
-      byte flags = ack ? FLAG_ACK : FLAG_NONE;
-      int streamId = 0;
-      frameHeader(streamId, length, type, flags);
-      sink.writeInt(payload1);
-      sink.writeInt(payload2);
-      sink.flush();
-    }
-
-    @Override public synchronized void goAway(int lastGoodStreamId, ErrorCode errorCode,
-        byte[] debugData) throws IOException {
-      if (closed) throw new IOException("closed");
-      if (errorCode.httpCode == -1) throw illegalArgument("errorCode.httpCode == -1");
-      int length = 8 + debugData.length;
-      byte type = TYPE_GOAWAY;
-      byte flags = FLAG_NONE;
-      int streamId = 0;
-      frameHeader(streamId, length, type, flags);
-      sink.writeInt(lastGoodStreamId);
-      sink.writeInt(errorCode.httpCode);
-      if (debugData.length > 0) {
-        sink.write(debugData);
-      }
-      sink.flush();
-    }
-
-    @Override public synchronized void windowUpdate(int streamId, long windowSizeIncrement)
-        throws IOException {
-      if (closed) throw new IOException("closed");
-      if (windowSizeIncrement == 0 || windowSizeIncrement > 0x7fffffffL) {
-        throw illegalArgument("windowSizeIncrement == 0 || windowSizeIncrement > 0x7fffffffL: %s",
-            windowSizeIncrement);
-      }
-      int length = 4;
-      byte type = TYPE_WINDOW_UPDATE;
-      byte flags = FLAG_NONE;
-      frameHeader(streamId, length, type, flags);
-      sink.writeInt((int) windowSizeIncrement);
-      sink.flush();
-    }
-
-    @Override public synchronized void close() throws IOException {
-      closed = true;
-      sink.close();
-    }
-
-    void frameHeader(int streamId, int length, byte type, byte flags) throws IOException {
-      if (logger.isLoggable(FINE)) logger.fine(formatHeader(false, streamId, length, type, flags));
-      if (length > MAX_FRAME_SIZE) {
-        throw illegalArgument("FRAME_SIZE_ERROR length > %d: %d", MAX_FRAME_SIZE, length);
-      }
-      if ((streamId & 0x80000000) != 0) throw illegalArgument("reserved bit set: %s", streamId);
-      sink.writeInt((length & 0x3fff) << 16 | (type & 0xff) << 8 | (flags & 0xff));
-      sink.writeInt(streamId & 0x7fffffff);
-    }
-  }
-
-  private static IllegalArgumentException illegalArgument(String message, Object... args) {
-    throw new IllegalArgumentException(format(message, args));
-  }
-
-  private static IOException ioException(String message, Object... args) throws IOException {
-    throw new IOException(format(message, args));
-  }
-
-  /**
-   * Decompression of the header block occurs above the framing layer. This
-   * class lazily reads continuation frames as they are needed by {@link
-   * HpackDraft08.Reader#readHeaders()}.
-   */
-  static final class ContinuationSource implements Source {
-    private final BufferedSource source;
-
-    short length;
-    byte flags;
-    int streamId;
-
-    short left;
-    short padding;
-
-    public ContinuationSource(BufferedSource source) {
-      this.source = source;
-    }
-
-    @Override public long read(Buffer sink, long byteCount) throws IOException {
-      while (left == 0) {
-        source.skip(padding);
-        padding = 0;
-        if ((flags & FLAG_END_HEADERS) != 0) return -1;
-        readContinuationHeader();
-        // TODO: test case for empty continuation header?
-      }
-
-      long read = source.read(sink, Math.min(byteCount, left));
-      if (read == -1) return -1;
-      left -= read;
-      return read;
-    }
-
-    @Override public Timeout timeout() {
-      return source.timeout();
-    }
-
-    @Override public void close() throws IOException {
-    }
-
-    private void readContinuationHeader() throws IOException {
-      int previousStreamId = streamId;
-      int w1 = source.readInt();
-      int w2 = source.readInt();
-      length = left = (short) ((w1 & 0x3fff0000) >> 16);
-      byte type = (byte) ((w1 & 0xff00) >> 8);
-      flags = (byte) (w1 & 0xff);
-      if (logger.isLoggable(FINE)) logger.fine(formatHeader(true, streamId, length, type, flags));
-      streamId = (w2 & 0x7fffffff);
-      if (type != TYPE_CONTINUATION) throw ioException("%s != TYPE_CONTINUATION", type);
-      if (streamId != previousStreamId) throw ioException("TYPE_CONTINUATION streamId changed");
-    }
-  }
-
-  private static short lengthWithoutPadding(short length, byte flags, short padding)
-      throws IOException {
-    if ((flags & FLAG_PADDED) != 0) length--; // Account for reading the padding length.
-    if (padding > length) {
-      throw ioException("PROTOCOL_ERROR padding %s > remaining length %s", padding, length);
-    }
-    return (short) (length - padding);
-  }
-
-  /**
-   * Logs a human-readable representation of HTTP/2 frame headers.
-   *
-   * <p>The format is:
-   *
-   * <pre>
-   *   direction streamID length type flags
-   * </pre>
-   * Where direction is {@code <<} for inbound and {@code >>} for outbound.
-   *
-   * <p> For example, the following would indicate a HEAD request sent from
-   * the client.
-   * <pre>
-   * {@code
-   *   << 0x0000000f    12 HEADERS       END_HEADERS|END_STREAM
-   * }
-   * </pre>
-   */
-  static final class FrameLogger {
-
-    static String formatHeader(boolean inbound, int streamId, int length, byte type, byte flags) {
-      String formattedType = type < TYPES.length ? TYPES[type] : format("0x%02x", type);
-      String formattedFlags = formatFlags(type, flags);
-      return format("%s 0x%08x %5d %-13s %s", inbound ? "<<" : ">>", streamId, length,
-          formattedType, formattedFlags);
-    }
-
-    /**
-     * Looks up valid string representing flags from the table. Invalid
-     * combinations are represented in binary.
-     */
-    // Visible for testing.
-    static String formatFlags(byte type, byte flags) {
-      if (flags == 0) return "";
-      switch (type) { // Special case types that have 0 or 1 flag.
-        case TYPE_SETTINGS:
-        case TYPE_PING:
-          return flags == FLAG_ACK ? "ACK" : BINARY[flags];
-        case TYPE_PRIORITY:
-        case TYPE_RST_STREAM:
-        case TYPE_GOAWAY:
-        case TYPE_WINDOW_UPDATE:
-          return BINARY[flags];
-      }
-      String result = flags < FLAGS.length ? FLAGS[flags] : BINARY[flags];
-      // Special case types that have overlap flag values.
-      if (type == TYPE_PUSH_PROMISE && (flags & FLAG_END_PUSH_PROMISE) != 0) {
-        return result.replace("HEADERS", "PUSH_PROMISE"); // TODO: Avoid allocation.
-      } else if (type == TYPE_DATA && (flags & FLAG_COMPRESSED) != 0) {
-        return result.replace("PRIORITY", "COMPRESSED"); // TODO: Avoid allocation.
-      }
-      return result;
-    }
-
-    /** Lookup table for valid frame types. */
-    private static final String[] TYPES = new String[] {
-        "DATA",
-        "HEADERS",
-        "PRIORITY",
-        "RST_STREAM",
-        "SETTINGS",
-        "PUSH_PROMISE",
-        "PING",
-        "GOAWAY",
-        "WINDOW_UPDATE",
-        "CONTINUATION"
-    };
-
-    /**
-     * Lookup table for valid flags for DATA, HEADERS, CONTINUATION. Invalid
-     * combinations are represented in binary.
-     */
-    private static final String[] FLAGS = new String[0x40]; // Highest bit flag is 0x20.
-    private static final String[] BINARY = new String[256];
-
-    static {
-      for (int i = 0; i < BINARY.length; i++) {
-        BINARY[i] = format("%8s", Integer.toBinaryString(i)).replace(' ', '0');
-      }
-
-      FLAGS[FLAG_NONE] = "";
-      FLAGS[FLAG_END_STREAM] = "END_STREAM";
-      FLAGS[FLAG_END_SEGMENT] = "END_SEGMENT";
-      FLAGS[FLAG_END_STREAM | FLAG_END_SEGMENT] = "END_STREAM|END_SEGMENT";
-      int[] prefixFlags =
-          new int[] {FLAG_END_STREAM, FLAG_END_SEGMENT, FLAG_END_SEGMENT | FLAG_END_STREAM};
-
-      FLAGS[FLAG_PADDED] = "PADDED";
-      for (int prefixFlag : prefixFlags) {
-         FLAGS[prefixFlag | FLAG_PADDED] = FLAGS[prefixFlag] + "|PADDED";
-      }
-
-      FLAGS[FLAG_END_HEADERS] = "END_HEADERS"; // Same as END_PUSH_PROMISE.
-      FLAGS[FLAG_PRIORITY] = "PRIORITY"; // Same as FLAG_COMPRESSED.
-      FLAGS[FLAG_END_HEADERS | FLAG_PRIORITY] = "END_HEADERS|PRIORITY"; // Only valid on HEADERS.
-      int[] frameFlags =
-          new int[] {FLAG_END_HEADERS, FLAG_PRIORITY, FLAG_END_HEADERS | FLAG_PRIORITY};
-
-      for (int frameFlag : frameFlags) {
-        for (int prefixFlag : prefixFlags) {
-          FLAGS[prefixFlag | frameFlag] = FLAGS[prefixFlag] + '|' + FLAGS[frameFlag];
-          FLAGS[prefixFlag | frameFlag | FLAG_PADDED] =
-              FLAGS[prefixFlag] + '|' + FLAGS[frameFlag] + "|PADDED";
-        }
-      }
-
-      for (int i = 0; i < FLAGS.length; i++) { // Fill in holes with binary representation.
-        if (FLAGS[i] == null) FLAGS[i] = BINARY[i];
-      }
-    }
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
index 2868ff225..f4e7d4e26 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
@@ -30,6 +30,7 @@
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.io.Writer;
 import java.net.ProtocolException;
 import java.nio.ByteOrder;
 import java.util.List;
@@ -248,9 +249,12 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             }
         };
 
+        /*
         @Override
         public void readConnectionPreface() {
         }
+        */
+
         private void readSynStream(ByteBufferList source, int flags, int length) throws IOException {
             int w1 = source.getInt();
             int w2 = source.getInt();
@@ -339,10 +343,6 @@ private void readSettings(ByteBufferList source, int flags, int length) throws I
         private static IOException ioException(String message, Object... args) throws IOException {
             throw new IOException(String.format(message, args));
         }
-
-        @Override
-        public void close() throws IOException {
-        }
     }
 
     /**

From 87387af1b33156c1a20e3948f14f0e5abf3addf9 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 28 Jul 2014 00:17:18 -0700
Subject: [PATCH 052/399] no more exceptions.[

---
 .../com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java  | 2 +-
 .../async/http/spdy/okhttp/internal/spdy/FrameReader.java      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
index 05a546ed6..19878327a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
@@ -531,7 +531,7 @@ public void priority(int streamId, int streamDependency, int weight, boolean exc
     }
 
     @Override
-    public void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders) throws IOException {
+    public void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders) {
         throw new AssertionError("pushPromise");
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
index 087182126..05d2107de 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
@@ -117,8 +117,7 @@ void headers(boolean outFinished, boolean inFinished, int streamId, int associat
          * @param requestHeaders   minimally includes {@code :method}, {@code :scheme},
          *                         {@code :authority}, and (@code :path}.
          */
-        void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders)
-        throws IOException;
+        void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders);
 
         /**
          * HTTP/2 only. Expresses that resources for the connection or a client-

From 1a9a74309110a7c122abdaad0dd0ed0956283134 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robUx4@gmail.com>
Date: Mon, 28 Jul 2014 09:55:36 +0200
Subject: [PATCH 053/399] use another hash function if MD5 is not available

---
 .../koushikdutta/async/util/FileCache.java    | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java b/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java
index 3ce4b97af..d1171083e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java
@@ -6,6 +6,8 @@
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.Provider;
+import java.security.Security;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -41,17 +43,42 @@ public void close() {
         }
     }
 
+    private static String hashAlgorithm = "MD5";
+
+    private static MessageDigest findAlternativeMessageDigest() {
+        if ("MD5".equals(hashAlgorithm)) {
+            for (Provider provider : Security.getProviders()) {
+                for (Provider.Service service : provider.getServices()) {
+                    hashAlgorithm = service.getAlgorithm();
+                    try {
+                        MessageDigest messageDigest = MessageDigest.getInstance(hashAlgorithm);
+                        if (messageDigest != null)
+                            return messageDigest;
+                    } catch (NoSuchAlgorithmException ignored) {
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
     public static String toKeyString(Object... parts) {
-        try {
-            MessageDigest messageDigest = MessageDigest.getInstance("MD5");
-            for (Object part: parts) {
-                messageDigest.update(part.toString().getBytes());
+        MessageDigest messageDigest;
+        synchronized (FileCache.class) {
+            try {
+                messageDigest = MessageDigest.getInstance(hashAlgorithm);
+            } catch (NoSuchAlgorithmException e) {
+                messageDigest = findAlternativeMessageDigest();
+                if (null == messageDigest)
+                    throw new RuntimeException(e);
             }
-            byte[] md5bytes = messageDigest.digest();
-            return new BigInteger(1, md5bytes).toString(16);
-        } catch (NoSuchAlgorithmException e) {
-            throw new RuntimeException(e);
         }
+
+        for (Object part : parts) {
+            messageDigest.update(part.toString().getBytes());
+        }
+        byte[] md5bytes = messageDigest.digest();
+        return new BigInteger(1, md5bytes).toString(16);
     }
 
     boolean loadAsync;

From 8f5a76fef616565541dacbae0a9d7841d9a33e98 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robUx4@gmail.com>
Date: Mon, 28 Jul 2014 10:06:32 +0200
Subject: [PATCH 054/399] Fix a rare NPE crash in Android 2.x See
 http://crashes.to/s/5ee30776a5d

---
 AndroidAsync/src/com/koushikdutta/async/AsyncServer.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 6d5e5575e..450dc5b60 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -727,6 +727,9 @@ private static void runLoop(final AsyncServer server, final SelectorWrapper sele
                 }
             }
         }
+        catch (NullPointerException e) {
+            throw new AsyncSelectorException(e);
+        }
         catch (IOException e) {
             throw new AsyncSelectorException(e);
         }

From c5d92d36e9613a47e54a8591484900277a2137fb Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 28 Jul 2014 02:16:24 -0700
Subject: [PATCH 055/399] New writer seems to work?

---
 .../koushikdutta/async/ByteBufferList.java    |  23 +-
 .../async/http/spdy/AsyncSpdyConnection.java  |  14 +-
 .../okhttp/internal/spdy/FrameWriter.java     |   7 +-
 .../okhttp/internal/spdy/HpackDraft08.java    |  48 +++--
 .../http/spdy/okhttp/internal/spdy/Spdy3.java | 202 ++++++++++--------
 .../spdy/okhttp/internal/spdy/Variant.java    |   4 +-
 6 files changed, 158 insertions(+), 140 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index 84c33074b..b42a58a19 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -41,9 +41,16 @@ public ByteBufferList(byte[] buf) {
         add(b);
     }
 
-    public void addAll(ByteBuffer... bb) {
+    public ByteBufferList addAll(ByteBuffer... bb) {
         for (ByteBuffer b: bb)
             add(b);
+        return this;
+    }
+
+    public ByteBufferList addAll(ByteBufferList... bb) {
+        for (ByteBufferList b: bb)
+            b.get(this);
+        return this;
     }
 
     public byte[] getBytes(int length) {
@@ -268,12 +275,17 @@ public void trim() {
         // this clears out buffers that are empty in the beginning of the list
         read(0);
     }
-    
-    public void add(ByteBuffer b) {
+
+    public ByteBufferList add(ByteBufferList b) {
+        b.get(this);
+        return this;
+    }
+
+    public ByteBufferList add(ByteBuffer b) {
         if (b.remaining() <= 0) {
 //            System.out.println("reclaiming remaining: " + b.remaining());
             reclaim(b);
-            return;
+            return this;
         }
         addRemaining(b.remaining());
         // see if we can fit the entirety of the buffer into the end
@@ -289,11 +301,12 @@ public void add(ByteBuffer b) {
                 last.reset();
                 reclaim(b);
                 trim();
-                return;
+                return this;
             }
         }
         mBuffers.add(b);
         trim();
+        return this;
     }
 
     public void addFirst(ByteBuffer b) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
index 19878327a..a961cbf3d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
@@ -2,7 +2,6 @@
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.AsyncSocket;
-import com.koushikdutta.async.BufferedDataEmitter;
 import com.koushikdutta.async.BufferedDataSink;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.Util;
@@ -23,7 +22,6 @@
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Variant;
 import com.koushikdutta.async.http.spdy.okio.BufferedSink;
 import com.koushikdutta.async.http.spdy.okio.ByteString;
-import com.koushikdutta.async.http.spdy.okio.Okio;
 
 import java.io.IOException;
 import java.util.Hashtable;
@@ -97,10 +95,6 @@ private SpdySocket newStream(int associatedStreamId, List<Header> requestHeaders
                 writer.pushPromise(associatedStreamId, streamId, requestHeaders);
             }
 
-            if (!out) {
-                writer.flush();
-            }
-
             return socket;
         }
         catch (IOException e) {
@@ -154,12 +148,6 @@ void updateWindowRead(int length) {
 
         public SpdySocket(int id, boolean outFinished, boolean inFinished, List<Header> headerBlock) {
             this.id = id;
-            try {
-                writer.windowUpdate(id, DEFAULT_INITIAL_WINDOW_SIZE);
-            }
-            catch (IOException e) {
-                throw new AssertionError(e);
-            }
         }
 
         public boolean isLocallyInitiated() {
@@ -285,7 +273,7 @@ else if (protocol == Protocol.HTTP_2) {
             variant = new Http20Draft13();
         }
         reader = variant.newReader(socket, this, true);
-        writer = variant.newWriter(bufferedSink = Okio.buffer(sink), true);
+        writer = variant.newWriter(bufferedSocket, true);
 
         boolean client = true;
         nextStreamId = client ? 1 : 2;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameWriter.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameWriter.java
index f8781767c..5bbf060c2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameWriter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameWriter.java
@@ -16,7 +16,7 @@
 
 package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
 
-import com.koushikdutta.async.http.spdy.okio.Buffer;
+import com.koushikdutta.async.ByteBufferList;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -47,7 +47,6 @@ void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders
       throws IOException;
 
   /** SPDY/3 only. */
-  void flush() throws IOException;
   void synStream(boolean outFinished, boolean inFinished, int streamId, int associatedStreamId,
                  List<Header> headerBlock) throws IOException;
   void synReply(boolean outFinished, int streamId, List<Header> headerBlock)
@@ -61,9 +60,7 @@ void synReply(boolean outFinished, int streamId, List<Header> headerBlock)
    *
    * @param source the buffer to draw bytes from. May be null if byteCount is 0.
    */
-  void data(boolean outFinished, int streamId, Buffer source, int byteCount) throws IOException;
-
-  void data(boolean outFinished, int streamId, Buffer source) throws IOException;
+  void data(boolean outFinished, int streamId, ByteBufferList source) throws IOException;
 
   /** Write okhttp's settings to the peer. */
   void settings(Settings okHttpSettings) throws IOException;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java
index f578cb225..b58d02958 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java
@@ -17,13 +17,10 @@
 
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.http.spdy.okhttp.internal.BitArray;
-import com.koushikdutta.async.http.spdy.okio.Buffer;
-import com.koushikdutta.async.http.spdy.okio.BufferedSource;
 import com.koushikdutta.async.http.spdy.okio.ByteString;
-import com.koushikdutta.async.http.spdy.okio.Okio;
-import com.koushikdutta.async.http.spdy.okio.Source;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -434,57 +431,64 @@ private static Map<ByteString, Integer> nameToFirstIndex() {
     }
 
     static final class Writer {
-        private final Buffer out;
-
-        Writer(Buffer out) {
-            this.out = out;
+        Writer() {
         }
 
         /**
          * This does not use "never indexed" semantics for sensitive headers.
          */
         // https://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08#section-4.3.3
-        void writeHeaders(List<Header> headerBlock) throws IOException {
+        ByteBufferList writeHeaders(List<Header> headerBlock) throws IOException {
+            ByteBufferList out = new ByteBufferList();
             // TODO: implement index tracking
+            ByteBuffer current = ByteBufferList.obtain(8192);
             for (int i = 0, size = headerBlock.size(); i < size; i++) {
+                if (current.remaining() < current.capacity() / 2) {
+                    current.flip();
+                    out.add(current);
+                    current = ByteBufferList.obtain(current.capacity() * 2);
+                }
                 ByteString name = headerBlock.get(i).name.toAsciiLowercase();
                 Integer staticIndex = NAME_TO_FIRST_INDEX.get(name);
                 if (staticIndex != null) {
                     // Literal Header Field without Indexing - Indexed Name.
-                    writeInt(staticIndex + 1, PREFIX_4_BITS, 0);
-                    writeByteString(headerBlock.get(i).value);
+                    writeInt(current, staticIndex + 1, PREFIX_4_BITS, 0);
+                    writeByteString(current, headerBlock.get(i).value);
                 } else {
-                    out.writeByte(0x00); // Literal Header without Indexing - New Name.
-                    writeByteString(name);
-                    writeByteString(headerBlock.get(i).value);
+                    current.put((byte) 0x00); // Literal Header without Indexing - New Name.
+                    writeByteString(current, name);
+                    writeByteString(current, headerBlock.get(i).value);
                 }
             }
+
+            out.add(current);
+            return out;
         }
 
         // http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08#section-4.1.1
-        void writeInt(int value, int prefixMask, int bits) throws IOException {
+        void writeInt(ByteBuffer out, int value, int prefixMask, int bits) throws IOException {
             // Write the raw value for a single byte value.
             if (value < prefixMask) {
-                out.writeByte(bits | value);
+                out.put((byte) (bits | value));
                 return;
             }
 
             // Write the mask to start a multibyte value.
-            out.writeByte(bits | prefixMask);
+            out.put((byte)(bits | prefixMask));
             value -= prefixMask;
 
             // Write 7 bits at a time 'til we're done.
             while (value >= 0x80) {
                 int b = value & 0x7f;
-                out.writeByte(b | 0x80);
+                out.put((byte) (b | 0x80));
                 value >>>= 7;
             }
-            out.writeByte(value);
+            out.put((byte) value);
         }
 
-        void writeByteString(ByteString data) throws IOException {
-            writeInt(data.size(), PREFIX_7_BITS, 0);
-            out.write(data);
+        void writeByteString(ByteBuffer out, ByteString data) throws IOException {
+            writeInt(out, data.size(), PREFIX_7_BITS, 0);
+            out.put(data.toByteArray());
         }
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
index f4e7d4e26..3db622365 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
@@ -15,23 +15,19 @@
  */
 package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
 
+import com.koushikdutta.async.BufferedDataSink;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.DataEmitterReader;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.http.Protocol;
-import com.koushikdutta.async.http.spdy.okhttp.internal.Util;
-import com.koushikdutta.async.http.spdy.okio.Buffer;
-import com.koushikdutta.async.http.spdy.okio.BufferedSink;
 import com.koushikdutta.async.http.spdy.okio.ByteString;
-import com.koushikdutta.async.http.spdy.okio.DeflaterSink;
-import com.koushikdutta.async.http.spdy.okio.Okio;
 import com.koushikdutta.async.util.Charsets;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.io.Writer;
 import java.net.ProtocolException;
+import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.List;
 import java.util.zip.Deflater;
@@ -111,7 +107,7 @@ public FrameReader newReader(DataEmitter source, FrameReader.Handler handler, bo
     }
 
     @Override
-    public FrameWriter newWriter(BufferedSink sink, boolean client) {
+    public FrameWriter newWriter(BufferedDataSink sink, boolean client) {
         return new Writer(sink, client);
     }
 
@@ -349,20 +345,17 @@ private static IOException ioException(String message, Object... args) throws IO
      * Write spdy/3 frames.
      */
     static final class Writer implements FrameWriter {
-        private final BufferedSink sink;
-        private final Buffer headerBlockBuffer;
-        private final BufferedSink headerBlockOut;
+        private final BufferedDataSink sink;
         private final boolean client;
         private boolean closed;
+        private ByteBufferList frameHeader = new ByteBufferList();
+        private final Deflater deflater = new Deflater();
 
-        Writer(BufferedSink sink, boolean client) {
+        Writer(BufferedDataSink sink, boolean client) {
             this.sink = sink;
             this.client = client;
 
-            Deflater deflater = new Deflater();
             deflater.setDictionary(DICTIONARY);
-            headerBlockBuffer = new Buffer();
-            headerBlockOut = Okio.buffer(new DeflaterSink(headerBlockBuffer, deflater));
         }
 
         @Override
@@ -381,61 +374,59 @@ public synchronized void connectionPreface() {
             // Do nothing: no connection preface for SPDY/3.
         }
 
-        @Override
-        public synchronized void flush() throws IOException {
-            if (closed) throw new IOException("closed");
-            sink.flush();
-        }
-
         @Override
         public synchronized void synStream(boolean outFinished, boolean inFinished,
                                            int streamId, int associatedStreamId, List<Header> headerBlock)
         throws IOException {
             if (closed) throw new IOException("closed");
-            writeNameValueBlockToBuffer(headerBlock);
-            int length = (int) (10 + headerBlockBuffer.size());
+            ByteBufferList headerBlockBuffer = writeNameValueBlockToBuffer(headerBlock);
+            int length = (int) (10 + headerBlockBuffer.remaining());
             int type = TYPE_SYN_STREAM;
             int flags = (outFinished ? FLAG_FIN : 0) | (inFinished ? FLAG_UNIDIRECTIONAL : 0);
 
             int unused = 0;
-            sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-            sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
-            sink.writeInt(streamId & 0x7fffffff);
-            sink.writeInt(associatedStreamId & 0x7fffffff);
-            sink.writeShort((unused & 0x7) << 13 | (unused & 0x1f) << 8 | (unused & 0xff));
-            sink.writeAll(headerBlockBuffer);
-            sink.flush();
+            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
+            sink.putInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+            sink.putInt((flags & 0xff) << 24 | length & 0xffffff);
+            sink.putInt(streamId & 0x7fffffff);
+            sink.putInt(associatedStreamId & 0x7fffffff);
+            sink.putShort((short) ((unused & 0x7) << 13 | (unused & 0x1f) << 8 | (unused & 0xff)));
+            sink.flip();
+            this.sink.write(frameHeader.add(sink).add(headerBlockBuffer));
         }
 
         @Override
         public synchronized void synReply(boolean outFinished, int streamId,
                                           List<Header> headerBlock) throws IOException {
             if (closed) throw new IOException("closed");
-            writeNameValueBlockToBuffer(headerBlock);
+            ByteBufferList headerBlockBuffer = writeNameValueBlockToBuffer(headerBlock);
             int type = TYPE_SYN_REPLY;
             int flags = (outFinished ? FLAG_FIN : 0);
-            int length = (int) (headerBlockBuffer.size() + 4);
-
-            sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-            sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
-            sink.writeInt(streamId & 0x7fffffff);
-            sink.writeAll(headerBlockBuffer);
-            sink.flush();
+            int length = (int) (headerBlockBuffer.remaining() + 4);
+
+            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
+            sink.putInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+            sink.putInt((flags & 0xff) << 24 | length & 0xffffff);
+            sink.putInt(streamId & 0x7fffffff);
+            sink.flip();
+            this.sink.write(frameHeader.add(sink).add(headerBlockBuffer));
         }
 
         @Override
         public synchronized void headers(int streamId, List<Header> headerBlock)
         throws IOException {
             if (closed) throw new IOException("closed");
-            writeNameValueBlockToBuffer(headerBlock);
+            ByteBufferList headerBlockBuffer = writeNameValueBlockToBuffer(headerBlock);
             int flags = 0;
             int type = TYPE_HEADERS;
-            int length = (int) (headerBlockBuffer.size() + 4);
-
-            sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-            sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
-            sink.writeInt(streamId & 0x7fffffff);
-            sink.writeAll(headerBlockBuffer);
+            int length = (int) (headerBlockBuffer.remaining() + 4);
+
+            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
+            sink.putInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+            sink.putInt((flags & 0xff) << 24 | length & 0xffffff);
+            sink.putInt(streamId & 0x7fffffff);
+            sink.flip();
+            this.sink.write(frameHeader.add(sink).add(headerBlockBuffer));
         }
 
         @Override
@@ -446,51 +437,69 @@ public synchronized void rstStream(int streamId, ErrorCode errorCode)
             int flags = 0;
             int type = TYPE_RST_STREAM;
             int length = 8;
-            sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-            sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
-            sink.writeInt(streamId & 0x7fffffff);
-            sink.writeInt(errorCode.spdyRstCode);
-            sink.flush();
+            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
+            sink.putInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+            sink.putInt((flags & 0xff) << 24 | length & 0xffffff);
+            sink.putInt(streamId & 0x7fffffff);
+            sink.putInt(errorCode.spdyRstCode);
+            sink.flip();
+            this.sink.write(frameHeader.addAll(sink));
         }
 
         @Override
-        public synchronized void data(boolean outFinished, int streamId, Buffer source)
-        throws IOException {
-            data(outFinished, streamId, source, (int) source.size());
-        }
-
-        @Override
-        public synchronized void data(boolean outFinished, int streamId, Buffer source,
-                                      int byteCount) throws IOException {
+        public synchronized void data(boolean outFinished, int streamId, ByteBufferList source) throws IOException {
             int flags = (outFinished ? FLAG_FIN : 0);
-            sendDataFrame(streamId, flags, source, byteCount);
+            sendDataFrame(streamId, flags, source);
         }
 
-        void sendDataFrame(int streamId, int flags, Buffer buffer, int byteCount)
+        ByteBufferList dataList = new ByteBufferList();
+        void sendDataFrame(int streamId, int flags, ByteBufferList buffer)
         throws IOException {
             if (closed) throw new IOException("closed");
+            int byteCount = buffer.remaining();
             if (byteCount > 0xffffffL) {
                 throw new IllegalArgumentException("FRAME_TOO_LARGE max size is 16Mib: " + byteCount);
             }
-            sink.writeInt(streamId & 0x7fffffff);
-            sink.writeInt((flags & 0xff) << 24 | byteCount & 0xffffff);
-            if (byteCount > 0) {
-                sink.write(buffer, byteCount);
-            }
+            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
+            sink.putInt(streamId & 0x7fffffff);
+            sink.putInt((flags & 0xff) << 24 | byteCount & 0xffffff);
+            sink.flip();
+            dataList.add(sink).add(buffer);
+            this.sink.write(dataList);
         }
 
-        private void writeNameValueBlockToBuffer(List<Header> headerBlock) throws IOException {
-            if (headerBlockBuffer.size() != 0) throw new IllegalStateException();
-            headerBlockOut.writeInt(headerBlock.size());
+        ByteBufferList headerBlockList = new ByteBufferList();
+        private ByteBufferList writeNameValueBlockToBuffer(List<Header> headerBlock) throws IOException {
+            if (headerBlockList.hasRemaining()) throw new IllegalStateException();
+            ByteBuffer headerBlockOut = ByteBufferList.obtain(8192).order(ByteOrder.BIG_ENDIAN);
+            headerBlockOut.putInt(headerBlock.size());
             for (int i = 0, size = headerBlock.size(); i < size; i++) {
                 ByteString name = headerBlock.get(i).name;
-                headerBlockOut.writeInt(name.size());
-                headerBlockOut.write(name);
+                headerBlockOut.putInt(name.size());
+                headerBlockOut.put(name.toByteArray());
                 ByteString value = headerBlock.get(i).value;
-                headerBlockOut.writeInt(value.size());
-                headerBlockOut.write(value);
+                headerBlockOut.putInt(value.size());
+                headerBlockOut.put(value.toByteArray());
+                if (headerBlockOut.remaining() < headerBlockOut.capacity() / 2) {
+                    ByteBuffer newOut = ByteBufferList.obtain(headerBlockOut.capacity() * 2).order(ByteOrder.BIG_ENDIAN);
+                    headerBlockOut.flip();
+                    newOut.put(headerBlockOut);
+                    ByteBufferList.reclaim(headerBlockOut);
+                    headerBlockOut = newOut;
+                }
             }
-            headerBlockOut.flush();
+
+            headerBlockOut.flip();
+            deflater.setInput(headerBlockOut.array(), 0, headerBlockOut.remaining());
+            while (!deflater.needsInput()) {
+                ByteBuffer deflated = ByteBufferList.obtain(headerBlockOut.capacity()).order(ByteOrder.BIG_ENDIAN);
+                int read = deflater.deflate(deflated.array(), 0, deflated.capacity(), Deflater.SYNC_FLUSH);
+                deflated.limit(read);
+                headerBlockList.add(deflated);
+            }
+            ByteBufferList.reclaim(headerBlockOut);
+
+            return headerBlockList;
         }
 
         @Override
@@ -500,16 +509,18 @@ public synchronized void settings(Settings settings) throws IOException {
             int flags = 0;
             int size = settings.size();
             int length = 4 + size * 8;
-            sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-            sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
-            sink.writeInt(size);
+            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
+            sink.putInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+            sink.putInt((flags & 0xff) << 24 | length & 0xffffff);
+            sink.putInt(size);
             for (int i = 0; i <= Settings.COUNT; i++) {
                 if (!settings.isSet(i)) continue;
                 int settingsFlags = settings.flags(i);
-                sink.writeInt((settingsFlags & 0xff) << 24 | (i & 0xffffff));
-                sink.writeInt(settings.get(i));
+                sink.putInt((settingsFlags & 0xff) << 24 | (i & 0xffffff));
+                sink.putInt(settings.get(i));
             }
-            sink.flush();
+            sink.flip();
+            this.sink.write(frameHeader.addAll(sink));
         }
 
         @Override
@@ -521,10 +532,12 @@ public synchronized void ping(boolean reply, int payload1, int payload2)
             int type = TYPE_PING;
             int flags = 0;
             int length = 4;
-            sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-            sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
-            sink.writeInt(payload1);
-            sink.flush();
+            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
+            sink.putInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+            sink.putInt((flags & 0xff) << 24 | length & 0xffffff);
+            sink.putInt(payload1);
+            sink.flip();
+            this.sink.write(frameHeader.addAll(sink));
         }
 
         @Override
@@ -537,11 +550,13 @@ public synchronized void goAway(int lastGoodStreamId, ErrorCode errorCode,
             int type = TYPE_GOAWAY;
             int flags = 0;
             int length = 8;
-            sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-            sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
-            sink.writeInt(lastGoodStreamId);
-            sink.writeInt(errorCode.spdyGoAwayCode);
-            sink.flush();
+            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
+            sink.putInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+            sink.putInt((flags & 0xff) << 24 | length & 0xffffff);
+            sink.putInt(lastGoodStreamId);
+            sink.putInt(errorCode.spdyGoAwayCode);
+            sink.flip();
+            this.sink.write(frameHeader.addAll(sink));
         }
 
         @Override
@@ -555,17 +570,18 @@ public synchronized void windowUpdate(int streamId, long increment)
             int type = TYPE_WINDOW_UPDATE;
             int flags = 0;
             int length = 8;
-            sink.writeInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-            sink.writeInt((flags & 0xff) << 24 | length & 0xffffff);
-            sink.writeInt(streamId);
-            sink.writeInt((int) increment);
-            sink.flush();
+            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
+            sink.putInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
+            sink.putInt((flags & 0xff) << 24 | length & 0xffffff);
+            sink.putInt(streamId);
+            sink.putInt((int) increment);
+            sink.flip();
+            this.sink.write(frameHeader.addAll(sink));
         }
 
         @Override
         public synchronized void close() throws IOException {
             closed = true;
-            Util.closeAll(sink, headerBlockOut);
         }
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Variant.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Variant.java
index eeb7c157e..00b12ffaf 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Variant.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Variant.java
@@ -16,9 +16,9 @@
 package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
 
 
+import com.koushikdutta.async.BufferedDataSink;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.http.Protocol;
-import com.koushikdutta.async.http.spdy.okio.BufferedSink;
 
 /** A version and dialect of the framed socket protocol. */
 public interface Variant {
@@ -34,7 +34,7 @@ public interface Variant {
   /**
    * @param client true if this is the HTTP client's writer, writing frames to a server.
    */
-  FrameWriter newWriter(BufferedSink sink, boolean client);
+  FrameWriter newWriter(BufferedDataSink sink, boolean client);
 
   int maxFrameSize();
 }

From bbc47ab4b3b093f09d96a6dee1a0b460e2f903ea Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 28 Jul 2014 02:20:11 -0700
Subject: [PATCH 056/399] remove cruft

---
 .../async/http/spdy/AsyncSpdyConnection.java  |  13 +-
 .../async/http/spdy/ByteBufferListSink.java   |  52 ------
 .../async/http/spdy/ByteBufferListSource.java |  40 -----
 .../async/http/spdy/SpdyMiddleware.java       |   2 -
 .../async/http/spdy/okio/DeflaterSink.java    | 150 ------------------
 .../http/spdy/okio/ForwardingSource.java      |  49 ------
 .../async/http/spdy/okio/InflaterSource.java  | 123 --------------
 7 files changed, 1 insertion(+), 428 deletions(-)
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSink.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSource.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/DeflaterSink.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/ForwardingSource.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/InflaterSource.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
index a961cbf3d..5c5f95c35 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
@@ -40,21 +40,10 @@ public class AsyncSpdyConnection implements FrameReader.Handler {
     FrameReader reader;
     FrameWriter writer;
     Variant variant;
-    ByteBufferListSink sink = new ByteBufferListSink() {
-        @Override
-        public void flush() throws IOException {
-            AsyncSpdyConnection.this.flush();
-        }
-    };
-    BufferedSink bufferedSink;
     Hashtable<Integer, SpdySocket> sockets = new Hashtable<Integer, SpdySocket>();
     Protocol protocol;
     boolean client = true;
 
-    public void flush() {
-        bufferedSocket.write(sink);
-    }
-
     /**
      * Returns a new locally-initiated stream.
      *
@@ -123,7 +112,7 @@ public class SpdySocket implements AsyncSocket {
         CompletedCallback closedCallback;
         CompletedCallback endCallback;
         DataCallback dataCallback;
-        ByteBufferListSink pending = new ByteBufferListSink();
+        ByteBufferList pending = new ByteBufferList();
         SimpleFuture<List<Header>> headers = new SimpleFuture<List<Header>>();
         boolean isOpen = true;
         int totalWindowRead;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSink.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSink.java
deleted file mode 100644
index aa9da9a15..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSink.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.koushikdutta.async.http.spdy;
-
-import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.http.spdy.okio.Buffer;
-import com.koushikdutta.async.http.spdy.okio.Segment;
-import com.koushikdutta.async.http.spdy.okio.SegmentPool;
-import com.koushikdutta.async.http.spdy.okio.Sink;
-import com.koushikdutta.async.http.spdy.okio.Timeout;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-/**
- * Created by koush on 7/25/14.
- */
-public class ByteBufferListSink extends ByteBufferList implements Sink {
-    @Override
-    public void write(Buffer source, long byteCount) throws IOException {
-        Segment s = source.head;
-        while (byteCount > 0) {
-            int toCopy = (int) Math.min(byteCount, s.limit - s.pos);
-            ByteBuffer b = obtain(toCopy);
-            b.put(s.data, s.pos, toCopy);
-            b.flip();
-            add(b);
-
-            s.pos += toCopy;
-            source.size -= toCopy;
-            byteCount -= toCopy;
-
-            if (s.pos == s.limit) {
-                Segment toRecycle = s;
-                source.head = s = toRecycle.pop();
-                SegmentPool.getInstance().recycle(toRecycle);
-            }
-        }
-    }
-
-    @Override
-    public void flush() throws IOException {
-    }
-
-    @Override
-    public Timeout timeout() {
-        return Timeout.NONE;
-    }
-
-    @Override
-    public void close() throws IOException {
-        recycle();
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSource.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSource.java
deleted file mode 100644
index 13803b3be..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteBufferListSource.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.koushikdutta.async.http.spdy;
-
-import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.http.spdy.okio.Buffer;
-import com.koushikdutta.async.http.spdy.okio.Source;
-import com.koushikdutta.async.http.spdy.okio.Timeout;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-/**
- * Created by koush on 7/25/14.
- */
-public class ByteBufferListSource extends ByteBufferList implements Source {
-    @Override
-    public long read(Buffer sink, long byteCount) throws IOException {
-        if (!hasRemaining())
-            throw new AssertionError("empty!");
-        int total = 0;
-        while (total < byteCount && hasRemaining()) {
-            ByteBuffer b = remove();
-            int toRead = (int)Math.min(byteCount - total, b.remaining());
-            total += toRead;
-            sink.write(b.array(), b.arrayOffset() + b.position(), toRead);
-            b.position(b.position() + toRead);
-            addFirst(b);
-        }
-        return total;
-    }
-
-    @Override
-    public Timeout timeout() {
-        return Timeout.NONE;
-    }
-
-    @Override
-    public void close() throws IOException {
-        recycle();
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 0e09fdd79..b97f261be 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -83,7 +83,6 @@ public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
                     }
                     final AsyncSpdyConnection connection = new AsyncSpdyConnection(socket, Protocol.get(protoString));
                     connection.sendConnectionPreface();
-                    connection.flush();
 
                     connections.put(data.request.getUri().getHost(), connection);
 
@@ -123,7 +122,6 @@ private void newSocket(GetSocketData data, final AsyncSpdyConnection connection,
         }
 
         AsyncSpdyConnection.SpdySocket spdy = connection.newStream(headers, false, true);
-        connection.flush();
         callback.onConnectCompleted(null, spdy);
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/DeflaterSink.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/DeflaterSink.java
deleted file mode 100644
index 960ee80c3..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/DeflaterSink.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-import java.io.IOException;
-import java.util.zip.Deflater;
-
-import static com.koushikdutta.async.http.spdy.okio.Util.checkOffsetAndCount;
-
-/**
- * A sink that uses <a href="http://tools.ietf.org/html/rfc1951">DEFLATE</a> to
- * compress data written to another source.
- *
- * <h3>Sync flush</h3>
- * Aggressive flushing of this stream may result in reduced compression. Each
- * call to {@link #flush} immediately compresses all currently-buffered data;
- * this early compression may be less effective than compression performed
- * without flushing.
- *
- * <p>This is equivalent to using {@link java.util.zip.Deflater} with the sync flush option.
- * This class does not offer any partial flush mechanism. For best performance,
- * only call {@link #flush} when application behavior requires it.
- */
-public final class DeflaterSink implements Sink {
-  private final BufferedSink sink;
-  private final Deflater deflater;
-  private boolean closed;
-
-  public DeflaterSink(Sink sink, Deflater deflater) {
-    this(Okio.buffer(sink), deflater);
-  }
-
-  /**
-   * This package-private constructor shares a buffer with its trusted caller.
-   * In general we can't share a BufferedSource because the deflater holds input
-   * bytes until they are inflated.
-   */
-  DeflaterSink(BufferedSink sink, Deflater deflater) {
-    if (sink == null) throw new IllegalArgumentException("source == null");
-    if (deflater == null) throw new IllegalArgumentException("inflater == null");
-    this.sink = sink;
-    this.deflater = deflater;
-  }
-
-  @Override public void write(Buffer source, long byteCount)
-      throws IOException {
-    checkOffsetAndCount(source.size, 0, byteCount);
-    while (byteCount > 0) {
-      // Share bytes from the head segment of 'source' with the deflater.
-      Segment head = source.head;
-      int toDeflate = (int) Math.min(byteCount, head.limit - head.pos);
-      deflater.setInput(head.data, head.pos, toDeflate);
-
-      // Deflate those bytes into sink.
-      deflate(false);
-
-      // Mark those bytes as read.
-      source.size -= toDeflate;
-      head.pos += toDeflate;
-      if (head.pos == head.limit) {
-        source.head = head.pop();
-        SegmentPool.getInstance().recycle(head);
-      }
-
-      byteCount -= toDeflate;
-    }
-  }
-
-  private void deflate(boolean syncFlush) throws IOException {
-    Buffer buffer = sink.buffer();
-    while (true) {
-      Segment s = buffer.writableSegment(1);
-
-      // The 4-parameter overload of deflate() doesn't exist in the RI until
-      // Java 1.7, and is public (although with @hide) on Android since 2.3.
-      // The @hide tag means that this code won't compile against the Android
-      // 2.3 SDK, but it will run fine there.
-      int deflated = syncFlush
-          ? deflater.deflate(s.data, s.limit, Segment.SIZE - s.limit, Deflater.SYNC_FLUSH)
-          : deflater.deflate(s.data, s.limit, Segment.SIZE - s.limit);
-
-      if (deflated > 0) {
-        s.limit += deflated;
-        buffer.size += deflated;
-        sink.emitCompleteSegments();
-      } else if (deflater.needsInput()) {
-        return;
-      }
-    }
-  }
-
-  @Override public void flush() throws IOException {
-    deflate(true);
-    sink.flush();
-  }
-
-  void finishDeflate() throws IOException {
-    deflater.finish();
-    deflate(false);
-  }
-
-  @Override public void close() throws IOException {
-    if (closed) return;
-
-    // Emit deflated data to the underlying sink. If this fails, we still need
-    // to close the deflater and the sink; otherwise we risk leaking resources.
-    Throwable thrown = null;
-    try {
-      finishDeflate();
-    } catch (Throwable e) {
-      thrown = e;
-    }
-
-    try {
-      deflater.end();
-    } catch (Throwable e) {
-      if (thrown == null) thrown = e;
-    }
-
-    try {
-      sink.close();
-    } catch (Throwable e) {
-      if (thrown == null) thrown = e;
-    }
-    closed = true;
-
-    if (thrown != null) Util.sneakyRethrow(thrown);
-  }
-
-  @Override public Timeout timeout() {
-    return sink.timeout();
-  }
-
-  @Override public String toString() {
-    return "DeflaterSink(" + sink + ")";
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/ForwardingSource.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/ForwardingSource.java
deleted file mode 100644
index 5e48dfd54..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/ForwardingSource.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-import java.io.IOException;
-
-/** A {@link Source} which forwards calls to another. Useful for subclassing. */
-public abstract class ForwardingSource implements Source {
-  private final Source delegate;
-
-  public ForwardingSource(Source delegate) {
-    if (delegate == null) throw new IllegalArgumentException("delegate == null");
-    this.delegate = delegate;
-  }
-
-  /** {@link Source} to which this instance is delegating. */
-  public final Source delegate() {
-    return delegate;
-  }
-
-  @Override public long read(Buffer sink, long byteCount) throws IOException {
-    return delegate.read(sink, byteCount);
-  }
-
-  @Override public Timeout timeout() {
-    return delegate.timeout();
-  }
-
-  @Override public void close() throws IOException {
-    delegate.close();
-  }
-
-  @Override public String toString() {
-    return getClass().getSimpleName() + "(" + delegate.toString() + ")";
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/InflaterSource.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/InflaterSource.java
deleted file mode 100644
index 76f7cc031..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/InflaterSource.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.util.zip.DataFormatException;
-import java.util.zip.Inflater;
-
-/**
- * A source that uses <a href="http://tools.ietf.org/html/rfc1951">DEFLATE</a>
- * to decompress data read from another source.
- */
-public final class InflaterSource implements Source {
-    private final BufferedSource source;
-    private final Inflater inflater;
-
-    /**
-     * When we call Inflater.setInput(), the inflater keeps our byte array until
-     * it needs input again. This tracks how many bytes the inflater is currently
-     * holding on to.
-     */
-    private int bufferBytesHeldByInflater;
-    private boolean closed;
-
-    public InflaterSource(Source source, Inflater inflater) {
-        this(Okio.buffer(source), inflater);
-    }
-
-    /**
-     * This package-private constructor shares a buffer with its trusted caller.
-     * In general we can't share a BufferedSource because the inflater holds input
-     * bytes until they are inflated.
-     */
-    InflaterSource(BufferedSource source, Inflater inflater) {
-        if (source == null) throw new IllegalArgumentException("source == null");
-        if (inflater == null) throw new IllegalArgumentException("inflater == null");
-        this.source = source;
-        this.inflater = inflater;
-    }
-
-    @Override public long read(
-    Buffer sink, long byteCount) throws IOException {
-        if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
-        if (closed) throw new IllegalStateException("closed");
-        if (byteCount == 0) return 0;
-
-        while (true) {
-            boolean sourceExhausted = refill();
-
-            // Decompress the inflater's compressed data into the sink.
-            try {
-                Segment tail = sink.writableSegment(1);
-                int bytesInflated = inflater.inflate(tail.data, tail.limit, Segment.SIZE - tail.limit);
-                if (bytesInflated > 0) {
-                    tail.limit += bytesInflated;
-                    sink.size += bytesInflated;
-                    return bytesInflated;
-                }
-                if (inflater.finished() || inflater.needsDictionary()) {
-                    releaseInflatedBytes();
-                    return -1;
-                }
-                if (sourceExhausted) throw new EOFException("source exhausted prematurely");
-            } catch (DataFormatException e) {
-                throw new IOException(e);
-            }
-        }
-    }
-
-    /**
-     * Refills the inflater with compressed data if it needs input. (And only if
-     * it needs input). Returns true if the inflater required input but the source
-     * was exhausted.
-     */
-    public boolean refill() throws IOException {
-        if (!inflater.needsInput()) return false;
-
-        releaseInflatedBytes();
-        if (inflater.getRemaining() != 0) throw new IllegalStateException("?"); // TODO: possible?
-
-        // If there are compressed bytes in the source, assign them to the inflater.
-        if (source.exhausted()) return true;
-
-        // Assign buffer bytes to the inflater.
-        Segment head = source.buffer().head;
-        bufferBytesHeldByInflater = head.limit - head.pos;
-        inflater.setInput(head.data, head.pos, bufferBytesHeldByInflater);
-        return false;
-    }
-
-    /** When the inflater has processed compressed data, remove it from the buffer. */
-    private void releaseInflatedBytes() throws IOException {
-        if (bufferBytesHeldByInflater == 0) return;
-        int toRelease = bufferBytesHeldByInflater - inflater.getRemaining();
-        bufferBytesHeldByInflater -= toRelease;
-        source.skip(toRelease);
-    }
-
-    @Override public Timeout timeout() {
-        return source.timeout();
-    }
-
-    @Override public void close() throws IOException {
-        if (closed) return;
-        inflater.end();
-        closed = true;
-        source.close();
-    }
-}

From 9953be594409605bef1c008fb0edd49a37c52415 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 28 Jul 2014 13:50:14 -0700
Subject: [PATCH 057/399] purge okio!

---
 AndroidAsync/build.gradle                     |   9 +-
 .../async/http/spdy/AsyncSpdyConnection.java  |   3 +-
 .../async/http/spdy/SpdyTransport.java        |   1 -
 .../okhttp/internal/spdy/FrameReader.java     |   4 +-
 .../spdy/okhttp/internal/spdy/Header.java     |   2 +-
 .../okhttp/internal/spdy/HeaderReader.java    |   2 +-
 .../okhttp/internal/spdy/HpackDraft08.java    |   2 +-
 .../okhttp/internal/spdy/PushObserver.java    |  96 --
 .../http/spdy/okhttp/internal/spdy/Spdy3.java |   2 +-
 .../async/http/spdy/okio/AsyncTimeout.java    | 318 ------
 .../async/http/spdy/okio/Base64.java          | 147 ---
 .../async/http/spdy/okio/Buffer.java          | 911 ------------------
 .../async/http/spdy/okio/BufferedSink.java    |  82 --
 .../async/http/spdy/okio/BufferedSource.java  | 171 ----
 .../async/http/spdy/okio/ByteString.java      | 283 ------
 .../async/http/spdy/okio/Okio.java            | 194 ----
 .../http/spdy/okio/RealBufferedSink.java      | 207 ----
 .../http/spdy/okio/RealBufferedSource.java    | 301 ------
 .../async/http/spdy/okio/Segment.java         | 135 ---
 .../async/http/spdy/okio/SegmentPool.java     |  64 --
 .../async/http/spdy/okio/Sink.java            |  66 --
 .../async/http/spdy/okio/Source.java          |  78 --
 .../async/http/spdy/okio/Timeout.java         | 153 ---
 .../async/http/spdy/okio/Util.java            |  72 --
 24 files changed, 13 insertions(+), 3290 deletions(-)
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/PushObserver.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/AsyncTimeout.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Base64.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Buffer.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/BufferedSink.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/BufferedSource.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/ByteString.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Okio.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/RealBufferedSink.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/RealBufferedSource.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Segment.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/SegmentPool.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Sink.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Source.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Timeout.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Util.java

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index e193153d7..77970b0f0 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -25,8 +25,13 @@ android {
         androidTest.assets.srcDirs=['test/assets/']
     }
 
-    lintOptions {
-        abortOnError false
+//    lintOptions {
+//        abortOnError false
+//    }
+
+    defaultConfig {
+        targetSdkVersion 21
+        minSdkVersion 9
     }
 
     compileSdkVersion 19
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
index 5c5f95c35..45117dc4a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
@@ -10,6 +10,7 @@
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.future.SimpleFuture;
 import com.koushikdutta.async.http.Protocol;
+import com.koushikdutta.async.http.spdy.okhttp.internal.ByteString;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.ErrorCode;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.FrameReader;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.FrameWriter;
@@ -20,8 +21,6 @@
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Settings;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Spdy3;
 import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Variant;
-import com.koushikdutta.async.http.spdy.okio.BufferedSink;
-import com.koushikdutta.async.http.spdy.okio.ByteString;
 
 import java.io.IOException;
 import java.util.Hashtable;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
index e915a0650..fb29b6a72 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
@@ -19,7 +19,6 @@
 
 import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.spdy.okhttp.internal.Util;
-import com.koushikdutta.async.http.spdy.okio.ByteString;
 
 import java.util.List;
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
index 05d2107de..674d80c52 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
@@ -17,10 +17,8 @@
 package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
 
 import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.http.spdy.okio.ByteString;
+import com.koushikdutta.async.http.spdy.okhttp.internal.ByteString;
 
-import java.io.Closeable;
-import java.io.IOException;
 import java.util.List;
 
 /**
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Header.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Header.java
index ba0244fcb..bf9aaeb53 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Header.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Header.java
@@ -1,7 +1,7 @@
 package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
 
 
-import com.koushikdutta.async.http.spdy.okio.ByteString;
+import com.koushikdutta.async.http.spdy.okhttp.internal.ByteString;
 
 /** HTTP header: the name is an ASCII string, but the value can be UTF-8. */
 public final class Header {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeaderReader.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeaderReader.java
index b4aa5dcbd..0df4ec83a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeaderReader.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeaderReader.java
@@ -1,7 +1,7 @@
 package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
 
 import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.http.spdy.okio.ByteString;
+import com.koushikdutta.async.http.spdy.okhttp.internal.ByteString;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java
index b58d02958..8ef4aa593 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java
@@ -17,7 +17,7 @@
 
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.http.spdy.okhttp.internal.BitArray;
-import com.koushikdutta.async.http.spdy.okio.ByteString;
+import com.koushikdutta.async.http.spdy.okhttp.internal.ByteString;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/PushObserver.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/PushObserver.java
deleted file mode 100644
index fcec1732b..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/PushObserver.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
-
-import com.koushikdutta.async.http.spdy.okio.BufferedSource;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * {@link com.squareup.okhttp.Protocol#HTTP_2 HTTP/2} only.
- * Processes server-initiated HTTP requests on the client. Implementations must
- * quickly dispatch callbacks to avoid creating a bottleneck.
- *
- * <p>While {@link #onReset} may occur at any time, the following callbacks are
- * expected in order, correlated by stream ID.
- * <ul>
- *   <li>{@link #onRequest}</li>
- *   <li>{@link #onHeaders} (unless canceled)</li>
- *   <li>{@link #onData} (optional sequence of data frames)</li>
- * </ul>
- *
- * <p>As a stream ID is scoped to a single HTTP/2 connection, implementations
- * which target multiple connections should expect repetition of stream IDs.
- *
- * <p>Return true to request cancellation of a pushed stream.  Note that this
- * does not guarantee future frames won't arrive on the stream ID.
- */
-public interface PushObserver {
-  /**
-   * Describes the request that the server intends to push a response for.
-   *
-   * @param streamId server-initiated stream ID: an even number.
-   * @param requestHeaders minimally includes {@code :method}, {@code :scheme},
-   * {@code :authority}, and (@code :path}.
-   */
-  boolean onRequest(int streamId, List<Header> requestHeaders);
-
-  /**
-   * The response headers corresponding to a pushed request.  When {@code last}
-   * is true, there are no data frames to follow.
-   *
-   * @param streamId server-initiated stream ID: an even number.
-   * @param responseHeaders minimally includes {@code :status}.
-   * @param last when true, there is no response data.
-   */
-  boolean onHeaders(int streamId, List<Header> responseHeaders, boolean last);
-
-  /**
-   * A chunk of response data corresponding to a pushed request.  This data
-   * must either be read or skipped.
-   *
-   * @param streamId server-initiated stream ID: an even number.
-   * @param source location of data corresponding with this stream ID.
-   * @param byteCount number of bytes to read or skip from the source.
-   * @param last when true, there are no data frames to follow.
-   */
-  boolean onData(int streamId, BufferedSource source, int byteCount, boolean last)
-      throws IOException;
-
-  /** Indicates the reason why this stream was canceled. */
-  void onReset(int streamId, ErrorCode errorCode);
-
-  PushObserver CANCEL = new PushObserver() {
-
-    @Override public boolean onRequest(int streamId, List<Header> requestHeaders) {
-      return true;
-    }
-
-    @Override public boolean onHeaders(int streamId, List<Header> responseHeaders, boolean last) {
-      return true;
-    }
-
-    @Override public boolean onData(int streamId, BufferedSource source, int byteCount,
-        boolean last) throws IOException {
-      source.skip(byteCount);
-      return true;
-    }
-
-    @Override public void onReset(int streamId, ErrorCode errorCode) {
-    }
-  };
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
index 3db622365..52155ca04 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
@@ -21,7 +21,7 @@
 import com.koushikdutta.async.DataEmitterReader;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.http.Protocol;
-import com.koushikdutta.async.http.spdy.okio.ByteString;
+import com.koushikdutta.async.http.spdy.okhttp.internal.ByteString;
 import com.koushikdutta.async.util.Charsets;
 
 import java.io.IOException;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/AsyncTimeout.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/AsyncTimeout.java
deleted file mode 100644
index b0b46ff59..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/AsyncTimeout.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-import java.io.IOException;
-import java.io.InterruptedIOException;
-
-/**
- * This timeout uses a background thread to take action exactly when the timeout
- * occurs. Use this to implement timeouts where they aren't supported natively,
- * such as to sockets that are blocked on writing.
- *
- * <p>Subclasses should override {@link #timedOut} to take action when a timeout
- * occurs. This method will be invoked by the shared watchdog thread so it
- * should not do any long-running operations. Otherwise we risk starving other
- * timeouts from being triggered.
- *
- * <p>Use {@link #sink} and {@link #source} to apply this timeout to a stream.
- * The returned value will apply the timeout to each operation on the wrapped
- * stream.
- *
- * <p>Callers should call {@link #enter} before doing work that is subject to
- * timeouts, and {@link #exit} afterwards. The return value of {@link #exit}
- * indicates whether a timeout was triggered. Note that the call to {@link
- * #timedOut} is asynchronous, and may be called after {@link #exit}.
- */
-public class AsyncTimeout extends Timeout {
-  /**
-   * The watchdog thread processes a linked list of pending timeouts, sorted in
-   * the order to be triggered. This class synchronizes on AsyncTimeout.class.
-   * This lock guards the queue.
-   *
-   * <p>Head's 'next' points to the first element of the linked list. The first
-   * element is the next node to time out, or null if the queue is empty. The
-   * head is null until the watchdog thread is started.
-   */
-  private static AsyncTimeout head;
-
-  /** True if this node is currently in the queue. */
-  private boolean inQueue;
-
-  /** The next node in the linked list. */
-  private AsyncTimeout next;
-
-  /** If scheduled, this is the time that the watchdog should time this out. */
-  private long timeoutAt;
-
-  public final void enter() {
-    if (inQueue) throw new IllegalStateException("Unbalanced enter/exit");
-    long timeoutNanos = timeoutNanos();
-    boolean hasDeadline = hasDeadline();
-    if (timeoutNanos == 0 && !hasDeadline) {
-      return; // No timeout and no deadline? Don't bother with the queue.
-    }
-    inQueue = true;
-    scheduleTimeout(this, timeoutNanos, hasDeadline);
-  }
-
-  private static synchronized void scheduleTimeout(
-      AsyncTimeout node, long timeoutNanos, boolean hasDeadline) {
-    // Start the watchdog thread and create the head node when the first timeout is scheduled.
-    if (head == null) {
-      head = new AsyncTimeout();
-      new Watchdog().start();
-    }
-
-    long now = System.nanoTime();
-    if (timeoutNanos != 0 && hasDeadline) {
-      // Compute the earliest event; either timeout or deadline. Because nanoTime can wrap around,
-      // Math.min() is undefined for absolute values, but meaningful for relative ones.
-      node.timeoutAt = now + Math.min(timeoutNanos, node.deadlineNanoTime() - now);
-    } else if (timeoutNanos != 0) {
-      node.timeoutAt = now + timeoutNanos;
-    } else if (hasDeadline) {
-      node.timeoutAt = node.deadlineNanoTime();
-    } else {
-      throw new AssertionError();
-    }
-
-    // Insert the node in sorted order.
-    long remainingNanos = node.remainingNanos(now);
-    for (AsyncTimeout prev = head; true; prev = prev.next) {
-      if (prev.next == null || remainingNanos < prev.next.remainingNanos(now)) {
-        node.next = prev.next;
-        prev.next = node;
-        if (prev == head) {
-          AsyncTimeout.class.notify(); // Wake up the watchdog when inserting at the front.
-        }
-        break;
-      }
-    }
-  }
-
-  /** Returns true if the timeout occurred. */
-  public final boolean exit() {
-    if (!inQueue) return false;
-    inQueue = false;
-    return cancelScheduledTimeout(this);
-  }
-
-  /** Returns true if the timeout occurred. */
-  private static synchronized boolean cancelScheduledTimeout(AsyncTimeout node) {
-    // Remove the node from the linked list.
-    for (AsyncTimeout prev = head; prev != null; prev = prev.next) {
-      if (prev.next == node) {
-        prev.next = node.next;
-        node.next = null;
-        return false;
-      }
-    }
-
-    // The node wasn't found in the linked list: it must have timed out!
-    return true;
-  }
-
-  /**
-   * Returns the amount of time left until the time out. This will be negative
-   * if the timeout has elapsed and the timeout should occur immediately.
-   */
-  private long remainingNanos(long now) {
-    return timeoutAt - now;
-  }
-
-  /**
-   * Invoked by the watchdog thread when the time between calls to {@link
-   * #enter()} and {@link #exit()} has exceeded the timeout.
-   */
-  protected void timedOut() {
-  }
-
-  /**
-   * Returns a new sink that delegates to {@code sink}, using this to implement
-   * timeouts. This works best if {@link #timedOut} is overridden to interrupt
-   * {@code sink}'s current operation.
-   */
-  public final Sink sink(final Sink sink) {
-    return new Sink() {
-      @Override public void write(Buffer source, long byteCount) throws IOException {
-        boolean throwOnTimeout = false;
-        enter();
-        try {
-          sink.write(source, byteCount);
-          throwOnTimeout = true;
-        } catch (IOException e) {
-          throw exit(e);
-        } finally {
-          exit(throwOnTimeout);
-        }
-      }
-
-      @Override public void flush() throws IOException {
-        boolean throwOnTimeout = false;
-        enter();
-        try {
-          sink.flush();
-          throwOnTimeout = true;
-        } catch (IOException e) {
-          throw exit(e);
-        } finally {
-          exit(throwOnTimeout);
-        }
-      }
-
-      @Override public void close() throws IOException {
-        boolean throwOnTimeout = false;
-        enter();
-        try {
-          sink.close();
-          throwOnTimeout = true;
-        } catch (IOException e) {
-          throw exit(e);
-        } finally {
-          exit(throwOnTimeout);
-        }
-      }
-
-      @Override public Timeout timeout() {
-        return AsyncTimeout.this;
-      }
-
-      @Override public String toString() {
-        return "AsyncTimeout.sink(" + sink + ")";
-      }
-    };
-  }
-
-  /**
-   * Returns a new source that delegates to {@code source}, using this to
-   * implement timeouts. This works best if {@link #timedOut} is overridden to
-   * interrupt {@code sink}'s current operation.
-   */
-  public final Source source(final Source source) {
-    return new Source() {
-      @Override public long read(Buffer sink, long byteCount) throws IOException {
-        boolean throwOnTimeout = false;
-        enter();
-        try {
-          long result = source.read(sink, byteCount);
-          throwOnTimeout = true;
-          return result;
-        } catch (IOException e) {
-          throw exit(e);
-        } finally {
-          exit(throwOnTimeout);
-        }
-      }
-
-      @Override public void close() throws IOException {
-        boolean throwOnTimeout = false;
-        try {
-          source.close();
-          throwOnTimeout = true;
-        } catch (IOException e) {
-          throw exit(e);
-        } finally {
-          exit(throwOnTimeout);
-        }
-      }
-
-      @Override public Timeout timeout() {
-        return AsyncTimeout.this;
-      }
-
-      @Override public String toString() {
-        return "AsyncTimeout.source(" + source + ")";
-      }
-    };
-  }
-
-  /**
-   * Throws an InterruptedIOException if {@code throwOnTimeout} is true and a
-   * timeout occurred.
-   */
-  final void exit(boolean throwOnTimeout) throws IOException {
-    boolean timedOut = exit();
-    if (timedOut && throwOnTimeout) throw new InterruptedIOException("timeout");
-  }
-
-  /**
-   * Returns either {@code cause} or an InterruptedIOException that's caused by
-   * {@code cause} if a timeout occurred.
-   */
-  final IOException exit(IOException cause) throws IOException {
-    if (!exit()) return cause;
-    InterruptedIOException e = new InterruptedIOException("timeout");
-    e.initCause(cause);
-    return e;
-  }
-
-  private static final class Watchdog extends Thread {
-    public Watchdog() {
-      super("Okio Watchdog");
-      setDaemon(true);
-    }
-
-    public void run() {
-      while (true) {
-        try {
-          AsyncTimeout timedOut = awaitTimeout();
-
-          // Didn't find a node to interrupt. Try again.
-          if (timedOut == null) continue;
-
-          // Close the timed out node.
-          timedOut.timedOut();
-        } catch (InterruptedException ignored) {
-        }
-      }
-    }
-  }
-
-  /**
-   * Removes and returns the node at the head of the list, waiting for it to
-   * time out if necessary. Returns null if the situation changes while waiting:
-   * either a newer node is inserted at the head, or the node being waited on
-   * has been removed.
-   */
-  private static synchronized AsyncTimeout awaitTimeout() throws InterruptedException {
-    // Get the next eligible node.
-    AsyncTimeout node = head.next;
-
-    // The queue is empty. Wait for something to be enqueued.
-    if (node == null) {
-      AsyncTimeout.class.wait();
-      return null;
-    }
-
-    long waitNanos = node.remainingNanos(System.nanoTime());
-
-    // The head of the queue hasn't timed out yet. Await that.
-    if (waitNanos > 0) {
-      // Waiting is made complicated by the fact that we work in nanoseconds,
-      // but the API wants (millis, nanos) in two arguments.
-      long waitMillis = waitNanos / 1000000L;
-      waitNanos -= (waitMillis * 1000000L);
-      AsyncTimeout.class.wait(waitMillis, (int) waitNanos);
-      return null;
-    }
-
-    // The head of the queue has timed out. Remove it.
-    head.next = node.next;
-    node.next = null;
-    return node;
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Base64.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Base64.java
deleted file mode 100644
index c0a6571f2..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Base64.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/**
- * @author Alexander Y. Kleymenov
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-import java.io.UnsupportedEncodingException;
-
-final class Base64 {
-  private Base64() {
-  }
-
-  public static byte[] decode(String in) {
-    // Ignore trailing '=' padding and whitespace from the input.
-    int limit = in.length();
-    for (; limit > 0; limit--) {
-      char c = in.charAt(limit - 1);
-      if (c != '=' && c != '\n' && c != '\r' && c != ' ' && c != '\t') {
-        break;
-      }
-    }
-
-    // If the input includes whitespace, this output array will be longer than necessary.
-    byte[] out = new byte[(int) (limit * 6L / 8L)];
-    int outCount = 0;
-    int inCount = 0;
-
-    int word = 0;
-    for (int pos = 0; pos < limit; pos++) {
-      char c = in.charAt(pos);
-
-      int bits;
-      if (c >= 'A' && c <= 'Z') {
-        // char ASCII value
-        //  A    65    0
-        //  Z    90    25 (ASCII - 65)
-        bits = c - 65;
-      } else if (c >= 'a' && c <= 'z') {
-        // char ASCII value
-        //  a    97    26
-        //  z    122   51 (ASCII - 71)
-        bits = c - 71;
-      } else if (c >= '0' && c <= '9') {
-        // char ASCII value
-        //  0    48    52
-        //  9    57    61 (ASCII + 4)
-        bits = c + 4;
-      } else if (c == '+') {
-        bits = 62;
-      } else if (c == '/') {
-        bits = 63;
-      } else if (c == '\n' || c == '\r' || c == ' ' || c == '\t') {
-        continue;
-      } else {
-        return null;
-      }
-
-      // Append this char's 6 bits to the word.
-      word = (word << 6) | (byte) bits;
-
-      // For every 4 chars of input, we accumulate 24 bits of output. Emit 3 bytes.
-      inCount++;
-      if (inCount % 4 == 0) {
-        out[outCount++] = (byte) (word >> 16);
-        out[outCount++] = (byte) (word >> 8);
-        out[outCount++] = (byte) word;
-      }
-    }
-
-    int lastWordChars = inCount % 4;
-    if (lastWordChars == 1) {
-      // We read 1 char followed by "===". But 6 bits is a truncated byte! Fail.
-      return null;
-    } else if (lastWordChars == 2) {
-      // We read 2 chars followed by "==". Emit 1 byte with 8 of those 12 bits.
-      word = word << 12;
-      out[outCount++] = (byte) (word >> 16);
-    } else if (lastWordChars == 3) {
-      // We read 3 chars, followed by "=". Emit 2 bytes for 16 of those 18 bits.
-      word = word << 6;
-      out[outCount++] = (byte) (word >> 16);
-      out[outCount++] = (byte) (word >> 8);
-    }
-
-    // If we sized our out array perfectly, we're done.
-    if (outCount == out.length) return out;
-
-    // Copy the decoded bytes to a new, right-sized array.
-    byte[] prefix = new byte[outCount];
-    System.arraycopy(out, 0, prefix, 0, outCount);
-    return prefix;
-  }
-
-  private static final byte[] MAP = new byte[] {
-      'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
-      'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
-      'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4',
-      '5', '6', '7', '8', '9', '+', '/'
-  };
-
-  public static String encode(byte[] in) {
-    int length = (in.length + 2) * 4 / 3;
-    byte[] out = new byte[length];
-    int index = 0, end = in.length - in.length % 3;
-    for (int i = 0; i < end; i += 3) {
-      out[index++] = MAP[(in[i] & 0xff) >> 2];
-      out[index++] = MAP[((in[i] & 0x03) << 4) | ((in[i + 1] & 0xff) >> 4)];
-      out[index++] = MAP[((in[i + 1] & 0x0f) << 2) | ((in[i + 2] & 0xff) >> 6)];
-      out[index++] = MAP[(in[i + 2] & 0x3f)];
-    }
-    switch (in.length % 3) {
-      case 1:
-        out[index++] = MAP[(in[end] & 0xff) >> 2];
-        out[index++] = MAP[(in[end] & 0x03) << 4];
-        out[index++] = '=';
-        out[index++] = '=';
-        break;
-      case 2:
-        out[index++] = MAP[(in[end] & 0xff) >> 2];
-        out[index++] = MAP[((in[end] & 0x03) << 4) | ((in[end + 1] & 0xff) >> 4)];
-        out[index++] = MAP[((in[end + 1] & 0x0f) << 2)];
-        out[index++] = '=';
-        break;
-    }
-    try {
-      return new String(out, 0, index, "US-ASCII");
-    } catch (UnsupportedEncodingException e) {
-      throw new AssertionError(e);
-    }
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Buffer.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Buffer.java
deleted file mode 100644
index bb6852dc4..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Buffer.java
+++ /dev/null
@@ -1,911 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static com.koushikdutta.async.http.spdy.okhttp.internal.Util.checkOffsetAndCount;
-import static com.koushikdutta.async.http.spdy.okio.Util.reverseBytesLong;
-
-/**
- * A collection of bytes in memory.
- *
- * <p><strong>Moving data from one buffer to another is fast.</strong> Instead
- * of copying bytes from one place in memory to another, this class just changes
- * ownership of the underlying byte arrays.
- *
- * <p><strong>This buffer grows with your data.</strong> Just like ArrayList,
- * each buffer starts small. It consumes only the memory it needs to.
- *
- * <p><strong>This buffer pools its byte arrays.</strong> When you allocate a
- * byte array in Java, the runtime must zero-fill the requested array before
- * returning it to you. Even if you're going to write over that space anyway.
- * This class avoids zero-fill and GC churn by pooling byte arrays.
- */
-public final class Buffer implements BufferedSource, BufferedSink, Cloneable {
-  public Segment head;
-  public long size;
-
-  public Buffer() {
-  }
-
-  /** Returns the number of bytes currently in this buffer. */
-  public long size() {
-    return size;
-  }
-
-  @Override public Buffer buffer() {
-    return this;
-  }
-
-  @Override public OutputStream outputStream() {
-    return new OutputStream() {
-      @Override public void write(int b) {
-        writeByte((byte) b);
-      }
-
-      @Override public void write(byte[] data, int offset, int byteCount) {
-        Buffer.this.write(data, offset, byteCount);
-      }
-
-      @Override public void flush() {
-      }
-
-      @Override public void close() {
-      }
-
-      @Override public String toString() {
-        return this + ".outputStream()";
-      }
-    };
-  }
-
-  @Override public Buffer emitCompleteSegments() {
-    return this; // Nowhere to emit to!
-  }
-
-  @Override public boolean exhausted() {
-    return size == 0;
-  }
-
-  @Override public void require(long byteCount) throws EOFException {
-    if (this.size < byteCount) throw new EOFException();
-  }
-
-  @Override public InputStream inputStream() {
-    return new InputStream() {
-      @Override public int read() {
-        if (size > 0) return readByte() & 0xff;
-        return -1;
-      }
-
-      @Override public int read(byte[] sink, int offset, int byteCount) {
-        return Buffer.this.read(sink, offset, byteCount);
-      }
-
-      @Override public int available() {
-        return (int) Math.min(size, Integer.MAX_VALUE);
-      }
-
-      @Override public void close() {
-      }
-
-      @Override public String toString() {
-        return Buffer.this + ".inputStream()";
-      }
-    };
-  }
-
-  /** Copy the contents of this to {@code out}. */
-  public Buffer copyTo(OutputStream out) throws IOException {
-    return copyTo(out, 0, size);
-  }
-
-  /**
-   * Copy {@code byteCount} bytes from this, starting at {@code offset}, to
-   * {@code out}.
-   */
-  public Buffer copyTo(OutputStream out, long offset, long byteCount) throws IOException {
-    if (out == null) throw new IllegalArgumentException("out == null");
-    checkOffsetAndCount(size, offset, byteCount);
-    if (byteCount == 0) return this;
-
-    // Skip segments that we aren't copying from.
-    Segment s = head;
-    for (; offset >= (s.limit - s.pos); s = s.next) {
-      offset -= (s.limit - s.pos);
-    }
-
-    // Copy from one segment at a time.
-    for (; byteCount > 0; s = s.next) {
-      int pos = (int) (s.pos + offset);
-      int toWrite = (int) Math.min(s.limit - pos, byteCount);
-      out.write(s.data, pos, toWrite);
-      byteCount -= toWrite;
-      offset = 0;
-    }
-
-    return this;
-  }
-
-  /** Write the contents of this to {@code out}. */
-  public Buffer writeTo(OutputStream out) throws IOException {
-    return writeTo(out, size);
-  }
-
-  /** Write {@code byteCount} bytes from this to {@code out}. */
-  public Buffer writeTo(OutputStream out, long byteCount) throws IOException {
-    if (out == null) throw new IllegalArgumentException("out == null");
-    checkOffsetAndCount(size, 0, byteCount);
-
-    Segment s = head;
-    while (byteCount > 0) {
-      int toCopy = (int) Math.min(byteCount, s.limit - s.pos);
-      out.write(s.data, s.pos, toCopy);
-
-      s.pos += toCopy;
-      size -= toCopy;
-      byteCount -= toCopy;
-
-      if (s.pos == s.limit) {
-        Segment toRecycle = s;
-        head = s = toRecycle.pop();
-        SegmentPool.getInstance().recycle(toRecycle);
-      }
-    }
-
-    return this;
-  }
-
-  /** Read and exhaust bytes from {@code in} to this. */
-  public Buffer readFrom(InputStream in) throws IOException {
-    readFrom(in, Long.MAX_VALUE, true);
-    return this;
-  }
-
-  /** Read {@code byteCount} bytes from {@code in} to this. */
-  public Buffer readFrom(InputStream in, long byteCount) throws IOException {
-    if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
-    readFrom(in, byteCount, false);
-    return this;
-  }
-
-  private void readFrom(InputStream in, long byteCount, boolean forever) throws IOException {
-    if (in == null) throw new IllegalArgumentException("in == null");
-    while (byteCount > 0 || forever) {
-      Segment tail = writableSegment(1);
-      int maxToCopy = (int) Math.min(byteCount, Segment.SIZE - tail.limit);
-      int bytesRead = in.read(tail.data, tail.limit, maxToCopy);
-      if (bytesRead == -1) {
-        if (forever) return;
-        throw new EOFException();
-      }
-      tail.limit += bytesRead;
-      size += bytesRead;
-      byteCount -= bytesRead;
-    }
-  }
-
-  /**
-   * Returns the number of bytes in segments that are not writable. This is the
-   * number of bytes that can be flushed immediately to an underlying sink
-   * without harming throughput.
-   */
-  public long completeSegmentByteCount() {
-    long result = size;
-    if (result == 0) return 0;
-
-    // Omit the tail if it's still writable.
-    Segment tail = head.prev;
-    if (tail.limit < Segment.SIZE) {
-      result -= tail.limit - tail.pos;
-    }
-
-    return result;
-  }
-
-  @Override public byte readByte() {
-    if (size == 0) throw new IllegalStateException("size == 0");
-
-    Segment segment = head;
-    int pos = segment.pos;
-    int limit = segment.limit;
-
-    byte[] data = segment.data;
-    byte b = data[pos++];
-    size -= 1;
-
-    if (pos == limit) {
-      head = segment.pop();
-      SegmentPool.getInstance().recycle(segment);
-    } else {
-      segment.pos = pos;
-    }
-
-    return b;
-  }
-
-  /** Returns the byte at {@code pos}. */
-  public byte getByte(long pos) {
-    checkOffsetAndCount(size, pos, 1);
-    for (Segment s = head; true; s = s.next) {
-      int segmentByteCount = s.limit - s.pos;
-      if (pos < segmentByteCount) return s.data[s.pos + (int) pos];
-      pos -= segmentByteCount;
-    }
-  }
-
-  @Override public short readShort() {
-    if (size < 2) throw new IllegalStateException("size < 2: " + size);
-
-    Segment segment = head;
-    int pos = segment.pos;
-    int limit = segment.limit;
-
-    // If the short is split across multiple segments, delegate to readByte().
-    if (limit - pos < 2) {
-      int s = (readByte() & 0xff) << 8
-          |   (readByte() & 0xff);
-      return (short) s;
-    }
-
-    byte[] data = segment.data;
-    int s = (data[pos++] & 0xff) << 8
-        |   (data[pos++] & 0xff);
-    size -= 2;
-
-    if (pos == limit) {
-      head = segment.pop();
-      SegmentPool.getInstance().recycle(segment);
-    } else {
-      segment.pos = pos;
-    }
-
-    return (short) s;
-  }
-
-  @Override public int readInt() {
-    if (size < 4) throw new IllegalStateException("size < 4: " + size);
-
-    Segment segment = head;
-    int pos = segment.pos;
-    int limit = segment.limit;
-
-    // If the int is split across multiple segments, delegate to readByte().
-    if (limit - pos < 4) {
-      return (readByte() & 0xff) << 24
-          |  (readByte() & 0xff) << 16
-          |  (readByte() & 0xff) <<  8
-          |  (readByte() & 0xff);
-    }
-
-    byte[] data = segment.data;
-    int i = (data[pos++] & 0xff) << 24
-        |   (data[pos++] & 0xff) << 16
-        |   (data[pos++] & 0xff) <<  8
-        |   (data[pos++] & 0xff);
-    size -= 4;
-
-    if (pos == limit) {
-      head = segment.pop();
-      SegmentPool.getInstance().recycle(segment);
-    } else {
-      segment.pos = pos;
-    }
-
-    return i;
-  }
-
-  @Override public long readLong() {
-    if (size < 8) throw new IllegalStateException("size < 8: " + size);
-
-    Segment segment = head;
-    int pos = segment.pos;
-    int limit = segment.limit;
-
-    // If the long is split across multiple segments, delegate to readInt().
-    if (limit - pos < 8) {
-      return (readInt() & 0xffffffffL) << 32
-          |  (readInt() & 0xffffffffL);
-    }
-
-    byte[] data = segment.data;
-    long v = (data[pos++] & 0xffL) << 56
-        |    (data[pos++] & 0xffL) << 48
-        |    (data[pos++] & 0xffL) << 40
-        |    (data[pos++] & 0xffL) << 32
-        |    (data[pos++] & 0xffL) << 24
-        |    (data[pos++] & 0xffL) << 16
-        |    (data[pos++] & 0xffL) <<  8
-        |    (data[pos++] & 0xffL);
-    size -= 8;
-
-    if (pos == limit) {
-      head = segment.pop();
-      SegmentPool.getInstance().recycle(segment);
-    } else {
-      segment.pos = pos;
-    }
-
-    return v;
-  }
-
-  @Override public short readShortLe() {
-    return Util.reverseBytesShort(readShort());
-  }
-
-  @Override public int readIntLe() {
-    return Util.reverseBytesInt(readInt());
-  }
-
-  @Override public long readLongLe() {
-    return Util.reverseBytesLong(readLong());
-  }
-
-  @Override public ByteString readByteString() {
-    return new ByteString(readByteArray());
-  }
-
-  @Override public ByteString readByteString(long byteCount) throws EOFException {
-    return new ByteString(readByteArray(byteCount));
-  }
-
-  @Override public void readFully(Buffer sink, long byteCount) throws EOFException {
-    if (size < byteCount) {
-      sink.write(this, size); // Exhaust ourselves.
-      throw new EOFException();
-    }
-    sink.write(this, byteCount);
-  }
-
-  @Override public long readAll(Sink sink) throws IOException {
-    long byteCount = size;
-    if (byteCount > 0) {
-      sink.write(this, byteCount);
-    }
-    return byteCount;
-  }
-
-  @Override public String readUtf8() {
-    try {
-      return readString(size, Util.UTF_8);
-    } catch (EOFException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  @Override public String readUtf8(long byteCount) throws EOFException {
-    return readString(byteCount, Util.UTF_8);
-  }
-
-  @Override public String readString(Charset charset) {
-    try {
-      return readString(size, charset);
-    } catch (EOFException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  @Override public String readString(long byteCount, Charset charset) throws EOFException {
-    checkOffsetAndCount(size, 0, byteCount);
-    if (charset == null) throw new IllegalArgumentException("charset == null");
-    if (byteCount > Integer.MAX_VALUE) {
-      throw new IllegalArgumentException("byteCount > Integer.MAX_VALUE: " + byteCount);
-    }
-    if (byteCount == 0) return "";
-
-    Segment head = this.head;
-    if (head.pos + byteCount > head.limit) {
-      // If the string spans multiple segments, delegate to readBytes().
-      return new String(readByteArray(byteCount), charset);
-    }
-
-    String result = new String(head.data, head.pos, (int) byteCount, charset);
-    head.pos += byteCount;
-    size -= byteCount;
-
-    if (head.pos == head.limit) {
-      this.head = head.pop();
-      SegmentPool.getInstance().recycle(head);
-    }
-
-    return result;
-  }
-
-  @Override public String readUtf8Line() throws EOFException {
-    long newline = indexOf((byte) '\n');
-
-    if (newline == -1) {
-      return size != 0 ? readUtf8(size) : null;
-    }
-
-    return readUtf8Line(newline);
-  }
-
-  @Override public String readUtf8LineStrict() throws EOFException {
-    long newline = indexOf((byte) '\n');
-    if (newline == -1) throw new EOFException();
-    return readUtf8Line(newline);
-  }
-
-  String readUtf8Line(long newline) throws EOFException {
-    if (newline > 0 && getByte(newline - 1) == '\r') {
-      // Read everything until '\r\n', then skip the '\r\n'.
-      String result = readUtf8((newline - 1));
-      skip(2);
-      return result;
-
-    } else {
-      // Read everything until '\n', then skip the '\n'.
-      String result = readUtf8(newline);
-      skip(1);
-      return result;
-    }
-  }
-
-  @Override public byte[] readByteArray() {
-    try {
-      return readByteArray(size);
-    } catch (EOFException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  @Override public byte[] readByteArray(long byteCount) throws EOFException {
-    checkOffsetAndCount(this.size, 0, byteCount);
-    if (byteCount > Integer.MAX_VALUE) {
-      throw new IllegalArgumentException("byteCount > Integer.MAX_VALUE: " + byteCount);
-    }
-
-    byte[] result = new byte[(int) byteCount];
-    readFully(result);
-    return result;
-  }
-
-  @Override public int read(byte[] sink) {
-    return read(sink, 0, sink.length);
-  }
-
-  @Override public void readFully(byte[] sink) throws EOFException {
-    int offset = 0;
-    while (offset < sink.length) {
-      int read = read(sink, offset, sink.length - offset);
-      if (read == -1) throw new EOFException();
-      offset += read;
-    }
-  }
-
-  @Override public int read(byte[] sink, int offset, int byteCount) {
-    checkOffsetAndCount(sink.length, offset, byteCount);
-
-    Segment s = this.head;
-    if (s == null) return -1;
-    int toCopy = Math.min(byteCount, s.limit - s.pos);
-    System.arraycopy(s.data, s.pos, sink, offset, toCopy);
-
-    s.pos += toCopy;
-    this.size -= toCopy;
-
-    if (s.pos == s.limit) {
-      this.head = s.pop();
-      SegmentPool.getInstance().recycle(s);
-    }
-
-    return toCopy;
-  }
-
-  /**
-   * Discards all bytes in this buffer. Calling this method when you're done
-   * with a buffer will return its segments to the pool.
-   */
-  public void clear() {
-    try {
-      skip(size);
-    } catch (EOFException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  /** Discards {@code byteCount} bytes from the head of this buffer. */
-  @Override public void skip(long byteCount) throws EOFException {
-    while (byteCount > 0) {
-      if (head == null) throw new EOFException();
-
-      int toSkip = (int) Math.min(byteCount, head.limit - head.pos);
-      size -= toSkip;
-      byteCount -= toSkip;
-      head.pos += toSkip;
-
-      if (head.pos == head.limit) {
-        Segment toRecycle = head;
-        head = toRecycle.pop();
-        SegmentPool.getInstance().recycle(toRecycle);
-      }
-    }
-  }
-
-  @Override public Buffer write(ByteString byteString) {
-    if (byteString == null) throw new IllegalArgumentException("byteString == null");
-    return write(byteString.data, 0, byteString.data.length);
-  }
-
-  @Override public Buffer writeUtf8(String string) {
-    if (string == null) throw new IllegalArgumentException("string == null");
-    // TODO: inline UTF-8 encoding to save allocating a byte[]?
-    return writeString(string, Util.UTF_8);
-  }
-
-  @Override public Buffer writeString(String string, Charset charset) {
-    if (string == null) throw new IllegalArgumentException("string == null");
-    if (charset == null) throw new IllegalArgumentException("charset == null");
-    byte[] data = string.getBytes(charset);
-    return write(data, 0, data.length);
-  }
-
-  @Override public Buffer write(byte[] source) {
-    if (source == null) throw new IllegalArgumentException("source == null");
-    return write(source, 0, source.length);
-  }
-
-  @Override public Buffer write(byte[] source, int offset, int byteCount) {
-    if (source == null) throw new IllegalArgumentException("source == null");
-    checkOffsetAndCount(source.length, offset, byteCount);
-
-    int limit = offset + byteCount;
-    while (offset < limit) {
-      Segment tail = writableSegment(1);
-
-      int toCopy = Math.min(limit - offset, Segment.SIZE - tail.limit);
-      System.arraycopy(source, offset, tail.data, tail.limit, toCopy);
-
-      offset += toCopy;
-      tail.limit += toCopy;
-    }
-
-    this.size += byteCount;
-    return this;
-  }
-
-  @Override public long writeAll(Source source) throws IOException {
-    if (source == null) throw new IllegalArgumentException("source == null");
-    long totalBytesRead = 0;
-    for (long readCount; (readCount = source.read(this, Segment.SIZE)) != -1; ) {
-      totalBytesRead += readCount;
-    }
-    return totalBytesRead;
-  }
-
-  @Override public Buffer writeByte(int b) {
-    Segment tail = writableSegment(1);
-    tail.data[tail.limit++] = (byte) b;
-    size += 1;
-    return this;
-  }
-
-  @Override public Buffer writeShort(int s) {
-    Segment tail = writableSegment(2);
-    byte[] data = tail.data;
-    int limit = tail.limit;
-    data[limit++] = (byte) ((s >>> 8) & 0xff);
-    data[limit++] = (byte)  (s        & 0xff);
-    tail.limit = limit;
-    size += 2;
-    return this;
-  }
-
-  @Override public Buffer writeShortLe(int s) {
-    return writeShort(Util.reverseBytesShort((short) s));
-  }
-
-  @Override public Buffer writeInt(int i) {
-    Segment tail = writableSegment(4);
-    byte[] data = tail.data;
-    int limit = tail.limit;
-    data[limit++] = (byte) ((i >>> 24) & 0xff);
-    data[limit++] = (byte) ((i >>> 16) & 0xff);
-    data[limit++] = (byte) ((i >>>  8) & 0xff);
-    data[limit++] = (byte)  (i         & 0xff);
-    tail.limit = limit;
-    size += 4;
-    return this;
-  }
-
-  @Override public Buffer writeIntLe(int i) {
-    return writeInt(Util.reverseBytesInt(i));
-  }
-
-  @Override public Buffer writeLong(long v) {
-    Segment tail = writableSegment(8);
-    byte[] data = tail.data;
-    int limit = tail.limit;
-    data[limit++] = (byte) ((v >>> 56L) & 0xff);
-    data[limit++] = (byte) ((v >>> 48L) & 0xff);
-    data[limit++] = (byte) ((v >>> 40L) & 0xff);
-    data[limit++] = (byte) ((v >>> 32L) & 0xff);
-    data[limit++] = (byte) ((v >>> 24L) & 0xff);
-    data[limit++] = (byte) ((v >>> 16L) & 0xff);
-    data[limit++] = (byte) ((v >>>  8L) & 0xff);
-    data[limit++] = (byte)  (v          & 0xff);
-    tail.limit = limit;
-    size += 8;
-    return this;
-  }
-
-  @Override public Buffer writeLongLe(long v) {
-    return writeLong(reverseBytesLong(v));
-  }
-
-  /**
-   * Returns a tail segment that we can write at least {@code minimumCapacity}
-   * bytes to, creating it if necessary.
-   */
-  Segment writableSegment(int minimumCapacity) {
-    if (minimumCapacity < 1 || minimumCapacity > Segment.SIZE) throw new IllegalArgumentException();
-
-    if (head == null) {
-      head = SegmentPool.getInstance().take(); // Acquire a first segment.
-      return head.next = head.prev = head;
-    }
-
-    Segment tail = head.prev;
-    if (tail.limit + minimumCapacity > Segment.SIZE) {
-      tail = tail.push(SegmentPool.getInstance().take()); // Append a new empty segment to fill up.
-    }
-    return tail;
-  }
-
-  @Override public void write(Buffer source, long byteCount) {
-    // Move bytes from the head of the source buffer to the tail of this buffer
-    // while balancing two conflicting goals: don't waste CPU and don't waste
-    // memory.
-    //
-    //
-    // Don't waste CPU (ie. don't copy data around).
-    //
-    // Copying large amounts of data is expensive. Instead, we prefer to
-    // reassign entire segments from one buffer to the other.
-    //
-    //
-    // Don't waste memory.
-    //
-    // As an invariant, adjacent pairs of segments in a buffer should be at
-    // least 50% full, except for the head segment and the tail segment.
-    //
-    // The head segment cannot maintain the invariant because the application is
-    // consuming bytes from this segment, decreasing its level.
-    //
-    // The tail segment cannot maintain the invariant because the application is
-    // producing bytes, which may require new nearly-empty tail segments to be
-    // appended.
-    //
-    //
-    // Moving segments between buffers
-    //
-    // When writing one buffer to another, we prefer to reassign entire segments
-    // over copying bytes into their most compact form. Suppose we have a buffer
-    // with these segment levels [91%, 61%]. If we append a buffer with a
-    // single [72%] segment, that yields [91%, 61%, 72%]. No bytes are copied.
-    //
-    // Or suppose we have a buffer with these segment levels: [100%, 2%], and we
-    // want to append it to a buffer with these segment levels [99%, 3%]. This
-    // operation will yield the following segments: [100%, 2%, 99%, 3%]. That
-    // is, we do not spend time copying bytes around to achieve more efficient
-    // memory use like [100%, 100%, 4%].
-    //
-    // When combining buffers, we will compact adjacent buffers when their
-    // combined level doesn't exceed 100%. For example, when we start with
-    // [100%, 40%] and append [30%, 80%], the result is [100%, 70%, 80%].
-    //
-    //
-    // Splitting segments
-    //
-    // Occasionally we write only part of a source buffer to a sink buffer. For
-    // example, given a sink [51%, 91%], we may want to write the first 30% of
-    // a source [92%, 82%] to it. To simplify, we first transform the source to
-    // an equivalent buffer [30%, 62%, 82%] and then move the head segment,
-    // yielding sink [51%, 91%, 30%] and source [62%, 82%].
-
-    if (source == null) throw new IllegalArgumentException("source == null");
-    if (source == this) throw new IllegalArgumentException("source == this");
-    checkOffsetAndCount(source.size, 0, byteCount);
-
-    while (byteCount > 0) {
-      // Is a prefix of the source's head segment all that we need to move?
-      if (byteCount < (source.head.limit - source.head.pos)) {
-        Segment tail = head != null ? head.prev : null;
-        if (tail == null || byteCount + (tail.limit - tail.pos) > Segment.SIZE) {
-          // We're going to need another segment. Split the source's head
-          // segment in two, then move the first of those two to this buffer.
-          source.head = source.head.split((int) byteCount);
-        } else {
-          // Our existing segments are sufficient. Move bytes from source's head to our tail.
-          source.head.writeTo(tail, (int) byteCount);
-          source.size -= byteCount;
-          this.size += byteCount;
-          return;
-        }
-      }
-
-      // Remove the source's head segment and append it to our tail.
-      Segment segmentToMove = source.head;
-      long movedByteCount = segmentToMove.limit - segmentToMove.pos;
-      source.head = segmentToMove.pop();
-      if (head == null) {
-        head = segmentToMove;
-        head.next = head.prev = head;
-      } else {
-        Segment tail = head.prev;
-        tail = tail.push(segmentToMove);
-        tail.compact();
-      }
-      source.size -= movedByteCount;
-      this.size += movedByteCount;
-      byteCount -= movedByteCount;
-    }
-  }
-
-  @Override public long read(Buffer sink, long byteCount) {
-    if (sink == null) throw new IllegalArgumentException("sink == null");
-    if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
-    if (this.size == 0) return -1L;
-    if (byteCount > this.size) byteCount = this.size;
-    sink.write(this, byteCount);
-    return byteCount;
-  }
-
-  @Override public long indexOf(byte b) {
-    return indexOf(b, 0);
-  }
-
-  /**
-   * Returns the index of {@code b} in this at or beyond {@code fromIndex}, or
-   * -1 if this buffer does not contain {@code b} in that range.
-   */
-  public long indexOf(byte b, long fromIndex) {
-    if (fromIndex < 0) throw new IllegalArgumentException("fromIndex < 0");
-
-    Segment s = head;
-    if (s == null) return -1L;
-    long offset = 0L;
-    do {
-      int segmentByteCount = s.limit - s.pos;
-      if (fromIndex >= segmentByteCount) {
-        fromIndex -= segmentByteCount;
-      } else {
-        byte[] data = s.data;
-        for (long pos = s.pos + fromIndex, limit = s.limit; pos < limit; pos++) {
-          if (data[(int) pos] == b) return offset + pos - s.pos;
-        }
-        fromIndex = 0;
-      }
-      offset += segmentByteCount;
-      s = s.next;
-    } while (s != head);
-    return -1L;
-  }
-
-  @Override public void flush() {
-  }
-
-  @Override public void close() {
-  }
-
-  @Override public Timeout timeout() {
-    return Timeout.NONE;
-  }
-
-  /** For testing. This returns the sizes of the segments in this buffer. */
-  List<Integer> segmentSizes() {
-    if (head == null) return Collections.emptyList();
-    List<Integer> result = new ArrayList<Integer>();
-    result.add(head.limit - head.pos);
-    for (Segment s = head.next; s != head; s = s.next) {
-      result.add(s.limit - s.pos);
-    }
-    return result;
-  }
-
-  @Override public boolean equals(Object o) {
-    if (this == o) return true;
-    if (!(o instanceof Buffer)) return false;
-    Buffer that = (Buffer) o;
-    if (size != that.size) return false;
-    if (size == 0) return true; // Both buffers are empty.
-
-    Segment sa = this.head;
-    Segment sb = that.head;
-    int posA = sa.pos;
-    int posB = sb.pos;
-
-    for (long pos = 0, count; pos < size; pos += count) {
-      count = Math.min(sa.limit - posA, sb.limit - posB);
-
-      for (int i = 0; i < count; i++) {
-        if (sa.data[posA++] != sb.data[posB++]) return false;
-      }
-
-      if (posA == sa.limit) {
-        sa = sa.next;
-        posA = sa.pos;
-      }
-
-      if (posB == sb.limit) {
-        sb = sb.next;
-        posB = sb.pos;
-      }
-    }
-
-    return true;
-  }
-
-  @Override public int hashCode() {
-    Segment s = head;
-    if (s == null) return 0;
-    int result = 1;
-    do {
-      for (int pos = s.pos, limit = s.limit; pos < limit; pos++) {
-        result = 31 * result + s.data[pos];
-      }
-      s = s.next;
-    } while (s != head);
-    return result;
-  }
-
-  @Override public String toString() {
-    if (size == 0) {
-      return "Buffer[size=0]";
-    }
-
-    if (size <= 16) {
-      ByteString data = clone().readByteString();
-      return String.format("Buffer[size=%s data=%s]", size, data.hex());
-    }
-
-    try {
-      MessageDigest md5 = MessageDigest.getInstance("MD5");
-      md5.update(head.data, head.pos, head.limit - head.pos);
-      for (Segment s = head.next; s != head; s = s.next) {
-        md5.update(s.data, s.pos, s.limit - s.pos);
-      }
-      return String.format("Buffer[size=%s md5=%s]",
-          size, ByteString.of(md5.digest()).hex());
-    } catch (NoSuchAlgorithmException e) {
-      throw new AssertionError();
-    }
-  }
-
-  /** Returns a deep copy of this buffer. */
-  @Override public Buffer clone() {
-    Buffer result = new Buffer();
-    if (size == 0) return result;
-
-    result.write(head.data, head.pos, head.limit - head.pos);
-    for (Segment s = head.next; s != head; s = s.next) {
-      result.write(s.data, s.pos, s.limit - s.pos);
-    }
-
-    return result;
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/BufferedSink.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/BufferedSink.java
deleted file mode 100644
index 777840389..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/BufferedSink.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-
-/**
- * A sink that keeps a buffer internally so that callers can do small writes
- * without a performance penalty.
- */
-public interface BufferedSink extends Sink {
-  /** Returns this sink's internal buffer. */
-  Buffer buffer();
-
-  BufferedSink write(ByteString byteString) throws IOException;
-
-  /**
-   * Like {@link java.io.OutputStream#write(byte[])}, this writes a complete byte array to
-   * this sink.
-   */
-  BufferedSink write(byte[] source) throws IOException;
-
-  /**
-   * Like {@link java.io.OutputStream#write(byte[], int, int)}, this writes {@code byteCount}
-   * bytes of {@code source}, starting at {@code offset}.
-   */
-  BufferedSink write(byte[] source, int offset, int byteCount) throws IOException;
-
-  /**
-   * Removes all bytes from {@code source} and appends them to this. Returns the
-   * number of bytes read which will be 0 if {@code source} is exhausted.
-   */
-  long writeAll(Source source) throws IOException;
-
-  /** Encodes {@code string} in UTF-8 and writes it to this sink. */
-  BufferedSink writeUtf8(String string) throws IOException;
-
-  /** Encodes {@code string} in {@code charset} and writes it to this sink. */
-  BufferedSink writeString(String string, Charset charset) throws IOException;
-
-  /** Writes a byte to this sink. */
-  BufferedSink writeByte(int b) throws IOException;
-
-  /** Writes a big-endian short to this sink using two bytes. */
-  BufferedSink writeShort(int s) throws IOException;
-
-  /** Writes a little-endian short to this sink using two bytes. */
-  BufferedSink writeShortLe(int s) throws IOException;
-
-  /** Writes a big-endian int to this sink using four bytes. */
-  BufferedSink writeInt(int i) throws IOException;
-
-  /** Writes a little-endian int to this sink using four bytes. */
-  BufferedSink writeIntLe(int i) throws IOException;
-
-  /** Writes a big-endian long to this sink using eight bytes. */
-  BufferedSink writeLong(long v) throws IOException;
-
-  /** Writes a little-endian long to this sink using eight bytes. */
-  BufferedSink writeLongLe(long v) throws IOException;
-
-  /** Writes complete segments to this sink. Like {@link #flush}, but weaker. */
-  BufferedSink emitCompleteSegments() throws IOException;
-
-  /** Returns an output stream that writes to this sink. */
-  OutputStream outputStream();
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/BufferedSource.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/BufferedSource.java
deleted file mode 100644
index af0129488..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/BufferedSource.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-
-/**
- * A source that keeps a buffer internally so that callers can do small reads
- * without a performance penalty. It also allows clients to read ahead,
- * buffering as much as necessary before consuming input.
- */
-public interface BufferedSource extends Source {
-  /** Returns this source's internal buffer. */
-  Buffer buffer();
-
-  /**
-   * Returns true if there are no more bytes in this source. This will block
-   * until there are bytes to read or the source is definitely exhausted.
-   */
-  boolean exhausted() throws IOException;
-
-  /**
-   * Returns when the buffer contains at least {@code byteCount} bytes. Throws
-   * an {@link java.io.EOFException} if the source is exhausted before the
-   * required bytes can be read.
-   */
-  void require(long byteCount) throws IOException;
-
-  /** Removes a byte from this source and returns it. */
-  byte readByte() throws IOException;
-
-  /** Removes two bytes from this source and returns a big-endian short. */
-  short readShort() throws IOException;
-
-  /** Removes two bytes from this source and returns a little-endian short. */
-  short readShortLe() throws IOException;
-
-  /** Removes four bytes from this source and returns a big-endian int. */
-  int readInt() throws IOException;
-
-  /** Removes four bytes from this source and returns a little-endian int. */
-  int readIntLe() throws IOException;
-
-  /** Removes eight bytes from this source and returns a big-endian long. */
-  long readLong() throws IOException;
-
-  /** Removes eight bytes from this source and returns a little-endian long. */
-  long readLongLe() throws IOException;
-
-  /**
-   * Reads and discards {@code byteCount} bytes from this source. Throws an
-   * {@link java.io.EOFException} if the source is exhausted before the
-   * requested bytes can be skipped.
-   */
-  void skip(long byteCount) throws IOException;
-
-  /** Removes all bytes bytes from this and returns them as a byte string. */
-  ByteString readByteString() throws IOException;
-
-  /** Removes {@code byteCount} bytes from this and returns them as a byte string. */
-  ByteString readByteString(long byteCount) throws IOException;
-
-  /** Removes all bytes from this and returns them as a byte array. */
-  byte[] readByteArray() throws IOException;
-
-  /** Removes {@code byteCount} bytes from this and returns them as a byte array. */
-  byte[] readByteArray(long byteCount) throws IOException;
-
-  /**
-   * Removes up to {@code sink.length} bytes from this and copies them into {@code sink}.
-   * Returns the number of bytes read, or -1 if this source is exhausted.
-   */
-  int read(byte[] sink) throws IOException;
-
-  /**
-   * Removes exactly {@code sink.length} bytes from this and copies them into {@code sink}.
-   * Throws an {@link java.io.EOFException} if the requested number of bytes cannot be read.
-   */
-  void readFully(byte[] sink) throws IOException;
-
-  /**
-   * Removes up to {@code byteCount} bytes from this and copies them into {@code sink} at
-   * {@code offset}. Returns the number of bytes read, or -1 if this source is exhausted.
-   */
-  int read(byte[] sink, int offset, int byteCount) throws IOException;
-
-  /**
-   * Removes exactly {@code byteCount} bytes from this and appends them to
-   * {@code sink}. Throws an {@link java.io.EOFException} if the requested
-   * number of bytes cannot be read.
-   */
-  void readFully(Buffer sink, long byteCount) throws IOException;
-
-  /**
-   * Removes all bytes from this and appends them to {@code sink}. Returns the
-   * total number of bytes written to {@code sink} which will be 0 if this is
-   * exhausted.
-   */
-  long readAll(Sink sink) throws IOException;
-
-  /** Removes all bytes from this, decodes them as UTF-8, and returns the string. */
-  String readUtf8() throws IOException;
-
-  /**
-   * Removes {@code byteCount} bytes from this, decodes them as UTF-8, and
-   * returns the string.
-   */
-  String readUtf8(long byteCount) throws IOException;
-
-  /**
-   * Removes and returns characters up to but not including the next line break.
-   * A line break is either {@code "\n"} or {@code "\r\n"}; these characters are
-   * not included in the result.
-   *
-   * <p><strong>On the end of the stream this method returns null,</strong> just
-   * like {@link java.io.BufferedReader}. If the source doesn't end with a line
-   * break then an implicit line break is assumed. Null is returned once the
-   * source is exhausted. Use this for human-generated data, where a trailing
-   * line break is optional.
-   */
-  String readUtf8Line() throws IOException;
-
-  /**
-   * Removes and returns characters up to but not including the next line break.
-   * A line break is either {@code "\n"} or {@code "\r\n"}; these characters are
-   * not included in the result.
-   *
-   * <p><strong>On the end of the stream this method throws.</strong> Every call
-   * must consume either '\r\n' or '\n'. If these characters are absent in the
-   * stream, an {@link java.io.EOFException} is thrown. Use this for
-   * machine-generated data where a missing line break implies truncated input.
-   */
-  String readUtf8LineStrict() throws IOException;
-
-  /**
-   * Removes all bytes from this, decodes them as {@code charset}, and returns
-   * the string.
-   */
-  String readString(Charset charset) throws IOException;
-
-  /**
-   * Removes {@code byteCount} bytes from this, decodes them as {@code charset},
-   * and returns the string.
-   */
-  String readString(long byteCount, Charset charset) throws IOException;
-
-  /**
-   * Returns the index of {@code b} in the buffer, refilling it if necessary
-   * until it is found. This reads an unbounded number of bytes into the buffer.
-   * Returns -1 if the stream is exhausted before the requested byte is found.
-   */
-  long indexOf(byte b) throws IOException;
-
-  /** Returns an input stream that reads from this source. */
-  InputStream inputStream();
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/ByteString.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/ByteString.java
deleted file mode 100644
index c029e1ee8..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/ByteString.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright 2014 Square Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-
-import static com.koushikdutta.async.http.spdy.okio.Util.checkOffsetAndCount;
-
-/**
- * An immutable sequence of bytes.
- *
- * <p><strong>Full disclosure:</strong> this class provides untrusted input and
- * output streams with raw access to the underlying byte array. A hostile
- * stream implementation could keep a reference to the mutable byte string,
- * violating the immutable guarantee of this class. For this reason a byte
- * string's immutability guarantee cannot be relied upon for security in applets
- * and other environments that run both trusted and untrusted code in the same
- * process.
- */
-public final class ByteString implements Serializable {
-  private static final char[] HEX_DIGITS =
-      { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-  private static final long serialVersionUID = 1L;
-
-  /** A singleton empty {@code ByteString}. */
-  public static final ByteString EMPTY = ByteString.of();
-
-  final byte[] data;
-  private transient int hashCode; // Lazily computed; 0 if unknown.
-  private transient String utf8; // Lazily computed.
-
-  ByteString(byte[] data) {
-    this.data = data; // Trusted internal constructor doesn't clone data.
-  }
-
-  /**
-   * Returns a new byte string containing a clone of the bytes of {@code data}.
-   */
-  public static ByteString of(byte... data) {
-    if (data == null) throw new IllegalArgumentException("data == null");
-    return new ByteString(data.clone());
-  }
-
-  /**
-   * Returns a new byte string containing a copy of {@code byteCount} bytes of {@code data} starting
-   * at {@code offset}.
-   */
-  public static ByteString of(byte[] data, int offset, int byteCount) {
-    if (data == null) throw new IllegalArgumentException("data == null");
-    checkOffsetAndCount(data.length, offset, byteCount);
-
-    byte[] copy = new byte[byteCount];
-    System.arraycopy(data, offset, copy, 0, byteCount);
-    return new ByteString(copy);
-  }
-
-  /** Returns a new byte string containing the {@code UTF-8} bytes of {@code s}. */
-  public static ByteString encodeUtf8(String s) {
-    if (s == null) throw new IllegalArgumentException("s == null");
-    ByteString byteString = new ByteString(s.getBytes(Util.UTF_8));
-    byteString.utf8 = s;
-    return byteString;
-  }
-
-  /** Constructs a new {@code String} by decoding the bytes as {@code UTF-8}. */
-  public String utf8() {
-    String result = utf8;
-    // We don't care if we double-allocate in racy code.
-    return result != null ? result : (utf8 = new String(data, Util.UTF_8));
-  }
-
-  /**
-   * Returns this byte string encoded as <a
-   * href="http://www.ietf.org/rfc/rfc2045.txt">Base64</a>. In violation of the
-   * RFC, the returned string does not wrap lines at 76 columns.
-   */
-  public String base64() {
-    return Base64.encode(data);
-  }
-
-  /**
-   * Decodes the Base64-encoded bytes and returns their value as a byte string.
-   * Returns null if {@code base64} is not a Base64-encoded sequence of bytes.
-   */
-  public static ByteString decodeBase64(String base64) {
-    if (base64 == null) throw new IllegalArgumentException("base64 == null");
-    byte[] decoded = Base64.decode(base64);
-    return decoded != null ? new ByteString(decoded) : null;
-  }
-
-  /** Returns this byte string encoded in hexadecimal. */
-  public String hex() {
-    char[] result = new char[data.length * 2];
-    int c = 0;
-    for (byte b : data) {
-      result[c++] = HEX_DIGITS[(b >> 4) & 0xf];
-      result[c++] = HEX_DIGITS[b & 0xf];
-    }
-    return new String(result);
-  }
-
-  /** Decodes the hex-encoded bytes and returns their value a byte string. */
-  public static ByteString decodeHex(String hex) {
-    if (hex == null) throw new IllegalArgumentException("hex == null");
-    if (hex.length() % 2 != 0) throw new IllegalArgumentException("Unexpected hex string: " + hex);
-
-    byte[] result = new byte[hex.length() / 2];
-    for (int i = 0; i < result.length; i++) {
-      int d1 = decodeHexDigit(hex.charAt(i * 2)) << 4;
-      int d2 = decodeHexDigit(hex.charAt(i * 2 + 1));
-      result[i] = (byte) (d1 + d2);
-    }
-    return of(result);
-  }
-
-  private static int decodeHexDigit(char c) {
-    if (c >= '0' && c <= '9') return c - '0';
-    if (c >= 'a' && c <= 'f') return c - 'a' + 10;
-    if (c >= 'A' && c <= 'F') return c - 'A' + 10;
-    throw new IllegalArgumentException("Unexpected hex digit: " + c);
-  }
-
-  /**
-   * Reads {@code count} bytes from {@code in} and returns the result.
-   *
-   * @throws java.io.EOFException if {@code in} has fewer than {@code count}
-   *     bytes to read.
-   */
-  public static ByteString read(InputStream in, int byteCount) throws IOException {
-    if (in == null) throw new IllegalArgumentException("in == null");
-    if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
-
-    byte[] result = new byte[byteCount];
-    for (int offset = 0, read; offset < byteCount; offset += read) {
-      read = in.read(result, offset, byteCount - offset);
-      if (read == -1) throw new EOFException();
-    }
-    return new ByteString(result);
-  }
-
-  /**
-   * Returns a byte string equal to this byte string, but with the bytes 'A'
-   * through 'Z' replaced with the corresponding byte in 'a' through 'z'.
-   * Returns this byte string if it contains no bytes in 'A' through 'Z'.
-   */
-  public ByteString toAsciiLowercase() {
-    // Search for an uppercase character. If we don't find one, return this.
-    for (int i = 0; i < data.length; i++) {
-      byte c = data[i];
-      if (c < 'A' || c > 'Z') continue;
-
-      // If we reach this point, this string is not not lowercase. Create and
-      // return a new byte string.
-      byte[] lowercase = data.clone();
-      lowercase[i++] = (byte) (c - ('A' - 'a'));
-      for (; i < lowercase.length; i++) {
-        c = lowercase[i];
-        if (c < 'A' || c > 'Z') continue;
-        lowercase[i] = (byte) (c - ('A' - 'a'));
-      }
-      return new ByteString(lowercase);
-    }
-    return this;
-  }
-
-  /**
-   * Returns a byte string equal to this byte string, but with the bytes 'a'
-   * through 'z' replaced with the corresponding byte in 'A' through 'Z'.
-   * Returns this byte string if it contains no bytes in 'a' through 'z'.
-   */
-  public ByteString toAsciiUppercase() {
-    // Search for an lowercase character. If we don't find one, return this.
-    for (int i = 0; i < data.length; i++) {
-      byte c = data[i];
-      if (c < 'a' || c > 'z') continue;
-
-      // If we reach this point, this string is not not uppercase. Create and
-      // return a new byte string.
-      byte[] lowercase = data.clone();
-      lowercase[i++] = (byte) (c - ('a' - 'A'));
-      for (; i < lowercase.length; i++) {
-        c = lowercase[i];
-        if (c < 'a' || c > 'z') continue;
-        lowercase[i] = (byte) (c - ('a' - 'A'));
-      }
-      return new ByteString(lowercase);
-    }
-    return this;
-  }
-
-  /** Returns the byte at {@code pos}. */
-  public byte getByte(int pos) {
-    return data[pos];
-  }
-
-  /**
-   * Returns the number of bytes in this ByteString.
-   */
-  public int size() {
-    return data.length;
-  }
-
-  /**
-   * Returns a byte array containing a copy of the bytes in this {@code ByteString}.
-   */
-  public byte[] toByteArray() {
-    return data.clone();
-  }
-
-  /** Writes the contents of this byte string to {@code out}. */
-  public void write(OutputStream out) throws IOException {
-    if (out == null) throw new IllegalArgumentException("out == null");
-    out.write(data);
-  }
-
-  @Override public boolean equals(Object o) {
-    return o == this || o instanceof ByteString && Arrays.equals(((ByteString) o).data, data);
-  }
-
-  @Override public int hashCode() {
-    int result = hashCode;
-    return result != 0 ? result : (hashCode = Arrays.hashCode(data));
-  }
-
-  @Override public String toString() {
-    if (data.length == 0) {
-      return "ByteString[size=0]";
-    }
-
-    if (data.length <= 16) {
-      return String.format("ByteString[size=%s data=%s]", data.length, hex());
-    }
-
-    try {
-      return String.format("ByteString[size=%s md5=%s]", data.length,
-          ByteString.of(MessageDigest.getInstance("MD5").digest(data)).hex());
-    } catch (NoSuchAlgorithmException e) {
-      throw new AssertionError();
-    }
-  }
-
-  private void readObject(ObjectInputStream in) throws IOException {
-    int dataLength = in.readInt();
-    ByteString byteString = ByteString.read(in, dataLength);
-    try {
-      Field field = ByteString.class.getDeclaredField("data");
-      field.setAccessible(true);
-      field.set(this, byteString.data);
-    } catch (NoSuchFieldException e) {
-      throw new AssertionError();
-    } catch (IllegalAccessException e) {
-      throw new AssertionError();
-    }
-  }
-
-  private void writeObject(ObjectOutputStream out) throws IOException {
-    out.writeInt(data.length);
-    out.write(data);
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Okio.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Okio.java
deleted file mode 100644
index 4aa579443..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Okio.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static com.koushikdutta.async.http.spdy.okio.Util.checkOffsetAndCount;
-
-/** Essential APIs for working with Okio. */
-public final class Okio {
-  private static final Logger logger = Logger.getLogger(Okio.class.getName());
-
-  private Okio() {
-  }
-
-  /**
-   * Returns a new source that buffers reads from {@code source}. The returned
-   * source will perform bulk reads into its in-memory buffer. Use this wherever
-   * you read a source to get an ergonomic and efficient access to data.
-   */
-  public static BufferedSource buffer(Source source) {
-    if (source == null) throw new IllegalArgumentException("source == null");
-    return new RealBufferedSource(source);
-  }
-
-  /**
-   * Returns a new sink that buffers writes to {@code sink}. The returned sink
-   * will batch writes to {@code sink}. Use this wherever you write to a sink to
-   * get an ergonomic and efficient access to data.
-   */
-  public static BufferedSink buffer(Sink sink) {
-    if (sink == null) throw new IllegalArgumentException("sink == null");
-    return new RealBufferedSink(sink);
-  }
-
-  /** Returns a sink that writes to {@code out}. */
-  public static Sink sink(final OutputStream out) {
-    return sink(out, new Timeout());
-  }
-
-  private static Sink sink(final OutputStream out, final Timeout timeout) {
-    if (out == null) throw new IllegalArgumentException("out == null");
-    if (timeout == null) throw new IllegalArgumentException("timeout == null");
-
-    return new Sink() {
-      @Override public void write(Buffer source, long byteCount) throws IOException {
-        checkOffsetAndCount(source.size, 0, byteCount);
-        while (byteCount > 0) {
-          timeout.throwIfReached();
-          Segment head = source.head;
-          int toCopy = (int) Math.min(byteCount, head.limit - head.pos);
-          out.write(head.data, head.pos, toCopy);
-
-          head.pos += toCopy;
-          byteCount -= toCopy;
-          source.size -= toCopy;
-
-          if (head.pos == head.limit) {
-            source.head = head.pop();
-            SegmentPool.getInstance().recycle(head);
-          }
-        }
-      }
-
-      @Override public void flush() throws IOException {
-        out.flush();
-      }
-
-      @Override public void close() throws IOException {
-        out.close();
-      }
-
-      @Override public Timeout timeout() {
-        return timeout;
-      }
-
-      @Override public String toString() {
-        return "sink(" + out + ")";
-      }
-    };
-  }
-
-  /**
-   * Returns a sink that writes to {@code socket}. Prefer this over {@link
-   * #sink(java.io.OutputStream)} because this method honors timeouts. When the socket
-   * write times out, the socket is asynchronously closed by a watchdog thread.
-   */
-  public static Sink sink(final Socket socket) throws IOException {
-    if (socket == null) throw new IllegalArgumentException("socket == null");
-    AsyncTimeout timeout = timeout(socket);
-    Sink sink = sink(socket.getOutputStream(), timeout);
-    return timeout.sink(sink);
-  }
-
-  /** Returns a source that reads from {@code in}. */
-  public static Source source(final InputStream in) {
-    return source(in, new Timeout());
-  }
-
-  private static Source source(final InputStream in, final Timeout timeout) {
-    if (in == null) throw new IllegalArgumentException("in == null");
-    if (timeout == null) throw new IllegalArgumentException("timeout == null");
-
-    return new Source() {
-      @Override public long read(Buffer sink, long byteCount) throws IOException {
-        if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
-        timeout.throwIfReached();
-        Segment tail = sink.writableSegment(1);
-        int maxToCopy = (int) Math.min(byteCount, Segment.SIZE - tail.limit);
-        int bytesRead = in.read(tail.data, tail.limit, maxToCopy);
-        if (bytesRead == -1) return -1;
-        tail.limit += bytesRead;
-        sink.size += bytesRead;
-        return bytesRead;
-      }
-
-      @Override public void close() throws IOException {
-        in.close();
-      }
-
-      @Override public Timeout timeout() {
-        return timeout;
-      }
-
-      @Override public String toString() {
-        return "source(" + in + ")";
-      }
-    };
-  }
-
-  /** Returns a source that reads from {@code file}. */
-  public static Source source(File file) throws FileNotFoundException {
-    if (file == null) throw new IllegalArgumentException("file == null");
-    return source(new FileInputStream(file));
-  }
-
-  /** Returns a sink that writes to {@code file}. */
-  public static Sink sink(File file) throws FileNotFoundException {
-    if (file == null) throw new IllegalArgumentException("file == null");
-    return sink(new FileOutputStream(file));
-  }
-
-  /** Returns a sink that appends to {@code file}. */
-  public static Sink appendingSink(File file) throws FileNotFoundException {
-    if (file == null) throw new IllegalArgumentException("file == null");
-    return sink(new FileOutputStream(file, true));
-  }
-
-  /**
-   * Returns a source that reads from {@code socket}. Prefer this over {@link
-   * #source(java.io.InputStream)} because this method honors timeouts. When the socket
-   * read times out, the socket is asynchronously closed by a watchdog thread.
-   */
-  public static Source source(final Socket socket) throws IOException {
-    if (socket == null) throw new IllegalArgumentException("socket == null");
-    AsyncTimeout timeout = timeout(socket);
-    Source source = source(socket.getInputStream(), timeout);
-    return timeout.source(source);
-  }
-
-  private static AsyncTimeout timeout(final Socket socket) {
-    return new AsyncTimeout() {
-      @Override protected void timedOut() {
-        try {
-          socket.close();
-        } catch (Exception e) {
-          logger.log(Level.WARNING, "Failed to close timed out socket " + socket, e);
-        }
-      }
-    };
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/RealBufferedSink.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/RealBufferedSink.java
deleted file mode 100644
index 8e393ca42..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/RealBufferedSink.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-
-final class RealBufferedSink implements BufferedSink {
-  public final Buffer buffer;
-  public final Sink sink;
-  private boolean closed;
-
-  public RealBufferedSink(Sink sink, Buffer buffer) {
-    if (sink == null) throw new IllegalArgumentException("sink == null");
-    this.buffer = buffer;
-    this.sink = sink;
-  }
-
-  public RealBufferedSink(Sink sink) {
-    this(sink, new Buffer());
-  }
-
-  @Override public Buffer buffer() {
-    return buffer;
-  }
-
-  @Override public void write(Buffer source, long byteCount)
-      throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    buffer.write(source, byteCount);
-    emitCompleteSegments();
-  }
-
-  @Override public BufferedSink write(ByteString byteString) throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    buffer.write(byteString);
-    return emitCompleteSegments();
-  }
-
-  @Override public BufferedSink writeUtf8(String string) throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    buffer.writeUtf8(string);
-    return emitCompleteSegments();
-  }
-
-  @Override public BufferedSink writeString(String string, Charset charset) throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    buffer.writeString(string, charset);
-    return emitCompleteSegments();
-  }
-
-  @Override public BufferedSink write(byte[] source) throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    buffer.write(source);
-    return emitCompleteSegments();
-  }
-
-  @Override public BufferedSink write(byte[] source, int offset, int byteCount) throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    buffer.write(source, offset, byteCount);
-    return emitCompleteSegments();
-  }
-
-  @Override public long writeAll(Source source) throws IOException {
-    if (source == null) throw new IllegalArgumentException("source == null");
-    long totalBytesRead = 0;
-    for (long readCount; (readCount = source.read(buffer, Segment.SIZE)) != -1; ) {
-      totalBytesRead += readCount;
-      emitCompleteSegments();
-    }
-    return totalBytesRead;
-  }
-
-  @Override public BufferedSink writeByte(int b) throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    buffer.writeByte(b);
-    return emitCompleteSegments();
-  }
-
-  @Override public BufferedSink writeShort(int s) throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    buffer.writeShort(s);
-    return emitCompleteSegments();
-  }
-
-  @Override public BufferedSink writeShortLe(int s) throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    buffer.writeShortLe(s);
-    return emitCompleteSegments();
-  }
-
-  @Override public BufferedSink writeInt(int i) throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    buffer.writeInt(i);
-    return emitCompleteSegments();
-  }
-
-  @Override public BufferedSink writeIntLe(int i) throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    buffer.writeIntLe(i);
-    return emitCompleteSegments();
-  }
-
-  @Override public BufferedSink writeLong(long v) throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    buffer.writeLong(v);
-    return emitCompleteSegments();
-  }
-
-  @Override public BufferedSink writeLongLe(long v) throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    buffer.writeLongLe(v);
-    return emitCompleteSegments();
-  }
-
-  @Override public BufferedSink emitCompleteSegments() throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    long byteCount = buffer.completeSegmentByteCount();
-    if (byteCount > 0) sink.write(buffer, byteCount);
-    return this;
-  }
-
-  @Override public OutputStream outputStream() {
-    return new OutputStream() {
-      @Override public void write(int b) throws IOException {
-        if (closed) throw new IOException("closed");
-        buffer.writeByte((byte) b);
-        emitCompleteSegments();
-      }
-
-      @Override public void write(byte[] data, int offset, int byteCount) throws IOException {
-        if (closed) throw new IOException("closed");
-        buffer.write(data, offset, byteCount);
-        emitCompleteSegments();
-      }
-
-      @Override public void flush() throws IOException {
-        // For backwards compatibility, a flush() on a closed stream is a no-op.
-        if (!closed) {
-          RealBufferedSink.this.flush();
-        }
-      }
-
-      @Override public void close() throws IOException {
-        RealBufferedSink.this.close();
-      }
-
-      @Override public String toString() {
-        return RealBufferedSink.this + ".outputStream()";
-      }
-    };
-  }
-
-  @Override public void flush() throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    if (buffer.size > 0) {
-      sink.write(buffer, buffer.size);
-    }
-    sink.flush();
-  }
-
-  @Override public void close() throws IOException {
-    if (closed) return;
-
-    // Emit buffered data to the underlying sink. If this fails, we still need
-    // to close the sink; otherwise we risk leaking resources.
-    Throwable thrown = null;
-    try {
-      if (buffer.size > 0) {
-        sink.write(buffer, buffer.size);
-      }
-    } catch (Throwable e) {
-      thrown = e;
-    }
-
-    try {
-      sink.close();
-    } catch (Throwable e) {
-      if (thrown == null) thrown = e;
-    }
-    closed = true;
-
-    if (thrown != null) Util.sneakyRethrow(thrown);
-  }
-
-  @Override public Timeout timeout() {
-    return sink.timeout();
-  }
-
-  @Override public String toString() {
-    return "buffer(" + sink + ")";
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/RealBufferedSource.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/RealBufferedSource.java
deleted file mode 100644
index 0397efdd0..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/RealBufferedSource.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-
-import static com.koushikdutta.async.http.spdy.okio.Util.checkOffsetAndCount;
-
-final class RealBufferedSource implements BufferedSource {
-  public final Buffer buffer;
-  public final Source source;
-  private boolean closed;
-
-  public RealBufferedSource(Source source, Buffer buffer) {
-    if (source == null) throw new IllegalArgumentException("source == null");
-    this.buffer = buffer;
-    this.source = source;
-  }
-
-  public RealBufferedSource(Source source) {
-    this(source, new Buffer());
-  }
-
-  @Override public Buffer buffer() {
-    return buffer;
-  }
-
-  @Override public long read(Buffer sink, long byteCount) throws IOException {
-    if (sink == null) throw new IllegalArgumentException("sink == null");
-    if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
-    if (closed) throw new IllegalStateException("closed");
-
-    if (buffer.size == 0) {
-      long read = source.read(buffer, Segment.SIZE);
-      if (read == -1) return -1;
-    }
-
-    long toRead = Math.min(byteCount, buffer.size);
-    return buffer.read(sink, toRead);
-  }
-
-  @Override public boolean exhausted() throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    return buffer.exhausted() && source.read(buffer, Segment.SIZE) == -1;
-  }
-
-  @Override public void require(long byteCount) throws IOException {
-    if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
-    if (closed) throw new IllegalStateException("closed");
-    while (buffer.size < byteCount) {
-      if (source.read(buffer, Segment.SIZE) == -1) throw new EOFException();
-    }
-  }
-
-  @Override public byte readByte() throws IOException {
-    require(1);
-    return buffer.readByte();
-  }
-
-  @Override public ByteString readByteString() throws IOException {
-    buffer.writeAll(source);
-    return buffer.readByteString();
-  }
-
-  @Override public ByteString readByteString(long byteCount) throws IOException {
-    require(byteCount);
-    return buffer.readByteString(byteCount);
-  }
-
-  @Override public byte[] readByteArray() throws IOException {
-    buffer.writeAll(source);
-    return buffer.readByteArray();
-  }
-
-  @Override public byte[] readByteArray(long byteCount) throws IOException {
-    require(byteCount);
-    return buffer.readByteArray(byteCount);
-  }
-
-  @Override public int read(byte[] sink) throws IOException {
-    return read(sink, 0, sink.length);
-  }
-
-  @Override public void readFully(byte[] sink) throws IOException {
-    try {
-      require(sink.length);
-    } catch (EOFException e) {
-      // The underlying source is exhausted. Copy the bytes we got before rethrowing.
-      int offset = 0;
-      while (buffer.size > 0) {
-        int read = buffer.read(sink, offset, (int) buffer.size - offset);
-        if (read == -1) throw new AssertionError();
-        offset += read;
-      }
-      throw e;
-    }
-    buffer.readFully(sink);
-  }
-
-  @Override public int read(byte[] sink, int offset, int byteCount) throws IOException {
-    checkOffsetAndCount(sink.length, offset, byteCount);
-
-    if (buffer.size == 0) {
-      long read = source.read(buffer, Segment.SIZE);
-      if (read == -1) return -1;
-    }
-
-    int toRead = (int) Math.min(byteCount, buffer.size);
-    return buffer.read(sink, offset, toRead);
-  }
-
-  @Override public void readFully(Buffer sink, long byteCount) throws IOException {
-    try {
-      require(byteCount);
-    } catch (EOFException e) {
-      // The underlying source is exhausted. Copy the bytes we got before rethrowing.
-      sink.writeAll(buffer);
-      throw e;
-    }
-    buffer.readFully(sink, byteCount);
-  }
-
-  @Override public long readAll(Sink sink) throws IOException {
-    if (sink == null) throw new IllegalArgumentException("sink == null");
-
-    long totalBytesWritten = 0;
-    while (source.read(buffer, Segment.SIZE) != -1) {
-      long emitByteCount = buffer.completeSegmentByteCount();
-      if (emitByteCount > 0) {
-        totalBytesWritten += emitByteCount;
-        sink.write(buffer, emitByteCount);
-      }
-    }
-    if (buffer.size() > 0) {
-      totalBytesWritten += buffer.size();
-      sink.write(buffer, buffer.size());
-    }
-    return totalBytesWritten;
-  }
-
-  @Override public String readUtf8() throws IOException {
-    buffer.writeAll(source);
-    return buffer.readUtf8();
-  }
-
-  @Override public String readUtf8(long byteCount) throws IOException {
-    require(byteCount);
-    return buffer.readUtf8(byteCount);
-  }
-
-  @Override public String readString(Charset charset) throws IOException {
-    if (charset == null) throw new IllegalArgumentException("charset == null");
-
-    buffer.writeAll(source);
-    return buffer.readString(charset);
-  }
-
-  @Override public String readString(long byteCount, Charset charset) throws IOException {
-    require(byteCount);
-    if (charset == null) throw new IllegalArgumentException("charset == null");
-    return buffer.readString(byteCount, charset);
-  }
-
-  @Override public String readUtf8Line() throws IOException {
-    long newline = indexOf((byte) '\n');
-
-    if (newline == -1) {
-      return buffer.size != 0 ? readUtf8(buffer.size) : null;
-    }
-
-    return buffer.readUtf8Line(newline);
-  }
-
-  @Override public String readUtf8LineStrict() throws IOException {
-    long newline = indexOf((byte) '\n');
-    if (newline == -1L) throw new EOFException();
-    return buffer.readUtf8Line(newline);
-  }
-
-  @Override public short readShort() throws IOException {
-    require(2);
-    return buffer.readShort();
-  }
-
-  @Override public short readShortLe() throws IOException {
-    require(2);
-    return buffer.readShortLe();
-  }
-
-  @Override public int readInt() throws IOException {
-    require(4);
-    return buffer.readInt();
-  }
-
-  @Override public int readIntLe() throws IOException {
-    require(4);
-    return buffer.readIntLe();
-  }
-
-  @Override public long readLong() throws IOException {
-    require(8);
-    return buffer.readLong();
-  }
-
-  @Override public long readLongLe() throws IOException {
-    require(8);
-    return buffer.readLongLe();
-  }
-
-  @Override public void skip(long byteCount) throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    while (byteCount > 0) {
-      if (buffer.size == 0 && source.read(buffer, Segment.SIZE) == -1) {
-        throw new EOFException();
-      }
-      long toSkip = Math.min(byteCount, buffer.size());
-      buffer.skip(toSkip);
-      byteCount -= toSkip;
-    }
-  }
-
-  @Override public long indexOf(byte b) throws IOException {
-    if (closed) throw new IllegalStateException("closed");
-    long start = 0;
-    long index;
-    while ((index = buffer.indexOf(b, start)) == -1) {
-      start = buffer.size;
-      if (source.read(buffer, Segment.SIZE) == -1) return -1L;
-    }
-    return index;
-  }
-
-  @Override public InputStream inputStream() {
-    return new InputStream() {
-      @Override public int read() throws IOException {
-        if (closed) throw new IOException("closed");
-        if (buffer.size == 0) {
-          long count = source.read(buffer, Segment.SIZE);
-          if (count == -1) return -1;
-        }
-        return buffer.readByte() & 0xff;
-      }
-
-      @Override public int read(byte[] data, int offset, int byteCount) throws IOException {
-        if (closed) throw new IOException("closed");
-        checkOffsetAndCount(data.length, offset, byteCount);
-
-        if (buffer.size == 0) {
-          long count = source.read(buffer, Segment.SIZE);
-          if (count == -1) return -1;
-        }
-
-        return buffer.read(data, offset, byteCount);
-      }
-
-      @Override public int available() throws IOException {
-        if (closed) throw new IOException("closed");
-        return (int) Math.min(buffer.size, Integer.MAX_VALUE);
-      }
-
-      @Override public void close() throws IOException {
-        RealBufferedSource.this.close();
-      }
-
-      @Override public String toString() {
-        return RealBufferedSource.this + ".inputStream()";
-      }
-    };
-  }
-
-  @Override public void close() throws IOException {
-    if (closed) return;
-    closed = true;
-    source.close();
-    buffer.clear();
-  }
-
-  @Override public Timeout timeout() {
-    return source.timeout();
-  }
-
-  @Override public String toString() {
-    return "buffer(" + source + ")";
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Segment.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Segment.java
deleted file mode 100644
index 9c289ef41..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Segment.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-/**
- * A segment of a buffer.
- *
- * <p>Each segment in a buffer is a circularly-linked list node referencing
- * the following and preceding segments in the buffer.
- *
- * <p>Each segment in the pool is a singly-linked list node referencing the rest
- * of segments in the pool.
- */
-public final class Segment {
-  /** The size of all segments in bytes. */
-  // TODO: Using fixed-size segments makes pooling easier. But it harms memory
-  //       efficiency and encourages copying. Try variable sized segments?
-  // TODO: Is 2 KiB a good default segment size?
-  static final int SIZE = 2048;
-
-  public final byte[] data = new byte[SIZE];
-
-  /** The next byte of application data byte to read in this segment. */
-  public int pos;
-
-  /** The first byte of available data ready to be written to. */
-  public int limit;
-
-  /** Next segment in a linked or circularly-linked list. */
-  Segment next;
-
-  /** Previous segment in a circularly-linked list. */
-  Segment prev;
-
-  /**
-   * Removes this segment of a circularly-linked list and returns its successor.
-   * Returns null if the list is now empty.
-   */
-  public Segment pop() {
-    Segment result = next != this ? next : null;
-    prev.next = next;
-    next.prev = prev;
-    next = null;
-    prev = null;
-    return result;
-  }
-
-  /**
-   * Appends {@code segment} after this segment in the circularly-linked list.
-   * Returns the pushed segment.
-   */
-  public Segment push(Segment segment) {
-    segment.prev = this;
-    segment.next = next;
-    next.prev = segment;
-    next = segment;
-    return segment;
-  }
-
-  /**
-   * Splits this head of a circularly-linked list into two segments. The first
-   * segment contains the data in {@code [pos..pos+byteCount)}. The second
-   * segment contains the data in {@code [pos+byteCount..limit)}. This can be
-   * useful when moving partial segments from one buffer to another.
-   *
-   * <p>Returns the new head of the circularly-linked list.
-   */
-  public Segment split(int byteCount) {
-    int aSize = byteCount;
-    int bSize = (limit - pos) - byteCount;
-    if (aSize <= 0 || bSize <= 0) throw new IllegalArgumentException();
-
-    // Which side of the split is larger? We want to copy as few bytes as possible.
-    if (aSize < bSize) {
-      // Create a segment of size 'aSize' before this segment.
-      Segment before = SegmentPool.getInstance().take();
-      System.arraycopy(data, pos, before.data, before.pos, aSize);
-      pos += aSize;
-      before.limit += aSize;
-      prev.push(before);
-      return before;
-    } else {
-      // Create a new segment of size 'bSize' after this segment.
-      Segment after = SegmentPool.getInstance().take();
-      System.arraycopy(data, pos + aSize, after.data, after.pos, bSize);
-      limit -= bSize;
-      after.limit += bSize;
-      push(after);
-      return this;
-    }
-  }
-
-  /**
-   * Call this when the tail and its predecessor may both be less than half
-   * full. This will copy data so that segments can be recycled.
-   */
-  public void compact() {
-    if (prev == this) throw new IllegalStateException();
-    if ((prev.limit - prev.pos) + (limit - pos) > SIZE) return; // Cannot compact.
-    writeTo(prev, limit - pos);
-    pop();
-    SegmentPool.getInstance().recycle(this);
-  }
-
-  /** Moves {@code byteCount} bytes from this segment to {@code sink}. */
-  // TODO: if sink has fewer bytes than this, it may be cheaper to reverse the
-  //       direction of the copy and swap the segments!
-  public void writeTo(Segment sink, int byteCount) {
-    if (byteCount + (sink.limit - sink.pos) > SIZE) throw new IllegalArgumentException();
-
-    if (sink.limit + byteCount > SIZE) {
-      // We can't fit byteCount bytes at the sink's current position. Compact sink first.
-      System.arraycopy(sink.data, sink.pos, sink.data, 0, sink.limit - sink.pos);
-      sink.limit -= sink.pos;
-      sink.pos = 0;
-    }
-
-    System.arraycopy(data, pos, sink.data, sink.limit, byteCount);
-    sink.limit += byteCount;
-    pos += byteCount;
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/SegmentPool.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/SegmentPool.java
deleted file mode 100644
index 58d362b90..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/SegmentPool.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-/**
- * A collection of unused segments, necessary to avoid GC churn and zero-fill.
- * This pool is a thread-safe static singleton.
- */
-public final class SegmentPool {
-  private static final SegmentPool INSTANCE = new SegmentPool();
-    public static SegmentPool getInstance() {
-        return INSTANCE;
-    }
-
-  /** The maximum number of bytes to pool. */
-  // TODO: Is 64 KiB a good maximum size? Do we ever have that many idle segments?
-  static final long MAX_SIZE = 64 * 1024; // 64 KiB.
-
-  /** Singly-linked list of segments. */
-  private Segment next;
-
-  /** Total bytes in this pool. */
-  long byteCount;
-
-  private SegmentPool() {
-  }
-
-  Segment take() {
-    synchronized (this) {
-      if (next != null) {
-        Segment result = next;
-        next = result.next;
-        result.next = null;
-        byteCount -= Segment.SIZE;
-        return result;
-      }
-    }
-    return new Segment(); // Pool is empty. Don't zero-fill while holding a lock.
-  }
-
-  public void recycle(Segment segment) {
-    if (segment.next != null || segment.prev != null) throw new IllegalArgumentException();
-    synchronized (this) {
-      if (byteCount + Segment.SIZE > MAX_SIZE) return; // Pool is full.
-      byteCount += Segment.SIZE;
-      segment.next = next;
-      segment.pos = segment.limit = 0;
-      next = segment;
-    }
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Sink.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Sink.java
deleted file mode 100644
index d1e3cc626..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Sink.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-import java.io.Closeable;
-import java.io.IOException;
-
-/**
- * Receives a stream of bytes. Use this interface to write data wherever it's
- * needed: to the network, storage, or a buffer in memory. Sinks may be layered
- * to transform received data, such as to compress, encrypt, throttle, or add
- * protocol framing.
- *
- * <p>Most application code shouldn't operate on a sink directly, but rather
- * {@link BufferedSink} which is both more efficient and more convenient. Use
- * {@link Okio#buffer(com.koushikdutta.async.http.spdy.okio.Sink)} to wrap any sink with a buffer.
- *
- * <p>Sinks are easy to test: just use an {@link Buffer} in your tests, and
- * read from it to confirm it received the data that was expected.
- *
- * <h3>Comparison with OutputStream</h3>
- * This interface is functionally equivalent to {@link java.io.OutputStream}.
- *
- * <p>{@code OutputStream} requires multiple layers when emitted data is
- * heterogeneous: a {@code DataOutputStream} for primitive values, a {@code
- * BufferedOutputStream} for buffering, and {@code OutputStreamWriter} for
- * charset encoding. This class uses {@code BufferedSink} for all of the above.
- *
- * <p>Sink is also easier to layer: there is no {@linkplain
- * java.io.OutputStream#write(int) single-byte write} method that is awkward to
- * implement efficiently.
- *
- * <h3>Interop with OutputStream</h3>
- * Use {@link Okio#sink} to adapt an {@code OutputStream} to a sink. Use {@link
- * BufferedSink#outputStream} to adapt a sink to an {@code OutputStream}.
- */
-public interface Sink extends Closeable {
-  /** Removes {@code byteCount} bytes from {@code source} and appends them to this. */
-  void write(Buffer source, long byteCount) throws IOException;
-
-  /** Pushes all buffered bytes to their final destination. */
-  void flush() throws IOException;
-
-  /** Returns the timeout for this sink. */
-  Timeout timeout();
-
-  /**
-   * Pushes all buffered bytes to their final destination and releases the
-   * resources held by this sink. It is an error to write a closed sink. It is
-   * safe to close a sink more than once.
-   */
-  @Override void close() throws IOException;
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Source.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Source.java
deleted file mode 100644
index 4f4132252..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Source.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-import java.io.Closeable;
-import java.io.IOException;
-
-/**
- * Supplies a stream of bytes. Use this interface to read data from wherever
- * it's located: from the network, storage, or a buffer in memory. Sources may
- * be layered to transform supplied data, such as to decompress, decrypt, or
- * remove protocol framing.
- *
- * <p>Most applications shouldn't operate on a source directly, but rather
- * {@link BufferedSource} which is both more efficient and more convenient. Use
- * {@link Okio#buffer(com.koushikdutta.async.http.spdy.okio.Source)} to wrap any source with a buffer.
- *
- * <p>Sources are easy to test: just use an {@link Buffer} in your tests, and
- * fill it with the data your application is to read.
- *
- * <h3>Comparison with InputStream</h3>
- * This interface is functionally equivalent to {@link java.io.InputStream}.
- *
- * <p>{@code InputStream} requires multiple layers when consumed data is
- * heterogeneous: a {@code DataInputStream} for primitive values, a {@code
- * BufferedInputStream} for buffering, and {@code InputStreamReader} for
- * strings. This class uses {@code BufferedSource} for all of the above.
- *
- * <p>Source avoids the impossible-to-implement {@linkplain
- * java.io.InputStream#available available()} method. Instead callers specify
- * how many bytes they {@link BufferedSource#require require}.
- *
- * <p>Source omits the unsafe-to-compose {@linkplain java.io.InputStream#mark
- * mark and reset} state that's tracked by {@code InputStream}; callers instead
- * just buffer what they need.
- *
- * <p>When implementing a source, you need not worry about the {@linkplain
- * java.io.InputStream#read single-byte read} method that is awkward to
- * implement efficiently and that returns one of 257 possible values.
- *
- * <p>And source has a stronger {@code skip} method: {@link BufferedSource#skip}
- * won't return prematurely.
- *
- * <h3>Interop with InputStream</h3>
- * Use {@link Okio#source} to adapt an {@code InputStream} to a source. Use
- * {@link BufferedSource#inputStream} to adapt a source to an {@code
- * InputStream}.
- */
-public interface Source extends Closeable {
-  /**
-   * Removes at least 1, and up to {@code byteCount} bytes from this and appends
-   * them to {@code sink}. Returns the number of bytes read, or -1 if this
-   * source is exhausted.
-   */
-  long read(Buffer sink, long byteCount) throws IOException;
-
-  /** Returns the timeout for this source. */
-  Timeout timeout();
-
-  /**
-   * Closes this source and releases the resources held by this source. It is an
-   * error to read a closed source. It is safe to close a source more than once.
-   */
-  @Override void close() throws IOException;
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Timeout.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Timeout.java
deleted file mode 100644
index 3a307e8d7..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Timeout.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.util.concurrent.TimeUnit;
-
-/**
- * A policy on how much time to spend on a task before giving up. When a task
- * times out, it is left in an unspecified state and should be abandoned. For
- * example, if reading from a source times out, that source should be closed and
- * the read should be retried later. If writing to a sink times out, the same
- * rules apply: close the sink and retry later.
- *
- * <h3>Timeouts and Deadlines</h3>
- * This class offers two complementary controls to define a timeout policy.
- *
- * <p><strong>Timeouts</strong> specify the maximum time to wait for a single
- * operation to complete. Timeouts are typically used to detect problems like
- * network partitions. For example, if a remote peer doesn't return <i>any</i>
- * data for ten seconds, we may assume that the peer is unavailable.
- *
- * <p><strong>Deadlines</strong> specify the maximum time to spend on a job,
- * composed of one or more operations. Use deadlines to set an upper bound on
- * the time invested on a job. For example, a battery-conscious app may limit
- * how much time it spends preloading content.
- */
-public class Timeout {
-  /**
-   * An empty timeout that neither tracks nor detects timeouts. Use this when
-   * timeouts aren't necessary, such as in implementations whose operations
-   * do not block.
-   */
-  public static final Timeout NONE = new Timeout() {
-    @Override public Timeout timeout(long timeout, TimeUnit unit) {
-      return this;
-    }
-
-    @Override public Timeout deadlineNanoTime(long deadlineNanoTime) {
-      return this;
-    }
-
-    @Override public void throwIfReached() throws IOException {
-    }
-  };
-
-  /**
-   * True if {@code deadlineNanoTime} is defined. There is no equivalent to null
-   * or 0 for {@link System#nanoTime}.
-   */
-  private boolean hasDeadline;
-  private long deadlineNanoTime;
-  private long timeoutNanos;
-
-  public Timeout() {
-  }
-
-  /**
-   * Wait at most {@code timeout} time before aborting an operation. Using a
-   * per-operation timeout means that as long as forward progress is being made,
-   * no sequence of operations will fail.
-   *
-   * <p>If {@code timeout == 0}, operations will run indefinitely. (Operating
-   * system timeouts may still apply.)
-   */
-  public Timeout timeout(long timeout, TimeUnit unit) {
-    if (timeout < 0) throw new IllegalArgumentException("timeout < 0: " + timeout);
-    if (unit == null) throw new IllegalArgumentException("unit == null");
-    this.timeoutNanos = unit.toNanos(timeout);
-    return this;
-  }
-
-  /** Returns the timeout in nanoseconds, or {@code 0} for no timeout. */
-  public long timeoutNanos() {
-    return timeoutNanos;
-  }
-
-  /** Returns true if a deadline is enabled. */
-  public boolean hasDeadline() {
-    return hasDeadline;
-  }
-
-  /**
-   * Returns the {@linkplain System#nanoTime() nano time} when the deadline will
-   * be reached.
-   *
-   * @throws IllegalStateException if no deadline is set.
-   */
-  public long deadlineNanoTime() {
-    if (!hasDeadline) throw new IllegalStateException("No deadline");
-    return deadlineNanoTime;
-  }
-
-  /**
-   * Sets the {@linkplain System#nanoTime() nano time} when the deadline will be
-   * reached. All operations must complete before this time. Use a deadline to
-   * set a maximum bound on the time spent on a sequence of operations.
-   */
-  public Timeout deadlineNanoTime(long deadlineNanoTime) {
-    this.hasDeadline = true;
-    this.deadlineNanoTime = deadlineNanoTime;
-    return this;
-  }
-
-  /** Set a deadline of now plus {@code duration} time. */
-  public final Timeout deadline(long duration, TimeUnit unit) {
-    if (duration <= 0) throw new IllegalArgumentException("duration <= 0: " + duration);
-    if (unit == null) throw new IllegalArgumentException("unit == null");
-    return deadlineNanoTime(System.nanoTime() + unit.toNanos(duration));
-  }
-
-  /** Clears the timeout. Operating system timeouts may still apply. */
-  public Timeout clearTimeout() {
-    this.timeoutNanos = 0;
-    return this;
-  }
-
-  /** Clears the deadline. */
-  public Timeout clearDeadline() {
-    this.hasDeadline = false;
-    return this;
-  }
-
-  /**
-   * Throws an {@link java.io.IOException} if the deadline has been reached or if the
-   * current thread has been interrupted. This method doesn't detect timeouts;
-   * that should be implemented to asynchronously abort an in-progress
-   * operation.
-   */
-  public void throwIfReached() throws IOException {
-    if (Thread.interrupted()) {
-      throw new InterruptedIOException();
-    }
-
-    if (hasDeadline && System.nanoTime() > deadlineNanoTime) {
-      throw new IOException("deadline reached");
-    }
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Util.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Util.java
deleted file mode 100644
index 14775e85a..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okio/Util.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy.okio;
-
-import java.nio.charset.Charset;
-
-final class Util {
-  /** A cheap and type-safe constant for the UTF-8 Charset. */
-  public static final Charset UTF_8 = Charset.forName("UTF-8");
-
-  private Util() {
-  }
-
-  public static void checkOffsetAndCount(long size, long offset, long byteCount) {
-    if ((offset | byteCount) < 0 || offset > size || size - offset < byteCount) {
-      throw new ArrayIndexOutOfBoundsException(
-          String.format("size=%s offset=%s byteCount=%s", size, offset, byteCount));
-    }
-  }
-
-  public static short reverseBytesShort(short s) {
-    int i = s & 0xffff;
-    int reversed = (i & 0xff00) >>> 8
-        |          (i & 0x00ff)  << 8;
-    return (short) reversed;
-  }
-
-  public static int reverseBytesInt(int i) {
-    return (i & 0xff000000) >>> 24
-        |  (i & 0x00ff0000) >>>  8
-        |  (i & 0x0000ff00)  <<  8
-        |  (i & 0x000000ff)  << 24;
-  }
-
-  public static long reverseBytesLong(long v) {
-    return (v & 0xff00000000000000L) >>> 56
-        |  (v & 0x00ff000000000000L) >>> 40
-        |  (v & 0x0000ff0000000000L) >>> 24
-        |  (v & 0x000000ff00000000L) >>>  8
-        |  (v & 0x00000000ff000000L)  <<  8
-        |  (v & 0x0000000000ff0000L)  << 24
-        |  (v & 0x000000000000ff00L)  << 40
-        |  (v & 0x00000000000000ffL)  << 56;
-  }
-
-  /**
-   * Throws {@code t}, even if the declared throws clause doesn't permit it.
-   * This is a terrible – but terribly convenient – hack that makes it easy to
-   * catch and rethrow exceptions after cleanup. See Java Puzzlers #43.
-   */
-  public static void sneakyRethrow(Throwable t) {
-    Util.<Error>sneakyThrow2(t);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static <T extends Throwable> void sneakyThrow2(Throwable t) throws T {
-    throw (T) t;
-  }
-}

From 0e28ad9a43f799df307e7f0972d48e4c1108b4b9 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 28 Jul 2014 13:53:02 -0700
Subject: [PATCH 058/399] more okhttp reshuffling and purging

---
 .../async/http/spdy/okhttp/internal/Util.java | 25 -------------------
 .../koushikdutta/async/test}/Handshake.java   |  2 +-
 .../koushikdutta/async/test/OkHttpTest.java   |  1 -
 3 files changed, 1 insertion(+), 27 deletions(-)
 rename AndroidAsync/{src/com/koushikdutta/async/http/spdy/okhttp => test/src/com/koushikdutta/async/test}/Handshake.java (98%)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/Util.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/Util.java
index 63f2661aa..6c8c0e4f1 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/Util.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/Util.java
@@ -16,8 +16,6 @@
 
 package com.koushikdutta.async.http.spdy.okhttp.internal;
 
-import java.io.Closeable;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -31,29 +29,6 @@ public static void checkOffsetAndCount(long arrayLength, long offset, long count
     }
   }
 
-  /**
-   * Closes {@code a} and {@code b}. If either close fails, this completes
-   * the other close and rethrows the first encountered exception.
-   */
-  public static void closeAll(Closeable a, Closeable b) throws IOException {
-    Throwable thrown = null;
-    try {
-      a.close();
-    } catch (Throwable e) {
-      thrown = e;
-    }
-    try {
-      b.close();
-    } catch (Throwable e) {
-      if (thrown == null) thrown = e;
-    }
-    if (thrown == null) return;
-    if (thrown instanceof IOException) throw (IOException) thrown;
-    if (thrown instanceof RuntimeException) throw (RuntimeException) thrown;
-    if (thrown instanceof Error) throw (Error) thrown;
-    throw new AssertionError(thrown);
-  }
-
   /** Returns an immutable copy of {@code list}. */
   public static <T> List<T> immutableList(List<T> list) {
     return Collections.unmodifiableList(new ArrayList<T>(list));
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/Handshake.java b/AndroidAsync/test/src/com/koushikdutta/async/test/Handshake.java
similarity index 98%
rename from AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/Handshake.java
rename to AndroidAsync/test/src/com/koushikdutta/async/test/Handshake.java
index b9ae5de7c..e53908f72 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/Handshake.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/Handshake.java
@@ -1,4 +1,4 @@
-package com.koushikdutta.async.http.spdy.okhttp;
+package com.koushikdutta.async.test;
 
 import com.koushikdutta.async.http.spdy.okhttp.internal.Util;
 
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/OkHttpTest.java b/AndroidAsync/test/src/com/koushikdutta/async/test/OkHttpTest.java
index 821de08fd..48fbf5b69 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/OkHttpTest.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/OkHttpTest.java
@@ -4,7 +4,6 @@
 import android.test.AndroidTestCase;
 
 import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.http.spdy.okhttp.Handshake;
 import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.util.Charsets;
 

From 9ec1a8ded7e3b59da7c2b53ebe0e4cf4ece566e1 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 28 Jul 2014 13:56:37 -0700
Subject: [PATCH 059/399] Restructure into single package, change visibility to
 package only.

---
 .../async/http/spdy/AsyncSpdyConnection.java  |  13 +-
 .../spdy/{okhttp/internal => }/BitArray.java  |   4 +-
 .../async/http/spdy/ByteString.java           | 285 +++++++
 .../{okhttp/internal/spdy => }/ErrorCode.java |   4 +-
 .../internal/spdy => }/FrameReader.java       |   5 +-
 .../internal/spdy => }/FrameWriter.java       |   4 +-
 .../{okhttp/internal/spdy => }/Header.java    |   6 +-
 .../internal/spdy => }/HeaderReader.java      |   5 +-
 .../internal/spdy => }/HeadersMode.java       |   2 +-
 .../internal/spdy => }/HpackDraft08.java      |   4 +-
 .../async/http/spdy/Http20Draft13.java        | 764 ++++++++++++++++++
 .../{okhttp/internal/spdy => }/Huffman.java   |   2 +-
 .../spdy/{okhttp/internal/spdy => }/Ping.java |   4 +-
 .../{okhttp/internal/spdy => }/Settings.java  |   4 +-
 .../{okhttp/internal/spdy => }/Spdy3.java     |   5 +-
 .../async/http/spdy/SpdyMiddleware.java       |   1 -
 .../async/http/spdy/SpdyTransport.java        |   1 -
 .../http/spdy/{okhttp/internal => }/Util.java |   4 +-
 .../{okhttp/internal/spdy => }/Variant.java   |   4 +-
 .../async/test/ConscryptTests.java            |  12 +-
 .../koushikdutta/async/test/Handshake.java    |   2 +-
 21 files changed, 1082 insertions(+), 53 deletions(-)
 rename AndroidAsync/src/com/koushikdutta/async/http/spdy/{okhttp/internal => }/BitArray.java (98%)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteString.java
 rename AndroidAsync/src/com/koushikdutta/async/http/spdy/{okhttp/internal/spdy => }/ErrorCode.java (96%)
 rename AndroidAsync/src/com/koushikdutta/async/http/spdy/{okhttp/internal/spdy => }/FrameReader.java (97%)
 rename AndroidAsync/src/com/koushikdutta/async/http/spdy/{okhttp/internal/spdy => }/FrameWriter.java (97%)
 rename AndroidAsync/src/com/koushikdutta/async/http/spdy/{okhttp/internal/spdy => }/Header.java (92%)
 rename AndroidAsync/src/com/koushikdutta/async/http/spdy/{okhttp/internal/spdy => }/HeaderReader.java (92%)
 rename AndroidAsync/src/com/koushikdutta/async/http/spdy/{okhttp/internal/spdy => }/HeadersMode.java (95%)
 rename AndroidAsync/src/com/koushikdutta/async/http/spdy/{okhttp/internal/spdy => }/HpackDraft08.java (99%)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/Http20Draft13.java
 rename AndroidAsync/src/com/koushikdutta/async/http/spdy/{okhttp/internal/spdy => }/Huffman.java (99%)
 rename AndroidAsync/src/com/koushikdutta/async/http/spdy/{okhttp/internal/spdy => }/Ping.java (95%)
 rename AndroidAsync/src/com/koushikdutta/async/http/spdy/{okhttp/internal/spdy => }/Settings.java (98%)
 rename AndroidAsync/src/com/koushikdutta/async/http/spdy/{okhttp/internal/spdy => }/Spdy3.java (99%)
 rename AndroidAsync/src/com/koushikdutta/async/http/spdy/{okhttp/internal => }/Util.java (94%)
 rename AndroidAsync/src/com/koushikdutta/async/http/spdy/{okhttp/internal/spdy => }/Variant.java (93%)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
index 45117dc4a..aca08f28d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
@@ -10,17 +10,6 @@
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.future.SimpleFuture;
 import com.koushikdutta.async.http.Protocol;
-import com.koushikdutta.async.http.spdy.okhttp.internal.ByteString;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.ErrorCode;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.FrameReader;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.FrameWriter;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Header;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.HeadersMode;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Http20Draft13;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Ping;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Settings;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Spdy3;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Variant;
 
 import java.io.IOException;
 import java.util.Hashtable;
@@ -28,7 +17,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Settings.DEFAULT_INITIAL_WINDOW_SIZE;
+import static com.koushikdutta.async.http.spdy.Settings.DEFAULT_INITIAL_WINDOW_SIZE;
 
 /**
  * Created by koush on 7/16/14.
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/BitArray.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/BitArray.java
similarity index 98%
rename from AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/BitArray.java
rename to AndroidAsync/src/com/koushikdutta/async/http/spdy/BitArray.java
index 5db2b6e20..1aa55b0dc 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/BitArray.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/BitArray.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.koushikdutta.async.http.spdy.okhttp.internal;
+package com.koushikdutta.async.http.spdy;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,7 +22,7 @@
 import static java.lang.String.format;
 
 /** A simple bitset which supports left shifting. */
-public interface BitArray {
+interface BitArray {
 
   void clear();
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteString.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteString.java
new file mode 100644
index 000000000..263b41bc0
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteString.java
@@ -0,0 +1,285 @@
+/*
+ * Copyright 2014 Square Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy;
+
+import android.util.Base64;
+
+import com.koushikdutta.async.util.Charsets;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
+/**
+ * An immutable sequence of bytes.
+ *
+ * <p><strong>Full disclosure:</strong> this class provides untrusted input and
+ * output streams with raw access to the underlying byte array. A hostile
+ * stream implementation could keep a reference to the mutable byte string,
+ * violating the immutable guarantee of this class. For this reason a byte
+ * string's immutability guarantee cannot be relied upon for security in applets
+ * and other environments that run both trusted and untrusted code in the same
+ * process.
+ */
+final class ByteString implements Serializable {
+  private static final char[] HEX_DIGITS =
+      { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+  private static final long serialVersionUID = 1L;
+
+  /** A singleton empty {@code ByteString}. */
+  public static final ByteString EMPTY = ByteString.of();
+
+  final byte[] data;
+  private transient int hashCode; // Lazily computed; 0 if unknown.
+  private transient String utf8; // Lazily computed.
+
+  ByteString(byte[] data) {
+    this.data = data; // Trusted internal constructor doesn't clone data.
+  }
+
+  /**
+   * Returns a new byte string containing a clone of the bytes of {@code data}.
+   */
+  public static ByteString of(byte... data) {
+    if (data == null) throw new IllegalArgumentException("data == null");
+    return new ByteString(data.clone());
+  }
+
+  /**
+   * Returns a new byte string containing a copy of {@code byteCount} bytes of {@code data} starting
+   * at {@code offset}.
+   */
+  public static ByteString of(byte[] data, int offset, int byteCount) {
+    if (data == null) throw new IllegalArgumentException("data == null");
+    Util.checkOffsetAndCount(data.length, offset, byteCount);
+
+    byte[] copy = new byte[byteCount];
+    System.arraycopy(data, offset, copy, 0, byteCount);
+    return new ByteString(copy);
+  }
+
+  /** Returns a new byte string containing the {@code UTF-8} bytes of {@code s}. */
+  public static ByteString encodeUtf8(String s) {
+    if (s == null) throw new IllegalArgumentException("s == null");
+    ByteString byteString = new ByteString(s.getBytes(Charsets.UTF_8));
+    byteString.utf8 = s;
+    return byteString;
+  }
+
+  /** Constructs a new {@code String} by decoding the bytes as {@code UTF-8}. */
+  public String utf8() {
+    String result = utf8;
+    // We don't care if we double-allocate in racy code.
+    return result != null ? result : (utf8 = new String(data, Charsets.UTF_8));
+  }
+
+  /**
+   * Returns this byte string encoded as <a
+   * href="http://www.ietf.org/rfc/rfc2045.txt">Base64</a>. In violation of the
+   * RFC, the returned string does not wrap lines at 76 columns.
+   */
+  public String base64() {
+    return Base64.encodeToString(data, Base64.DEFAULT);
+  }
+
+  /**
+   * Decodes the Base64-encoded bytes and returns their value as a byte string.
+   * Returns null if {@code base64} is not a Base64-encoded sequence of bytes.
+   */
+  public static ByteString decodeBase64(String base64) {
+    if (base64 == null) throw new IllegalArgumentException("base64 == null");
+    byte[] decoded = Base64.decode(base64, Base64.DEFAULT);
+    return decoded != null ? new ByteString(decoded) : null;
+  }
+
+  /** Returns this byte string encoded in hexadecimal. */
+  public String hex() {
+    char[] result = new char[data.length * 2];
+    int c = 0;
+    for (byte b : data) {
+      result[c++] = HEX_DIGITS[(b >> 4) & 0xf];
+      result[c++] = HEX_DIGITS[b & 0xf];
+    }
+    return new String(result);
+  }
+
+  /** Decodes the hex-encoded bytes and returns their value a byte string. */
+  public static ByteString decodeHex(String hex) {
+    if (hex == null) throw new IllegalArgumentException("hex == null");
+    if (hex.length() % 2 != 0) throw new IllegalArgumentException("Unexpected hex string: " + hex);
+
+    byte[] result = new byte[hex.length() / 2];
+    for (int i = 0; i < result.length; i++) {
+      int d1 = decodeHexDigit(hex.charAt(i * 2)) << 4;
+      int d2 = decodeHexDigit(hex.charAt(i * 2 + 1));
+      result[i] = (byte) (d1 + d2);
+    }
+    return of(result);
+  }
+
+  private static int decodeHexDigit(char c) {
+    if (c >= '0' && c <= '9') return c - '0';
+    if (c >= 'a' && c <= 'f') return c - 'a' + 10;
+    if (c >= 'A' && c <= 'F') return c - 'A' + 10;
+    throw new IllegalArgumentException("Unexpected hex digit: " + c);
+  }
+
+  /**
+   * Reads {@code count} bytes from {@code in} and returns the result.
+   *
+   * @throws java.io.EOFException if {@code in} has fewer than {@code count}
+   *     bytes to read.
+   */
+  public static ByteString read(InputStream in, int byteCount) throws IOException {
+    if (in == null) throw new IllegalArgumentException("in == null");
+    if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
+
+    byte[] result = new byte[byteCount];
+    for (int offset = 0, read; offset < byteCount; offset += read) {
+      read = in.read(result, offset, byteCount - offset);
+      if (read == -1) throw new EOFException();
+    }
+    return new ByteString(result);
+  }
+
+  /**
+   * Returns a byte string equal to this byte string, but with the bytes 'A'
+   * through 'Z' replaced with the corresponding byte in 'a' through 'z'.
+   * Returns this byte string if it contains no bytes in 'A' through 'Z'.
+   */
+  public ByteString toAsciiLowercase() {
+    // Search for an uppercase character. If we don't find one, return this.
+    for (int i = 0; i < data.length; i++) {
+      byte c = data[i];
+      if (c < 'A' || c > 'Z') continue;
+
+      // If we reach this point, this string is not not lowercase. Create and
+      // return a new byte string.
+      byte[] lowercase = data.clone();
+      lowercase[i++] = (byte) (c - ('A' - 'a'));
+      for (; i < lowercase.length; i++) {
+        c = lowercase[i];
+        if (c < 'A' || c > 'Z') continue;
+        lowercase[i] = (byte) (c - ('A' - 'a'));
+      }
+      return new ByteString(lowercase);
+    }
+    return this;
+  }
+
+  /**
+   * Returns a byte string equal to this byte string, but with the bytes 'a'
+   * through 'z' replaced with the corresponding byte in 'A' through 'Z'.
+   * Returns this byte string if it contains no bytes in 'a' through 'z'.
+   */
+  public ByteString toAsciiUppercase() {
+    // Search for an lowercase character. If we don't find one, return this.
+    for (int i = 0; i < data.length; i++) {
+      byte c = data[i];
+      if (c < 'a' || c > 'z') continue;
+
+      // If we reach this point, this string is not not uppercase. Create and
+      // return a new byte string.
+      byte[] lowercase = data.clone();
+      lowercase[i++] = (byte) (c - ('a' - 'A'));
+      for (; i < lowercase.length; i++) {
+        c = lowercase[i];
+        if (c < 'a' || c > 'z') continue;
+        lowercase[i] = (byte) (c - ('a' - 'A'));
+      }
+      return new ByteString(lowercase);
+    }
+    return this;
+  }
+
+  /** Returns the byte at {@code pos}. */
+  public byte getByte(int pos) {
+    return data[pos];
+  }
+
+  /**
+   * Returns the number of bytes in this ByteString.
+   */
+  public int size() {
+    return data.length;
+  }
+
+  /**
+   * Returns a byte array containing a copy of the bytes in this {@code ByteString}.
+   */
+  public byte[] toByteArray() {
+    return data.clone();
+  }
+
+  /** Writes the contents of this byte string to {@code out}. */
+  public void write(OutputStream out) throws IOException {
+    if (out == null) throw new IllegalArgumentException("out == null");
+    out.write(data);
+  }
+
+  @Override public boolean equals(Object o) {
+    return o == this || o instanceof ByteString && Arrays.equals(((ByteString) o).data, data);
+  }
+
+  @Override public int hashCode() {
+    int result = hashCode;
+    return result != 0 ? result : (hashCode = Arrays.hashCode(data));
+  }
+
+  @Override public String toString() {
+    if (data.length == 0) {
+      return "ByteString[size=0]";
+    }
+
+    if (data.length <= 16) {
+      return String.format("ByteString[size=%s data=%s]", data.length, hex());
+    }
+
+    try {
+      return String.format("ByteString[size=%s md5=%s]", data.length,
+          ByteString.of(MessageDigest.getInstance("MD5").digest(data)).hex());
+    } catch (NoSuchAlgorithmException e) {
+      throw new AssertionError();
+    }
+  }
+
+  private void readObject(ObjectInputStream in) throws IOException {
+    int dataLength = in.readInt();
+    ByteString byteString = ByteString.read(in, dataLength);
+    try {
+      Field field = ByteString.class.getDeclaredField("data");
+      field.setAccessible(true);
+      field.set(this, byteString.data);
+    } catch (NoSuchFieldException e) {
+      throw new AssertionError();
+    } catch (IllegalAccessException e) {
+      throw new AssertionError();
+    }
+  }
+
+  private void writeObject(ObjectOutputStream out) throws IOException {
+    out.writeInt(data.length);
+    out.write(data);
+  }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/ErrorCode.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/ErrorCode.java
similarity index 96%
rename from AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/ErrorCode.java
rename to AndroidAsync/src/com/koushikdutta/async/http/spdy/ErrorCode.java
index 9a83aaae5..11ed9f255 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/ErrorCode.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/ErrorCode.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+package com.koushikdutta.async.http.spdy;
 
 // http://tools.ietf.org/html/draft-ietf-httpbis-http2-13#section-7
-public enum ErrorCode {
+enum ErrorCode {
   /** Not an error! For SPDY stream resets, prefer null over NO_ERROR. */
   NO_ERROR(0, -1, 0),
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/FrameReader.java
similarity index 97%
rename from AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
rename to AndroidAsync/src/com/koushikdutta/async/http/spdy/FrameReader.java
index 674d80c52..1cbf2bfdc 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameReader.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/FrameReader.java
@@ -14,17 +14,16 @@
  * limitations under the License.
  */
 
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+package com.koushikdutta.async.http.spdy;
 
 import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.http.spdy.okhttp.internal.ByteString;
 
 import java.util.List;
 
 /**
  * Reads transport frames for SPDY/3 or HTTP/2.
  */
-public interface FrameReader {
+interface FrameReader {
 //    void readConnectionPreface() throws IOException;
 //  boolean nextFrame(Handler handler) throws IOException;
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameWriter.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/FrameWriter.java
similarity index 97%
rename from AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameWriter.java
rename to AndroidAsync/src/com/koushikdutta/async/http/spdy/FrameWriter.java
index 5bbf060c2..b82a794de 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/FrameWriter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/FrameWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+package com.koushikdutta.async.http.spdy;
 
 import com.koushikdutta.async.ByteBufferList;
 
@@ -23,7 +23,7 @@
 import java.util.List;
 
 /** Writes transport frames for SPDY/3 or HTTP/2. */
-public interface FrameWriter extends Closeable {
+interface FrameWriter extends Closeable {
   /** HTTP/2 only. */
   void connectionPreface() throws IOException;
   void ackSettings() throws IOException;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Header.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Header.java
similarity index 92%
rename from AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Header.java
rename to AndroidAsync/src/com/koushikdutta/async/http/spdy/Header.java
index bf9aaeb53..610c816b3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Header.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Header.java
@@ -1,10 +1,8 @@
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+package com.koushikdutta.async.http.spdy;
 
 
-import com.koushikdutta.async.http.spdy.okhttp.internal.ByteString;
-
 /** HTTP header: the name is an ASCII string, but the value can be UTF-8. */
-public final class Header {
+final class Header {
   // Special header names defined in the SPDY and HTTP/2 specs.
   public static final ByteString RESPONSE_STATUS = ByteString.encodeUtf8(":status");
   public static final ByteString TARGET_METHOD = ByteString.encodeUtf8(":method");
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeaderReader.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/HeaderReader.java
similarity index 92%
rename from AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeaderReader.java
rename to AndroidAsync/src/com/koushikdutta/async/http/spdy/HeaderReader.java
index 0df4ec83a..f8dbbf435 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeaderReader.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/HeaderReader.java
@@ -1,7 +1,6 @@
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+package com.koushikdutta.async.http.spdy;
 
 import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.http.spdy.okhttp.internal.ByteString;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -14,7 +13,7 @@
 /**
  * Created by koush on 7/27/14.
  */
-public class HeaderReader {
+class HeaderReader {
     Inflater inflater;
     public HeaderReader() {
         inflater = new Inflater() {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeadersMode.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/HeadersMode.java
similarity index 95%
rename from AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeadersMode.java
rename to AndroidAsync/src/com/koushikdutta/async/http/spdy/HeadersMode.java
index 7ec54b58a..ebb72330d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HeadersMode.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/HeadersMode.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+package com.koushikdutta.async.http.spdy;
 
 public enum HeadersMode {
   SPDY_SYN_STREAM,
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/HpackDraft08.java
similarity index 99%
rename from AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java
rename to AndroidAsync/src/com/koushikdutta/async/http/spdy/HpackDraft08.java
index 8ef4aa593..a77fce4bf 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/HpackDraft08.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/HpackDraft08.java
@@ -13,11 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+package com.koushikdutta.async.http.spdy;
 
 import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.http.spdy.okhttp.internal.BitArray;
-import com.koushikdutta.async.http.spdy.okhttp.internal.ByteString;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Http20Draft13.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Http20Draft13.java
new file mode 100644
index 000000000..d1ec33948
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Http20Draft13.java
@@ -0,0 +1,764 @@
+/*
+ * Copyright (C) 2013 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.koushikdutta.async.http.spdy;
+
+import com.koushikdutta.async.BufferedDataSink;
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.DataEmitter;
+import com.koushikdutta.async.DataEmitterReader;
+import com.koushikdutta.async.callback.DataCallback;
+import com.koushikdutta.async.http.Protocol;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.List;
+import java.util.logging.Logger;
+
+import static com.koushikdutta.async.http.spdy.Http20Draft13.FrameLogger.formatHeader;
+import static java.lang.String.format;
+import static java.util.logging.Level.FINE;
+
+/**
+ * Read and write HTTP/2 v13 frames.
+ * <p>http://tools.ietf.org/html/draft-ietf-httpbis-http2-13
+ */
+
+final class Http20Draft13 implements Variant {
+    private static final Logger logger = Logger.getLogger(Http20Draft13.class.getName());
+
+    @Override
+    public Protocol getProtocol() {
+        return Protocol.HTTP_2;
+    }
+
+    private static final ByteString CONNECTION_PREFACE
+    = ByteString.encodeUtf8("PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n");
+
+    static final int MAX_FRAME_SIZE = 0x3fff; // 16383
+
+    static final byte TYPE_DATA = 0x0;
+    static final byte TYPE_HEADERS = 0x1;
+    static final byte TYPE_PRIORITY = 0x2;
+    static final byte TYPE_RST_STREAM = 0x3;
+    static final byte TYPE_SETTINGS = 0x4;
+    static final byte TYPE_PUSH_PROMISE = 0x5;
+    static final byte TYPE_PING = 0x6;
+    static final byte TYPE_GOAWAY = 0x7;
+    static final byte TYPE_WINDOW_UPDATE = 0x8;
+    static final byte TYPE_CONTINUATION = 0x9;
+
+    static final byte FLAG_NONE = 0x0;
+    static final byte FLAG_ACK = 0x1; // Used for settings and ping.
+    static final byte FLAG_END_STREAM = 0x1; // Used for headers and data.
+    static final byte FLAG_END_SEGMENT = 0x2;
+    static final byte FLAG_END_HEADERS = 0x4; // Used for headers and continuation.
+    static final byte FLAG_END_PUSH_PROMISE = 0x4;
+    static final byte FLAG_PADDED = 0x8; // Used for headers and data.
+    static final byte FLAG_PRIORITY = 0x20; // Used for headers.
+    static final byte FLAG_COMPRESSED = 0x20; // Used for data.
+
+    /**
+     * Creates a frame reader with max header table size of 4096 and data frame
+     * compression disabled.
+     */
+    @Override
+    public FrameReader newReader(DataEmitter source, FrameReader.Handler handler, boolean client) {
+        return new Reader(source, handler, 4096, client);
+    }
+
+    @Override
+    public FrameWriter newWriter(BufferedDataSink sink, boolean client) {
+        return new Writer(sink, client);
+    }
+
+    @Override
+    public int maxFrameSize() {
+        return MAX_FRAME_SIZE;
+    }
+
+    static final class Reader implements FrameReader {
+        private final DataEmitter emitter;
+        private final boolean client;
+        private final Handler handler;
+        private final DataEmitterReader reader;
+
+        // Visible for testing.
+        final HpackDraft08.Reader hpackReader;
+
+        Reader(DataEmitter emitter, Handler handler, int headerTableSize, boolean client) {
+            this.emitter = emitter;
+            this.client = client;
+            this.hpackReader = new HpackDraft08.Reader(headerTableSize);
+            this.handler = handler;
+            reader = new DataEmitterReader();
+
+            parseFrameHeader();
+        }
+
+        private void parseFrameHeader() {
+            emitter.setDataCallback(reader);
+            reader.read(8, onFrame);
+        }
+
+        int w1;
+        int w2;
+        byte flags;
+        byte type;
+        short length;
+        int streamId;
+        private final DataCallback onFrame = new DataCallback() {
+            @Override
+            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+                bb.order(ByteOrder.BIG_ENDIAN);
+                w1 = bb.getInt();
+                w2 = bb.getInt();
+
+                // boolean r = (w1 & 0xc0000000) != 0; // Reserved: Ignore first 2 bits.
+                length = (short) ((w1 & 0x3fff0000) >> 16); // 14-bit unsigned == MAX_FRAME_SIZE
+                type = (byte) ((w1 & 0xff00) >> 8);
+                flags = (byte) (w1 & 0xff);
+                // boolean r = (w2 & 0x80000000) != 0; // Reserved: Ignore first bit.
+                streamId = (w2 & 0x7fffffff); // 31-bit opaque identifier.
+                if (logger.isLoggable(FINE))
+                    logger.fine(formatHeader(true, streamId, length, type, flags));
+
+                reader.read(length, onFullFrame);
+            }
+        };
+
+        private final DataCallback onFullFrame = new DataCallback() {
+            @Override
+            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+                try {
+                    switch (type) {
+                        case TYPE_DATA:
+                            readData(bb, length, flags, streamId);
+                            break;
+
+                        case TYPE_HEADERS:
+                            readHeaders(bb, length, flags, streamId);
+                            break;
+
+                        case TYPE_PRIORITY:
+                            readPriority(bb, length, flags, streamId);
+                            break;
+
+                        case TYPE_RST_STREAM:
+                            readRstStream(bb, length, flags, streamId);
+                            break;
+
+                        case TYPE_SETTINGS:
+                            readSettings(bb, length, flags, streamId);
+                            break;
+
+                        case TYPE_PUSH_PROMISE:
+                            readPushPromise(bb, length, flags, streamId);
+                            break;
+
+                        case TYPE_PING:
+                            readPing(bb, length, flags, streamId);
+                            break;
+
+                        case TYPE_GOAWAY:
+                            readGoAway(bb, length, flags, streamId);
+                            break;
+
+                        case TYPE_WINDOW_UPDATE:
+                            readWindowUpdate(bb, length, flags, streamId);
+                            break;
+
+                        case TYPE_CONTINUATION:
+                            readContinuation(bb, length, flags, streamId);
+                            break;
+
+                        default:
+                            // Implementations MUST discard frames that have unknown or unsupported types.
+                            bb.recycle();
+                    }
+                    parseFrameHeader();
+                }
+                catch (IOException e) {
+                    handler.error(e);
+                }
+            }
+        };
+
+        /*
+        @Override
+        public void readConnectionPreface() throws IOException {
+            if (client) return; // Nothing to read; servers doesn't send a connection preface!
+            ByteString connectionPreface = source.readByteString(CONNECTION_PREFACE.size());
+            if (logger.isLoggable(FINE))
+                logger.fine(format("<< CONNECTION %s", connectionPreface.hex()));
+            if (!CONNECTION_PREFACE.equals(connectionPreface)) {
+                throw ioException("Expected a connection header but was %s", connectionPreface.utf8());
+            }
+        }
+        */
+
+        byte pendingHeaderType;
+        private void readHeaders(ByteBufferList source, short length, byte flags, int streamId)
+        throws IOException {
+            if (streamId == 0) throw ioException("PROTOCOL_ERROR: TYPE_HEADERS streamId == 0");
+
+
+            short padding = (flags & FLAG_PADDED) != 0 ? (short) (source.get() & 0xff) : 0;
+
+            if ((flags & FLAG_PRIORITY) != 0) {
+                readPriority(source, streamId);
+                length -= 5; // account for above read.
+            }
+
+            length = lengthWithoutPadding(length, flags, padding);
+
+            pendingHeaderType = type;
+            readHeaderBlock(source, length, padding, flags, streamId);
+
+//            handler.headers(false, endStream, streamId, -1, headerBlock, HeadersMode.HTTP_20_HEADERS);
+        }
+
+        private void readContinuation(ByteBufferList source, short length, byte flags, int streamId)
+        throws IOException {
+            if (streamId != continuingStreamId)
+                throw new IOException("continuation stream id mismatch");
+            readHeaderBlock(source, length, (short)0, flags, streamId);
+        }
+
+        int continuingStreamId;
+        private void readHeaderBlock(ByteBufferList source, short length, short padding, byte flags, int streamId)
+        throws IOException {
+            source.skip(padding);
+            hpackReader.refill(source);
+            hpackReader.readHeaders();
+            hpackReader.emitReferenceSet();
+            // TODO: Concat multi-value headers with 0x0, except COOKIE, which uses 0x3B, 0x20.
+            // http://tools.ietf.org/html/draft-ietf-httpbis-http2-09#section-8.1.3
+            if ((flags & FLAG_END_HEADERS) != 0) {
+                if (pendingHeaderType == TYPE_HEADERS) {
+                    boolean endStream = (flags & FLAG_END_STREAM) != 0;
+                    handler.headers(false, endStream, streamId, -1, hpackReader.getAndReset(), HeadersMode.HTTP_20_HEADERS);
+                }
+                else if (pendingHeaderType == TYPE_PUSH_PROMISE) {
+                    handler.pushPromise(streamId, promisedStreamId, hpackReader.getAndReset());
+                }
+                else {
+                    throw new AssertionError("unknown header type");
+                }
+            }
+            else {
+                continuingStreamId = streamId;
+            }
+        }
+
+        private void readData(ByteBufferList source, short length, byte flags, int streamId)
+        throws IOException {
+            // TODO: checkState open or half-closed (local) or raise STREAM_CLOSED
+            boolean inFinished = (flags & FLAG_END_STREAM) != 0;
+            boolean gzipped = (flags & FLAG_COMPRESSED) != 0;
+            if (gzipped) {
+                throw ioException("PROTOCOL_ERROR: FLAG_COMPRESSED without SETTINGS_COMPRESS_DATA");
+            }
+
+            short padding = (flags & FLAG_PADDED) != 0 ? (short) (source.get() & 0xff) : 0;
+            length = lengthWithoutPadding(length, flags, padding);
+
+            handler.data(inFinished, streamId, source);
+            source.skip(padding);
+        }
+
+        private void readPriority(ByteBufferList source, short length, byte flags, int streamId)
+        throws IOException {
+            if (length != 5) throw ioException("TYPE_PRIORITY length: %d != 5", length);
+            if (streamId == 0) throw ioException("TYPE_PRIORITY streamId == 0");
+            readPriority(source, streamId);
+        }
+
+        private void readPriority(ByteBufferList source, int streamId) throws IOException {
+            int w1 = source.getInt();
+            boolean exclusive = (w1 & 0x80000000) != 0;
+            int streamDependency = (w1 & 0x7fffffff);
+            int weight = (source.get() & 0xff) + 1;
+            handler.priority(streamId, streamDependency, weight, exclusive);
+        }
+
+        private void readRstStream(ByteBufferList source, short length, byte flags, int streamId)
+        throws IOException {
+            if (length != 4) throw ioException("TYPE_RST_STREAM length: %d != 4", length);
+            if (streamId == 0) throw ioException("TYPE_RST_STREAM streamId == 0");
+            int errorCodeInt = source.getInt();
+            ErrorCode errorCode = ErrorCode.fromHttp2(errorCodeInt);
+            if (errorCode == null) {
+                throw ioException("TYPE_RST_STREAM unexpected error code: %d", errorCodeInt);
+            }
+            handler.rstStream(streamId, errorCode);
+        }
+
+        private void readSettings(ByteBufferList source, short length, byte flags, int streamId)
+        throws IOException {
+            if (streamId != 0) throw ioException("TYPE_SETTINGS streamId != 0");
+            if ((flags & FLAG_ACK) != 0) {
+                if (length != 0) throw ioException("FRAME_SIZE_ERROR ack frame should be empty!");
+                handler.ackSettings();
+                return;
+            }
+
+            if (length % 6 != 0) throw ioException("TYPE_SETTINGS length %% 6 != 0: %s", length);
+            Settings settings = new Settings();
+            for (int i = 0; i < length; i += 6) {
+                short id = source.getShort();
+                int value = source.getInt();
+
+                switch (id) {
+                    case 1: // SETTINGS_HEADER_TABLE_SIZE
+                        break;
+                    case 2: // SETTINGS_ENABLE_PUSH
+                        if (value != 0 && value != 1) {
+                            throw ioException("PROTOCOL_ERROR SETTINGS_ENABLE_PUSH != 0 or 1");
+                        }
+                        break;
+                    case 3: // SETTINGS_MAX_CONCURRENT_STREAMS
+                        id = 4; // Renumbered in draft 10.
+                        break;
+                    case 4: // SETTINGS_INITIAL_WINDOW_SIZE
+                        id = 7; // Renumbered in draft 10.
+                        if (value < 0) {
+                            throw ioException("PROTOCOL_ERROR SETTINGS_INITIAL_WINDOW_SIZE > 2^31 - 1");
+                        }
+                        break;
+                    case 5: // SETTINGS_COMPRESS_DATA
+                        break;
+                    default:
+                        throw ioException("PROTOCOL_ERROR invalid settings id: %s", id);
+                }
+                settings.set(id, 0, value);
+            }
+            handler.settings(false, settings);
+            if (settings.getHeaderTableSize() >= 0) {
+                hpackReader.maxHeaderTableByteCountSetting(settings.getHeaderTableSize());
+            }
+        }
+
+        int promisedStreamId;
+        private void readPushPromise(ByteBufferList source, short length, byte flags, int streamId)
+        throws IOException {
+            if (streamId == 0) {
+                throw ioException("PROTOCOL_ERROR: TYPE_PUSH_PROMISE streamId == 0");
+            }
+            short padding = (flags & FLAG_PADDED) != 0 ? (short) (source.get() & 0xff) : 0;
+            promisedStreamId = source.getInt() & 0x7fffffff;
+            length -= 4; // account for above read.
+            length = lengthWithoutPadding(length, flags, padding);
+            pendingHeaderType = TYPE_PUSH_PROMISE;
+            readHeaderBlock(source, length, padding, flags, streamId);
+        }
+
+        private void readPing(ByteBufferList source, short length, byte flags, int streamId)
+        throws IOException {
+            if (length != 8) throw ioException("TYPE_PING length != 8: %s", length);
+            if (streamId != 0) throw ioException("TYPE_PING streamId != 0");
+            int payload1 = source.getInt();
+            int payload2 = source.getInt();
+            boolean ack = (flags & FLAG_ACK) != 0;
+            handler.ping(ack, payload1, payload2);
+        }
+
+        private void readGoAway(ByteBufferList source, short length, byte flags, int streamId)
+        throws IOException {
+            if (length < 8) throw ioException("TYPE_GOAWAY length < 8: %s", length);
+            if (streamId != 0) throw ioException("TYPE_GOAWAY streamId != 0");
+            int lastStreamId = source.getInt();
+            int errorCodeInt = source.getInt();
+            int opaqueDataLength = length - 8;
+            ErrorCode errorCode = ErrorCode.fromHttp2(errorCodeInt);
+            if (errorCode == null) {
+                throw ioException("TYPE_GOAWAY unexpected error code: %d", errorCodeInt);
+            }
+            ByteString debugData = ByteString.EMPTY;
+            if (opaqueDataLength > 0) { // Must read debug data in order to not corrupt the connection.
+                debugData = ByteString.of(source.getBytes(opaqueDataLength));
+            }
+            handler.goAway(lastStreamId, errorCode, debugData);
+        }
+
+        private void readWindowUpdate(ByteBufferList source, short length, byte flags, int streamId)
+        throws IOException {
+            if (length != 4) throw ioException("TYPE_WINDOW_UPDATE length !=4: %s", length);
+            long increment = (source.getInt() & 0x7fffffffL);
+            if (increment == 0) throw ioException("windowSizeIncrement was 0", increment);
+            handler.windowUpdate(streamId, increment);
+        }
+    }
+
+    static final class Writer implements FrameWriter {
+        private final BufferedDataSink sink;
+        private final boolean client;
+        private final HpackDraft08.Writer hpackWriter;
+        private boolean closed;
+        private final ByteBufferList frameHeader = new ByteBufferList();
+
+        Writer(BufferedDataSink sink, boolean client) {
+            this.sink = sink;
+            this.client = client;
+            this.hpackWriter = new HpackDraft08.Writer();
+        }
+
+        @Override
+        public synchronized void ackSettings() throws IOException {
+            if (closed) throw new IOException("closed");
+            int length = 0;
+            byte type = TYPE_SETTINGS;
+            byte flags = FLAG_ACK;
+            int streamId = 0;
+            frameHeader(streamId, length, type, flags);
+        }
+
+        @Override
+        public synchronized void connectionPreface() throws IOException {
+            if (closed) throw new IOException("closed");
+            if (!client) return; // Nothing to write; servers don't send connection headers!
+            if (logger.isLoggable(FINE)) {
+                logger.fine(format(">> CONNECTION %s", CONNECTION_PREFACE.hex()));
+            }
+            sink.write(new ByteBufferList(CONNECTION_PREFACE.toByteArray()));
+        }
+
+        @Override
+        public synchronized void synStream(boolean outFinished, boolean inFinished,
+                                           int streamId, int associatedStreamId, List<Header> headerBlock)
+        throws IOException {
+            if (inFinished) throw new UnsupportedOperationException();
+            if (closed) throw new IOException("closed");
+            headers(outFinished, streamId, headerBlock);
+        }
+
+        @Override
+        public synchronized void synReply(boolean outFinished, int streamId,
+                                          List<Header> headerBlock) throws IOException {
+            if (closed) throw new IOException("closed");
+            headers(outFinished, streamId, headerBlock);
+        }
+
+        @Override
+        public synchronized void headers(int streamId, List<Header> headerBlock)
+        throws IOException {
+            if (closed) throw new IOException("closed");
+            headers(false, streamId, headerBlock);
+        }
+
+        @Override
+        public synchronized void pushPromise(int streamId, int promisedStreamId,
+                                             List<Header> requestHeaders) throws IOException {
+            if (closed) throw new IOException("closed");
+            ByteBufferList hpackBuffer = hpackWriter.writeHeaders(requestHeaders);
+
+            long byteCount = hpackBuffer.remaining();
+            int length = (int) Math.min(MAX_FRAME_SIZE - 4, byteCount);
+            byte type = TYPE_PUSH_PROMISE;
+            byte flags = byteCount == length ? FLAG_END_HEADERS : 0;
+            frameHeader(streamId, length + 4, type, flags);
+            ByteBuffer sink = ByteBufferList.obtain(8192).order(ByteOrder.BIG_ENDIAN);
+            sink.putInt(promisedStreamId & 0x7fffffff);
+            sink.flip();
+            frameHeader.add(sink);
+            hpackBuffer.get(frameHeader, length);
+            this.sink.write(frameHeader);
+
+            if (byteCount > length) writeContinuationFrames(hpackBuffer, streamId);
+        }
+
+        void headers(boolean outFinished, int streamId, List<Header> headerBlock) throws IOException {
+            if (closed) throw new IOException("closed");
+            ByteBufferList hpackBuffer = hpackWriter.writeHeaders(headerBlock);
+
+            long byteCount = hpackBuffer.remaining();
+            int length = (int) Math.min(MAX_FRAME_SIZE, byteCount);
+            byte type = TYPE_HEADERS;
+            byte flags = byteCount == length ? FLAG_END_HEADERS : 0;
+            if (outFinished) flags |= FLAG_END_STREAM;
+            frameHeader(streamId, length, type, flags);
+            hpackBuffer.get(frameHeader, length);
+            this.sink.write(frameHeader);
+
+            if (byteCount > length) writeContinuationFrames(hpackBuffer, streamId);
+        }
+
+        private void writeContinuationFrames(ByteBufferList hpackBuffer, int streamId) throws IOException {
+            while (hpackBuffer.hasRemaining()) {
+                int length = (int) Math.min(MAX_FRAME_SIZE, hpackBuffer.remaining());
+                int newRemaining = hpackBuffer.remaining() - length;
+                frameHeader(streamId, length, TYPE_CONTINUATION, newRemaining == 0 ? FLAG_END_HEADERS : 0);
+                hpackBuffer.get(frameHeader, length);
+                sink.write(frameHeader);
+            }
+        }
+
+        @Override
+        public synchronized void rstStream(int streamId, ErrorCode errorCode)
+        throws IOException {
+            if (closed) throw new IOException("closed");
+            if (errorCode.spdyRstCode == -1) throw new IllegalArgumentException();
+
+            int length = 4;
+            byte type = TYPE_RST_STREAM;
+            byte flags = FLAG_NONE;
+            frameHeader(streamId, length, type, flags);
+            ByteBuffer sink = ByteBufferList.obtain(8192).order(ByteOrder.BIG_ENDIAN);
+            sink.putInt(errorCode.httpCode);
+            sink.flip();
+            this.sink.write(frameHeader.add(sink));
+        }
+
+        @Override
+        public synchronized void data(boolean outFinished, int streamId, ByteBufferList source)
+        throws IOException {
+            if (closed) throw new IOException("closed");
+            byte flags = FLAG_NONE;
+            if (outFinished) flags |= FLAG_END_STREAM;
+            dataFrame(streamId, flags, source);
+        }
+
+        void dataFrame(int streamId, byte flags, ByteBufferList buffer) throws IOException {
+            byte type = TYPE_DATA;
+            frameHeader(streamId, buffer.remaining(), type, flags);
+            sink.write(buffer);
+        }
+
+        @Override
+        public synchronized void settings(Settings settings) throws IOException {
+            if (closed) throw new IOException("closed");
+            int length = settings.size() * 6;
+            byte type = TYPE_SETTINGS;
+            byte flags = FLAG_NONE;
+            int streamId = 0;
+            frameHeader(streamId, length, type, flags);
+            ByteBuffer sink = ByteBufferList.obtain(8192).order(ByteOrder.BIG_ENDIAN);
+            for (int i = 0; i < Settings.COUNT; i++) {
+                if (!settings.isSet(i)) continue;
+                int id = i;
+                if (id == 4) id = 3; // SETTINGS_MAX_CONCURRENT_STREAMS renumbered.
+                else if (id == 7) id = 4; // SETTINGS_INITIAL_WINDOW_SIZE renumbered.
+                sink.putShort((short) id);
+                sink.putInt(settings.get(i));
+            }
+            sink.flip();
+            this.sink.write(frameHeader.add(sink));
+        }
+
+        @Override
+        public synchronized void ping(boolean ack, int payload1, int payload2)
+        throws IOException {
+            if (closed) throw new IOException("closed");
+            int length = 8;
+            byte type = TYPE_PING;
+            byte flags = ack ? FLAG_ACK : FLAG_NONE;
+            int streamId = 0;
+            frameHeader(streamId, length, type, flags);
+            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
+            sink.putInt(payload1);
+            sink.putInt(payload2);
+            sink.flip();
+            this.sink.write(frameHeader.add(sink));
+        }
+
+        @Override
+        public synchronized void goAway(int lastGoodStreamId, ErrorCode errorCode,
+                                        byte[] debugData) throws IOException {
+            if (closed) throw new IOException("closed");
+            if (errorCode.httpCode == -1) throw illegalArgument("errorCode.httpCode == -1");
+            int length = 8 + debugData.length;
+            byte type = TYPE_GOAWAY;
+            byte flags = FLAG_NONE;
+            int streamId = 0;
+            frameHeader(streamId, length, type, flags);
+            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
+            sink.putInt(lastGoodStreamId);
+            sink.putInt(errorCode.httpCode);
+            sink.put(debugData);
+            sink.flip();
+            this.sink.write(frameHeader.add(sink));
+        }
+
+        @Override
+        public synchronized void windowUpdate(int streamId, long windowSizeIncrement)
+        throws IOException {
+            if (closed) throw new IOException("closed");
+            if (windowSizeIncrement == 0 || windowSizeIncrement > 0x7fffffffL) {
+                throw illegalArgument("windowSizeIncrement == 0 || windowSizeIncrement > 0x7fffffffL: %s",
+                windowSizeIncrement);
+            }
+            int length = 4;
+            byte type = TYPE_WINDOW_UPDATE;
+            byte flags = FLAG_NONE;
+            frameHeader(streamId, length, type, flags);
+            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
+            sink.putInt((int) windowSizeIncrement);
+            sink.flip();
+            this.sink.write(frameHeader.add(sink));
+        }
+
+        @Override
+        public synchronized void close() throws IOException {
+            closed = true;
+        }
+
+        void frameHeader(int streamId, int length, byte type, byte flags) throws IOException {
+            if (logger.isLoggable(FINE))
+                logger.fine(formatHeader(false, streamId, length, type, flags));
+            if (length > MAX_FRAME_SIZE) {
+                throw illegalArgument("FRAME_SIZE_ERROR length > %d: %d", MAX_FRAME_SIZE, length);
+            }
+            if ((streamId & 0x80000000) != 0)
+                throw illegalArgument("reserved bit set: %s", streamId);
+            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
+            sink.putInt((length & 0x3fff) << 16 | (type & 0xff) << 8 | (flags & 0xff));
+            sink.putInt(streamId & 0x7fffffff);
+            sink.flip();
+            this.sink.write(frameHeader.add(sink));
+        }
+    }
+
+    private static IllegalArgumentException illegalArgument(String message, Object... args) {
+        throw new IllegalArgumentException(format(message, args));
+    }
+
+    private static IOException ioException(String message, Object... args) throws IOException {
+        throw new IOException(format(message, args));
+    }
+
+    private static short lengthWithoutPadding(short length, byte flags, short padding)
+    throws IOException {
+        if ((flags & FLAG_PADDED) != 0) length--; // Account for reading the padding length.
+        if (padding > length) {
+            throw ioException("PROTOCOL_ERROR padding %s > remaining length %s", padding, length);
+        }
+        return (short) (length - padding);
+    }
+
+    /**
+     * Logs a human-readable representation of HTTP/2 frame headers.
+     * <p/>
+     * <p>The format is:
+     * <p/>
+     * <pre>
+     *   direction streamID length type flags
+     * </pre>
+     * Where direction is {@code <<} for inbound and {@code >>} for outbound.
+     * <p/>
+     * <p> For example, the following would indicate a HEAD request sent from
+     * the client.
+     * <pre>
+     * {@code
+     *   << 0x0000000f    12 HEADERS       END_HEADERS|END_STREAM
+     * }
+     * </pre>
+     */
+    static final class FrameLogger {
+
+        static String formatHeader(boolean inbound, int streamId, int length, byte type, byte flags) {
+            String formattedType = type < TYPES.length ? TYPES[type] : format("0x%02x", type);
+            String formattedFlags = formatFlags(type, flags);
+            return format("%s 0x%08x %5d %-13s %s", inbound ? "<<" : ">>", streamId, length,
+            formattedType, formattedFlags);
+        }
+
+        /**
+         * Looks up valid string representing flags from the table. Invalid
+         * combinations are represented in binary.
+         */
+        // Visible for testing.
+        static String formatFlags(byte type, byte flags) {
+            if (flags == 0) return "";
+            switch (type) { // Special case types that have 0 or 1 flag.
+                case TYPE_SETTINGS:
+                case TYPE_PING:
+                    return flags == FLAG_ACK ? "ACK" : BINARY[flags];
+                case TYPE_PRIORITY:
+                case TYPE_RST_STREAM:
+                case TYPE_GOAWAY:
+                case TYPE_WINDOW_UPDATE:
+                    return BINARY[flags];
+            }
+            String result = flags < FLAGS.length ? FLAGS[flags] : BINARY[flags];
+            // Special case types that have overlap flag values.
+            if (type == TYPE_PUSH_PROMISE && (flags & FLAG_END_PUSH_PROMISE) != 0) {
+                return result.replace("HEADERS", "PUSH_PROMISE"); // TODO: Avoid allocation.
+            } else if (type == TYPE_DATA && (flags & FLAG_COMPRESSED) != 0) {
+                return result.replace("PRIORITY", "COMPRESSED"); // TODO: Avoid allocation.
+            }
+            return result;
+        }
+
+        /**
+         * Lookup table for valid frame types.
+         */
+        private static final String[] TYPES = new String[]{
+        "DATA",
+        "HEADERS",
+        "PRIORITY",
+        "RST_STREAM",
+        "SETTINGS",
+        "PUSH_PROMISE",
+        "PING",
+        "GOAWAY",
+        "WINDOW_UPDATE",
+        "CONTINUATION"
+        };
+
+        /**
+         * Lookup table for valid flags for DATA, HEADERS, CONTINUATION. Invalid
+         * combinations are represented in binary.
+         */
+        private static final String[] FLAGS = new String[0x40]; // Highest bit flag is 0x20.
+        private static final String[] BINARY = new String[256];
+
+        static {
+            for (int i = 0; i < BINARY.length; i++) {
+                BINARY[i] = format("%8s", Integer.toBinaryString(i)).replace(' ', '0');
+            }
+
+            FLAGS[FLAG_NONE] = "";
+            FLAGS[FLAG_END_STREAM] = "END_STREAM";
+            FLAGS[FLAG_END_SEGMENT] = "END_SEGMENT";
+            FLAGS[FLAG_END_STREAM | FLAG_END_SEGMENT] = "END_STREAM|END_SEGMENT";
+            int[] prefixFlags =
+            new int[]{FLAG_END_STREAM, FLAG_END_SEGMENT, FLAG_END_SEGMENT | FLAG_END_STREAM};
+
+            FLAGS[FLAG_PADDED] = "PADDED";
+            for (int prefixFlag : prefixFlags) {
+                FLAGS[prefixFlag | FLAG_PADDED] = FLAGS[prefixFlag] + "|PADDED";
+            }
+
+            FLAGS[FLAG_END_HEADERS] = "END_HEADERS"; // Same as END_PUSH_PROMISE.
+            FLAGS[FLAG_PRIORITY] = "PRIORITY"; // Same as FLAG_COMPRESSED.
+            FLAGS[FLAG_END_HEADERS | FLAG_PRIORITY] = "END_HEADERS|PRIORITY"; // Only valid on HEADERS.
+            int[] frameFlags =
+            new int[]{FLAG_END_HEADERS, FLAG_PRIORITY, FLAG_END_HEADERS | FLAG_PRIORITY};
+
+            for (int frameFlag : frameFlags) {
+                for (int prefixFlag : prefixFlags) {
+                    FLAGS[prefixFlag | frameFlag] = FLAGS[prefixFlag] + '|' + FLAGS[frameFlag];
+                    FLAGS[prefixFlag | frameFlag | FLAG_PADDED] =
+                    FLAGS[prefixFlag] + '|' + FLAGS[frameFlag] + "|PADDED";
+                }
+            }
+
+            for (int i = 0; i < FLAGS.length; i++) { // Fill in holes with binary representation.
+                if (FLAGS[i] == null) FLAGS[i] = BINARY[i];
+            }
+        }
+    }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Huffman.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Huffman.java
similarity index 99%
rename from AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Huffman.java
rename to AndroidAsync/src/com/koushikdutta/async/http/spdy/Huffman.java
index dfa7153ef..2472a03b3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Huffman.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Huffman.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+package com.koushikdutta.async.http.spdy;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Ping.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Ping.java
similarity index 95%
rename from AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Ping.java
rename to AndroidAsync/src/com/koushikdutta/async/http/spdy/Ping.java
index 0a82b4308..9f5ae8f5d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Ping.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Ping.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+package com.koushikdutta.async.http.spdy;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -21,7 +21,7 @@
 /**
  * A locally-originated ping.
  */
-public final class Ping {
+final class Ping {
   private final CountDownLatch latch = new CountDownLatch(1);
   private long sent = -1;
   private long received = -1;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Settings.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Settings.java
similarity index 98%
rename from AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Settings.java
rename to AndroidAsync/src/com/koushikdutta/async/http/spdy/Settings.java
index 1b96f64a5..726816f11 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Settings.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Settings.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+package com.koushikdutta.async.http.spdy;
 
 import java.util.Arrays;
 
@@ -21,7 +21,7 @@
  * Settings describe characteristics of the sending peer, which are used by the receiving peer.
  * Settings are {@link com.koushikdutta.async.http.spdy.okhttp.internal.spdy.SpdyConnection connection} scoped.
  */
-public final class Settings {
+final class Settings {
   /**
    * From the SPDY/3 and HTTP/2 specs, the default initial window size for all
    * streams is 64 KiB. (Chrome 25 uses 10 MiB).
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
similarity index 99%
rename from AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
rename to AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
index 52155ca04..35f4e6e3b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Spdy3.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+package com.koushikdutta.async.http.spdy;
 
 import com.koushikdutta.async.BufferedDataSink;
 import com.koushikdutta.async.ByteBufferList;
@@ -21,7 +21,6 @@
 import com.koushikdutta.async.DataEmitterReader;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.http.Protocol;
-import com.koushikdutta.async.http.spdy.okhttp.internal.ByteString;
 import com.koushikdutta.async.util.Charsets;
 
 import java.io.IOException;
@@ -37,7 +36,7 @@
  * Read and write spdy/3.1 frames.
  * http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3-1
  */
-public final class Spdy3 implements Variant {
+final class Spdy3 implements Variant {
 
     @Override
     public Protocol getProtocol() {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index b97f261be..1ac43d5d8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -16,7 +16,6 @@
 import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.Multimap;
 import com.koushikdutta.async.http.Protocol;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Header;
 import com.koushikdutta.async.util.Charsets;
 
 import java.lang.reflect.Field;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
index fb29b6a72..a2e3029e2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
@@ -18,7 +18,6 @@
 
 
 import com.koushikdutta.async.http.Protocol;
-import com.koushikdutta.async.http.spdy.okhttp.internal.Util;
 
 import java.util.List;
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/Util.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Util.java
similarity index 94%
rename from AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/Util.java
rename to AndroidAsync/src/com/koushikdutta/async/http/spdy/Util.java
index 6c8c0e4f1..288ba2640 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/Util.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Util.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.koushikdutta.async.http.spdy.okhttp.internal;
+package com.koushikdutta.async.http.spdy;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,7 +22,7 @@
 import java.util.List;
 
 /** Junk drawer of utility methods. */
-public final class Util {
+final class Util {
   public static void checkOffsetAndCount(long arrayLength, long offset, long count) {
     if ((offset | count) < 0 || offset > arrayLength || arrayLength - offset < count) {
       throw new ArrayIndexOutOfBoundsException();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Variant.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Variant.java
similarity index 93%
rename from AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Variant.java
rename to AndroidAsync/src/com/koushikdutta/async/http/spdy/Variant.java
index 00b12ffaf..d54a48470 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/okhttp/internal/spdy/Variant.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Variant.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.koushikdutta.async.http.spdy.okhttp.internal.spdy;
+package com.koushikdutta.async.http.spdy;
 
 
 import com.koushikdutta.async.BufferedDataSink;
@@ -21,7 +21,7 @@
 import com.koushikdutta.async.http.Protocol;
 
 /** A version and dialect of the framed socket protocol. */
-public interface Variant {
+interface Variant {
 
   /** The protocol as selected using NPN or ALPN. */
   Protocol getProtocol();
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
index a50d910f7..cd5014883 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
@@ -18,12 +18,12 @@
 
 
 import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.ErrorCode;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.FrameReader;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Header;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.HeadersMode;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Settings;
-import com.koushikdutta.async.http.spdy.okhttp.internal.spdy.Spdy3;
+import com.koushikdutta.async.http.spdy.ErrorCode;
+import com.koushikdutta.async.http.spdy.FrameReader;
+import com.koushikdutta.async.http.spdy.Header;
+import com.koushikdutta.async.http.spdy.HeadersMode;
+import com.koushikdutta.async.http.spdy.Settings;
+import com.koushikdutta.async.http.spdy.Spdy3;
 import com.koushikdutta.async.http.spdy.okio.BufferedSource;
 import com.koushikdutta.async.http.spdy.okio.ByteString;
 import com.koushikdutta.async.http.spdy.okio.Okio;
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/Handshake.java b/AndroidAsync/test/src/com/koushikdutta/async/test/Handshake.java
index e53908f72..597436b6a 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/Handshake.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/Handshake.java
@@ -1,6 +1,6 @@
 package com.koushikdutta.async.test;
 
-import com.koushikdutta.async.http.spdy.okhttp.internal.Util;
+import com.koushikdutta.async.http.spdy.Util;
 
 import java.security.Principal;
 import java.security.cert.Certificate;

From 1280d7b44e14dbac19f773136742224bcab91302 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 28 Jul 2014 20:07:37 -0700
Subject: [PATCH 060/399] spdy posting works.

---
 .../async/http/AsyncHttpClient.java           |  24 +-
 .../async/http/AsyncHttpClientMiddleware.java |  29 ++-
 .../async/http/AsyncHttpResponseImpl.java     |   3 +-
 .../async/http/AsyncSocketMiddleware.java     |   2 +-
 .../com/koushikdutta/async/http/Headers.java  |  19 +-
 .../async/http/HttpTransportMiddleware.java   |  14 +-
 .../async/http/SimpleMiddleware.java          |  14 +-
 .../http/body/MultipartFormDataBody.java      |   6 +-
 .../async/http/body/UrlEncodedFormBody.java   |   1 +
 .../http/cache/ResponseCacheMiddleware.java   |   4 +-
 .../http/filter/ChunkedOutputFilter.java      |   3 +-
 .../async/http/server/BoundaryEmitter.java    |   1 -
 .../async/http/spdy/AsyncSpdyConnection.java  |  30 ++-
 .../koushikdutta/async/http/spdy/Spdy3.java   |   2 +-
 .../async/http/spdy/SpdyMiddleware.java       | 235 ++++++++++--------
 15 files changed, 236 insertions(+), 151 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index ee4f8054c..49c7de506 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -17,7 +17,6 @@
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.FutureCallback;
 import com.koushikdutta.async.future.SimpleFuture;
-import com.koushikdutta.async.http.AsyncHttpClientMiddleware.OnRequestCompleteData;
 import com.koushikdutta.async.http.callback.HttpConnectCallback;
 import com.koushikdutta.async.http.callback.RequestCallback;
 import com.koushikdutta.async.parser.AsyncParser;
@@ -204,7 +203,7 @@ private void executeAffinity(final AsyncHttpRequest request, final int redirectC
             return;
         }
         final Uri uri = request.getUri();
-        final OnRequestCompleteData data = new OnRequestCompleteData();
+        final AsyncHttpClientMiddleware.OnResponseCompleteDataOnRequestSentData data = new AsyncHttpClientMiddleware.OnResponseCompleteDataOnRequestSentData();
         request.executionTime = System.currentTimeMillis();
         data.request = request;
 
@@ -273,6 +272,12 @@ public void onConnectCompleted(Exception ex, AsyncSocket socket) {
         // set up the system default proxy and connect
         setupAndroidProxy(request);
 
+        // set the implicit content type
+        if (request.getBody() != null) {
+            if (request.getHeaders().get("Content-Type") == null)
+                request.getHeaders().set("Content-Type", request.getBody().getContentType());
+        }
+
         synchronized (mMiddleware) {
             for (AsyncHttpClientMiddleware middleware: mMiddleware) {
                 Cancellable socketCancellable = middleware.getSocket(data);
@@ -288,13 +293,18 @@ public void onConnectCompleted(Exception ex, AsyncSocket socket) {
 
     private void executeSocket(final AsyncHttpRequest request, final int redirectCount,
                                final FutureAsyncHttpResponse cancel, final HttpConnectCallback callback,
-                               final OnRequestCompleteData data) {
+                               final AsyncHttpClientMiddleware.OnResponseCompleteDataOnRequestSentData data) {
         // 4) wait for request to be sent fully
         // and
         // 6) wait for headers
         final AsyncHttpResponseImpl ret = new AsyncHttpResponseImpl(request) {
             @Override
             protected void onRequestCompleted(Exception ex) {
+                if (ex != null) {
+                    reportConnectedCompleted(cancel, ex, null, request, callback);
+                    return;
+                }
+
                 request.logv("request completed");
                 if (cancel.isCancelled())
                     return;
@@ -303,6 +313,12 @@ protected void onRequestCompleted(Exception ex) {
                     mServer.removeAllCallbacks(cancel.scheduled);
                     cancel.scheduled = mServer.postDelayed(cancel.timeoutRunnable, getTimeoutRemaining(request));
                 }
+
+                synchronized (mMiddleware) {
+                    for (AsyncHttpClientMiddleware middleware: mMiddleware) {
+                        middleware.onRequestSent(data);
+                    }
+                }
             }
 
             @Override
@@ -402,7 +418,7 @@ protected void report(Exception ex) {
                 data.exception = ex;
                 synchronized (mMiddleware) {
                     for (AsyncHttpClientMiddleware middleware: mMiddleware) {
-                        middleware.onRequestComplete(data);
+                        middleware.onResponseComplete(data);
                     }
                 }
             }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
index edce25dda..48be20947 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
@@ -40,21 +40,24 @@ public static class GetSocketData extends OnRequestData {
         public String protocol;
     }
 
-    public static class ExchangeHeaderData extends GetSocketData {
+    public static class OnExchangeHeaderData extends GetSocketData {
         public AsyncSocket socket;
         public ResponseHead response;
         public CompletedCallback sendHeadersCallback;
         public CompletedCallback receiveHeadersCallback;
     }
 
-    public static class OnHeadersReceivedData extends ExchangeHeaderData {
+    public static class OnRequestSentData extends OnExchangeHeaderData {
     }
 
-    public static class OnBodyData extends OnHeadersReceivedData {
+    public static class OnHeadersReceivedDataOnRequestSentData extends OnRequestSentData {
+    }
+
+    public static class OnBodyDataOnRequestSentData extends OnHeadersReceivedDataOnRequestSentData {
         public DataEmitter bodyEmitter;
     }
 
-    public static class OnRequestCompleteData extends OnBodyData {
+    public static class OnResponseCompleteDataOnRequestSentData extends OnBodyDataOnRequestSentData {
         public Exception exception;
     }
 
@@ -77,23 +80,31 @@ public static class OnRequestCompleteData extends OnBodyData {
      * @param data
      * @return
      */
-    public boolean exchangeHeaders(ExchangeHeaderData data);
+    public boolean exchangeHeaders(OnExchangeHeaderData data);
+
+    /**
+     * Called once the headers and any optional request body has
+     * been sent
+     * @param data
+     */
+    public void onRequestSent(OnRequestSentData data);
 
     /**
      * Called once the headers have been received via the socket
      * @param data
      */
-    public void onHeadersReceived(OnHeadersReceivedData data);
+    public void onHeadersReceived(OnHeadersReceivedDataOnRequestSentData data);
 
     /**
      * Called before the body is decoded
      * @param data
      */
-    public void onBodyDecoder(OnBodyData data);
+    public void onBodyDecoder(OnBodyDataOnRequestSentData data);
 
     /**
-     * Called once the request is complete
+     * Called once the request is complete and response has been received,
+     * or if an error occurred
      * @param data
      */
-    public void onRequestComplete(OnRequestCompleteData data);
+    public void onResponseComplete(OnResponseCompleteDataOnRequestSentData data);
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index 7938b935e..cd6ffffcd 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -193,8 +193,7 @@ public void write(ByteBufferList bb) {
 
     @Override
     public void end() {
-        if (mSink instanceof ChunkedOutputFilter)
-            mSink.end();
+        throw new AssertionError("end called?");
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index 5c11684de..35ce3dd70 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -345,7 +345,7 @@ private void nextConnection(AsyncHttpRequest request) {
     }
 
     @Override
-    public void onRequestComplete(final OnRequestCompleteData data) {
+    public void onResponseComplete(final OnResponseCompleteDataOnRequestSentData data) {
         if (!data.state.get(getClass().getCanonicalName() + ".owned", false)) {
             return;
         }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
index 8fb70253e..1b4cdc294 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
@@ -29,20 +29,20 @@ public Multimap getMultiMap() {
     }
 
     public List<String> getAll(String header) {
-        return map.get(header);
+        return map.get(header.toLowerCase());
     }
 
     public String get(String header) {
-        return map.getString(header);
+        return map.getString(header.toLowerCase());
     }
 
     public Headers set(String header, String value) {
-        map.put(header, value);
+        map.put(header.toLowerCase(), value);
         return this;
     }
 
     public Headers add(String header, String value) {
-        map.add(header, value);
+        map.add(header.toLowerCase(), value);
         return this;
     }
 
@@ -66,21 +66,26 @@ public Headers addAll(String header, List<String> values) {
     }
 
     public Headers addAll(Map<String, List<String>> m) {
-        map.putAll(m);
+        for (String key: m.keySet()) {
+            for (String value: m.get(key)) {
+                add(key, value);
+            }
+        }
         return this;
     }
 
     public Headers addAll(Headers headers) {
+        // safe to addall since this is another Headers object
         map.putAll(headers.map);
         return this;
     }
 
     public List<String> removeAll(String header) {
-        return map.remove(header);
+        return map.remove(header.toLowerCase());
     }
 
     public String remove(String header) {
-        List<String> r = removeAll(header);
+        List<String> r = removeAll(header.toLowerCase());
         if (r == null || r.size() == 0)
             return null;
         return r.get(0);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
index 837ca925f..6659193e1 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
@@ -14,7 +14,7 @@
  */
 public class HttpTransportMiddleware extends SimpleMiddleware {
     @Override
-    public boolean exchangeHeaders(final ExchangeHeaderData data) {
+    public boolean exchangeHeaders(final OnExchangeHeaderData data) {
         Protocol p = Protocol.get(data.protocol);
         if (p != null && p != Protocol.HTTP_1_0 && p != Protocol.HTTP_1_1)
             return super.exchangeHeaders(data);
@@ -23,8 +23,6 @@ public boolean exchangeHeaders(final ExchangeHeaderData data) {
         AsyncHttpRequestBody requestBody = data.request.getBody();
 
         if (requestBody != null) {
-            if (request.getHeaders().get("Content-Type") == null)
-                request.getHeaders().set("Content-Type", requestBody.getContentType());
             if (requestBody.length() >= 0) {
                 request.getHeaders().set("Content-Length", String.valueOf(requestBody.length()));
                 data.response.sink(data.socket);
@@ -92,4 +90,14 @@ else if (!"\r".equals(s)) {
         liner.setLineCallback(headerCallback);
         return true;
     }
+
+    @Override
+    public void onRequestSent(OnRequestSentData data) {
+        Protocol p = Protocol.get(data.protocol);
+        if (p != null && p != Protocol.HTTP_1_0 && p != Protocol.HTTP_1_1)
+            return;
+
+        if (data.response.sink() instanceof ChunkedOutputFilter)
+            data.response.sink().end();
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java
index 242fdabbc..8b2998ae8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java
@@ -13,19 +13,23 @@ public Cancellable getSocket(GetSocketData data) {
     }
 
     @Override
-    public void onHeadersReceived(OnHeadersReceivedData data) {
+    public boolean exchangeHeaders(OnExchangeHeaderData data) {
+        return false;
     }
 
     @Override
-    public void onBodyDecoder(OnBodyData data) {
+    public void onRequestSent(OnRequestSentData data) {
     }
 
     @Override
-    public void onRequestComplete(OnRequestCompleteData data) {
+    public void onHeadersReceived(OnHeadersReceivedDataOnRequestSentData data) {
     }
 
     @Override
-    public boolean exchangeHeaders(ExchangeHeaderData data) {
-        return false;
+    public void onBodyDecoder(OnBodyDataOnRequestSentData data) {
+    }
+
+    @Override
+    public void onResponseComplete(OnResponseCompleteDataOnRequestSentData data) {
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
index 309d9c33e..4cf41f201 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
@@ -126,11 +126,9 @@ public MultipartCallback getMultipartCallback() {
     int written;
     @Override
     public void write(AsyncHttpRequest request, final DataSink sink, final CompletedCallback completed) {
-        if (mParts == null) {
-            sink.end();
+        if (mParts == null)
             return;
-        }
-        
+
         Continuation c = new Continuation(new CompletedCallback() {
             @Override
             public void onCompleted(Exception ex) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
index b50b7c72d..b52fc75f2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
@@ -45,6 +45,7 @@ private void buildData() {
             mBodyBytes = b.toString().getBytes("ISO-8859-1");
         }
         catch (UnsupportedEncodingException e) {
+            throw new AssertionError(e);
         }
     }
     
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index 57e389574..40aa530cd 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -213,7 +213,7 @@ public int getCacheStoreCount() {
     // step 2) if this is a conditional cache request, serve it from the cache if necessary
     // otherwise, see if it is cacheable
     @Override
-    public void onBodyDecoder(OnBodyData data) {
+    public void onBodyDecoder(OnBodyDataOnRequestSentData data) {
         CachedSocket cached = com.koushikdutta.async.Util.getWrappedSocket(data.socket, CachedSocket.class);
         if (cached != null) {
             data.response.headers().set(SERVED_FROM, CACHE);
@@ -292,7 +292,7 @@ public void onBodyDecoder(OnBodyData data) {
 
     // step 3: close up shop
     @Override
-    public void onRequestComplete(OnRequestCompleteData data) {
+    public void onResponseComplete(OnResponseCompleteDataOnRequestSentData data) {
         CacheData cacheData = data.state.get("cache-data");
         if (cacheData != null && cacheData.snapshot != null)
             StreamUtility.closeQuietly(cacheData.snapshot);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedOutputFilter.java b/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedOutputFilter.java
index f0f18d3b3..00d3f9e31 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedOutputFilter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedOutputFilter.java
@@ -25,6 +25,7 @@ public void end() {
         ByteBufferList fin = new ByteBufferList();
         write(fin);
         setMaxBuffer(0);
-        super.end();
+        // do NOT call through to super.end, as chunking is a framing protocol.
+        // we don't want to close the underlying transport.
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java
index 3eab5e272..e642ba448 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java
@@ -1,6 +1,5 @@
 package com.koushikdutta.async.http.server;
 
-import android.util.Log;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.FilteredDataEmitter;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
index aca08f28d..29b7fb8ed 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
@@ -94,7 +94,7 @@ void updateWindowRead(int length) {
     }
 
     public class SpdySocket implements AsyncSocket {
-        long bytesLeftInWriteWindow;
+        long bytesLeftInWriteWindow = AsyncSpdyConnection.this.peerSettings.getInitialWindowSize(Settings.DEFAULT_INITIAL_WINDOW_SIZE);
         WritableCallback writable;
         final int id;
         CompletedCallback closedCallback;
@@ -195,9 +195,29 @@ public String charset() {
             return null;
         }
 
+        ByteBufferList writing = new ByteBufferList();
         @Override
         public void write(ByteBufferList bb) {
-            System.out.println("writing!");
+            int canWrite = (int)Math.min(bytesLeftInWriteWindow, AsyncSpdyConnection.this.bytesLeftInWriteWindow);
+            canWrite = Math.min(bb.remaining(), canWrite);
+            if (canWrite == 0) {
+                System.out.println("derp");
+                return;
+            }
+            if (canWrite < bb.remaining()) {
+                if (writing.hasRemaining())
+                    throw new AssertionError("wtf");
+                bb.get(writing, canWrite);
+                bb = writing;
+            }
+
+            try {
+                writer.data(false, id, bb);
+                bytesLeftInWriteWindow -= canWrite;
+            }
+            catch (IOException e) {
+                throw new AssertionError(e);
+            }
         }
 
         @Override
@@ -217,6 +237,12 @@ public boolean isOpen() {
 
         @Override
         public void end() {
+            try {
+                writer.data(true, id, writing);
+            }
+            catch (IOException e) {
+                throw new AssertionError(e);
+            }
         }
 
         @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
index 35f4e6e3b..ddea2f2f3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
@@ -167,12 +167,12 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             }
         };
 
+        ByteBufferList partial = new ByteBufferList();
         private final DataCallback onDataFrame = new DataCallback() {
             @Override
             public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                 int toRead = Math.min(bb.remaining(), length);
                 if (toRead < bb.remaining()) {
-                    ByteBufferList partial = new ByteBufferList();
                     bb.get(partial, toRead);
                     bb = partial;
                 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 1ac43d5d8..b5a608ca4 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -16,6 +16,7 @@
 import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.Multimap;
 import com.koushikdutta.async.http.Protocol;
+import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 import com.koushikdutta.async.util.Charsets;
 
 import java.lang.reflect.Field;
@@ -39,6 +40,94 @@ public void configureEngine(SSLEngine engine, String host, int port) {
         });
     }
 
+    private void configure(SSLEngine engine, String host, int port) {
+        if (!initialized) {
+            initialized = true;
+            try {
+                peerHost = engine.getClass().getSuperclass().getDeclaredField("peerHost");
+                peerPort = engine.getClass().getSuperclass().getDeclaredField("peerPort");
+                sslParameters = engine.getClass().getDeclaredField("sslParameters");
+                npnProtocols = sslParameters.getType().getDeclaredField("npnProtocols");
+                alpnProtocols = sslParameters.getType().getDeclaredField("alpnProtocols");
+                useSni = sslParameters.getType().getDeclaredField("useSni");
+                sslNativePointer = engine.getClass().getDeclaredField("sslNativePointer");
+                String nativeCryptoName = sslParameters.getType().getPackage().getName() + ".NativeCrypto";
+                nativeGetNpnNegotiatedProtocol = Class.forName(nativeCryptoName, true, sslParameters.getType().getClassLoader())
+                .getDeclaredMethod("SSL_get_npn_negotiated_protocol", long.class);
+                nativeGetAlpnNegotiatedProtocol = Class.forName(nativeCryptoName, true, sslParameters.getType().getClassLoader())
+                .getDeclaredMethod("SSL_get0_alpn_selected", long.class);
+
+                peerHost.setAccessible(true);
+                peerPort.setAccessible(true);
+                sslParameters.setAccessible(true);
+                npnProtocols.setAccessible(true);
+                alpnProtocols.setAccessible(true);
+                useSni.setAccessible(true);
+                sslNativePointer.setAccessible(true);
+                nativeGetNpnNegotiatedProtocol.setAccessible(true);
+                nativeGetAlpnNegotiatedProtocol.setAccessible(true);
+            }
+            catch (Exception e) {
+                sslParameters = null;
+                npnProtocols = null;
+                alpnProtocols = null;
+                useSni = null;
+                sslNativePointer = null;
+                nativeGetNpnNegotiatedProtocol = null;
+                nativeGetAlpnNegotiatedProtocol = null;
+            }
+        }
+
+        if (sslParameters != null) {
+            try {
+                byte[] protocols = concatLengthPrefixed(
+                Protocol.HTTP_1_1,
+                Protocol.SPDY_3
+                );
+
+                peerHost.set(engine, host);
+                peerPort.set(engine, port);
+                Object sslp = sslParameters.get(engine);
+//                npnProtocols.set(sslp, protocols);
+                alpnProtocols.set(sslp, protocols);
+                useSni.set(sslp, true);
+            }
+            catch (Exception e ) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    @Override
+    protected SSLEngine createConfiguredSSLEngine(String host, int port) {
+        SSLContext sslContext = getSSLContext();
+        SSLEngine sslEngine = sslContext.createSSLEngine();
+
+        for (AsyncSSLEngineConfigurator configurator : engineConfigurators) {
+            configurator.configureEngine(sslEngine, host, port);
+        }
+
+        return sslEngine;
+    }
+
+    boolean initialized;
+    Field peerHost;
+    Field peerPort;
+    Field sslParameters;
+    Field npnProtocols;
+    Field alpnProtocols;
+    Field sslNativePointer;
+    Field useSni;
+    Method nativeGetNpnNegotiatedProtocol;
+    Method nativeGetAlpnNegotiatedProtocol;
+    Hashtable<String, AsyncSpdyConnection> connections = new Hashtable<String, AsyncSpdyConnection>();
+
+    @Override
+    public void setSSLContext(SSLContext sslContext) {
+        super.setSSLContext(sslContext);
+        initialized = false;
+    }
+
     static byte[] concatLengthPrefixed(Protocol... protocols) {
         ByteBuffer result = ByteBuffer.allocate(8192);
         for (Protocol protocol: protocols) {
@@ -80,6 +169,7 @@ public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
                         callback.onConnectCompleted(null, socket);
                         return;
                     }
+                    data.protocol = protoString;
                     final AsyncSpdyConnection connection = new AsyncSpdyConnection(socket, Protocol.get(protoString));
                     connection.sendConnectionPreface();
 
@@ -120,15 +210,44 @@ private void newSocket(GetSocketData data, final AsyncSpdyConnection connection,
             }
         }
 
-        AsyncSpdyConnection.SpdySocket spdy = connection.newStream(headers, false, true);
+        data.request.logv("\n" + data.request);
+        AsyncSpdyConnection.SpdySocket spdy = connection.newStream(headers, data.request.getBody() != null, true);
         callback.onConnectCompleted(null, spdy);
     }
 
     @Override
-    public boolean exchangeHeaders(final ExchangeHeaderData data) {
+    public Cancellable getSocket(GetSocketData data) {
+        final Uri uri = data.request.getUri();
+        final int port = getSchemePort(data.request.getUri());
+        if (port == -1) {
+            return null;
+        }
+
+        // can we use an existing connection to satisfy this, or do we need a new one?
+        String host = uri.getHost();
+        AsyncSpdyConnection conn = connections.get(host);
+        if (conn == null || !conn.socket.isOpen()) {
+            connections.remove(host);
+            return super.getSocket(data);
+        }
+
+        newSocket(data, conn, data.connectCallback);
+
+        SimpleCancellable ret = new SimpleCancellable();
+        ret.setComplete();
+        return ret;
+    }
+
+    @Override
+    public boolean exchangeHeaders(final OnExchangeHeaderData data) {
         if (!(data.socket instanceof AsyncSpdyConnection.SpdySocket))
             return false;
 
+        AsyncHttpRequestBody requestBody = data.request.getBody();
+        if (requestBody != null) {
+            data.response.sink(data.socket);
+        }
+
         // headers were already sent as part of the socket being opened.
         data.sendHeadersCallback.onCompleted(null);
 
@@ -162,114 +281,12 @@ public void onCompleted(Exception e, Headers result) {
         return true;
     }
 
-    private void configure(SSLEngine engine, String host, int port) {
-        if (!initialized) {
-            initialized = true;
-            try {
-                peerHost = engine.getClass().getSuperclass().getDeclaredField("peerHost");
-                peerPort = engine.getClass().getSuperclass().getDeclaredField("peerPort");
-                sslParameters = engine.getClass().getDeclaredField("sslParameters");
-                npnProtocols = sslParameters.getType().getDeclaredField("npnProtocols");
-                alpnProtocols = sslParameters.getType().getDeclaredField("alpnProtocols");
-                useSni = sslParameters.getType().getDeclaredField("useSni");
-                sslNativePointer = engine.getClass().getDeclaredField("sslNativePointer");
-                String nativeCryptoName = sslParameters.getType().getPackage().getName() + ".NativeCrypto";
-                nativeGetNpnNegotiatedProtocol = Class.forName(nativeCryptoName, true, sslParameters.getType().getClassLoader())
-                .getDeclaredMethod("SSL_get_npn_negotiated_protocol", long.class);
-                nativeGetAlpnNegotiatedProtocol = Class.forName(nativeCryptoName, true, sslParameters.getType().getClassLoader())
-                .getDeclaredMethod("SSL_get0_alpn_selected", long.class);
-
-                peerHost.setAccessible(true);
-                peerPort.setAccessible(true);
-                sslParameters.setAccessible(true);
-                npnProtocols.setAccessible(true);
-                alpnProtocols.setAccessible(true);
-                useSni.setAccessible(true);
-                sslNativePointer.setAccessible(true);
-                nativeGetNpnNegotiatedProtocol.setAccessible(true);
-                nativeGetAlpnNegotiatedProtocol.setAccessible(true);
-            }
-            catch (Exception e) {
-                sslParameters = null;
-                npnProtocols = null;
-                alpnProtocols = null;
-                useSni = null;
-                sslNativePointer = null;
-                nativeGetNpnNegotiatedProtocol = null;
-                nativeGetAlpnNegotiatedProtocol = null;
-            }
-        }
-
-        if (sslParameters != null) {
-            try {
-                byte[] protocols = concatLengthPrefixed(
-                Protocol.HTTP_1_1,
-                Protocol.SPDY_3
-                );
-
-                peerHost.set(engine, host);
-                peerPort.set(engine, port);
-                Object sslp = sslParameters.get(engine);
-//                npnProtocols.set(sslp, protocols);
-                alpnProtocols.set(sslp, protocols);
-                useSni.set(sslp, true);
-            }
-            catch (Exception e ) {
-                e.printStackTrace();
-            }
-        }
-    }
-
     @Override
-    protected SSLEngine createConfiguredSSLEngine(String host, int port) {
-        SSLContext sslContext = getSSLContext();
-        SSLEngine sslEngine = sslContext.createSSLEngine();
-
-        for (AsyncSSLEngineConfigurator configurator : engineConfigurators) {
-            configurator.configureEngine(sslEngine, host, port);
-        }
-
-        return sslEngine;
-    }
-
-    boolean initialized;
-    Field peerHost;
-    Field peerPort;
-    Field sslParameters;
-    Field npnProtocols;
-    Field alpnProtocols;
-    Field sslNativePointer;
-    Field useSni;
-    Method nativeGetNpnNegotiatedProtocol;
-    Method nativeGetAlpnNegotiatedProtocol;
-    Hashtable<String, AsyncSpdyConnection> connections = new Hashtable<String, AsyncSpdyConnection>();
-
-    @Override
-    public void setSSLContext(SSLContext sslContext) {
-        super.setSSLContext(sslContext);
-        initialized = false;
-    }
-
-    @Override
-    public Cancellable getSocket(GetSocketData data) {
-        final Uri uri = data.request.getUri();
-        final int port = getSchemePort(data.request.getUri());
-        if (port == -1) {
-            return null;
-        }
-
-        // can we use an existing connection to satisfy this, or do we need a new one?
-        String host = uri.getHost();
-        AsyncSpdyConnection conn = connections.get(host);
-        if (conn == null || !conn.socket.isOpen()) {
-            connections.remove(host);
-            return super.getSocket(data);
-        }
-
-        newSocket(data, conn, data.connectCallback);
+    public void onRequestSent(OnRequestSentData data) {
+        if (!(data.socket instanceof AsyncSpdyConnection.SpdySocket))
+            return;
 
-        SimpleCancellable ret = new SimpleCancellable();
-        ret.setComplete();
-        return ret;
+        if (data.request.getBody() != null)
+            data.response.sink().end();
     }
 }
\ No newline at end of file

From 06987e72af6bad8d4c88a8b587218375f1955810 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 28 Jul 2014 20:33:28 -0700
Subject: [PATCH 061/399] fix all the tests.

---
 .../async/http/cache/ResponseHeaders.java     |   2 +-
 .../koushikdutta/async/test/CacheTests.java   |   8 +-
 .../async/test/ConscryptTests.java            |  84 +-------------
 .../koushikdutta/async/test/FileTests.java    |   6 +-
 .../koushikdutta/async/test/Handshake.java    | 106 ------------------
 .../async/test/HttpClientTests.java           |  15 ++-
 .../async/test/MultipartTests.java            |   5 +-
 .../koushikdutta/async/test/OkHttpTest.java   |  89 ---------------
 8 files changed, 19 insertions(+), 296 deletions(-)
 delete mode 100644 AndroidAsync/test/src/com/koushikdutta/async/test/Handshake.java
 delete mode 100644 AndroidAsync/test/src/com/koushikdutta/async/test/OkHttpTest.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseHeaders.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseHeaders.java
index 327564714..d71cf9df9 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseHeaders.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseHeaders.java
@@ -160,7 +160,7 @@ public ResponseHeaders(Uri uri, RawHeaders headers) {
                     varyFields = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
                 }
                 for (String varyField : value.split(",")) {
-                    varyFields.add(varyField.trim());
+                    varyFields.add(varyField.trim().toLowerCase());
                 }
             } else if ("Content-Encoding".equalsIgnoreCase(fieldName)) {
                 contentEncoding = value;
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
index 78f330126..2edd1ae08 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
@@ -1,6 +1,6 @@
 package com.koushikdutta.async.test;
 
-import android.os.Environment;
+import android.test.AndroidTestCase;
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.AsyncServerSocket;
@@ -13,18 +13,16 @@
 import com.koushikdutta.async.http.server.AsyncHttpServerResponse;
 import com.koushikdutta.async.http.server.HttpServerRequestCallback;
 
-import junit.framework.TestCase;
-
 import java.io.File;
 import java.util.Date;
 
 /**
  * Created by koush on 6/13/13.
  */
-public class CacheTests extends TestCase {
+public class CacheTests extends AndroidTestCase {
     public void testMaxAgePrivate() throws Exception {
         AsyncHttpClient client = new AsyncHttpClient(AsyncServer.getDefault());
-        ResponseCacheMiddleware cache = ResponseCacheMiddleware.addCache(client, new File(Environment.getExternalStorageDirectory(), "AndroidAsyncTest"), 1024 * 1024 * 10);
+        ResponseCacheMiddleware cache = ResponseCacheMiddleware.addCache(client, new File(getContext().getFilesDir(), "AndroidAsyncTest"), 1024 * 1024 * 10);
         AsyncHttpServer httpServer = new AsyncHttpServer();
         try {
             httpServer.get("/uname/(.*)", new HttpServerRequestCallback() {
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
index cd5014883..2bcfd5a78 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
@@ -17,24 +17,11 @@
 package com.koushikdutta.async.test;
 
 
-import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.http.spdy.ErrorCode;
-import com.koushikdutta.async.http.spdy.FrameReader;
-import com.koushikdutta.async.http.spdy.Header;
-import com.koushikdutta.async.http.spdy.HeadersMode;
-import com.koushikdutta.async.http.spdy.Settings;
-import com.koushikdutta.async.http.spdy.Spdy3;
-import com.koushikdutta.async.http.spdy.okio.BufferedSource;
-import com.koushikdutta.async.http.spdy.okio.ByteString;
-import com.koushikdutta.async.http.spdy.okio.Okio;
-
 import junit.framework.TestCase;
 
 import org.conscrypt.OpenSSLEngineImpl;
 import org.conscrypt.OpenSSLProvider;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Field;
@@ -44,7 +31,6 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.security.Security;
-import java.util.List;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
@@ -193,74 +179,6 @@ else if (handshakeStatus == SSLEngineResult.HandshakeStatus.NEED_TASK) {
         System.out.println("negotiated protocol was: " + protoString);
         assertEquals(protoString, "spdy/3.1");
 
-        dummy.clear();
-        SSLEngineResult res = engine.unwrap(unwrap, dummy);
-        dummy.flip();
-        byte[] frame = new byte[dummy.remaining()];
-        dummy.get(frame );
-        Spdy3 spdy3 = new Spdy3();
-        BufferedSource source = Okio.buffer(Okio.source(new ByteArrayInputStream(frame)));
-        FrameReader frameReader = spdy3.newReader(source, true);
-        ByteBufferList bb = new ByteBufferList(ByteBuffer.wrap(frame));
-        assertTrue(frameReader.canProcessFrame(bb));
-
-        frameReader.nextFrame(new FrameReader.Handler() {
-            @Override
-            public void data(boolean inFinished, int streamId, BufferedSource source, int length) throws IOException {
-
-            }
-
-            @Override
-            public void headers(boolean outFinished, boolean inFinished, int streamId, int associatedStreamId, List<Header> headerBlock, HeadersMode headersMode) {
-
-            }
-
-            @Override
-            public void rstStream(int streamId, ErrorCode errorCode) {
-
-            }
-
-            @Override
-            public void settings(boolean clearPrevious, Settings settings) {
-
-            }
-
-            @Override
-            public void ackSettings() {
-
-            }
-
-            @Override
-            public void ping(boolean ack, int payload1, int payload2) {
-
-            }
-
-            @Override
-            public void goAway(int lastGoodStreamId, ErrorCode errorCode, ByteString debugData) {
-
-            }
-
-            @Override
-            public void windowUpdate(int streamId, long windowSizeIncrement) {
-
-            }
-
-            @Override
-            public void priority(int streamId, int streamDependency, int weight, boolean exclusive) {
-
-            }
-
-            @Override
-            public void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders) throws IOException {
-
-            }
-
-            @Override
-            public void alternateService(int streamId, String origin, ByteString protocol, String host, int port, long maxAge) {
-
-            }
-        });
-
-
+        socket.close();
     }
 }
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java
index 1d372397a..4642bd2f5 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java
@@ -1,5 +1,7 @@
 package com.koushikdutta.async.test;
 
+import android.test.AndroidTestCase;
+
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.FileDataEmitter;
 import com.koushikdutta.async.future.Future;
@@ -16,11 +18,11 @@
 /**
  * Created by koush on 5/22/13.
  */
-public class FileTests extends TestCase {
+public class FileTests extends AndroidTestCase {
     public static final long TIMEOUT = 1000L;
     public void testFileDataEmitter() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
-        File f = new File("/sdcard/test.txt");
+        File f = getContext().getFileStreamPath("test.txt");
         StreamUtility.writeFile(f, "hello world");
         FileDataEmitter fdm = new FileDataEmitter(AsyncServer.getDefault(), f);
         final Md5 md5 = Md5.createInstance();
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/Handshake.java b/AndroidAsync/test/src/com/koushikdutta/async/test/Handshake.java
deleted file mode 100644
index 597436b6a..000000000
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/Handshake.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.koushikdutta.async.test;
-
-import com.koushikdutta.async.http.spdy.Util;
-
-import java.security.Principal;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-import java.util.Collections;
-import java.util.List;
-
-import javax.net.ssl.SSLPeerUnverifiedException;
-import javax.net.ssl.SSLSession;
-
-/**
- * A record of a TLS handshake. For HTTPS clients, the client is <i>local</i>
- * and the remote server is its <i>peer</i>.
- *
- * <p>This value object describes a completed handshake. Use {@link
- * javax.net.ssl.SSLSocketFactory} to set policy for new handshakes.
- */
-public final class Handshake {
-  private final String cipherSuite;
-  private final List<Certificate> peerCertificates;
-  private final List<Certificate> localCertificates;
-
-  private Handshake(
-      String cipherSuite, List<Certificate> peerCertificates, List<Certificate> localCertificates) {
-    this.cipherSuite = cipherSuite;
-    this.peerCertificates = peerCertificates;
-    this.localCertificates = localCertificates;
-  }
-
-  public static Handshake get(SSLSession session) {
-    String cipherSuite = session.getCipherSuite();
-    if (cipherSuite == null) throw new IllegalStateException("cipherSuite == null");
-
-    Certificate[] peerCertificates;
-    try {
-      peerCertificates = session.getPeerCertificates();
-    } catch (SSLPeerUnverifiedException ignored) {
-      peerCertificates = null;
-    }
-    List<Certificate> peerCertificatesList = peerCertificates != null
-        ? Util.immutableList(peerCertificates)
-        : Collections.<Certificate>emptyList();
-
-    Certificate[] localCertificates = session.getLocalCertificates();
-    List<Certificate> localCertificatesList = localCertificates != null
-        ? Util.immutableList(localCertificates)
-        : Collections.<Certificate>emptyList();
-
-    return new Handshake(cipherSuite, peerCertificatesList, localCertificatesList);
-  }
-
-  public static Handshake get(
-      String cipherSuite, List<Certificate> peerCertificates, List<Certificate> localCertificates) {
-    if (cipherSuite == null) throw new IllegalArgumentException("cipherSuite == null");
-    return new Handshake(cipherSuite, Util.immutableList(peerCertificates),
-        Util.immutableList(localCertificates));
-  }
-
-  /** Returns a cipher suite name like "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA". */
-  public String cipherSuite() {
-    return cipherSuite;
-  }
-
-  /** Returns a possibly-empty list of certificates that identify the remote peer. */
-  public List<Certificate> peerCertificates() {
-    return peerCertificates;
-  }
-
-  /** Returns the remote peer's principle, or null if that peer is anonymous. */
-  public Principal peerPrincipal() {
-    return !peerCertificates.isEmpty()
-        ? ((X509Certificate) peerCertificates.get(0)).getSubjectX500Principal()
-        : null;
-  }
-
-  /** Returns a possibly-empty list of certificates that identify this peer. */
-  public List<Certificate> localCertificates() {
-    return localCertificates;
-  }
-
-  /** Returns the local principle, or null if this peer is anonymous. */
-  public Principal localPrincipal() {
-    return !localCertificates.isEmpty()
-        ? ((X509Certificate) localCertificates.get(0)).getSubjectX500Principal()
-        : null;
-  }
-
-  @Override public boolean equals(Object other) {
-    if (!(other instanceof Handshake)) return false;
-    Handshake that = (Handshake) other;
-    return cipherSuite.equals(that.cipherSuite)
-        && peerCertificates.equals(that.peerCertificates)
-        && localCertificates.equals(that.localCertificates);
-  }
-
-  @Override public int hashCode() {
-    int result = 17;
-    result = 31 * result + cipherSuite.hashCode();
-    result = 31 * result + peerCertificates.hashCode();
-    result = 31 * result + localCertificates.hashCode();
-    return result;
-  }
-}
\ No newline at end of file
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
index 5be77f90e..4ba7c7d30 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
@@ -2,6 +2,7 @@
 
 import android.net.Uri;
 import android.os.Environment;
+import android.test.AndroidTestCase;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -20,17 +21,14 @@
 import com.koushikdutta.async.http.AsyncHttpPost;
 import com.koushikdutta.async.http.AsyncHttpRequest;
 import com.koushikdutta.async.http.AsyncHttpResponse;
-import com.koushikdutta.async.http.cache.ResponseCacheMiddleware;
 import com.koushikdutta.async.http.body.JSONObjectBody;
+import com.koushikdutta.async.http.cache.ResponseCacheMiddleware;
 import com.koushikdutta.async.http.callback.HttpConnectCallback;
-import com.koushikdutta.async.http.server.AsyncHttpServer;
 import com.koushikdutta.async.http.server.AsyncHttpServerRequest;
 import com.koushikdutta.async.http.server.AsyncHttpServerResponse;
 import com.koushikdutta.async.http.server.AsyncProxyServer;
-import com.koushikdutta.async.http.server.HttpServerRequestCallback;
 
 import junit.framework.Assert;
-import junit.framework.TestCase;
 
 import org.json.JSONObject;
 
@@ -41,7 +39,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-public class HttpClientTests extends TestCase {
+public class HttpClientTests extends AndroidTestCase {
     AsyncHttpClient client;
     AsyncServer server = new AsyncServer();
     
@@ -227,7 +225,7 @@ public void onConnect(AsyncHttpResponse response) {
     }
 
     public void testCache() throws Exception {
-        ResponseCacheMiddleware cache = ResponseCacheMiddleware.addCache(client, new File(Environment.getExternalStorageDirectory(), "AndroidAsyncTest"), 1024 * 1024 * 10);
+        ResponseCacheMiddleware cache = ResponseCacheMiddleware.addCache(client, new File(getContext().getFilesDir(), "AndroidAsyncTest"), 1024 * 1024 * 10);
         try {
             // clear the old cache
             cache.clear();
@@ -245,7 +243,8 @@ public void testCache() throws Exception {
     Future<File> fileFuture;
     public void testFileCancel() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
-        fileFuture = client.executeFile(new AsyncHttpGet(github), "/sdcard/hello.txt", new AsyncHttpClient.FileCallback() {
+        File f = getContext().getFileStreamPath("test.txt");
+        fileFuture = client.executeFile(new AsyncHttpGet(github), f.getAbsolutePath(), new AsyncHttpClient.FileCallback() {
             @Override
             public void onCompleted(Exception e, AsyncHttpResponse source, File result) {
                 fail();
@@ -274,7 +273,7 @@ public void onCompleted(Exception e, File result) {
         }
 //        Thread.sleep(1000);
 //        assertTrue("timeout", semaphore.tryAcquire(TIMEOUT, TimeUnit.MILLISECONDS));
-        assertFalse(new File("/sdcard/hello.txt").exists());
+        assertFalse(f.exists());
     }
 
     boolean wasProxied;
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/MultipartTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/MultipartTests.java
index cace2a549..0a4a5a246 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/MultipartTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/MultipartTests.java
@@ -1,6 +1,7 @@
 package com.koushikdutta.async.test;
 
 import android.os.Environment;
+import android.test.AndroidTestCase;
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.ByteBufferList;
@@ -26,7 +27,7 @@
 import java.io.FileOutputStream;
 import java.util.concurrent.TimeUnit;
 
-public class MultipartTests extends TestCase {
+public class MultipartTests extends AndroidTestCase {
     AsyncHttpServer httpServer;
 
     @Override
@@ -81,7 +82,7 @@ protected void tearDown() throws Exception {
     }
 
     public void testUpload() throws Exception {
-        File dummy = new File(Environment.getExternalStorageDirectory(), "AndroidAsync/dummy.txt");
+        File dummy = getContext().getFileStreamPath("dummy.txt");
         final String FIELD_VAL = "bar";
         dummy.getParentFile().mkdirs();
         FileOutputStream fout = new FileOutputStream(dummy);
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/OkHttpTest.java b/AndroidAsync/test/src/com/koushikdutta/async/test/OkHttpTest.java
deleted file mode 100644
index 48fbf5b69..000000000
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/OkHttpTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.koushikdutta.async.test;
-
-
-import android.test.AndroidTestCase;
-
-import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.http.Protocol;
-import com.koushikdutta.async.util.Charsets;
-
-import org.conscrypt.OpenSSLProvider;
-
-import java.lang.reflect.Method;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.nio.ByteBuffer;
-import java.security.Security;
-
-import javax.net.SocketFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocket;
-
-public class OkHttpTest extends AndroidTestCase {
-    public void testOkHttp() throws Exception {
-//        Context context = getContext().getApplicationContext();
-//        Context gms = context.createPackageContext("com.google.android.gms", Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY);
-//        gms
-//        .getClassLoader()
-//        .loadClass("com.google.android.gms.common.security.ProviderInstallerImpl")
-//        .getMethod("insertProvider", Context.class)
-//        .invoke(null, context);
-        Security.insertProviderAt(new OpenSSLProvider("MyNameBlah"), 1);
-
-        Class<?> openSslSocketClass;
-        Method setUseSessionTickets;
-        Method setHostname;
-        openSslSocketClass = Class.forName("org.conscrypt.OpenSSLSocketImpl");
-        setUseSessionTickets = openSslSocketClass.getMethod("setUseSessionTickets", boolean.class);
-        setHostname = openSslSocketClass.getMethod("setHostname", String.class);
-        Method trafficStatsTagSocket = null;
-        Method trafficStatsUntagSocket = null;
-        Class<?> trafficStats = Class.forName("android.net.TrafficStats");
-        trafficStatsTagSocket = trafficStats.getMethod("tagSocket", Socket.class);
-        trafficStatsUntagSocket = trafficStats.getMethod("untagSocket", Socket.class);
-
-        // Attempt to find Android 4.1+ APIs.
-        Method setNpnProtocols = null;
-        Method getNpnSelectedProtocol = null;
-        setNpnProtocols = openSslSocketClass.getMethod("setNpnProtocols", byte[].class);
-        getNpnSelectedProtocol = openSslSocketClass.getMethod("getNpnSelectedProtocol");
-
-
-//            Platform p = Platform.get();
-
-        SSLContext ctx = SSLContext.getInstance("TLS");
-        ctx.init(null, null, null);
-        Socket socket = SocketFactory.getDefault().createSocket();
-        socket.connect(new InetSocketAddress("www.google.com", 443));
-        socket = ctx.getSocketFactory().createSocket(socket, "www.google.com", 443, true);
-        SSLSocket sslSocket = (SSLSocket) socket;
-
-        setUseSessionTickets.invoke(sslSocket, true);
-        setHostname.invoke(sslSocket, "www.google.com");
-        setNpnProtocols.invoke(sslSocket, new Object[] { concatLengthPrefixed(Protocol.HTTP_1_1, Protocol.SPDY_3) });
-
-
-        sslSocket.startHandshake();
-        Handshake handshake = Handshake.get(sslSocket.getSession());
-
-        String proto = new String((byte[])getNpnSelectedProtocol.invoke(sslSocket));
-
-//        InputStream is = sslSocket.getInputStream();
-//        StreamUtility.eat(is);
-
-        System.out.println(proto);
-    }
-
-    static byte[] concatLengthPrefixed(Protocol... protocols) {
-        ByteBuffer result = ByteBuffer.allocate(8192);
-        for (Protocol protocol: protocols) {
-            if (protocol == Protocol.HTTP_1_0) continue; // No HTTP/1.0 for NPN.
-            result.put((byte) protocol.toString().length());
-            result.put(protocol.toString().getBytes(Charsets.UTF_8));
-        }
-        result.flip();
-        byte[] ret = new ByteBufferList(result).getAllByteArray();
-        return ret;
-    }
-
-}
\ No newline at end of file

From cfaf22a7a260b60f6814545cede08237e60206c1 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 28 Jul 2014 22:39:08 -0700
Subject: [PATCH 062/399] remove conscrypt dependency. not necessary with alpn
 not exhibiting the same handshake bug as npn.

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml    |  6 ------
 AndroidAsync/build.gradle                     |  4 ++--
 .../async/http/spdy/SpdyMiddleware.java       | 11 +++++++---
 .../async/test/ConscryptTests.java            | 21 ++++++++++++-------
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index f88736b56..1cdbd092c 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -60,12 +60,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <content url="file://$MODULE_DIR$/../compat">
-      <sourceFolder url="file://$MODULE_DIR$/../compat" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../conscrypt">
-      <sourceFolder url="file://$MODULE_DIR$/../conscrypt" isTestSource="false" />
-    </content>
     <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 77970b0f0..05d82cad1 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -16,8 +16,8 @@ android {
             jniLibs.srcDirs = ['libs/']
 
             java.srcDirs=['src/'
-                          , '../conscrypt/'
-                          , '../compat/'
+//                          , '../conscrypt/'
+//                          , '../compat/'
             ]
         }
         androidTest.java.srcDirs=['test/src/']
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index b5a608ca4..c4bbe52f5 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -1,6 +1,7 @@
 package com.koushikdutta.async.http.spdy;
 
 import android.net.Uri;
+import android.text.TextUtils;
 
 import com.koushikdutta.async.AsyncSSLSocket;
 import com.koushikdutta.async.AsyncSSLSocketWrapper;
@@ -141,9 +142,13 @@ static byte[] concatLengthPrefixed(Protocol... protocols) {
     }
 
     private static String requestPath(Uri uri) {
-        String pathAndQuery = uri.getPath();
-        if (pathAndQuery == null) return "/";
-        if (!pathAndQuery.startsWith("/")) return "/" + pathAndQuery;
+        String pathAndQuery = uri.getEncodedPath();
+        if (pathAndQuery == null)
+            pathAndQuery = "/";
+        else if (!pathAndQuery.startsWith("/"))
+            pathAndQuery = "/" + pathAndQuery;
+        if (!TextUtils.isEmpty(uri.getEncodedQuery()))
+            pathAndQuery += "?" + uri.getEncodedQuery();
         return pathAndQuery;
     }
 
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
index 2bcfd5a78..ac18eadee 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
@@ -17,10 +17,8 @@
 package com.koushikdutta.async.test;
 
 
-import junit.framework.TestCase;
-
-import org.conscrypt.OpenSSLEngineImpl;
-import org.conscrypt.OpenSSLProvider;
+import android.content.Context;
+import android.test.AndroidTestCase;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -30,7 +28,6 @@
 import java.net.Socket;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
-import java.security.Security;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
@@ -39,7 +36,7 @@
 /**
  * Created by koush on 7/15/14.
  */
-public class ConscryptTests extends TestCase {
+public class ConscryptTests extends AndroidTestCase {
     boolean initialized;
     Field peerHost;
     Field peerPort;
@@ -104,11 +101,19 @@ static byte[] concatLengthPrefixed(String... protocols) {
     }
 
     public void testConscryptSSLEngineNPNHandshakeBug() throws Exception {
-        Security.insertProviderAt(new OpenSSLProvider("MyNameBlah"), 1);
+//        Security.insertProviderAt(new OpenSSLProvider("MyNameBlah"), 1);
+
+        Context gms = getContext().createPackageContext("com.google.android.gms", Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY);
+        gms
+        .getClassLoader()
+        .loadClass("com.google.android.gms.common.security.ProviderInstallerImpl")
+        .getMethod("insertProvider", Context.class)
+        .invoke(null, getContext());
+
         SSLContext ctx = SSLContext.getInstance("TLS");
         ctx.init(null, null, null);
 
-        OpenSSLEngineImpl engine = (OpenSSLEngineImpl)ctx.createSSLEngine();
+        SSLEngine engine = ctx.createSSLEngine();
         configure(engine, "www.google.com", 443);
         engine.setUseClientMode(true);
         engine.beginHandshake();

From 1d505a845934cf5ba7cb02fb8749a39fd57e73a0 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 29 Jul 2014 13:41:44 -0700
Subject: [PATCH 063/399] remove defaultConfig stuff.

---
 AndroidAsync/build.gradle | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 05d82cad1..02e423597 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -25,15 +25,15 @@ android {
         androidTest.assets.srcDirs=['test/assets/']
     }
 
-//    lintOptions {
-//        abortOnError false
-//    }
-
-    defaultConfig {
-        targetSdkVersion 21
-        minSdkVersion 9
+    lintOptions {
+        abortOnError false
     }
 
+//    defaultConfig {
+//        targetSdkVersion 21
+//        minSdkVersion 9
+//    }
+
     compileSdkVersion 19
     buildToolsVersion "20.0.0"
 }

From e03f1f8be424508823c07b8741b447bc9b683ea9 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 29 Jul 2014 18:34:19 -0700
Subject: [PATCH 064/399] watch for exceptions when setting the proxy

---
 .../src/com/koushikdutta/async/http/AsyncHttpClient.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 49c7de506..956fb26ac 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -81,7 +81,14 @@ private static void setupAndroidProxy(AsyncHttpRequest request) {
         if (request.proxyHost != null)
             return;
 
-        List<Proxy> proxies = ProxySelector.getDefault().select(URI.create(request.getUri().toString()));
+        List<Proxy> proxies;
+        try {
+            proxies = ProxySelector.getDefault().select(URI.create(request.getUri().toString()));
+        }
+        catch (Exception e) {
+            // uri parsing craps itself sometimes.
+            return;
+        }
         if (proxies.isEmpty())
             return;
         Proxy proxy = proxies.get(0);

From aa77649d29788a755958f407d542be31f1ccd3b0 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 3 Aug 2014 15:13:22 -0700
Subject: [PATCH 065/399] tolerate no response message

---
 .../com/koushikdutta/async/http/HttpTransportMiddleware.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
index 6659193e1..219519dad 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
@@ -53,14 +53,14 @@ else if (!"\r".equals(s)) {
                     }
                     else {
                         String[] parts = statusLine.split(" ", 3);
-                        if (parts.length != 3)
+                        if (parts.length < 2)
                             throw new Exception(new IOException("Not HTTP"));
 
                         data.response.headers(mRawHeaders);
                         String protocol = parts[0];
                         data.response.protocol(protocol);
                         data.response.code(Integer.parseInt(parts[1]));
-                        data.response.message(parts[2]);
+                        data.response.message(parts.length == 3 ? parts[2] : "");
                         data.receiveHeadersCallback.onCompleted(null);
 
                         // socket may get detached after headers (websocket)

From 86079517f2a9b1c5e509e504c2a8ff96bf3fbc76 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 3 Aug 2014 15:35:58 -0700
Subject: [PATCH 066/399] Some HTTP servers are sending only newline instead of
 CRLF.

---
 .../com/koushikdutta/async/http/AsyncHttpResponseImpl.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index 2b77b568e..70f10f77b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -1,5 +1,7 @@
 package com.koushikdutta.async.http;
 
+import android.text.TextUtils;
+
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.ByteBufferList;
@@ -109,10 +111,11 @@ public void onCompleted(Exception error) {
         @Override
         public void onStringAvailable(String s) {
             try {
+                s = s.trim();
                 if (mRawHeaders.getStatusLine() == null) {
                     mRawHeaders.setStatusLine(s);
                 }
-                else if (!"\r".equals(s)) {
+                else if (!TextUtils.isEmpty(s)) {
                     mRawHeaders.addLine(s);
                 }
                 else {

From 9808e0391b8f9bff7247ee0f7366caeb77230406 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 3 Aug 2014 15:40:02 -0700
Subject: [PATCH 067/399] missing file

---
 .../com/koushikdutta/async/http/HttpTransportMiddleware.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
index 219519dad..9dacb55de 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
@@ -1,5 +1,7 @@
 package com.koushikdutta.async.http;
 
+import android.text.TextUtils;
+
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.LineEmitter;
@@ -45,10 +47,11 @@ public boolean exchangeHeaders(final OnExchangeHeaderData data) {
             @Override
             public void onStringAvailable(String s) {
                 try {
+                    s = s.trim();
                     if (statusLine == null) {
                         statusLine = s;
                     }
-                    else if (!"\r".equals(s)) {
+                    else if (!TextUtils.isEmpty(s)) {
                         mRawHeaders.addLine(s);
                     }
                     else {

From 64a3b995009f21e42569b46f7f49dd7ee7f48e03 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 4 Aug 2014 21:00:01 -0700
Subject: [PATCH 068/399] Enable Content-Encoding for spdy. Disable using SPDY
 if sending a request body.

---
 .../async/http/spdy/AsyncSpdyConnection.java  |  4 ++
 .../async/http/spdy/SpdyMiddleware.java       | 47 ++++++++++++++-----
 .../async/http/spdy/SpdyTransport.java        |  4 --
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
index 29b7fb8ed..806968bd5 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
@@ -105,6 +105,10 @@ public class SpdySocket implements AsyncSocket {
         boolean isOpen = true;
         int totalWindowRead;
 
+        public AsyncSpdyConnection getConnection() {
+            return AsyncSpdyConnection.this;
+        }
+
         public SimpleFuture<List<Header>> headers() {
             return headers;
         }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index c4bbe52f5..211f06b90 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -6,15 +6,19 @@
 import com.koushikdutta.async.AsyncSSLSocket;
 import com.koushikdutta.async.AsyncSSLSocketWrapper;
 import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.future.Cancellable;
 import com.koushikdutta.async.future.FutureCallback;
 import com.koushikdutta.async.future.SimpleCancellable;
 import com.koushikdutta.async.future.TransformFuture;
 import com.koushikdutta.async.http.AsyncHttpClient;
+import com.koushikdutta.async.http.AsyncHttpClientMiddleware;
+import com.koushikdutta.async.http.AsyncHttpRequest;
 import com.koushikdutta.async.http.AsyncSSLEngineConfigurator;
 import com.koushikdutta.async.http.AsyncSSLSocketMiddleware;
 import com.koushikdutta.async.http.Headers;
+import com.koushikdutta.async.http.HttpUtil;
 import com.koushikdutta.async.http.Multimap;
 import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
@@ -174,7 +178,6 @@ public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
                         callback.onConnectCompleted(null, socket);
                         return;
                     }
-                    data.protocol = protoString;
                     final AsyncSpdyConnection connection = new AsyncSpdyConnection(socket, Protocol.get(protoString));
                     connection.sendConnectionPreface();
 
@@ -191,11 +194,25 @@ public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
     }
 
     private void newSocket(GetSocketData data, final AsyncSpdyConnection connection, final ConnectCallback callback) {
-        data.request.logv("using spdy connection");
+        final AsyncHttpRequest request = data.request;
+        request.logv("using spdy connection");
+
+        data.protocol = connection.protocol.toString();
+
+        final AsyncHttpRequestBody requestBody = data.request.getBody();
+
+        // this causes app engine to shit a brick, but if it is missing,
+        // drive shits the bed
+//        if (requestBody != null) {
+//            if (requestBody.length() >= 0) {
+//                request.getHeaders().set("Content-Length", String.valueOf(requestBody.length()));
+//            }
+//        }
+
         final ArrayList<Header> headers = new ArrayList<Header>();
-        headers.add(new Header(Header.TARGET_METHOD, data.request.getMethod()));
-        headers.add(new Header(Header.TARGET_PATH, requestPath(data.request.getUri())));
-        String host = data.request.getHeaders().get("Host");
+        headers.add(new Header(Header.TARGET_METHOD, request.getMethod()));
+        headers.add(new Header(Header.TARGET_PATH, requestPath(request.getUri())));
+        String host = request.getHeaders().get("Host");
         if (Protocol.SPDY_3 == connection.protocol) {
             headers.add(new Header(Header.VERSION, "HTTP/1.1"));
             headers.add(new Header(Header.TARGET_HOST, host));
@@ -204,9 +221,9 @@ private void newSocket(GetSocketData data, final AsyncSpdyConnection connection,
         } else {
             throw new AssertionError();
         }
-        headers.add(new Header(Header.TARGET_SCHEME, data.request.getUri().getScheme()));
+        headers.add(new Header(Header.TARGET_SCHEME, request.getUri().getScheme()));
 
-        Multimap mm = data.request.getHeaders().getMultiMap();
+        final Multimap mm = request.getHeaders().getMultiMap();
         for (String key: mm.keySet()) {
             if (SpdyTransport.isProhibitedHeader(connection.protocol, key))
                 continue;
@@ -215,8 +232,9 @@ private void newSocket(GetSocketData data, final AsyncSpdyConnection connection,
             }
         }
 
-        data.request.logv("\n" + data.request);
-        AsyncSpdyConnection.SpdySocket spdy = connection.newStream(headers, data.request.getBody() != null, true);
+
+        request.logv("\n" + request);
+        final AsyncSpdyConnection.SpdySocket spdy = connection.newStream(headers, requestBody != null, true);
         callback.onConnectCompleted(null, spdy);
     }
 
@@ -228,6 +246,12 @@ public Cancellable getSocket(GetSocketData data) {
             return null;
         }
 
+        // TODO: figure out why POST does not work if sending content-length header
+        // see above regarding app engine comment as to why: drive requires content-length
+        // but app engine sends a GO_AWAY if it sees a content-length...
+        if (data.request.getBody() != null)
+            return null;
+
         // can we use an existing connection to satisfy this, or do we need a new one?
         String host = uri.getHost();
         AsyncSpdyConnection conn = connections.get(host);
@@ -246,7 +270,7 @@ public Cancellable getSocket(GetSocketData data) {
     @Override
     public boolean exchangeHeaders(final OnExchangeHeaderData data) {
         if (!(data.socket instanceof AsyncSpdyConnection.SpdySocket))
-            return false;
+            return super.exchangeHeaders(data);
 
         AsyncHttpRequestBody requestBody = data.request.getBody();
         if (requestBody != null) {
@@ -280,7 +304,8 @@ protected void transform(List<Header> result) throws Exception {
             @Override
             public void onCompleted(Exception e, Headers result) {
                 data.receiveHeadersCallback.onCompleted(e);
-                data.response.emitter(spdySocket);
+                DataEmitter emitter = HttpUtil.getBodyDecoder(spdySocket, spdySocket.getConnection().protocol, result, false);
+                data.response.emitter(emitter);
             }
         });
         return true;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
index a2e3029e2..fe07e7887 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
@@ -25,10 +25,6 @@
 final class SpdyTransport {
   /** See http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3-1#TOC-3.2.1-Request. */
   private static final List<String> SPDY_3_PROHIBITED_HEADERS = Util.immutableList(
-  "accept-encoding",
-  "user-agent",
-  "accept",
-
   "connection",
   "host",
   "keep-alive",

From b5ad587bf3611a4e2cc63967c0889106f50cd917 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 6 Aug 2014 19:19:00 -0700
Subject: [PATCH 069/399] move NullDataCallback. change how socket ownership
 works. fix possible bugs around that. throw assertion error if connect
 callback is invoked twice. Switch to future?

---
 .../async/AsyncSSLSocketWrapper.java          |  2 +-
 .../koushikdutta/async/NullDataCallback.java  | 10 --------
 .../src/com/koushikdutta/async/Util.java      | 14 ++++++++---
 .../async/callback/CompletedCallback.java     |  7 ++++++
 .../async/callback/DataCallback.java          |  7 ++++++
 .../async/http/AsyncHttpClient.java           | 25 +++++++++++++------
 .../async/http/AsyncHttpResponseImpl.java     |  6 -----
 .../async/http/AsyncSocketMiddleware.java     | 12 ++++-----
 .../http/body/MultipartFormDataBody.java      |  1 -
 .../http/cache/ResponseCacheMiddleware.java   |  5 +++-
 .../async/http/filter/GZIPInputFilter.java    |  1 -
 .../async/http/server/AsyncHttpServer.java    |  1 -
 .../async/http/server/UnknownRequestBody.java |  3 +--
 .../transport/WebSocketTransport.java         |  4 +--
 .../async/test/ByteUtilTests.java             |  6 ++---
 15 files changed, 60 insertions(+), 44 deletions(-)
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/NullDataCallback.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 0f777e6ea..8760bdd38 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -411,7 +411,7 @@ private void report(Exception e) {
         final HandshakeCallback hs = handshakeCallback;
         if (hs != null) {
             handshakeCallback = null;
-            mSocket.setDataCallback(new NullDataCallback());
+            mSocket.setDataCallback(new DataCallback.NullDataCallback());
             mSocket.end();
             mSocket.close();
             hs.onHandshakeCompleted(e, null);
diff --git a/AndroidAsync/src/com/koushikdutta/async/NullDataCallback.java b/AndroidAsync/src/com/koushikdutta/async/NullDataCallback.java
deleted file mode 100644
index 3f9be2444..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/NullDataCallback.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.koushikdutta.async;
-
-import com.koushikdutta.async.callback.DataCallback;
-
-public class NullDataCallback implements DataCallback {
-    @Override
-    public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-        bb.recycle();
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/Util.java b/AndroidAsync/src/com/koushikdutta/async/Util.java
index 5e2666224..d9808ae59 100644
--- a/AndroidAsync/src/com/koushikdutta/async/Util.java
+++ b/AndroidAsync/src/com/koushikdutta/async/Util.java
@@ -130,22 +130,30 @@ public void onWriteable() {
             }
         });
 
-        CompletedCallback wrapper = new CompletedCallback() {
+        final CompletedCallback wrapper = new CompletedCallback() {
             boolean reported;
             @Override
             public void onCompleted(Exception ex) {
                 if (reported)
                     return;
+                reported = true;
+                emitter.setDataCallback(null);
                 emitter.setEndCallback(null);
                 sink.setClosedCallback(null);
                 sink.setWriteableCallback(null);
-                reported = true;
                 callback.onCompleted(ex);
             }
         };
 
         emitter.setEndCallback(wrapper);
-        sink.setClosedCallback(wrapper);
+        sink.setClosedCallback(new CompletedCallback() {
+            @Override
+            public void onCompleted(Exception ex) {
+                if (ex == null)
+                    ex = new IOException("sink was closed before emitter ended");
+                wrapper.onCompleted(ex);
+            }
+        });
     }
     
     public static void stream(AsyncSocket s1, AsyncSocket s2, CompletedCallback callback) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/callback/CompletedCallback.java b/AndroidAsync/src/com/koushikdutta/async/callback/CompletedCallback.java
index d6c034245..a5b4d64e4 100644
--- a/AndroidAsync/src/com/koushikdutta/async/callback/CompletedCallback.java
+++ b/AndroidAsync/src/com/koushikdutta/async/callback/CompletedCallback.java
@@ -1,5 +1,12 @@
 package com.koushikdutta.async.callback;
 
 public interface CompletedCallback {
+    public class NullCompletedCallback implements CompletedCallback {
+        @Override
+        public void onCompleted(Exception ex) {
+
+        }
+    }
+
     public void onCompleted(Exception ex);
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/callback/DataCallback.java b/AndroidAsync/src/com/koushikdutta/async/callback/DataCallback.java
index 564e48b59..54da7ea6d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/callback/DataCallback.java
+++ b/AndroidAsync/src/com/koushikdutta/async/callback/DataCallback.java
@@ -5,5 +5,12 @@
 
 
 public interface DataCallback {
+    public class NullDataCallback implements DataCallback {
+        @Override
+        public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+            bb.recycle();
+        }
+    }
+
     public void onDataAvailable(DataEmitter emitter, ByteBufferList bb);
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 956fb26ac..943cee93f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -10,9 +10,9 @@
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
-import com.koushikdutta.async.NullDataCallback;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ConnectCallback;
+import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.future.Cancellable;
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.FutureCallback;
@@ -141,7 +141,7 @@ public boolean cancel() {
                 return false;
 
             if (socket != null) {
-                socket.setDataCallback(new NullDataCallback());
+                socket.setDataCallback(new DataCallback.NullDataCallback());
                 socket.close();
             }
 
@@ -172,7 +172,7 @@ private void reportConnectedCompleted(FutureAsyncHttpResponse cancel, Exception
 
         if (response != null) {
             // the request was cancelled, so close up shop, and eat any pending data
-            response.setDataCallback(new NullDataCallback());
+            response.setDataCallback(new DataCallback.NullDataCallback());
             response.close();
         }
     }
@@ -251,8 +251,19 @@ public void run() {
 
         // 2) wait for a connect
         data.connectCallback = new ConnectCallback() {
+            boolean reported;
             @Override
             public void onConnectCompleted(Exception ex, AsyncSocket socket) {
+                if (reported) {
+                    if (socket != null) {
+                        socket.setDataCallback(new DataCallback.NullDataCallback());
+                        socket.setEndCallback(new CompletedCallback.NullCompletedCallback());
+                        socket.close();
+                        throw new AssertionError("double connect callback");
+                    }
+                }
+                reported = true;
+
                 request.logv("socket connected");
                 if (cancel.isCancelled()) {
                     if (socket != null)
@@ -264,14 +275,14 @@ public void onConnectCompleted(Exception ex, AsyncSocket socket) {
                 if (cancel.timeoutRunnable != null)
                     mServer.removeAllCallbacks(cancel.scheduled);
 
-                data.socket = socket;
-                cancel.socket = socket;
-
                 if (ex != null) {
                     reportConnectedCompleted(cancel, ex, null, request, callback);
                     return;
                 }
 
+                data.socket = socket;
+                cancel.socket = socket;
+
                 executeSocket(request, redirectCount, cancel, callback, data);
             }
         };
@@ -563,7 +574,7 @@ public Future<File> executeFile(AsyncHttpRequest req, final String filename, fin
             @Override
             public void cancelCleanup() {
                 try {
-                    cancel.get().setDataCallback(new NullDataCallback());
+                    cancel.get().setDataCallback(new DataCallback.NullDataCallback());
                     cancel.get().close();
                 }
                 catch (Exception e) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index cd6ffffcd..c161f3060 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -6,16 +6,10 @@
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.FilteredDataEmitter;
-import com.koushikdutta.async.LineEmitter;
-import com.koushikdutta.async.LineEmitter.StringCallback;
-import com.koushikdutta.async.NullDataCallback;
-import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
-import com.koushikdutta.async.http.filter.ChunkedOutputFilter;
 
-import java.io.IOException;
 import java.nio.charset.Charset;
 
 abstract class AsyncHttpResponseImpl extends FilteredDataEmitter implements AsyncSocket, AsyncHttpResponse, AsyncHttpClientMiddleware.ResponseHead {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index 35ce3dd70..12dd28a06 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -6,10 +6,10 @@
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
-import com.koushikdutta.async.NullDataCallback;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.callback.ContinuationCallback;
+import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.future.Cancellable;
 import com.koushikdutta.async.future.Continuation;
 import com.koushikdutta.async.future.SimpleCancellable;
@@ -127,6 +127,8 @@ public Cancellable getSocket(final GetSocketData data) {
             return null;
         }
 
+        data.state.put("socket-owner", this);
+
         final String lookup = computeLookup(uri, port, data.request.getProxyHost(), data.request.getProxyPort());
         ConnectionInfo info = getOrCreateConnectionInfo(lookup);
         synchronized (AsyncSocketMiddleware.this) {
@@ -139,7 +141,6 @@ public Cancellable getSocket(final GetSocketData data) {
 
             info.openCount++;
 
-            data.state.put(getClass().getCanonicalName() + ".owned", true);
 
             while (!info.sockets.isEmpty()) {
                 IdleSocketHolder idleSocketHolder = info.sockets.pop();
@@ -239,7 +240,7 @@ public void onConnectCompleted(Exception ex, AsyncSocket socket) {
                                     }
 
                                     if (setComplete(null, socket)) {
-                                        data.connectCallback.onConnectCompleted(ex, socket);
+                                        data.connectCallback.onConnectCompleted(null, socket);
                                     }
                                 }
                             }));
@@ -313,7 +314,7 @@ public void onCompleted(Exception ex) {
         socket.setWriteableCallback(null);
         // should not get any data after this point...
         // if so, eat it and disconnect.
-        socket.setDataCallback(new NullDataCallback() {
+        socket.setDataCallback(new DataCallback.NullDataCallback() {
             @Override
             public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                 super.onDataAvailable(emitter, bb);
@@ -346,9 +347,8 @@ private void nextConnection(AsyncHttpRequest request) {
 
     @Override
     public void onResponseComplete(final OnResponseCompleteDataOnRequestSentData data) {
-        if (!data.state.get(getClass().getCanonicalName() + ".owned", false)) {
+        if (data.state.get("socket-owner") != this)
             return;
-        }
 
         try {
             idleSocket(data.socket);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
index 4cf41f201..0a8a26d3d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
@@ -5,7 +5,6 @@
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.LineEmitter;
 import com.koushikdutta.async.LineEmitter.StringCallback;
-import com.koushikdutta.async.NullDataCallback;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ContinuationCallback;
 import com.koushikdutta.async.callback.DataCallback;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index 40aa530cd..ae8417332 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -173,7 +173,10 @@ public void run() {
                 }
             });
             cacheHitCount++;
-            return new SimpleCancellable();
+            data.state.put("socket-owner", this);
+            SimpleCancellable ret = new SimpleCancellable();
+            ret.setComplete();
+            return ret;
         }
         else if (responseSource == ResponseSource.CONDITIONAL_CACHE) {
             data.request.logi("Response may be served from conditional cache");
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java b/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java
index 83beef7f7..81b9c1df8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java
@@ -2,7 +2,6 @@
 
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
-import com.koushikdutta.async.NullDataCallback;
 import com.koushikdutta.async.PushParser;
 import com.koushikdutta.async.PushParser.ParseCallback;
 import com.koushikdutta.async.callback.DataCallback;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 3d6566933..c18c5d596 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -13,7 +13,6 @@
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
-import com.koushikdutta.async.NullDataCallback;
 import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ListenCallback;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/UnknownRequestBody.java b/AndroidAsync/src/com/koushikdutta/async/http/server/UnknownRequestBody.java
index 14a142479..a3fde6dc3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/UnknownRequestBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/UnknownRequestBody.java
@@ -2,7 +2,6 @@
 
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.DataSink;
-import com.koushikdutta.async.NullDataCallback;
 import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
@@ -64,6 +63,6 @@ public DataEmitter getEmitter() {
     public void parse(DataEmitter emitter, CompletedCallback completed) {
         this.emitter = emitter;
         emitter.setEndCallback(completed);
-        emitter.setDataCallback(new NullDataCallback());
+        emitter.setDataCallback(new DataCallback.NullDataCallback());
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/WebSocketTransport.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/WebSocketTransport.java
index 15928a3f3..5514ecd09 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/WebSocketTransport.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/WebSocketTransport.java
@@ -1,8 +1,8 @@
 package com.koushikdutta.async.http.socketio.transport;
 
 import com.koushikdutta.async.AsyncServer;
-import com.koushikdutta.async.NullDataCallback;
 import com.koushikdutta.async.callback.CompletedCallback;
+import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.http.WebSocket;
 
 public class WebSocketTransport implements SocketIOTransport {
@@ -12,7 +12,7 @@ public class WebSocketTransport implements SocketIOTransport {
     public WebSocketTransport(WebSocket webSocket) {
         this.webSocket = webSocket;
 
-        this.webSocket.setDataCallback(new NullDataCallback());
+        this.webSocket.setDataCallback(new DataCallback.NullDataCallback());
     }
 
     @Override
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ByteUtilTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ByteUtilTests.java
index 0d2f5df6a..386c31a4b 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/ByteUtilTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ByteUtilTests.java
@@ -2,10 +2,10 @@
 
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.FilteredDataEmitter;
-import com.koushikdutta.async.NullDataCallback;
 import com.koushikdutta.async.PushParser;
 import com.koushikdutta.async.TapCallback;
 import com.koushikdutta.async.Util;
+import com.koushikdutta.async.callback.DataCallback;
 
 import junit.framework.TestCase;
 
@@ -23,7 +23,7 @@ public boolean isPaused() {
             }
         };
         new PushParser(mock)
-            .until((byte)0, new NullDataCallback())
+            .until((byte)0, new DataCallback.NullDataCallback())
             .readInt(new PushParser.ParseCallback<Integer>() {
                 public void parsed(Integer arg) {
                     valRead = arg;
@@ -43,7 +43,7 @@ public boolean isPaused() {
             }
         };
         new PushParser(mock)
-                .until((byte)0, new NullDataCallback())
+                .until((byte)0, new DataCallback.NullDataCallback())
                 .readInt()
                 .tap(new TapCallback() {
                     public void parsed(int arg) {

From 871a496436a916704173a8c61e0381724a8c0b41 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 7 Aug 2014 10:02:17 -0700
Subject: [PATCH 070/399] name future threads

---
 .../src/com/koushikdutta/async/future/FutureThread.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/FutureThread.java b/AndroidAsync/src/com/koushikdutta/async/future/FutureThread.java
index b83dd47f1..ec089cc66 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/FutureThread.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/FutureThread.java
@@ -5,6 +5,10 @@
  */
 public class FutureThread<T> extends SimpleFuture<T> {
     public FutureThread(final FutureRunnable<T> runnable) {
+        this(runnable, "FutureThread");
+    }
+
+    public FutureThread(final FutureRunnable<T> runnable, String name) {
         new Thread(new Runnable() {
             @Override
             public void run() {

From c79ad08b4994267c6d23abe8d778c12d23aea94c Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 29 Jul 2014 18:34:19 -0700
Subject: [PATCH 071/399] watch for exceptions when setting the proxy

---
 .../src/com/koushikdutta/async/http/AsyncHttpClient.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 504d5c602..0034dbe0a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -81,7 +81,14 @@ private static void setupAndroidProxy(AsyncHttpRequest request) {
         if (request.proxyHost != null)
             return;
 
-        List<Proxy> proxies = ProxySelector.getDefault().select(URI.create(request.getUri().toString()));
+        List<Proxy> proxies;
+        try {
+            proxies = ProxySelector.getDefault().select(URI.create(request.getUri().toString()));
+        }
+        catch (Exception e) {
+            // uri parsing craps itself sometimes.
+            return;
+        }
         if (proxies.isEmpty())
             return;
         Proxy proxy = proxies.get(0);

From db12acce66b4e64075db043a9d66b1f5eba76660 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 7 Aug 2014 14:08:13 -0700
Subject: [PATCH 072/399] fix gzip input filter

---
 .../koushikdutta/async/http/filter/GZIPInputFilter.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java b/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java
index 81b9c1df8..8f76dbe73 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java
@@ -98,14 +98,23 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                                     ByteBufferList.reclaim(b);
                                 }
                             }
+                            bb.recycle();
+                            done();
                         }
                     };
                     if ((flags & FNAME) != 0) {
                         parser.until((byte) 0, summer);
+                        return;
                     }
                     if ((flags & FCOMMENT) != 0) {
                         parser.until((byte) 0, summer);
+                        return;
                     }
+
+                    done();
+                }
+
+                private void done() {
                     if (hcrc) {
                         parser.readByteArray(2, new ParseCallback<byte[]>() {
                             public void parsed(byte[] header) {

From 9681d1f0701ada9cd6aba7e2ef26ed2bb1d96039 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 7 Aug 2014 14:08:13 -0700
Subject: [PATCH 073/399] fix gzip input filter

---
 .../koushikdutta/async/http/filter/GZIPInputFilter.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java b/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java
index e1a23d014..04eb9c98f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java
@@ -89,14 +89,23 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                                     ByteBufferList.reclaim(b);
                                 }
                             }
+                            bb.recycle();
+                            done();
                         }
                     };
                     if ((flags & FNAME) != 0) {
                         parser.until((byte) 0, summer);
+                        return;
                     }
                     if ((flags & FCOMMENT) != 0) {
                         parser.until((byte) 0, summer);
+                        return;
                     }
+
+                    done();
+                }
+
+                private void done() {
                     if (hcrc) {
                         parser.readByteArray(2, new ParseCallback<byte[]>() {
                             public void parsed(byte[] header) {

From e3e2faea978636cf5938a886a09f9578885d0f09 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 7 Aug 2014 21:15:59 -0700
Subject: [PATCH 074/399] proxy help

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml    | 20 +++++++++++++++-
 .../com/koushikdutta/async/http/Headers.java  |  8 +++++++
 .../async/http/server/AsyncHttpServer.java    |  2 +-
 .../http/server/AsyncHttpServerResponse.java  |  5 ++++
 .../server/AsyncHttpServerResponseImpl.java   | 23 ++++++++++++++++++-
 .../async/http/server/AsyncProxyServer.java   | 11 +--------
 6 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index 1cdbd092c..bf5ba2cad 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -56,7 +56,25 @@
       <sourceFolder url="file://$MODULE_DIR$/test/src" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
index 1b4cdc294..9724ce915 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
@@ -9,6 +9,7 @@
 import org.apache.http.message.BasicHeader;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -91,6 +92,13 @@ public String remove(String header) {
         return r.get(0);
     }
 
+    public Headers removeAll(Collection<String> headers) {
+        for (String header: headers) {
+            remove(header);
+        }
+        return this;
+    }
+
     public Header[] toHeaderArray() {
         ArrayList<Header> ret = new ArrayList<Header>();
         for (String key: map.keySet()) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index c18c5d596..d5db48b80 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -482,7 +482,7 @@ public void onCompleted(Exception ex) {
             }
         });
     }
-    
+
     private static Hashtable<Integer, String> mCodes = new Hashtable<Integer, String>();
     static {
         mCodes.put(200, "OK");
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
index bc6e33295..58b8fbc23 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
@@ -3,6 +3,7 @@
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.callback.CompletedCallback;
+import com.koushikdutta.async.http.AsyncHttpResponse;
 import com.koushikdutta.async.http.Headers;
 
 import org.json.JSONObject;
@@ -23,6 +24,10 @@ public interface AsyncHttpServerResponse extends DataSink, CompletedCallback {
     public void writeHead();
     public void setContentType(String contentType);
     public void redirect(String location);
+
+    // NOT FINAL
+    public void proxy(AsyncHttpResponse response);
+
     /**
      * Alias for end. Used with CompletedEmitters
      */
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index 41c20cecd..639ac77d8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -9,6 +9,7 @@
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
+import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.http.AsyncHttpHead;
 import com.koushikdutta.async.http.AsyncHttpResponse;
@@ -145,7 +146,8 @@ public WritableCallback getWriteableCallback() {
 
     @Override
     public void end() {
-        if ("Chunked".equalsIgnoreCase(mRawHeaders.get("Transfer-Encoding"))) {
+        if ("Chunked".equalsIgnoreCase(mRawHeaders.get("Transfer-Encoding")) && mSink == null
+        || mSink instanceof ChunkedOutputFilter) {
             initFirstWrite();
             ((ChunkedOutputFilter)mSink).setMaxBuffer(Integer.MAX_VALUE);
             mSink.write(new ByteBufferList());
@@ -291,6 +293,25 @@ public void sendFile(File file) {
         }
     }
 
+    @Override
+    public void proxy(final AsyncHttpResponse remoteResponse) {
+        code(remoteResponse.code());
+        remoteResponse.headers().removeAll("Transfer-Encoding");
+        remoteResponse.headers().removeAll("Content-Encoding");
+        remoteResponse.headers().removeAll("Connection");
+        getHeaders().addAll(remoteResponse.headers());
+        // TODO: remove?
+        remoteResponse.headers().set("Connection", "close");
+        Util.pump(remoteResponse, this, new CompletedCallback() {
+            @Override
+            public void onCompleted(Exception ex) {
+                remoteResponse.setEndCallback(new NullCompletedCallback());
+                remoteResponse.setDataCallback(new DataCallback.NullDataCallback());
+                end();
+            }
+        });
+    }
+
     int code = 200;
     @Override
     public AsyncHttpServerResponse code(int code) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncProxyServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncProxyServer.java
index 8a16c092a..077cead12 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncProxyServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncProxyServer.java
@@ -55,16 +55,7 @@ public void onConnectCompleted(Exception ex, AsyncHttpResponse remoteResponse) {
                         response.send(ex.getMessage());
                         return;
                     }
-                    response.code(remoteResponse.code());
-                    response.getHeaders().addAll(remoteResponse.headers());
-                    response.getHeaders().removeAll("Transfer-Encoding");
-                    response.getHeaders().removeAll("Content-Encoding");
-                    Util.pump(remoteResponse, response, new CompletedCallback() {
-                        @Override
-                        public void onCompleted(Exception ex) {
-                            response.end();
-                        }
-                    });
+                    response.proxy(remoteResponse);
                 }
             });
         }

From 50afaa58b44cb452e19efa7e4b5bfc0288536e1b Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 8 Aug 2014 01:32:53 -0700
Subject: [PATCH 075/399] use thread name

---
 .../src/com/koushikdutta/async/future/FutureThread.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/FutureThread.java b/AndroidAsync/src/com/koushikdutta/async/future/FutureThread.java
index ec089cc66..37091e6e1 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/FutureThread.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/FutureThread.java
@@ -19,6 +19,6 @@ public void run() {
                     setComplete(e);
                 }
             }
-        }).start();
+        }, name).start();
     }
 }

From f780d542a448a1c0a2dd1bf1092dafc103bb616d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20Szyman=CC=81ski?=
 <zbigniew.szymanski@wearezeta.com>
Date: Fri, 8 Aug 2014 11:49:04 +0200
Subject: [PATCH 076/399] Add api for sending ping and receiving pong on
 WebSocket

---
 .../koushikdutta/async/http/HybiParser.java   | 11 +++++-----
 .../koushikdutta/async/http/WebSocket.java    |  9 +++++++-
 .../async/http/WebSocketImpl.java             | 22 +++++++++++++++++++
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java b/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
index 80844ad1e..e1b401590 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
@@ -302,6 +302,10 @@ public byte[] frame(byte[] data, int offset, int length) {
     	return frame(OP_BINARY, data, -1, offset, length);
     }
 
+    public byte[] pingFrame(String data) {
+        return frame(OP_PING, data, -1);
+    }
+
     /**
      * Flip the opcode so to avoid the name collision with the public method
      * 
@@ -378,10 +382,6 @@ private byte[] frame(int opcode, byte [] data, int errorCode, int dataOffset, in
         return frame;
     }
 
-    public void ping(String message) {
-//        send(frame(message, OP_PING, -1));
-    }
-
     public void close(int code, String reason) {
         if (mClosed) return;
         sendFrame(frame(OP_CLOSE, reason, code));
@@ -444,13 +444,14 @@ private void emitFrame() throws IOException {
 
         } else if (opcode == OP_PONG) {
             String message = encode(payload);
-            // FIXME: Fire callback...
+            onPong(message);
 //            Log.d(TAG, "Got pong! " + message);
         }
     }
     
     protected abstract void onMessage(byte[] payload);
     protected abstract void onMessage(String payload);
+    protected abstract void onPong(String payload);
     protected abstract void onDisconnect(int code, String reason);
     protected abstract void report(Exception ex);
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java
index 8242381c1..1aaafa6d2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java
@@ -7,14 +7,21 @@ public interface WebSocket extends AsyncSocket {
     static public interface StringCallback {
         public void onStringAvailable(String s);
     }
+    static public interface PongCallback {
+        public void onPongReceived(String s);
+    }
 
     public void send(byte[] bytes);
     public void send(String string);
     public void send(byte [] bytes, int offset, int len);
+    public void ping(String message);
     
     public void setStringCallback(StringCallback callback);
     public StringCallback getStringCallback();
-    
+
+    public void setPongCallback(PongCallback callback);
+    public PongCallback getPongCallback();
+
     public boolean isBuffering();
     
     public AsyncSocket getSocket();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
index 8fabcb28b..e4a2787d4 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
@@ -98,6 +98,12 @@ protected void onDisconnect(int code, String reason) {
             protected void sendFrame(byte[] frame) {
                 mSink.write(ByteBuffer.wrap(frame));
             }
+
+            @Override
+            protected void onPong(String payload) {
+                if (WebSocketImpl.this.mPongCallback != null)
+                    WebSocketImpl.this.mPongCallback.onPongReceived(payload);
+            }
         };
         mParser.setMasking(masking);
         mParser.setDeflate(deflate);
@@ -228,6 +234,11 @@ public void send(String string) {
         mSink.write(ByteBuffer.wrap(mParser.frame(string)));
     }
 
+    @Override
+    public void ping(String string) {
+        mSink.write(ByteBuffer.wrap(mParser.pingFrame(string)));
+    }
+
     private StringCallback mStringCallback;
     @Override
     public void setStringCallback(StringCallback callback) {
@@ -245,6 +256,17 @@ public StringCallback getStringCallback() {
         return mStringCallback;
     }
 
+    private PongCallback mPongCallback;
+    @Override
+    public void setPongCallback(PongCallback callback) {
+        mPongCallback = callback;
+    }
+
+    @Override
+    public PongCallback getPongCallback() {
+        return mPongCallback;
+    }
+
     @Override
     public DataCallback getDataCallback() {
         return mDataCallback;

From 3274c82a338ff06859b68bd3dc580b4b9c3046f8 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 16 Aug 2014 16:19:20 -0700
Subject: [PATCH 077/399] AsyncHttpServer: watch for socket close

---
 .../async/http/server/AsyncHttpServerRequestImpl.java            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
index 15bed1025..6e914a20d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
@@ -93,6 +93,7 @@ void setSocket(AsyncSocket socket) {
         LineEmitter liner = new LineEmitter();
         mSocket.setDataCallback(liner);
         liner.setLineCallback(mHeaderCallback);
+        mSocket.setEndCallback(new NullCompletedCallback());
     }
     
     @Override

From 1a491bc951f01f98dd41a194fcf9fac69e82ecea Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 16 Aug 2014 19:07:53 -0700
Subject: [PATCH 078/399] DataEmitter.charset fixes:

FilteredDataEmitter.charset now calls into underlying DataEmitter.
UrlEncodedFormBody encodes as utf8.
---
 .../src/com/koushikdutta/async/FilteredDataEmitter.java    | 7 +++++++
 .../koushikdutta/async/http/body/UrlEncodedFormBody.java   | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java b/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java
index 6c59def72..576b5d60d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java
@@ -85,4 +85,11 @@ public AsyncServer getServer() {
     public void close() {
         mEmitter.close();
     }
+
+    @Override
+    public String charset() {
+        if (mEmitter == null)
+            return null;
+        return mEmitter.charset();
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
index b52fc75f2..a3fad5459 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
@@ -8,6 +8,7 @@
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.http.AsyncHttpRequest;
 import com.koushikdutta.async.http.Multimap;
+import com.koushikdutta.async.util.Charsets;
 
 import org.apache.http.NameValuePair;
 
@@ -42,7 +43,7 @@ private void buildData() {
                 b.append('=');
                 b.append(URLEncoder.encode(pair.getValue(), "UTF-8"));
             }
-            mBodyBytes = b.toString().getBytes("ISO-8859-1");
+            mBodyBytes = b.toString().getBytes("UTF-8");
         }
         catch (UnsupportedEncodingException e) {
             throw new AssertionError(e);
@@ -59,7 +60,7 @@ public void write(AsyncHttpRequest request, final DataSink response, final Compl
     public static final String CONTENT_TYPE = "application/x-www-form-urlencoded";
     @Override
     public String getContentType() {
-        return CONTENT_TYPE;
+        return CONTENT_TYPE + "; charset=utf8";
     }
 
     @Override

From 00d1f567597af6e141c6788da281e32962103570 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 16 Aug 2014 19:07:53 -0700
Subject: [PATCH 079/399] DataEmitter.charset fixes:

FilteredDataEmitter.charset now calls into underlying DataEmitter.
UrlEncodedFormBody encodes as utf8.
---
 .../src/com/koushikdutta/async/FilteredDataEmitter.java    | 7 +++++++
 .../koushikdutta/async/http/body/UrlEncodedFormBody.java   | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java b/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java
index 71bcfa940..10e850407 100644
--- a/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java
@@ -85,4 +85,11 @@ public AsyncServer getServer() {
     public void close() {
         mEmitter.close();
     }
+
+    @Override
+    public String charset() {
+        if (mEmitter == null)
+            return null;
+        return mEmitter.charset();
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
index b50b7c72d..7bceceb89 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
@@ -8,6 +8,7 @@
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.http.AsyncHttpRequest;
 import com.koushikdutta.async.http.Multimap;
+import com.koushikdutta.async.util.Charsets;
 
 import org.apache.http.NameValuePair;
 
@@ -42,7 +43,7 @@ private void buildData() {
                 b.append('=');
                 b.append(URLEncoder.encode(pair.getValue(), "UTF-8"));
             }
-            mBodyBytes = b.toString().getBytes("ISO-8859-1");
+            mBodyBytes = b.toString().getBytes("UTF-8");
         }
         catch (UnsupportedEncodingException e) {
         }
@@ -58,7 +59,7 @@ public void write(AsyncHttpRequest request, final DataSink response, final Compl
     public static final String CONTENT_TYPE = "application/x-www-form-urlencoded";
     @Override
     public String getContentType() {
-        return CONTENT_TYPE;
+        return CONTENT_TYPE + "; charset=utf8";
     }
 
     @Override

From f3213fed8a1f68d8c1c8098f7fc84b318abc7a89 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 16 Aug 2014 19:11:27 -0700
Subject: [PATCH 080/399] iml

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index 1cdbd092c..bf5ba2cad 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -56,7 +56,25 @@
       <sourceFolder url="file://$MODULE_DIR$/test/src" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>

From b939829331950f98b5cddde7a7a83d6ec8d361f1 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 16 Aug 2014 19:12:59 -0700
Subject: [PATCH 081/399] merge websocket fix

---
 AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
index 9da4e51c8..0f113bb9a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
@@ -235,7 +235,7 @@ public void send(String string) {
 
     @Override
     public void ping(String string) {
-        mSink.write(ByteBuffer.wrap(mParser.pingFrame(string)));
+        mSink.write(new ByteBufferList(ByteBuffer.wrap(mParser.pingFrame(string))));
     }
 
     private StringCallback mStringCallback;

From 775814837142693baa11d882a2ec963cdddc4e89 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 26 Aug 2014 01:13:10 -0700
Subject: [PATCH 082/399] Fix up leaky alloctions.

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml                 | 6 +++---
 .../src/com/koushikdutta/async/AsyncNetworkSocket.java     | 3 +++
 .../src/com/koushikdutta/async/AsyncSSLSocketWrapper.java  | 7 +++----
 .../async/http/cache/ResponseCacheMiddleware.java          | 2 ++
 .../async/http/filter/InflaterInputFilter.java             | 6 ++----
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index bf5ba2cad..73665c349 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -37,22 +37,22 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/test/assets" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/test/src" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
index 3eb5a3cd1..5b1bfe508 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
@@ -142,6 +142,9 @@ int onReadable() {
                 pending.add(b);
                 Util.emitAllData(this, pending);
             }
+            else {
+                ByteBufferList.reclaim(b);
+            }
 
             if (closed) {
                 reportEndPending(null);
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 8760bdd38..f138a471d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -364,10 +364,8 @@ public void write(ByteBufferList bb) {
             // if the handshake is finished, don't send
             // 0 bytes of data, since that makes the ssl connection die.
             // it wraps a 0 byte package, and craps out.
-            if (finishedHandshake && bb.remaining() == 0) {
-                mWrapping = false;
-                return;
-            }
+            if (finishedHandshake && bb.remaining() == 0)
+                break;
             remaining = bb.remaining();
             try {
                 ByteBuffer[] arr = bb.getAllArray();
@@ -395,6 +393,7 @@ public void write(ByteBufferList bb) {
         }
         while ((remaining != bb.remaining() || (res != null && res.getHandshakeStatus() == HandshakeStatus.NEED_WRAP)) && mSink.remaining() == 0);
         mWrapping = false;
+        ByteBufferList.reclaim(writeBuf);
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index ae8417332..bf0e92c2c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -431,10 +431,12 @@ void spewInternal() {
                 FileInputStream din = cacheResponse.getBody();
                 int read = din.read(buffer.array(), buffer.arrayOffset(), buffer.capacity());
                 if (read == -1) {
+                    ByteBufferList.reclaim(buffer);
                     allowEnd = true;
                     report(null);
                     return;
                 }
+                allocator.track(read);
                 buffer.limit(read);
                 pending.add(buffer);
             }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/filter/InflaterInputFilter.java b/AndroidAsync/src/com/koushikdutta/async/http/filter/InflaterInputFilter.java
index 8ec87f2b2..3ae1363a8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/filter/InflaterInputFilter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/filter/InflaterInputFilter.java
@@ -36,8 +36,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                         int inflated = mInflater.inflate(output.array(), output.arrayOffset() + output.position(), output.remaining());
                         output.position(output.position() + inflated);
                         if (!output.hasRemaining()) {
-                            output.limit(output.position());
-                            output.position(0);
+                            output.flip();
                             transformed.add(output);
                             assert totalRead != 0;
                             int newSize = output.capacity() * 2;
@@ -48,8 +47,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                 }
                 ByteBufferList.reclaim(b);
             }
-            output.limit(output.position());
-            output.position(0);
+            output.flip();
             transformed.add(output);
 
             Util.emitAllData(this, transformed);

From 3f9ececb5057cce5a069651edbc30d5b56a1b836 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 26 Aug 2014 01:13:10 -0700
Subject: [PATCH 083/399] Fix up leaky alloctions.

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml                 | 6 +++---
 .../src/com/koushikdutta/async/AsyncNetworkSocket.java     | 3 +++
 .../src/com/koushikdutta/async/AsyncSSLSocketWrapper.java  | 7 +++----
 .../koushikdutta/async/http/ResponseCacheMiddleware.java   | 2 ++
 .../async/http/filter/InflaterInputFilter.java             | 6 ++----
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index bf5ba2cad..73665c349 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -37,22 +37,22 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/test/assets" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/test/src" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
index 9a15cb287..19fd2c3d2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
@@ -174,6 +174,9 @@ int onReadable() {
                 pending.add(b);
                 Util.emitAllData(this, pending);
             }
+            else {
+                ByteBufferList.reclaim(b);
+            }
 
             if (closed) {
                 reportEndPending(null);
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 36d087c51..0e8ab1999 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -388,10 +388,8 @@ public void write(ByteBufferList bb) {
             // if the handshake is finished, don't send
             // 0 bytes of data, since that makes the ssl connection die.
             // it wraps a 0 byte package, and craps out.
-            if (finishedHandshake && bb.remaining() == 0) {
-                mWrapping = false;
-                return;
-            }
+            if (finishedHandshake && bb.remaining() == 0)
+                break;
             remaining = bb.remaining();
             try {
                 ByteBuffer[] arr = bb.getAllArray();
@@ -417,6 +415,7 @@ public void write(ByteBufferList bb) {
         while ((remaining != bb.remaining() || (res != null && res.getHandshakeStatus() == HandshakeStatus.NEED_WRAP)) && mSink.remaining() == 0);
         ByteBufferList.reclaim(mWriteTmp);
         mWrapping = false;
+        ByteBufferList.reclaim(writeBuf);
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
index 851d77dd8..3715fb74a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
@@ -416,10 +416,12 @@ void spewInternal() {
                 FileInputStream din = cacheResponse.getBody();
                 int read = din.read(buffer.array(), buffer.arrayOffset(), buffer.capacity());
                 if (read == -1) {
+                    ByteBufferList.reclaim(buffer);
                     allowEnd = true;
                     report(null);
                     return;
                 }
+                allocator.track(read);
                 buffer.limit(read);
                 pending.add(buffer);
             }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/filter/InflaterInputFilter.java b/AndroidAsync/src/com/koushikdutta/async/http/filter/InflaterInputFilter.java
index 8ec87f2b2..3ae1363a8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/filter/InflaterInputFilter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/filter/InflaterInputFilter.java
@@ -36,8 +36,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                         int inflated = mInflater.inflate(output.array(), output.arrayOffset() + output.position(), output.remaining());
                         output.position(output.position() + inflated);
                         if (!output.hasRemaining()) {
-                            output.limit(output.position());
-                            output.position(0);
+                            output.flip();
                             transformed.add(output);
                             assert totalRead != 0;
                             int newSize = output.capacity() * 2;
@@ -48,8 +47,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                 }
                 ByteBufferList.reclaim(b);
             }
-            output.limit(output.position());
-            output.position(0);
+            output.flip();
             transformed.add(output);
 
             Util.emitAllData(this, transformed);

From 04dfd678e8d61c99b4a8fa6592819e910c98acd1 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 26 Aug 2014 01:21:40 -0700
Subject: [PATCH 084/399] 138

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 6984a72e7..ae615c1c7 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.koushikdutta.async"
-    android:versionCode="137"
-    android:versionName="1.3.7">
+    android:versionCode="138"
+    android:versionName="1.3.8">
 
     <uses-sdk
         tools:node="replace" />

From 758763ac44490003d72bd5660611c45fc8483a9f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 26 Aug 2014 01:25:19 -0700
Subject: [PATCH 085/399] fix cherry-pick

---
 .../src/com/koushikdutta/async/AsyncSSLSocketWrapper.java        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 0e8ab1999..0c53f56e3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -415,7 +415,6 @@ public void write(ByteBufferList bb) {
         while ((remaining != bb.remaining() || (res != null && res.getHandshakeStatus() == HandshakeStatus.NEED_WRAP)) && mSink.remaining() == 0);
         ByteBufferList.reclaim(mWriteTmp);
         mWrapping = false;
-        ByteBufferList.reclaim(writeBuf);
     }
 
     @Override

From da15c726c63eddb980be38a02e31d5d6206bc92b Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 27 Aug 2014 00:10:12 -0700
Subject: [PATCH 086/399] AsyncHttpServer: fix some bugs around end invocation
 behavior

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml    |  2 +
 .../com/koushikdutta/async/AsyncServer.java   |  4 ++
 .../async/http/server/AsyncHttpServer.java    | 10 +++++
 .../server/AsyncHttpServerResponseImpl.java   | 38 ++++++++++++++-----
 4 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index 73665c349..60c8976e2 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -75,7 +75,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 450dc5b60..d6f95e0c8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -727,6 +727,10 @@ private static void runLoop(final AsyncServer server, final SelectorWrapper sele
                 }
             }
         }
+        catch (CancelledKeyException e) {
+            // not supposed to be thrown, but apparently is...
+            throw new AsyncSelectorException(e);
+        }
         catch (NullPointerException e) {
             throw new AsyncSelectorException(e);
         }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index d5db48b80..fbbec8038 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -127,6 +127,16 @@ public void onCompleted(Exception ex) {
                         }
                     }
                     res = new AsyncHttpServerResponseImpl(socket, this) {
+                        @Override
+                        protected void report(Exception e) {
+                            super.report(e);
+                            if (e != null) {
+                                socket.setDataCallback(new NullDataCallback());
+                                socket.setEndCallback(new NullCompletedCallback());
+                                socket.close();
+                            }
+                        }
+
                         @Override
                         protected void onEnd() {
                             super.onEnd();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index 639ac77d8..2e7d2ad47 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -4,7 +4,6 @@
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.AsyncSocket;
-import com.koushikdutta.async.BufferedDataSink;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.Util;
@@ -55,7 +54,7 @@ public void write(ByteBufferList bb) {
         // order is important here...
         assert !mEnded;
         // do the header write... this will call onWritable, which may be reentrant
-        if (!mHasWritten)
+        if (!headWritten)
             initFirstWrite();
 
         // now check to see if the list is empty. reentrancy may cause it to empty itself.
@@ -70,13 +69,13 @@ public void write(ByteBufferList bb) {
         mSink.write(bb);
     }
 
-    boolean mHasWritten = false;
+    boolean headWritten = false;
     DataSink mSink;
     void initFirstWrite() {
-        if (mHasWritten)
+        if (headWritten)
             return;
 
-        mHasWritten = true;
+        headWritten = true;
 
         final boolean isChunked;
         String currentEncoding = mRawHeaders.get("Transfer-Encoding");
@@ -103,6 +102,10 @@ void initFirstWrite() {
         Util.writeAll(mSocket, rh.getBytes(), new CompletedCallback() {
             @Override
             public void onCompleted(Exception ex) {
+                if (ex != null) {
+                    report(ex);
+                    return;
+                }
                 if (isChunked) {
                     ChunkedOutputFilter chunked = new ChunkedOutputFilter(mSocket);
                     chunked.setMaxBuffer(0);
@@ -116,6 +119,11 @@ public void onCompleted(Exception ex) {
                 closedCallback = null;
                 mSink.setWriteableCallback(writable);
                 writable = null;
+                if (ended) {
+                    // the response ended while headers were written
+                    end();
+                    return;
+                }
                 getServer().post(new Runnable() {
                     @Override
                     public void run() {
@@ -144,16 +152,28 @@ public WritableCallback getWriteableCallback() {
         return writable;
     }
 
+    boolean ended;
     @Override
     public void end() {
-        if ("Chunked".equalsIgnoreCase(mRawHeaders.get("Transfer-Encoding")) && mSink == null
-        || mSink instanceof ChunkedOutputFilter) {
-            initFirstWrite();
+        if (ended)
+            return;
+        ended = true;
+        if (headWritten && mSink == null) {
+            // header is in the process of being written... bail out.
+            // end will be called again after finished.
+            return;
+        }
+        if (!headWritten) {
+            // end was called, and no head or body was yet written,
+            // so strip the transfer encoding as that is superfluous.
+            mRawHeaders.remove("Transfer-Encoding");
+        }
+        if (mSink instanceof ChunkedOutputFilter) {
             ((ChunkedOutputFilter)mSink).setMaxBuffer(Integer.MAX_VALUE);
             mSink.write(new ByteBufferList());
             onEnd();
         }
-        else if (!mHasWritten) {
+        else if (!headWritten) {
             if (!mRequest.getMethod().equalsIgnoreCase(AsyncHttpHead.METHOD))
                 send("text/html", "");
             else {

From edb529cd56c6f1f66ddf2ebcc807ba30a592b3ea Mon Sep 17 00:00:00 2001
From: Tae Hwan Kim <contact@thefinestartist.com>
Date: Mon, 1 Sep 2014 09:27:39 +0900
Subject: [PATCH 087/399] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6c86ae658..042c0917e 100644
--- a/README.md
+++ b/README.md
@@ -137,7 +137,7 @@ AsyncHttpClient.getDefaultInstance().websocket(get, "my-protocol", new WebSocket
 ```
 
 
-### AndroidAsync also supports socket.io
+### AndroidAsync also supports socket.io (version 0.9.x)
 
 ```java
 SocketIOClient.connect(AsyncHttpClient.getDefaultInstance(), "http://192.168.1.2:3000", new ConnectCallback() {

From 6fc4bc82f4504770ae23f6be9a3894b823057b3a Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 7 Sep 2014 16:48:16 -0700
Subject: [PATCH 088/399] AsyncHttpClient:

Make SpdyMiddleware the default SSL Socket provider. Spdy disabled by default.
---
 AndroidAsync/AndroidAsync-AndroidAsync.iml    |  1 +
 .../async/http/AsyncHttpClient.java           |  7 +++--
 .../async/http/spdy/SpdyMiddleware.java       | 28 +++++++++----------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index 60c8976e2..e506543a0 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -13,6 +13,7 @@
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 943cee93f..c6b77e15a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -19,6 +19,7 @@
 import com.koushikdutta.async.future.SimpleFuture;
 import com.koushikdutta.async.http.callback.HttpConnectCallback;
 import com.koushikdutta.async.http.callback.RequestCallback;
+import com.koushikdutta.async.http.spdy.SpdyMiddleware;
 import com.koushikdutta.async.parser.AsyncParser;
 import com.koushikdutta.async.parser.ByteBufferListParser;
 import com.koushikdutta.async.parser.JSONArrayParser;
@@ -63,14 +64,14 @@ public void insertMiddleware(AsyncHttpClientMiddleware middleware) {
         mMiddleware.add(0, middleware);
     }
 
-    AsyncSSLSocketMiddleware sslSocketMiddleware;
+    SpdyMiddleware sslSocketMiddleware;
     AsyncSocketMiddleware socketMiddleware;
     HttpTransportMiddleware httpTransportMiddleware;
     AsyncServer mServer;
     public AsyncHttpClient(AsyncServer server) {
         mServer = server;
         insertMiddleware(socketMiddleware = new AsyncSocketMiddleware(this));
-        insertMiddleware(sslSocketMiddleware = new AsyncSSLSocketMiddleware(this));
+        insertMiddleware(sslSocketMiddleware = new SpdyMiddleware(this));
         insertMiddleware(httpTransportMiddleware = new HttpTransportMiddleware());
     }
 
@@ -115,7 +116,7 @@ public AsyncSocketMiddleware getSocketMiddleware() {
         return socketMiddleware;
     }
 
-    public AsyncSSLSocketMiddleware getSSLSocketMiddleware() {
+    public SpdyMiddleware getSSLSocketMiddleware() {
         return sslSocketMiddleware;
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 211f06b90..74b08bd73 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -46,7 +46,7 @@ public void configureEngine(SSLEngine engine, String host, int port) {
     }
 
     private void configure(SSLEngine engine, String host, int port) {
-        if (!initialized) {
+        if (!initialized && spdyEnabled) {
             initialized = true;
             try {
                 peerHost = engine.getClass().getSuperclass().getDeclaredField("peerHost");
@@ -103,18 +103,6 @@ private void configure(SSLEngine engine, String host, int port) {
         }
     }
 
-    @Override
-    protected SSLEngine createConfiguredSSLEngine(String host, int port) {
-        SSLContext sslContext = getSSLContext();
-        SSLEngine sslEngine = sslContext.createSSLEngine();
-
-        for (AsyncSSLEngineConfigurator configurator : engineConfigurators) {
-            configurator.configureEngine(sslEngine, host, port);
-        }
-
-        return sslEngine;
-    }
-
     boolean initialized;
     Field peerHost;
     Field peerPort;
@@ -126,6 +114,15 @@ protected SSLEngine createConfiguredSSLEngine(String host, int port) {
     Method nativeGetNpnNegotiatedProtocol;
     Method nativeGetAlpnNegotiatedProtocol;
     Hashtable<String, AsyncSpdyConnection> connections = new Hashtable<String, AsyncSpdyConnection>();
+    boolean spdyEnabled;
+
+    public boolean getSpdyEnabled() {
+        return spdyEnabled;
+    }
+
+    public void setSpdyEnabled(boolean enabled) {
+        spdyEnabled = enabled;
+    }
 
     @Override
     public void setSSLContext(SSLContext sslContext) {
@@ -240,6 +237,9 @@ private void newSocket(GetSocketData data, final AsyncSpdyConnection connection,
 
     @Override
     public Cancellable getSocket(GetSocketData data) {
+        if (!spdyEnabled)
+            return super.getSocket(data);
+
         final Uri uri = data.request.getUri();
         final int port = getSchemePort(data.request.getUri());
         if (port == -1) {
@@ -250,7 +250,7 @@ public Cancellable getSocket(GetSocketData data) {
         // see above regarding app engine comment as to why: drive requires content-length
         // but app engine sends a GO_AWAY if it sees a content-length...
         if (data.request.getBody() != null)
-            return null;
+            return super.getSocket(data);
 
         // can we use an existing connection to satisfy this, or do we need a new one?
         String host = uri.getHost();

From 8a2a9569ea7dca527a473c4a509f6c4e5469fe62 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 7 Sep 2014 19:06:09 -0700
Subject: [PATCH 089/399] iml

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index 73665c349..e506543a0 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -13,6 +13,7 @@
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
@@ -75,7 +76,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />

From 4ee0ae0e6206f90a07f3a2269abc6c655a0289df Mon Sep 17 00:00:00 2001
From: paulpdaniels <paulpdaniels@gmail.com>
Date: Mon, 8 Sep 2014 18:06:31 -0700
Subject: [PATCH 090/399] Added protected API for WebSocket creation

---
 .../com/koushikdutta/async/http/server/AsyncHttpServer.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index b1b393d64..4259d1d5c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -318,11 +318,15 @@ public void onRequest(final AsyncHttpServerRequest request, final AsyncHttpServe
                     response.end();
                     return;
                 }
-                callback.onConnected(new WebSocketImpl(request, response), request.getHeaders());
+                callback.onConnected(createWebSocket(request, response), request.getHeaders());
             }
         });
     }
     
+    protected WebSocket createWebSocket(final AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
+        return new WebSocketImpl(request, response);
+    }
+    
     public void get(String regex, HttpServerRequestCallback callback) {
         addAction(AsyncHttpGet.METHOD, regex, callback);
     }

From ddae2e320ff07584fcf21d65872639fdc24bae9b Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 9 Sep 2014 00:37:11 -0700
Subject: [PATCH 091/399] watch for selector exceptions.

---
 AndroidAsync/src/com/koushikdutta/async/AsyncServer.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index d6f95e0c8..d7b9f8456 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -608,6 +608,10 @@ private static void run(final AsyncServer server, final SelectorWrapper selector
                 runLoop(server, selector, queue);
             }
             catch (ClosedSelectorException e) {
+                StreamUtility.closeQuietly(selector.getSelector());
+            }
+            catch (AsyncSelectorException e) {
+                StreamUtility.closeQuietly(selector.getSelector());
             }
             // see if we keep looping, this must be in a synchronized block since the queue is accessed.
             synchronized (server) {

From 0b99866b2b74a37a419183e1ff4b1c59974cfa8d Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 9 Sep 2014 00:37:11 -0700
Subject: [PATCH 092/399] watch for selector exceptions.

---
 AndroidAsync/src/com/koushikdutta/async/AsyncServer.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 450dc5b60..be4a363e2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -608,6 +608,10 @@ private static void run(final AsyncServer server, final SelectorWrapper selector
                 runLoop(server, selector, queue);
             }
             catch (ClosedSelectorException e) {
+                StreamUtility.closeQuietly(selector.getSelector());
+            }
+            catch (AsyncSelectorException e) {
+                StreamUtility.closeQuietly(selector.getSelector());
             }
             // see if we keep looping, this must be in a synchronized block since the queue is accessed.
             synchronized (server) {

From 4d2430ebbd04c88d0393d0b7bb0e9a0bc09ea528 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 10 Sep 2014 14:44:45 -0700
Subject: [PATCH 093/399] AsyncServer: Catch all selector exceptions.

Various firmwares seem to throw all sorts of insane exceptions.
---
 .../com/koushikdutta/async/AsyncServer.java   | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index d7b9f8456..251132ada 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -20,7 +20,6 @@
 import java.net.SocketAddress;
 import java.nio.channels.CancelledKeyException;
 import java.nio.channels.ClosedChannelException;
-import java.nio.channels.ClosedSelectorException;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.ServerSocketChannel;
@@ -586,7 +585,9 @@ public void run() {
             try {
                 runLoop(this, selector, queue);
             }
-            catch (ClosedSelectorException e) {
+            catch (AsyncSelectorException e) {
+                Log.e(LOGTAG, "Selector exception", e);
+                StreamUtility.closeQuietly(selector.getSelector());
             }
             return;
         }
@@ -607,10 +608,8 @@ private static void run(final AsyncServer server, final SelectorWrapper selector
             try {
                 runLoop(server, selector, queue);
             }
-            catch (ClosedSelectorException e) {
-                StreamUtility.closeQuietly(selector.getSelector());
-            }
             catch (AsyncSelectorException e) {
+                Log.e(LOGTAG, "Selector exception", e);
                 StreamUtility.closeQuietly(selector.getSelector());
             }
             // see if we keep looping, this must be in a synchronized block since the queue is accessed.
@@ -690,7 +689,7 @@ private static long lockAndRunQueue(final AsyncServer server, final PriorityQueu
         return wait;
     }
 
-    private static class AsyncSelectorException extends RuntimeException {
+    private static class AsyncSelectorException extends IOException {
         public AsyncSelectorException(Exception e) {
             super(e);
         }
@@ -731,14 +730,7 @@ private static void runLoop(final AsyncServer server, final SelectorWrapper sele
                 }
             }
         }
-        catch (CancelledKeyException e) {
-            // not supposed to be thrown, but apparently is...
-            throw new AsyncSelectorException(e);
-        }
-        catch (NullPointerException e) {
-            throw new AsyncSelectorException(e);
-        }
-        catch (IOException e) {
+        catch (Exception e) {
             throw new AsyncSelectorException(e);
         }
 

From 681789004dab5cf5460c31b064edd2d6a510817e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 10 Sep 2014 14:44:45 -0700
Subject: [PATCH 094/399] AsyncServer: Catch all selector exceptions.

Various firmwares seem to throw all sorts of insane exceptions.

Conflicts:
	AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
---
 .../src/com/koushikdutta/async/AsyncServer.java  | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index be4a363e2..251132ada 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -20,7 +20,6 @@
 import java.net.SocketAddress;
 import java.nio.channels.CancelledKeyException;
 import java.nio.channels.ClosedChannelException;
-import java.nio.channels.ClosedSelectorException;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.ServerSocketChannel;
@@ -586,7 +585,9 @@ public void run() {
             try {
                 runLoop(this, selector, queue);
             }
-            catch (ClosedSelectorException e) {
+            catch (AsyncSelectorException e) {
+                Log.e(LOGTAG, "Selector exception", e);
+                StreamUtility.closeQuietly(selector.getSelector());
             }
             return;
         }
@@ -607,10 +608,8 @@ private static void run(final AsyncServer server, final SelectorWrapper selector
             try {
                 runLoop(server, selector, queue);
             }
-            catch (ClosedSelectorException e) {
-                StreamUtility.closeQuietly(selector.getSelector());
-            }
             catch (AsyncSelectorException e) {
+                Log.e(LOGTAG, "Selector exception", e);
                 StreamUtility.closeQuietly(selector.getSelector());
             }
             // see if we keep looping, this must be in a synchronized block since the queue is accessed.
@@ -690,7 +689,7 @@ private static long lockAndRunQueue(final AsyncServer server, final PriorityQueu
         return wait;
     }
 
-    private static class AsyncSelectorException extends RuntimeException {
+    private static class AsyncSelectorException extends IOException {
         public AsyncSelectorException(Exception e) {
             super(e);
         }
@@ -731,10 +730,7 @@ private static void runLoop(final AsyncServer server, final SelectorWrapper sele
                 }
             }
         }
-        catch (NullPointerException e) {
-            throw new AsyncSelectorException(e);
-        }
-        catch (IOException e) {
+        catch (Exception e) {
             throw new AsyncSelectorException(e);
         }
 

From f27ca756f9d1c5b02e828195fac46cd8b3c1abb1 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 10 Sep 2014 15:12:09 -0700
Subject: [PATCH 095/399] AsyncServer: *actually* use the resolved address.

---
 AndroidAsync/src/com/koushikdutta/async/AsyncServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 251132ada..6488dcc97 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -386,7 +386,7 @@ public void onCompleted(Exception e, InetAddress result) {
                     return;
                 }
 
-                ret.setComplete(connectResolvedInetSocketAddress(new InetSocketAddress(remote.getHostName(), remote.getPort()), callback));
+                ret.setComplete(connectResolvedInetSocketAddress(new InetSocketAddress(result, remote.getPort()), callback));
             }
         });
         return ret;

From e3eafe47c267e537e71053a3d9e01c3aa26528b7 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 10 Sep 2014 15:12:09 -0700
Subject: [PATCH 096/399] AsyncServer: *actually* use the resolved address.

---
 AndroidAsync/src/com/koushikdutta/async/AsyncServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 251132ada..6488dcc97 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -386,7 +386,7 @@ public void onCompleted(Exception e, InetAddress result) {
                     return;
                 }
 
-                ret.setComplete(connectResolvedInetSocketAddress(new InetSocketAddress(remote.getHostName(), remote.getPort()), callback));
+                ret.setComplete(connectResolvedInetSocketAddress(new InetSocketAddress(result, remote.getPort()), callback));
             }
         });
         return ret;

From 52064191814fe744ae85e640cb869e122e4d61a3 Mon Sep 17 00:00:00 2001
From: Florian Vallee <f.vallee@oberthur.com>
Date: Thu, 11 Sep 2014 16:20:24 +0200
Subject: [PATCH 097/399] Revert "Added protected API for WebSocket creation"

This reverts commit 4ee0ae0e6206f90a07f3a2269abc6c655a0289df.
---
 .../com/koushikdutta/async/http/server/AsyncHttpServer.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 4259d1d5c..b1b393d64 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -318,15 +318,11 @@ public void onRequest(final AsyncHttpServerRequest request, final AsyncHttpServe
                     response.end();
                     return;
                 }
-                callback.onConnected(createWebSocket(request, response), request.getHeaders());
+                callback.onConnected(new WebSocketImpl(request, response), request.getHeaders());
             }
         });
     }
     
-    protected WebSocket createWebSocket(final AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
-        return new WebSocketImpl(request, response);
-    }
-    
     public void get(String regex, HttpServerRequestCallback callback) {
         addAction(AsyncHttpGet.METHOD, regex, callback);
     }

From ba1c1d1c31116357139d584196559dfd5a26896c Mon Sep 17 00:00:00 2001
From: Florian Vallee <f.vallee@oberthur.com>
Date: Fri, 12 Sep 2014 11:17:12 +0200
Subject: [PATCH 098/399] expose initial http request to WebSocket handlers

  replace headers object with the complete AsyncHttpServerRequest in callback

  see #232
---
 .../com/koushikdutta/async/http/server/AsyncHttpServer.java   | 4 ++--
 .../test/src/com/koushikdutta/async/test/WebSocketTests.java  | 3 ++-
 README.md                                                     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index b1b393d64..41bbfe0de 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -285,7 +285,7 @@ public void addAction(String action, String regex, HttpServerRequestCallback cal
     }
 
     public static interface WebSocketRequestCallback {
-        public void onConnected(WebSocket webSocket, RequestHeaders headers);
+        public void onConnected(WebSocket webSocket, AsyncHttpServerRequest request);
     }
 
     public void websocket(String regex, final WebSocketRequestCallback callback) {
@@ -318,7 +318,7 @@ public void onRequest(final AsyncHttpServerRequest request, final AsyncHttpServe
                     response.end();
                     return;
                 }
-                callback.onConnected(new WebSocketImpl(request, response), request.getHeaders());
+                callback.onConnected(new WebSocketImpl(request, response), request);
             }
         });
     }
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
index a5a7f92b0..5784e3833 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
@@ -9,6 +9,7 @@
 import com.koushikdutta.async.http.libcore.RequestHeaders;
 import com.koushikdutta.async.http.server.AsyncHttpServer;
 import com.koushikdutta.async.http.server.AsyncHttpServer.WebSocketRequestCallback;
+import com.koushikdutta.async.http.server.AsyncHttpServerRequest;
 
 import junit.framework.TestCase;
 
@@ -34,7 +35,7 @@ public void onCompleted(Exception ex) {
     
         httpServer.websocket("/ws", new WebSocketRequestCallback() {
             @Override
-            public void onConnected(final WebSocket webSocket, RequestHeaders headers) {
+            public void onConnected(final WebSocket webSocket, AsyncHttpServerRequest request) {
                 webSocket.setStringCallback(new StringCallback() {
                     @Override
                     public void onStringAvailable(String s) {
diff --git a/README.md b/README.md
index 042c0917e..9fed2d42e 100644
--- a/README.md
+++ b/README.md
@@ -216,7 +216,7 @@ server.listen(5000);
 ```java
 server.websocket("/live", new WebSocketRequestCallback() {
     @Override
-    public void onConnected(final WebSocket webSocket, RequestHeaders headers) {
+    public void onConnected(final WebSocket webSocket, AsyncHttpServerRequest request) {
         _sockets.add(webSocket);
         
         //Use this to clean up any references to your websocket

From 0f0cdf011febb97bacde87771c452b9cf757bcce Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 17 Sep 2014 10:18:35 -0700
Subject: [PATCH 099/399] fix https://github.com/koush/AndroidAsync/issues/244

---
 .../src/com/koushikdutta/async/AsyncServer.java    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 6488dcc97..450396425 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -587,7 +587,12 @@ public void run() {
             }
             catch (AsyncSelectorException e) {
                 Log.e(LOGTAG, "Selector exception", e);
-                StreamUtility.closeQuietly(selector.getSelector());
+                try {
+                    // StreamUtility.closeQuiety is throwing ArrayStoreException?
+                    selector.getSelector().close();
+                }
+                catch (Exception ex) {
+                }
             }
             return;
         }
@@ -610,7 +615,12 @@ private static void run(final AsyncServer server, final SelectorWrapper selector
             }
             catch (AsyncSelectorException e) {
                 Log.e(LOGTAG, "Selector exception", e);
-                StreamUtility.closeQuietly(selector.getSelector());
+                try {
+                    // StreamUtility.closeQuiety is throwing ArrayStoreException?
+                    selector.getSelector().close();
+                }
+                catch (Exception ex) {
+                }
             }
             // see if we keep looping, this must be in a synchronized block since the queue is accessed.
             synchronized (server) {

From 62a33257319f92dcdf9fc2028ad4a99ae8451965 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 17 Sep 2014 10:18:35 -0700
Subject: [PATCH 100/399] fix https://github.com/koush/AndroidAsync/issues/244

---
 .../src/com/koushikdutta/async/AsyncServer.java    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 6488dcc97..450396425 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -587,7 +587,12 @@ public void run() {
             }
             catch (AsyncSelectorException e) {
                 Log.e(LOGTAG, "Selector exception", e);
-                StreamUtility.closeQuietly(selector.getSelector());
+                try {
+                    // StreamUtility.closeQuiety is throwing ArrayStoreException?
+                    selector.getSelector().close();
+                }
+                catch (Exception ex) {
+                }
             }
             return;
         }
@@ -610,7 +615,12 @@ private static void run(final AsyncServer server, final SelectorWrapper selector
             }
             catch (AsyncSelectorException e) {
                 Log.e(LOGTAG, "Selector exception", e);
-                StreamUtility.closeQuietly(selector.getSelector());
+                try {
+                    // StreamUtility.closeQuiety is throwing ArrayStoreException?
+                    selector.getSelector().close();
+                }
+                catch (Exception ex) {
+                }
             }
             // see if we keep looping, this must be in a synchronized block since the queue is accessed.
             synchronized (server) {

From 53b7a417290ce4f8ab3528ef76480ee5ac76d18f Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@gmail.com>
Date: Wed, 17 Sep 2014 10:48:24 +0200
Subject: [PATCH 101/399] more debug about invalid URI not recognized by any
 middleware

---
 .../src/com/koushikdutta/async/http/AsyncHttpClient.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 0034dbe0a..5da94b287 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -420,6 +420,7 @@ public AsyncSocket detachSocket() {
         // set up the system default proxy and connect
         setupAndroidProxy(request);
 
+        final Exception unsupportedURI;
         synchronized (mMiddleware) {
             for (AsyncHttpClientMiddleware middleware: mMiddleware) {
                 Cancellable socketCancellable = middleware.getSocket(data);
@@ -429,8 +430,9 @@ public AsyncSocket detachSocket() {
                     return;
                 }
             }
+            unsupportedURI = new IllegalArgumentException("invalid uri="+uri+" middlewares="+mMiddleware);
         }
-        reportConnectedCompleted(cancel, new IllegalArgumentException("invalid uri"), null, request, callback);
+        reportConnectedCompleted(cancel, unsupportedURI, null, request, callback);
     }
 
     public static abstract class RequestCallbackBase<T> implements RequestCallback<T> {

From c265454f54a752b47f5f6139b11c8737f56f4201 Mon Sep 17 00:00:00 2001
From: Amin Cheloh <hidden.min@gmail.com>
Date: Thu, 25 Sep 2014 19:43:38 +0700
Subject: [PATCH 102/399] fix charset from utf8 to utf-8

---
 .../com/koushikdutta/async/http/body/UrlEncodedFormBody.java  | 2 +-
 .../async/http/server/AsyncHttpServerResponseImpl.java        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
index 7bceceb89..1c9cbc6c0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
@@ -59,7 +59,7 @@ public void write(AsyncHttpRequest request, final DataSink response, final Compl
     public static final String CONTENT_TYPE = "application/x-www-form-urlencoded";
     @Override
     public String getContentType() {
-        return CONTENT_TYPE + "; charset=utf8";
+        return CONTENT_TYPE + "; charset=utf-8";
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index bd7211bdb..9faa3658e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -206,13 +206,13 @@ public void send(String string) {
         responseCode(200);
         String contentType = mRawHeaders.get("Content-Type");
         if (contentType == null)
-            contentType = "text/html; charset=utf8";
+            contentType = "text/html; charset=utf-8";
         send(contentType, string);
     }
 
     @Override
     public void send(JSONObject json) {
-        send("application/json; charset=utf8", json.toString());
+        send("application/json; charset=utf-8", json.toString());
     }
 
     @Override

From be2ab2188e5440010d0d9a1a141f3f623a71080d Mon Sep 17 00:00:00 2001
From: Alexander Maxakov <alexander.maxakov@surfstudio.ru>
Date: Tue, 7 Oct 2014 15:39:49 +0400
Subject: [PATCH 103/399] socket io transport stores session id

---
 .../async/http/socketio/SocketIOConnection.java       | 10 +++++-----
 .../http/socketio/transport/SocketIOTransport.java    |  2 ++
 .../http/socketio/transport/WebSocketTransport.java   | 11 +++++++++--
 .../http/socketio/transport/XHRPollingTransport.java  | 11 +++++++++--
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
index fb4da56d8..28fb5fd84 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
@@ -109,7 +109,7 @@ void reconnect(final DependentCancellable child) {
             @Override
             protected void transform(String result) throws Exception {
                 String[] parts = result.split(":");
-                String session = parts[0];
+                final String sessionId = parts[0];
                 if (!"".equals(parts[1]))
                     heartbeat = Integer.parseInt(parts[1]) / 2 * 1000;
                 else
@@ -122,7 +122,7 @@ protected void transform(String result) throws Exception {
 
                 if (set.contains("websocket")) {
                     final String sessionUrl = Uri.parse(request.getUri().toString()).buildUpon()
-                            .appendPath("websocket").appendPath(session)
+                            .appendPath("websocket").appendPath(sessionId)
                             .build().toString();
 
                     httpClient.websocket(sessionUrl, null, null)
@@ -133,14 +133,14 @@ public void onCompleted(Exception e, WebSocket result) {
                                 transport.setComplete(e);
                                 return;
                             }
-                            transport.setComplete(new WebSocketTransport(result));
+                            transport.setComplete(new WebSocketTransport(result, sessionId));
                         }
                     });
                 } else if (set.contains("xhr-polling")) {
                     final String sessionUrl = Uri.parse(request.getUri().toString()).buildUpon()
-                            .appendPath("xhr-polling").appendPath(session)
+                            .appendPath("xhr-polling").appendPath(sessionId)
                             .build().toString();
-                    XHRPollingTransport xhrPolling = new XHRPollingTransport(httpClient, sessionUrl);
+                    XHRPollingTransport xhrPolling = new XHRPollingTransport(httpClient, sessionUrl, sessionId);
                     transport.setComplete(xhrPolling);
                 } else {
                     throw new SocketIOException("transport not supported");
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/SocketIOTransport.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/SocketIOTransport.java
index 4b5a26def..66219d78b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/SocketIOTransport.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/SocketIOTransport.java
@@ -35,4 +35,6 @@ static public interface StringCallback {
      * @return
      */
     public boolean heartbeats();
+    
+    public String getSessionId();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/WebSocketTransport.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/WebSocketTransport.java
index 15928a3f3..51be61c74 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/WebSocketTransport.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/WebSocketTransport.java
@@ -8,10 +8,11 @@
 public class WebSocketTransport implements SocketIOTransport {
     private WebSocket webSocket;
     private StringCallback stringCallback;
+	private String sessionId;
 
-    public WebSocketTransport(WebSocket webSocket) {
+    public WebSocketTransport(WebSocket webSocket, String sessionId) {
         this.webSocket = webSocket;
-
+        this.sessionId = sessionId;
         this.webSocket.setDataCallback(new NullDataCallback());
     }
 
@@ -63,4 +64,10 @@ public void onStringAvailable(String s) {
     public boolean heartbeats() {
         return true;
     }
+
+	@Override
+	public String getSessionId() {
+		return this.sessionId;
+	}
 }
+
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/XHRPollingTransport.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/XHRPollingTransport.java
index e9a03f637..dc6aca5ca 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/XHRPollingTransport.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/XHRPollingTransport.java
@@ -18,13 +18,15 @@ public class XHRPollingTransport implements SocketIOTransport {
     private StringCallback stringCallback;
     private CompletedCallback closedCallback;
     private boolean connected;
+	private String sessionId;
 
     private static final String SEPARATOR = "\ufffd";
 
-    public XHRPollingTransport(AsyncHttpClient client, String sessionUrl) {
+    public XHRPollingTransport(AsyncHttpClient client, String sessionUrl, String sessionId) {
         this.client = client;
         this.sessionUrl = Uri.parse(sessionUrl);
-
+        this.sessionId = sessionId;
+        
         doLongPolling();
         connected = true;
     }
@@ -135,4 +137,9 @@ public void setStringCallback(StringCallback callback) {
     public boolean heartbeats() {
         return false;
     }
+
+	@Override
+	public String getSessionId() {
+		return this.sessionId;
+	}
 }

From f662a69a1c861a9bfe7ba2aef0f604ba88dffebd Mon Sep 17 00:00:00 2001
From: Yurii <laguta.yurii@gmail.com>
Date: Thu, 9 Oct 2014 12:03:29 +1100
Subject: [PATCH 104/399] Update README.md with gradle dependency

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 9fed2d42e..a57940ec4 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,13 @@ Download [the latest JAR](http://repository.sonatype.org/service/local/artifact/
 </dependency>
 ```
 
+Gradle: 
+```groovy
+dependencies {
+    compile 'com.koushikdutta.androidasync:AndroidAsync:1.0.0'
+}
+```
+
 ### Download a url to a String
 
 ```java

From e23ad66699c19b434fdd8a5ffdf8c6c87b2db7ea Mon Sep 17 00:00:00 2001
From: Pulkit Bhuwalka <pulkit.bosco05@gmail.com>
Date: Sat, 18 Oct 2014 15:01:11 -0400
Subject: [PATCH 105/399] Fixing pattern match to replace only the first
 matched group.

---
 .../async/http/server/AsyncHttpServer.java           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 41bbfe0de..94550a0d0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -332,7 +332,7 @@ public void post(String regex, HttpServerRequestCallback callback) {
     }
 
     public static android.util.Pair<Integer, InputStream> getAssetStream(final Context context, String asset) {
-        AssetManager am = context.getAssets();
+        AssetManager am = context.getResources().getAssets();
         try {
             InputStream is = am.open(asset);
             return new android.util.Pair<Integer, InputStream>(is.available(), is);
@@ -373,12 +373,16 @@ public static String tryGetContentType(String path) {
         return null;
     }
 
+    private String replacePrefix(Matcher m) {
+        return m.group(0).substring(m.end(1));
+    }
+
     public void directory(Context context, String regex, final String assetPath) {
         final Context _context = context.getApplicationContext();
         addAction(AsyncHttpGet.METHOD, regex, new HttpServerRequestCallback() {
             @Override
             public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
-                String path = request.getMatcher().replaceAll("");
+                String path = replacePrefix(request.getMatcher());
                 android.util.Pair<Integer, InputStream> pair = getAssetStream(_context, assetPath + path);
                 final InputStream is = pair.second;
                 response.getHeaders().getHeaders().set("Content-Length", String.valueOf(pair.first));
@@ -401,7 +405,7 @@ public void onCompleted(Exception ex) {
         addAction(AsyncHttpHead.METHOD, regex, new HttpServerRequestCallback() {
             @Override
             public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
-                String path = request.getMatcher().replaceAll("");
+                String path = replacePrefix(request.getMatcher());
                 android.util.Pair<Integer, InputStream> pair = getAssetStream(_context, assetPath + path);
                 final InputStream is = pair.second;
                 StreamUtility.closeQuietly(is);
@@ -428,7 +432,7 @@ public void directory(String regex, final File directory, final boolean list) {
         addAction("GET", regex, new HttpServerRequestCallback() {
             @Override
             public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
-                String path = request.getMatcher().replaceAll("");
+                String path = replacePrefix(request.getMatcher());
                 File file = new File(directory, path);
                 
                 if (file.isDirectory() && list) {

From 3f03c7aa3d071a2276c5f97cb5fdea734cdc0538 Mon Sep 17 00:00:00 2001
From: Justin Huntington <justinhuntington@gmail.com>
Date: Thu, 23 Oct 2014 18:41:22 -0400
Subject: [PATCH 106/399] fix #245 on socket.io reconnect, update the
 connecting field with the current Cancellable

Ensure calls to SocketIOConnection.reconnect() when a reconnect attempt is already is progress will properly have their DependentCancellables made children of that attempt.
---
 .../koushikdutta/async/http/socketio/SocketIOConnection.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
index fb4da56d8..9b03541af 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
@@ -104,7 +104,7 @@ void reconnect(final DependentCancellable child) {
 
         request.logi("Reconnecting socket.io");
 
-        Cancellable connecting = httpClient.executeString(request, null)
+        connecting = httpClient.executeString(request, null)
         .then(new TransformFuture<SocketIOTransport, String>() {
             @Override
             protected void transform(String result) throws Exception {

From bf781c7cfea6e01b659425ec97a1c97aae5c6470 Mon Sep 17 00:00:00 2001
From: Justin Huntington <justinhuntington@gmail.com>
Date: Thu, 23 Oct 2014 19:09:14 -0400
Subject: [PATCH 107/399] fix #181 configurable reconnectDelay and
 reconnectDelayMax for socket.io

Add class SocketIORequest.Config whose instances may optionally be passed to SocketIORequest's constructor to configure reconnectDelay (initial delay) and reconnectDelayMax.  The delay will double on each attempt as before, but never exceed reconnectDelayMax, if specified.  If reconnectDelayMax is 0 (the default), there is no max and reconnect delay will grow forever (as it did before this change).
---
 .../http/socketio/SocketIOConnection.java     | 11 ++++--
 .../async/http/socketio/SocketIORequest.java  | 35 ++++++++++++++++++-
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
index 9b03541af..c8381cb93 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
@@ -30,6 +30,7 @@
 class SocketIOConnection {
     AsyncHttpClient httpClient;
     int heartbeat;
+    long reconnectDelay;
     ArrayList<SocketIOClient> clients = new ArrayList<SocketIOClient>();
     SocketIOTransport transport;
     SocketIORequest request;
@@ -37,6 +38,7 @@ class SocketIOConnection {
     public SocketIOConnection(AsyncHttpClient httpClient, SocketIORequest request) {
         this.httpClient = httpClient;
         this.request = request;
+        this.reconnectDelay = this.request.config.reconnectDelay;
     }
 
     public boolean isConnected() {
@@ -157,7 +159,7 @@ public void onCompleted(Exception e, SocketIOTransport result) {
                     return;
                 }
 
-                reconnectDelay = 1000L;
+                reconnectDelay = request.config.reconnectDelay;
                 SocketIOConnection.this.transport = result;
                 attach();
             }
@@ -216,10 +218,13 @@ public void run() {
                 reconnect(null);
             }
         }, reconnectDelay);
-        reconnectDelay *= 2;
+
+        reconnectDelay = reconnectDelay * 2;
+        if (request.config.reconnectDelayMax > 0L) {
+            reconnectDelay = Math.min(reconnectDelay, request.config.reconnectDelayMax);
+        }
     }
 
-    long reconnectDelay = 1000L;
     private void reportDisconnect(final Exception ex) {
         if (ex != null) {
             request.loge("socket.io disconnected", ex);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIORequest.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIORequest.java
index 49ff2daba..f98407f70 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIORequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIORequest.java
@@ -1,7 +1,6 @@
 package com.koushikdutta.async.http.socketio;
 
 import android.net.Uri;
-import android.text.TextUtils;
 
 import com.koushikdutta.async.http.AsyncHttpPost;
 
@@ -10,6 +9,11 @@ public SocketIORequest(String uri) {
         this(uri, "");
     }
 
+    Config config;
+    public Config getConfig() {
+        return config;
+    }
+
     String endpoint;
     public String getEndpoint() {
         return endpoint;
@@ -25,8 +29,37 @@ public SocketIORequest(String uri, String endpoint) {
     }
 
     public SocketIORequest(String uri, String endpoint, String query) {
+        this(uri, endpoint, query, null);
+    }
+
+    public SocketIORequest(String uri, String endpoint, String query, Config config) {
         super(Uri.parse(uri + (query == null ? "" : "?" + query)).buildUpon().encodedPath("/socket.io/1/").build().toString());
+        this.config = (config != null) ? config : new Config();
         this.endpoint = endpoint;
         this.query = query;
     }
+
+    public static class Config {
+        long reconnectDelay = 1000L;
+        public void setReconnectDelay(long reconnectDelay) {
+            if (reconnectDelay < 0L) {
+                throw new IllegalArgumentException("reconnectDelay must be >= 0");
+            }
+            this.reconnectDelay = reconnectDelay;
+        }
+        public long getReconnectDelay() {
+            return reconnectDelay;
+        }
+
+        long reconnectDelayMax = 0L;
+        public void setReconnectDelayMax(long reconnectDelayMax) {
+            if (reconnectDelay < 0L) {
+                throw new IllegalArgumentException("reconnectDelayMax must be >= 0");
+            }
+            this.reconnectDelayMax = reconnectDelayMax;
+        }
+        public long getReconnectDelayMax() {
+            return reconnectDelayMax;
+        }
+    }
 }

From 806eb7a8b55fe345bbcd0a2a229333b0b5bf67a5 Mon Sep 17 00:00:00 2001
From: Justin Huntington <justinhuntington@gmail.com>
Date: Fri, 24 Oct 2014 11:22:50 -0400
Subject: [PATCH 108/399] randomize socket.io reconnect delays +/-50%

To prevent a "thundering herd" of clients all reconnecting on the same schedule after a server-side outage, randomize each reconnect attempt's delay by +/-50%
---
 .../async/http/socketio/SocketIOConnection.java       | 11 ++++++++++-
 .../async/http/socketio/SocketIORequest.java          |  8 ++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
index c8381cb93..f7c87ff61 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
@@ -217,7 +217,7 @@ private void delayReconnect() {
             public void run() {
                 reconnect(null);
             }
-        }, reconnectDelay);
+        }, nextReconnectDelay(reconnectDelay));
 
         reconnectDelay = reconnectDelay * 2;
         if (request.config.reconnectDelayMax > 0L) {
@@ -225,6 +225,15 @@ public void run() {
         }
     }
 
+    private long nextReconnectDelay(long targetDelay) {
+        if (targetDelay < 2L || targetDelay > (Long.MAX_VALUE >> 1) ||
+            !request.config.randomizeReconnectDelay)
+        {
+            return targetDelay;
+        }
+        return (targetDelay >> 1) + (long) (targetDelay * Math.random());
+    }
+
     private void reportDisconnect(final Exception ex) {
         if (ex != null) {
             request.loge("socket.io disconnected", ex);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIORequest.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIORequest.java
index f98407f70..c5bc873cb 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIORequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIORequest.java
@@ -40,6 +40,14 @@ public SocketIORequest(String uri, String endpoint, String query, Config config)
     }
 
     public static class Config {
+        boolean randomizeReconnectDelay = false;
+        public void setRandomizeReconnectDelay(boolean randomizeReconnectDelay) {
+            this.randomizeReconnectDelay = randomizeReconnectDelay;
+        }
+        public boolean isRandomizeReconnectDelay() {
+            return randomizeReconnectDelay;
+        }
+
         long reconnectDelay = 1000L;
         public void setReconnectDelay(long reconnectDelay) {
             if (reconnectDelay < 0L) {

From 910e3c8b05e2f46115704d9b6049c1dc46dbb18a Mon Sep 17 00:00:00 2001
From: Justin Huntington <justinhuntington@gmail.com>
Date: Thu, 23 Oct 2014 19:37:47 -0400
Subject: [PATCH 109/399] name threads created by
 AsyncServer.synchronousWorkers

---
 .../com/koushikdutta/async/AsyncServer.java   | 75 ++++++++++++++-----
 1 file changed, 55 insertions(+), 20 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 450396425..1d7ecff0c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -31,7 +31,12 @@
 import java.util.WeakHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class AsyncServer {
     public static final String LOGTAG = "NIO";
@@ -85,7 +90,7 @@ public static void post(Handler handler, Runnable runnable) {
         catch (Throwable ex) {
         }
     }
-    
+
     static AsyncServer mInstance = new AsyncServer();
     public static AsyncServer getDefault() {
         return mInstance;
@@ -114,7 +119,7 @@ private void handleSocket(final AsyncNetworkSocket handler) throws ClosedChannel
         ckey.attach(handler);
         handler.setup(this, ckey);
     }
-    
+
     public void removeAllCallbacks(Object scheduled) {
         synchronized (this) {
             mQueue.remove(scheduled);
@@ -134,7 +139,7 @@ public void run() {
             }
         });
     }
-    
+
     public Object postDelayed(Runnable runnable, long delay) {
         Scheduled s;
         synchronized (this) {
@@ -161,11 +166,11 @@ public Object postDelayed(Runnable runnable, long delay) {
         }
         return s;
     }
-    
+
     public Object post(Runnable runnable) {
         return postDelayed(runnable, 0);
     }
-    
+
     public Object post(final CompletedCallback callback, final Exception e) {
         return post(new Runnable() {
             @Override
@@ -174,7 +179,7 @@ public void run() {
             }
         });
     }
-    
+
     public void run(final Runnable runnable) {
         if (Thread.currentThread() == mAffinity) {
             post(runnable);
@@ -263,7 +268,7 @@ public void run() {
         catch (Exception e) {
         }
     }
-    
+
     protected void onDataReceived(int transmitted) {
     }
 
@@ -335,7 +340,7 @@ protected void cancelCleanup() {
         SocketChannel socket;
         ConnectCallback callback;
     }
-    
+
     private ConnectFuture connectResolvedInetSocketAddress(final InetSocketAddress address, final ConnectCallback callback) {
         final ConnectFuture cancel = new ConnectFuture();
         assert !address.isUnresolved();
@@ -396,7 +401,14 @@ public Cancellable connectSocket(final String host, final int port, final Connec
         return connectSocket(InetSocketAddress.createUnresolved(host, port), callback);
     }
 
-    private static ExecutorService synchronousWorkers = Executors.newFixedThreadPool(4);
+    private static ExecutorService newSynchronousWorkers() {
+        ThreadFactory tf = new NamedThreadFactory("AsyncServer-worker-");
+        ThreadPoolExecutor tpe = new ThreadPoolExecutor(4, 4, 0L,
+            TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(), tf);
+        return tpe;
+    }
+
+    private static ExecutorService synchronousWorkers = newSynchronousWorkers();
     public Future<InetAddress[]> getAllByName(final String host) {
         final SimpleFuture<InetAddress[]> ret = new SimpleFuture<InetAddress[]>();
         synchronousWorkers.execute(new Runnable() {
@@ -487,7 +499,7 @@ public void run() {
         });
         return handler;
     }
-    
+
     public AsyncDatagramSocket connectDatagram(final SocketAddress remote) throws IOException {
         final DatagramChannel socket = DatagramChannel.open();
         final AsyncDatagramSocket handler = new AsyncDatagramSocket();
@@ -509,7 +521,7 @@ public void run() {
         });
         return handler;
     }
-    
+
     final static WeakHashMap<Thread, AsyncServer> mServers = new WeakHashMap<Thread, AsyncServer>();
 
     private boolean addMe() {
@@ -527,7 +539,7 @@ private boolean addMe() {
     public static AsyncServer getCurrentThreadServer() {
         return mServers.get(Thread.currentThread());
     }
-    
+
     Thread mAffinity;
     private void run(boolean newThread) {
         final SelectorWrapper selector;
@@ -596,10 +608,10 @@ public void run() {
             }
             return;
         }
-        
+
         run(this, selector, queue);
     }
-    
+
     private static void run(final AsyncServer server, final SelectorWrapper selector, final PriorityQueue<Scheduled> queue) {
 //        Log.i(LOGTAG, "****AsyncServer is starting.****");
         // at this point, this local queue and selector are owned
@@ -666,11 +678,11 @@ private static void shutdownEverything(SelectorWrapper selector) {
         catch (Exception e) {
         }
     }
-    
+
     private static final long QUEUE_EMPTY = Long.MAX_VALUE;
     private static long lockAndRunQueue(final AsyncServer server, final PriorityQueue<Scheduled> queue) {
         long wait = QUEUE_EMPTY;
-        
+
         // find the first item we can actually run
         while (true) {
             Scheduled run = null;
@@ -689,10 +701,10 @@ private static long lockAndRunQueue(final AsyncServer server, final PriorityQueu
                     }
                 }
             }
-            
+
             if (run == null)
                 break;
-            
+
             run.runnable.run();
         }
 
@@ -834,11 +846,11 @@ public void run() {
             }
         });
     }
-    
+
     public Thread getAffinity() {
         return mAffinity;
     }
-    
+
     public boolean isAffinityThread() {
         return mAffinity == Thread.currentThread();
     }
@@ -847,4 +859,27 @@ public boolean isAffinityThreadOrStopped() {
         Thread affinity = mAffinity;
         return affinity == null || affinity == Thread.currentThread();
     }
+
+    private static class NamedThreadFactory implements ThreadFactory {
+        private final ThreadGroup group;
+        private final AtomicInteger threadNumber = new AtomicInteger(1);
+        private final String namePrefix;
+
+        NamedThreadFactory(String namePrefix) {
+            SecurityManager s = System.getSecurityManager();
+            group = (s != null) ? s.getThreadGroup() :
+                Thread.currentThread().getThreadGroup();
+            this.namePrefix = namePrefix;
+        }
+
+        public Thread newThread(Runnable r) {
+            Thread t = new Thread(group, r,
+                namePrefix + threadNumber.getAndIncrement(), 0);
+            if (t.isDaemon()) t.setDaemon(false);
+            if (t.getPriority() != Thread.NORM_PRIORITY) {
+                t.setPriority(Thread.NORM_PRIORITY);
+            }
+            return t;
+        }
+    }
 }

From 4efe25227cd73ffbce24b2444b209ec2dc7734a2 Mon Sep 17 00:00:00 2001
From: Justin Huntington <justinhuntington@gmail.com>
Date: Thu, 23 Oct 2014 19:39:06 -0400
Subject: [PATCH 110/399] auto-shrink AsyncServer.synchronousWorkers threadpool
 when idle

---
 AndroidAsync/src/com/koushikdutta/async/AsyncServer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 1d7ecff0c..4c9484475 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -403,8 +403,8 @@ public Cancellable connectSocket(final String host, final int port, final Connec
 
     private static ExecutorService newSynchronousWorkers() {
         ThreadFactory tf = new NamedThreadFactory("AsyncServer-worker-");
-        ThreadPoolExecutor tpe = new ThreadPoolExecutor(4, 4, 0L,
-            TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(), tf);
+        ThreadPoolExecutor tpe = new ThreadPoolExecutor(1, 4, 10L,
+            TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), tf);
         return tpe;
     }
 

From 04f46c0d1e164f66d9206a4de8172dd95d268b82 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koush@koushikdutta.com>
Date: Fri, 24 Oct 2014 17:17:00 -0700
Subject: [PATCH 111/399] Update README.md

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 9fed2d42e..36d5644a1 100644
--- a/README.md
+++ b/README.md
@@ -282,3 +282,6 @@ client.getString("http://foo.com/hello.txt")
 });
 ```
 
+### Note on SSLv3
+
+https://github.com/koush/AndroidAsync/issues/174

From 170efe3b6157d93839549413d181d5696883dbba Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 27 Oct 2014 16:23:42 -0700
Subject: [PATCH 112/399] underp

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml                      | 2 --
 .../com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java   | 1 -
 2 files changed, 3 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index e506543a0..faea5ca62 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -76,9 +76,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
index 806968bd5..1926dc8d6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
@@ -205,7 +205,6 @@ public void write(ByteBufferList bb) {
             int canWrite = (int)Math.min(bytesLeftInWriteWindow, AsyncSpdyConnection.this.bytesLeftInWriteWindow);
             canWrite = Math.min(bb.remaining(), canWrite);
             if (canWrite == 0) {
-                System.out.println("derp");
                 return;
             }
             if (canWrite < bb.remaining()) {

From b6bb8a84d94e86387a4520b9b7b4d3132a456e99 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 3 Nov 2014 15:28:24 -0800
Subject: [PATCH 113/399] update platform

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml | 4 +++-
 AndroidAsync/build.gradle                  | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index faea5ca62..dfd449fd1 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -76,10 +76,12 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 02e423597..a620204d3 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -34,8 +34,8 @@ android {
 //        minSdkVersion 9
 //    }
 
-    compileSdkVersion 19
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 21
+    buildToolsVersion "21.0.0"
 }
 
 // upload to maven task

From 28e12c3b7b6aa2aedba2852874141463c872943e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 3 Nov 2014 17:20:49 -0800
Subject: [PATCH 114/399] fix tests

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml | 6 +++---
 AndroidAsync/AndroidManifest.xml           | 3 ---
 AndroidAsync/build.gradle                  | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index dfd449fd1..362642fd6 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -10,7 +10,7 @@
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
@@ -31,11 +31,13 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -76,9 +78,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index bd080cd06..ed150c452 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,11 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.koushikdutta.async"
     android:versionCode="200"
     android:versionName="2.0.0">
 
-    <uses-sdk
-        tools:node="replace" />
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application>
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index a620204d3..7bcb25b9e 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url 'http://repo1.maven.org/maven2' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:+'
+        classpath 'com.android.tools.build:gradle:0.14.1'
     }
 }
 apply plugin: 'com.android.library'
@@ -35,7 +35,7 @@ android {
 //    }
 
     compileSdkVersion 21
-    buildToolsVersion "21.0.0"
+    buildToolsVersion '21.1.0'
 }
 
 // upload to maven task

From d20b5975e77b5b21d37ed486bf8506b85a44dc2f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 5 Nov 2014 21:32:40 -0800
Subject: [PATCH 115/399] Exception is simply info, not an error

---
 AndroidAsync/src/com/koushikdutta/async/AsyncServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 4c9484475..acfc8bcfa 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -598,7 +598,7 @@ public void run() {
                 runLoop(this, selector, queue);
             }
             catch (AsyncSelectorException e) {
-                Log.e(LOGTAG, "Selector exception", e);
+                Log.i(LOGTAG, "Selector closed", e);
                 try {
                     // StreamUtility.closeQuiety is throwing ArrayStoreException?
                     selector.getSelector().close();

From e9dbac41b5388727de9abac9aa382f76e163bbb3 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 5 Nov 2014 21:32:40 -0800
Subject: [PATCH 116/399] Exception is simply info, not an error

---
 AndroidAsync/src/com/koushikdutta/async/AsyncServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 4c9484475..acfc8bcfa 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -598,7 +598,7 @@ public void run() {
                 runLoop(this, selector, queue);
             }
             catch (AsyncSelectorException e) {
-                Log.e(LOGTAG, "Selector exception", e);
+                Log.i(LOGTAG, "Selector closed", e);
                 try {
                     // StreamUtility.closeQuiety is throwing ArrayStoreException?
                     selector.getSelector().close();

From b1792d0c3cbf03633ed020c8dbca002de7627369 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 5 Nov 2014 21:44:15 -0800
Subject: [PATCH 117/399] 139

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index ae615c1c7..5d9b2710c 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.koushikdutta.async"
-    android:versionCode="138"
-    android:versionName="1.3.8">
+    android:versionCode="139"
+    android:versionName="1.3.9">
 
     <uses-sdk
         tools:node="replace" />

From bc948148178d7c9616ddb8edd3dc1222d9d2d8f8 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 5 Nov 2014 22:03:16 -0800
Subject: [PATCH 118/399] update build and tests

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml | 6 ++++--
 AndroidAsync/AndroidManifest.xml           | 7 ++-----
 AndroidAsync/build.gradle                  | 6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index e506543a0..d92cf7f54 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -10,7 +10,7 @@
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
@@ -31,11 +31,13 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -81,7 +83,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 5d9b2710c..95af56077 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,11 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.koushikdutta.async"
-    android:versionCode="139"
-    android:versionName="1.3.9">
+    android:versionCode="140"
+    android:versionName="1.4.0">
 
-    <uses-sdk
-        tools:node="replace" />
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application>
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 0a1985d0b..238ce0a72 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -31,11 +31,11 @@ android {
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 19
+        targetSdkVersion 21
     }
 
-    compileSdkVersion 19
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 21
+    buildToolsVersion "21.1.0"
 }
 
 // upload to maven task

From 02b146297b392fce04642ca9ab3d653cf19c7424 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 6 Nov 2014 16:28:05 -0800
Subject: [PATCH 119/399] pass in the GetSocketData to the engine
 configurators.

---
 .../http/AsyncSSLEngineConfigurator.java      |  2 +-
 .../async/http/AsyncSSLSocketMiddleware.java  |  6 ++---
 .../async/http/spdy/SpdyMiddleware.java       | 22 ++++++++++++++-----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLEngineConfigurator.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLEngineConfigurator.java
index 36af9c151..755a50d3d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLEngineConfigurator.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLEngineConfigurator.java
@@ -3,5 +3,5 @@
 import javax.net.ssl.SSLEngine;
 
 public interface AsyncSSLEngineConfigurator {
-    public void configureEngine(SSLEngine engine, String host, int port);
+    public void configureEngine(SSLEngine engine, AsyncHttpClientMiddleware.GetSocketData data, String host, int port);
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
index 01f3fbeec..d557a3104 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
@@ -57,12 +57,12 @@ public void clearEngineConfigurators() {
         engineConfigurators.clear();
     }
 
-    protected SSLEngine createConfiguredSSLEngine(String host, int port) {
+    protected SSLEngine createConfiguredSSLEngine(GetSocketData data, String host, int port) {
         SSLContext sslContext = getSSLContext();
         SSLEngine sslEngine = sslContext.createSSLEngine();
 
         for (AsyncSSLEngineConfigurator configurator : engineConfigurators) {
-            configurator.configureEngine(sslEngine, host, port);
+            configurator.configureEngine(sslEngine, data, host, port);
         }
 
         return sslEngine;
@@ -79,7 +79,7 @@ public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
 
     protected void tryHandshake(AsyncSocket socket, GetSocketData data, final Uri uri, final int port, final ConnectCallback callback) {
         AsyncSSLSocketWrapper.handshake(socket, uri.getHost(), port,
-        createConfiguredSSLEngine(uri.getHost(), port),
+        createConfiguredSSLEngine(data, uri.getHost(), port),
         trustManagers, hostnameVerifier, true,
         createHandshakeCallback(data, callback));
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 74b08bd73..b45f16a66 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -39,13 +39,13 @@ public SpdyMiddleware(AsyncHttpClient client) {
         super(client);
         addEngineConfigurator(new AsyncSSLEngineConfigurator() {
             @Override
-            public void configureEngine(SSLEngine engine, String host, int port) {
-                configure(engine, host, port);
+            public void configureEngine(SSLEngine engine, GetSocketData data, String host, int port) {
+                configure(engine, data, host, port);
             }
         });
     }
 
-    private void configure(SSLEngine engine, String host, int port) {
+    private void configure(SSLEngine engine, GetSocketData data, String host, int port) {
         if (!initialized && spdyEnabled) {
             initialized = true;
             try {
@@ -83,6 +83,12 @@ private void configure(SSLEngine engine, String host, int port) {
             }
         }
 
+        // TODO: figure out why POST does not work if sending content-length header
+        // see above regarding app engine comment as to why: drive requires content-length
+        // but app engine sends a GO_AWAY if it sees a content-length...
+        if (!canSpdyRequest(data))
+            return;
+
         if (sslParameters != null) {
             try {
                 byte[] protocols = concatLengthPrefixed(
@@ -229,12 +235,18 @@ private void newSocket(GetSocketData data, final AsyncSpdyConnection connection,
             }
         }
 
-
         request.logv("\n" + request);
         final AsyncSpdyConnection.SpdySocket spdy = connection.newStream(headers, requestBody != null, true);
         callback.onConnectCompleted(null, spdy);
     }
 
+    private boolean canSpdyRequest(GetSocketData data) {
+        // TODO: figure out why POST does not work if sending content-length header
+        // see above regarding app engine comment as to why: drive requires content-length
+        // but app engine sends a GO_AWAY if it sees a content-length...
+        return data.request.getBody() == null;
+    }
+
     @Override
     public Cancellable getSocket(GetSocketData data) {
         if (!spdyEnabled)
@@ -249,7 +261,7 @@ public Cancellable getSocket(GetSocketData data) {
         // TODO: figure out why POST does not work if sending content-length header
         // see above regarding app engine comment as to why: drive requires content-length
         // but app engine sends a GO_AWAY if it sees a content-length...
-        if (data.request.getBody() != null)
+        if (!canSpdyRequest(data))
             return super.getSocket(data);
 
         // can we use an existing connection to satisfy this, or do we need a new one?

From 255ff987a813acd8002710fa8fee95511d59224c Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 7 Nov 2014 18:49:27 -0800
Subject: [PATCH 120/399] Fix crash bug when cancelling requests being cached.

https://github.com/koush/ion/issues/252#issuecomment-62217371
---
 .../async/FilteredDataEmitter.java            | 11 +++-
 .../http/cache/ResponseCacheMiddleware.java   |  8 ++-
 .../koushikdutta/async/test/CacheTests.java   | 64 ++++++++++++-------
 3 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java b/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java
index 576b5d60d..930918030 100644
--- a/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java
@@ -45,6 +45,12 @@ public void setDataTracker(DataTracker tracker) {
     private int totalRead;
     @Override
     public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+        if (closed) {
+            // this emitter was closed but for some reason data is still being spewed...
+            // eat it, nom nom.
+            bb.recycle();
+            return;
+        }
         if (bb != null)
             totalRead += bb.remaining();
         Util.emitAllData(this, bb);
@@ -81,9 +87,12 @@ public AsyncServer getServer() {
         return mEmitter.getServer();
     }
 
+    boolean closed;
     @Override
     public void close() {
-        mEmitter.close();
+        closed = true;
+        if (mEmitter != null)
+            mEmitter.close();
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index bf0e92c2c..36e088941 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -340,7 +340,7 @@ protected void report(Exception e) {
         @Override
         public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             if (cached != null) {
-                com.koushikdutta.async.Util.emitAllData(this, cached);
+                super.onDataAvailable(emitter, cached);
                 // couldn't emit it all, so just wait for another day...
                 if (cached.remaining() > 0)
                     return;
@@ -384,6 +384,12 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             }
         }
 
+        @Override
+        public void close() {
+            abort();
+            super.close();
+        }
+
         public void abort() {
             if (editor != null) {
                 editor.abort();
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
index 2edd1ae08..990d7dded 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
@@ -4,6 +4,11 @@
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.AsyncServerSocket;
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.DataEmitter;
+import com.koushikdutta.async.FilteredDataEmitter;
+import com.koushikdutta.async.Util;
+import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.http.AsyncHttpClient;
 import com.koushikdutta.async.http.AsyncHttpGet;
 import com.koushikdutta.async.http.HttpDate;
@@ -14,7 +19,10 @@
 import com.koushikdutta.async.http.server.HttpServerRequestCallback;
 
 import java.io.File;
+import java.nio.ByteBuffer;
 import java.util.Date;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Created by koush on 6/13/13.
@@ -53,29 +61,37 @@ public void onRequest(AsyncHttpServerRequest request, AsyncHttpServerResponse re
         }
     }
 
-//    static public boolean deleteDirectory(File path) {
-//        if (path.exists()) {
-//            File[] files = path.listFiles();
-//            if (files != null) {
-//                for (int i = 0; i < files.length; i++) {
-//                    if (files[i].isDirectory()) {
-//                        deleteDirectory(files[i]);
-//                    } else {
-//                        files[i].delete();
-//                    }
-//                }
-//            }
-//        }
-//        return (path.delete());
-//    }
+    private static final long TIMEOUT = 1000L;
+    public void testFilteredDataEmitter() throws Exception {
+        final Semaphore semaphore = new Semaphore(0);
 
-//    public void testDiskLruCache() throws Exception {
-//        File dir = new File(Environment.getExternalStorageDirectory(), "AndroidAsyncTest/cache-test");
-//        deleteDirectory(dir);
-//        DiskLruCache cache = DiskLruCache.open(dir, 0, 1000, 10000000);
-//        DiskLruCache.Editor editor = cache.edit("stuff");
-//
-//        DiskLruCache cache2 = DiskLruCache.open(dir, 0, 2, 10000000);
-//        DiskLruCache.Snapshot snapshot = cache2.get("stuff");
-//    }
+        FilteredDataEmitter f = new FilteredDataEmitter() {
+            @Override
+            public boolean isPaused() {
+                return false;
+            }
+        };
+
+        f.setDataCallback(new DataCallback() {
+            @Override
+            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+                assertEquals(bb.readString(), "hello");
+                bb.recycle();
+                semaphore.release();
+            }
+        });
+
+        f.onDataAvailable(f, new ByteBufferList().add(ByteBuffer.wrap("hello".getBytes())));
+        assertTrue("timeout", semaphore.tryAcquire(TIMEOUT, TimeUnit.MILLISECONDS));
+
+        f.setDataCallback(new DataCallback() {
+            @Override
+            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+                fail();
+            }
+        });
+        f.close();
+
+        f.onDataAvailable(f, new ByteBufferList().add(ByteBuffer.wrap("hello".getBytes())));
+    }
 }

From 0799f67c389fbbe71aad3fd502b1e637d8de2e68 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 10 Nov 2014 19:11:02 -0800
Subject: [PATCH 121/399] Preserve header casing. Fix sample.

---
 .../com/koushikdutta/async/AsyncServer.java   |  2 +-
 .../com/koushikdutta/async/http/Headers.java  | 26 ++++--
 .../com/koushikdutta/async/http/Multimap.java |  8 +-
 .../com/koushikdutta/async/util/HashList.java |  7 +-
 .../koushikdutta/async/util/TaggedList.java   | 20 +++++
 AndroidAsyncSample/AndroidAsyncSample.iml     | 82 ++++++++++++++++---
 AndroidAsyncSample/build.gradle               | 36 ++++++++
 .../async/sample/MainActivity.java            | 19 ++---
 8 files changed, 165 insertions(+), 35 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/util/TaggedList.java
 create mode 100644 AndroidAsyncSample/build.gradle

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index acfc8bcfa..1b8ab503d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -626,7 +626,7 @@ private static void run(final AsyncServer server, final SelectorWrapper selector
                 runLoop(server, selector, queue);
             }
             catch (AsyncSelectorException e) {
-                Log.e(LOGTAG, "Selector exception", e);
+                Log.i(LOGTAG, "Selector exception, shutting down", e);
                 try {
                     // StreamUtility.closeQuiety is throwing ArrayStoreException?
                     selector.getSelector().close();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
index 9724ce915..df1b07500 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
@@ -4,6 +4,7 @@
 import android.text.TextUtils;
 
 import com.koushikdutta.async.http.server.AsyncHttpServer;
+import com.koushikdutta.async.util.TaggedList;
 
 import org.apache.http.Header;
 import org.apache.http.message.BasicHeader;
@@ -24,7 +25,12 @@ public Headers(Map<String, List<String>> mm) {
         map.putAll(mm);
     }
 
-    Multimap map = new Multimap();
+    final Multimap map = new Multimap() {
+        @Override
+        protected List<String> newList() {
+            return new TaggedList<String>();
+        }
+    };
     public Multimap getMultiMap() {
         return map;
     }
@@ -38,12 +44,18 @@ public String get(String header) {
     }
 
     public Headers set(String header, String value) {
-        map.put(header.toLowerCase(), value);
+        String lc = header.toLowerCase();
+        map.put(lc, value);
+        TaggedList<String> list = (TaggedList<String>)map.get(lc);
+        list.tagNull(header);
         return this;
     }
 
     public Headers add(String header, String value) {
-        map.add(header.toLowerCase(), value);
+        String lc = header.toLowerCase();
+        map.add(lc, value);
+        TaggedList<String> list = (TaggedList<String>)map.get(lc);
+        list.tagNull(header);
         return this;
     }
 
@@ -102,8 +114,9 @@ public Headers removeAll(Collection<String> headers) {
     public Header[] toHeaderArray() {
         ArrayList<Header> ret = new ArrayList<Header>();
         for (String key: map.keySet()) {
+            TaggedList<String> list = (TaggedList<String>)map.get(key);
             for (String v: map.get(key)) {
-                ret.add(new BasicHeader(key, v));
+                ret.add(new BasicHeader((String)list.tag(), v));
             }
         }
         return ret.toArray(new Header[ret.size()]);
@@ -112,8 +125,9 @@ public Header[] toHeaderArray() {
     public StringBuilder toStringBuilder() {
         StringBuilder result = new StringBuilder(256);
         for (String key: map.keySet()) {
-            for (String v: map.get(key)) {
-                result.append(key)
+            TaggedList<String> list = (TaggedList<String>)map.get(key);
+            for (String v: list) {
+                result.append((String)list.tag())
                 .append(": ")
                 .append(v)
                 .append("\r\n");
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
index 913532e50..111b336d0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
@@ -18,6 +18,10 @@ public class Multimap extends LinkedHashMap<String, List<String>> implements Ite
     public Multimap() {
     }
 
+    protected List<String> newList() {
+        return new ArrayList<String>();
+    }
+
     public String getString(String name) {
         List<String> ret = get(name);
         if (ret == null || ret.size() == 0)
@@ -28,14 +32,14 @@ public String getString(String name) {
     public void add(String name, String value) {
         List<String> ret = get(name);
         if (ret == null) {
-            ret = new ArrayList<String>();
+            ret = newList();
             put(name, ret);
         }
         ret.add(value);
     }
 
     public void put(String name, String value) {
-        ArrayList<String> ret = new ArrayList<String>();
+        List<String> ret = newList();
         ret.add(value);
         put(name, ret);
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/HashList.java b/AndroidAsync/src/com/koushikdutta/async/util/HashList.java
index cd1d12384..80727a9e3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/HashList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/HashList.java
@@ -8,9 +8,6 @@
  * Created by koush on 5/27/13.
  */
 public class HashList<T> {
-    class TaggedList<T> extends ArrayList<T> {
-        Object tag;
-    }
     Hashtable<String, TaggedList<T>> internal = new Hashtable<String, TaggedList<T>>();
 
     public HashList() {
@@ -24,7 +21,7 @@ public synchronized <V> V tag(String key) {
         TaggedList<T> list = internal.get(key);
         if (list == null)
             return null;
-        return (V)list.tag;
+        return list.tag();
     }
 
     public synchronized <V> void tag(String key, V tag) {
@@ -33,7 +30,7 @@ public synchronized <V> void tag(String key, V tag) {
             list = new TaggedList<T>();
             internal.put(key, list);
         }
-        list.tag = tag;
+        list.tag(tag);
     }
 
     public synchronized ArrayList<T> remove(String key) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/TaggedList.java b/AndroidAsync/src/com/koushikdutta/async/util/TaggedList.java
new file mode 100644
index 000000000..8159352af
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/util/TaggedList.java
@@ -0,0 +1,20 @@
+package com.koushikdutta.async.util;
+
+import java.util.ArrayList;
+
+public class TaggedList<T> extends ArrayList<T> {
+    private Object tag;
+
+    public synchronized <V> V tag() {
+        return (V)tag;
+    }
+
+    public synchronized <V> void tag(V tag) {
+        this.tag = tag;
+    }
+
+    public synchronized <V> void tagNull(V tag) {
+        if (this.tag == null)
+            this.tag = tag;
+    }
+}
\ No newline at end of file
diff --git a/AndroidAsyncSample/AndroidAsyncSample.iml b/AndroidAsyncSample/AndroidAsyncSample.iml
index 64441a220..21fa9a433 100644
--- a/AndroidAsyncSample/AndroidAsyncSample.iml
+++ b/AndroidAsyncSample/AndroidAsyncSample.iml
@@ -1,26 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="Gradle.AndroidAsync" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":AndroidAsync:AndroidAsyncSample" />
+      </configuration>
+    </facet>
     <facet type="android" name="Android">
       <configuration>
-        <notImportedProperties>
-          <property>MANIFEST_FILE_PATH</property>
-          <property>RESOURCES_DIR_PATH</property>
-          <property>ASSETS_DIR_PATH</property>
-          <property>NATIVE_LIBS_DIR_PATH</property>
-        </notImportedProperties>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="AndroidAsync" />
+    <orderEntry type="module" module-name="AndroidAsync-AndroidAsync" exported="" />
   </component>
 </module>
 
diff --git a/AndroidAsyncSample/build.gradle b/AndroidAsyncSample/build.gradle
new file mode 100644
index 000000000..6bbfb2ad0
--- /dev/null
+++ b/AndroidAsyncSample/build.gradle
@@ -0,0 +1,36 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:+'
+    }
+}
+apply plugin: 'com.android.application'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile project(':AndroidAsync:AndroidAsync')
+}
+
+android {
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            res.srcDirs = ['res/']
+            java.srcDirs = ['src/']
+        }
+    }
+
+    defaultConfig {
+        targetSdkVersion 21
+        minSdkVersion 9
+    }
+
+    compileSdkVersion 21
+    buildToolsVersion "21.1.0"
+}
+
diff --git a/AndroidAsyncSample/src/com/koushikdutta/async/sample/MainActivity.java b/AndroidAsyncSample/src/com/koushikdutta/async/sample/MainActivity.java
index b87b3eac6..ac37803d4 100644
--- a/AndroidAsyncSample/src/com/koushikdutta/async/sample/MainActivity.java
+++ b/AndroidAsyncSample/src/com/koushikdutta/async/sample/MainActivity.java
@@ -1,12 +1,5 @@
 package com.koushikdutta.async.sample;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-
-import org.apache.http.NameValuePair;
-import org.apache.http.message.BasicNameValuePair;
-
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.graphics.Bitmap;
@@ -26,13 +19,19 @@
 import com.koushikdutta.async.http.AsyncHttpClient;
 import com.koushikdutta.async.http.AsyncHttpGet;
 import com.koushikdutta.async.http.AsyncHttpPost;
-import com.koushikdutta.async.http.AsyncHttpRequest;
 import com.koushikdutta.async.http.AsyncHttpResponse;
-import com.koushikdutta.async.http.ResponseCacheMiddleware;
 import com.koushikdutta.async.http.body.UrlEncodedFormBody;
+import com.koushikdutta.async.http.cache.ResponseCacheMiddleware;
+
+import org.apache.http.NameValuePair;
+import org.apache.http.message.BasicNameValuePair;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
 
 public class MainActivity extends Activity {
-    static ResponseCacheMiddleware cacher; 
+    static ResponseCacheMiddleware cacher;
     
     ImageView rommanager;
     ImageView tether;

From 1789e8643231a265f0a18c75659e119386a5599b Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 11 Nov 2014 00:55:41 -0800
Subject: [PATCH 122/399] Revert "Fixing pattern match to replace only the
 first matched group."

This reverts commit e23ad66699c19b434fdd8a5ffdf8c6c87b2db7ea.
---
 .../async/http/server/AsyncHttpServer.java           | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 8343965ae..27ba4e57d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -347,7 +347,7 @@ public void post(String regex, HttpServerRequestCallback callback) {
     }
 
     public static android.util.Pair<Integer, InputStream> getAssetStream(final Context context, String asset) {
-        AssetManager am = context.getResources().getAssets();
+        AssetManager am = context.getAssets();
         try {
             InputStream is = am.open(asset);
             return new android.util.Pair<Integer, InputStream>(is.available(), is);
@@ -388,16 +388,12 @@ public static String tryGetContentType(String path) {
         return null;
     }
 
-    private String replacePrefix(Matcher m) {
-        return m.group(0).substring(m.end(1));
-    }
-
     public void directory(Context context, String regex, final String assetPath) {
         final Context _context = context.getApplicationContext();
         addAction(AsyncHttpGet.METHOD, regex, new HttpServerRequestCallback() {
             @Override
             public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
-                String path = replacePrefix(request.getMatcher());
+                String path = request.getMatcher().replaceAll("");
                 android.util.Pair<Integer, InputStream> pair = getAssetStream(_context, assetPath + path);
                 if (pair == null || pair.second == null) {
                     response.code(404);
@@ -420,7 +416,7 @@ public void onCompleted(Exception ex) {
         addAction(AsyncHttpHead.METHOD, regex, new HttpServerRequestCallback() {
             @Override
             public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
-                String path = replacePrefix(request.getMatcher());
+                String path = request.getMatcher().replaceAll("");
                 android.util.Pair<Integer, InputStream> pair = getAssetStream(_context, assetPath + path);
                 if (pair == null || pair.second == null) {
                     response.code(404);
@@ -447,7 +443,7 @@ public void directory(String regex, final File directory, final boolean list) {
         addAction("GET", regex, new HttpServerRequestCallback() {
             @Override
             public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
-                String path = replacePrefix(request.getMatcher());
+                String path = request.getMatcher().replaceAll("");
                 File file = new File(directory, path);
                 
                 if (file.isDirectory() && list) {

From 8eb728698dc6b9de0e5553900fb61f6e60cfcee5 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 11 Nov 2014 16:29:05 -0800
Subject: [PATCH 123/399] Fix for
 https://github.com/koush/ion/issues/388#issuecomment-62581926

---
 .../src/com/koushikdutta/async/AsyncNetworkSocket.java       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
index 5b1bfe508..6423774fc 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
@@ -10,6 +10,7 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
+import java.nio.channels.CancelledKeyException;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
@@ -91,7 +92,9 @@ public void run() {
         }
     }
     
-    private void handleRemaining(int remaining) {
+    private void handleRemaining(int remaining) throws IOException {
+        if (!mKey.isValid())
+            throw new IOException(new CancelledKeyException());
         if (remaining > 0) {
             // chunked channels should not fail
             assert !mChannel.isChunked();

From 99adaa77a8ef30e5c9ca8d70b08aff9c75a729c8 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koush@koushikdutta.com>
Date: Thu, 20 Nov 2014 21:09:17 -0800
Subject: [PATCH 124/399] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b1a709f60..addf009f8 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ is it.
 
 ### Download
 
-Download [the latest JAR](http://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=com.koushikdutta.async&a=androidasync&v=LATEST
+Download [the latest JAR](https://search.maven.org/remote_content?g=com.koushikdutta.async&a=androidasync&v=LATEST
 ) or grab via Maven:
 
 ```xml

From bced3aa3757e8e722ab402a42fe47c7c37d2a253 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koush@koushikdutta.com>
Date: Thu, 20 Nov 2014 21:09:45 -0800
Subject: [PATCH 125/399] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index addf009f8..e085565f8 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Download [the latest JAR](https://search.maven.org/remote_content?g=com.koushikd
 Gradle: 
 ```groovy
 dependencies {
-    compile 'com.koushikdutta.androidasync:AndroidAsync:1.0.0'
+    compile 'com.koushikdutta.androidasync:AndroidAsync:2.+'
 }
 ```
 

From f8be34f6b6efcaa864c0d8313565b4b1028c7420 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 20 Nov 2014 21:16:33 -0800
Subject: [PATCH 126/399] 201

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index ed150c452..7fb58210c 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="200"
-    android:versionName="2.0.0">
+    android:versionCode="201"
+    android:versionName="2.0.1">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

From e1dfb4e2adb4fb77e519139c114784837ebf248c Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 20 Nov 2014 21:22:12 -0800
Subject: [PATCH 127/399] gradle crap

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml | 1 -
 AndroidAsync/build.gradle                  | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index 362642fd6..dcb209cfd 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -79,7 +79,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 7bcb25b9e..be7776f41 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url 'http://repo1.maven.org/maven2' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.14.1'
+        classpath 'com.android.tools.build:gradle:+'
     }
 }
 apply plugin: 'com.android.library'
@@ -35,7 +35,7 @@ android {
 //    }
 
     compileSdkVersion 21
-    buildToolsVersion '21.1.0'
+    buildToolsVersion '21.1.1'
 }
 
 // upload to maven task

From dba3b2a5dbf8b24df2c4f8e59853a56c7eb281a8 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koush@koushikdutta.com>
Date: Mon, 24 Nov 2014 20:12:46 -0800
Subject: [PATCH 128/399] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e085565f8..980da959f 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Download [the latest JAR](https://search.maven.org/remote_content?g=com.koushikd
 Gradle: 
 ```groovy
 dependencies {
-    compile 'com.koushikdutta.androidasync:AndroidAsync:2.+'
+    compile 'com.koushikdutta.androidasync:androidasync:2.+'
 }
 ```
 

From eed710a8ce3376fb207647b23c78f1224a0f1d58 Mon Sep 17 00:00:00 2001
From: Dylan Turney <dylan@icerfish.com>
Date: Wed, 26 Nov 2014 11:18:49 +0000
Subject: [PATCH 129/399] Fixed Gradle Script in Readme.MD

Package name was incorrect.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 980da959f..d19487ade 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Download [the latest JAR](https://search.maven.org/remote_content?g=com.koushikd
 Gradle: 
 ```groovy
 dependencies {
-    compile 'com.koushikdutta.androidasync:androidasync:2.+'
+    compile 'com.koushikdutta.async:androidasync:2.+'
 }
 ```
 

From 680f39e8b694b13f12eac1a83aa551551cc77867 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 21 Nov 2014 13:05:31 -0800
Subject: [PATCH 130/399] BUbble up SSL exceptions

---
 .../com/koushikdutta/async/http/AsyncSocketMiddleware.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index 12dd28a06..4a420fb8c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -206,7 +206,9 @@ public void onCompleted(Exception ex) {
                         // if it completed, that means that the connection failed
                         if (lastException == null)
                             lastException = new ConnectionFailedException("Unable to connect to remote address");
-                        setComplete(lastException);
+                        if (setComplete(lastException)) {
+                            data.connectCallback.onConnectCompleted(lastException, null);
+                        }
                     }
                 });
 

From de52c3676ba1b07155c4a80ceccbf235df880bc1 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 1 Dec 2014 19:04:27 -0800
Subject: [PATCH 131/399] ResponseCacheMiddleware: use super.onDataAvailable vs
 Util.onDataAvailable

If the request is cancelled, the super.onDataAvailable will eat spewed data.
---
 .../async/http/cache/ResponseCacheMiddleware.java             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index 36e088941..007dcd797 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -425,7 +425,7 @@ public void run() {
 
         void spewInternal() {
             if (pending.remaining() > 0) {
-                com.koushikdutta.async.Util.emitAllData(CachedBodyEmitter.this, pending);
+                super.onDataAvailable(CachedBodyEmitter.this, pending);
                 if (pending.remaining() > 0)
                     return;
             }
@@ -451,7 +451,7 @@ void spewInternal() {
                 report(e);
                 return;
             }
-            com.koushikdutta.async.Util.emitAllData(this, pending);
+            super.onDataAvailable(this, pending);
             if (pending.remaining() > 0)
                 return;
             // this limits max throughput to 256k (aka max alloc) * 100 per second...

From 9bbb4bcd46390b492836c309a52abfe2b15ed718 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 1 Dec 2014 19:10:14 -0800
Subject: [PATCH 132/399] Response cache close should clean up the cached
 stream.

This prevents noisy data coming through.
---
 .../async/http/cache/ResponseCacheMiddleware.java           | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index 007dcd797..614ba40b9 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -474,6 +474,12 @@ public boolean isPaused() {
             return paused;
         }
 
+        @Override
+        public void close() {
+            StreamUtility.closeQuietly(cacheResponse.getBody());
+            super.close();
+        }
+
         @Override
         protected void report(Exception e) {
             // a 304 response will immediate call report/end since there is no body.

From 4ddc6591c78e9e72bacb1c4d9e4571fa4a08c969 Mon Sep 17 00:00:00 2001
From: Vladimir Mironov <nsk.mironov@gmail.com>
Date: Sat, 6 Dec 2014 19:42:41 +0300
Subject: [PATCH 133/399] Fix NPE

---
 .../src/com/koushikdutta/async/AsyncSSLSocketWrapper.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index f138a471d..6b6af4573 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -229,7 +229,7 @@ else if (res.getStatus() == Status.BUFFER_UNDERFLOW) {
     public void onDataAvailable() {
         Util.emitAllData(this, pending);
 
-        if (mEnded && !pending.hasRemaining())
+        if (mEnded && !pending.hasRemaining() && mEndCallback != null)
             mEndCallback.onCompleted(mEndException);
     }
 

From fb81e9912307c64a5311d9afb8c42b0e47a3fc73 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 8 Dec 2014 16:58:01 -0800
Subject: [PATCH 134/399] Use reflection to enable SNI in the SSLEngine when
 available.

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml    |  1 +
 .../async/http/AsyncHttpClient.java           |  2 +-
 .../async/http/SSLEngineSNIConfigurator.java  | 64 +++++++++++++++++++
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index dcb209cfd..362642fd6 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -79,6 +79,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index e2e1404ed..6382494ea 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -73,9 +73,9 @@ public AsyncHttpClient(AsyncServer server) {
         insertMiddleware(socketMiddleware = new AsyncSocketMiddleware(this));
         insertMiddleware(sslSocketMiddleware = new SpdyMiddleware(this));
         insertMiddleware(httpTransportMiddleware = new HttpTransportMiddleware());
+        sslSocketMiddleware.addEngineConfigurator(new SSLEngineSNIConfigurator());
     }
 
-
     @SuppressLint("NewApi")
     private static void setupAndroidProxy(AsyncHttpRequest request) {
         // using a explicit proxy?
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java b/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java
new file mode 100644
index 000000000..5a87a5616
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java
@@ -0,0 +1,64 @@
+package com.koushikdutta.async.http;
+
+import java.lang.reflect.Field;
+import java.util.Hashtable;
+
+import javax.net.ssl.SSLEngine;
+
+/**
+ * Created by koush on 12/8/14.
+ */
+public class SSLEngineSNIConfigurator implements AsyncSSLEngineConfigurator {
+    private static class EngineHolder implements AsyncSSLEngineConfigurator {
+        Field peerHost;
+        Field peerPort;
+        Field sslParameters;
+        Field useSni;
+
+        public EngineHolder(Class engineClass) {
+            try {
+                peerHost = engineClass.getSuperclass().getDeclaredField("peerHost");
+                peerHost.setAccessible(true);
+
+                peerPort = engineClass.getSuperclass().getDeclaredField("peerPort");
+                peerPort.setAccessible(true);
+
+                sslParameters = engineClass.getDeclaredField("sslParameters");
+                sslParameters.setAccessible(true);
+
+                useSni = sslParameters.getType().getDeclaredField("useSni");
+                useSni.setAccessible(true);
+            }
+            catch (NoSuchFieldException e) {
+            }
+        }
+
+        @Override
+        public void configureEngine(SSLEngine engine, AsyncHttpClientMiddleware.GetSocketData data, String host, int port) {
+            if (useSni == null)
+                return;
+            try {
+                peerHost.set(engine, host);
+                peerPort.set(engine, port);
+                Object sslp = sslParameters.get(engine);
+                useSni.set(sslp, true);
+            }
+            catch (IllegalAccessException e) {
+            }
+        }
+    }
+
+    Hashtable<String, EngineHolder> holders = new Hashtable<String, EngineHolder>();
+
+    @Override
+    public void configureEngine(SSLEngine engine, AsyncHttpClientMiddleware.GetSocketData data, String host, int port) {
+        String name = engine.getClass().getCanonicalName();
+        EngineHolder holder = holders.get(name);
+        if (holder == null) {
+            holder = new EngineHolder(engine.getClass());
+            holders.put(name, holder);
+        }
+
+        holder.configureEngine(engine, data, host, port);
+    }
+}

From c4f989cb376ce1d2aae0eb4b8652ca91e647b7b0 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 8 Dec 2014 17:02:29 -0800
Subject: [PATCH 135/399] add test for https://github.com/koush/ion/issues/428

---
 .../test/src/com/koushikdutta/async/test/Issue59.java       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java b/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
index 18aa00b45..f664ac328 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/Issue59.java
@@ -3,6 +3,7 @@
 import android.util.Log;
 
 import com.koushikdutta.async.AsyncServer;
+import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.http.AsyncHttpClient;
@@ -53,4 +54,9 @@ public void onCompleted(Exception ex) {
             AsyncServer.getDefault().stop();
         }
     }
+
+    public void testIon428() throws Exception {
+        ByteBufferList bb = AsyncHttpClient.getDefaultInstance().executeByteBufferList(new AsyncHttpGet("https://cdn2.vox-cdn.com/thumbor/KxtZNw37jKNfxdA0hX5edHvbTBE=/0x0:2039x1359/800x536/cdn0.vox-cdn.com/uploads/chorus_image/image/44254028/lg-g-watch.0.0.jpg"), null)
+        .get();
+    }
 }

From 683da377b7ecfc187b0d8f1ead969a5a8a80a7d3 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 8 Dec 2014 17:05:50 -0800
Subject: [PATCH 136/399] 202

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 7fb58210c..642c3430a 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="201"
-    android:versionName="2.0.1">
+    android:versionCode="202"
+    android:versionName="2.0.2">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

From a548938e8fa46a1a089c06821cf83094d1e8a4e8 Mon Sep 17 00:00:00 2001
From: pappz <zoltan.pmail@gmail.com>
Date: Tue, 9 Dec 2014 22:18:12 +0100
Subject: [PATCH 137/399] Update WebSocketImpl.java

Fix the newline character in the "Sec-WebSocket-Accept" headers's value.
---
 AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
index 0f113bb9a..1b82ef09d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
@@ -39,7 +39,7 @@ private static String SHA1(String text) {
             MessageDigest md = MessageDigest.getInstance("SHA-1");
             md.update(text.getBytes("iso-8859-1"), 0, text.length());
             byte[] sha1hash = md.digest();
-            return Base64.encodeToString(sha1hash, 0);
+            return Base64.encodeToString(sha1hash, Base64.NO_WRAP);
         }
         catch (Exception ex) {
             return null;

From cd3f26489d57a2d413971c0c2906842f90a5e1d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20Szyman=CC=81ski?=
 <zbigniew.szymanski@wearezeta.com>
Date: Mon, 15 Dec 2014 14:47:19 +0100
Subject: [PATCH 138/399] Fix SSL proxy tunneling. Added Host header to CONNECT
 request, required by some proxies (for example 724 Solutions on swiss
 network). Changed status line handling to allow any 2xx response code.
 Removed check for empty second line, proxy is allowed to send any number of
 headers after status line in response.

---
 .../async/http/AsyncSSLSocketMiddleware.java   | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
index d557a3104..dfee9709a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
@@ -101,7 +101,8 @@ public void onConnectCompleted(Exception ex, final AsyncSocket socket) {
 
                 // this SSL connection is proxied, must issue a CONNECT request to the proxy server
                 // http://stackoverflow.com/a/6594880/704837
-                String connect = String.format("CONNECT %s:%s HTTP/1.1\r\n\r\n", uri.getHost(), port);
+                // some proxies also require 'Host' header, it should be safe to provide it every time
+                String connect = String.format("CONNECT %s:%s HTTP/1.1\r\nHost: %s\r\n\r\n", uri.getHost(), port, uri.getHost());
                 Util.writeAll(socket, connect.getBytes(), new CompletedCallback() {
                     @Override
                     public void onCompleted(Exception ex) {
@@ -116,22 +117,17 @@ public void onCompleted(Exception ex) {
                             @Override
                             public void onStringAvailable(String s) {
                                 if (statusLine == null) {
-                                    statusLine = s;
-                                    if (statusLine.length() > 128 || !statusLine.contains("200")) {
+                                    statusLine = s.trim();
+                                    if (!statusLine.matches("HTTP/1.\\d 2\\d\\d .*")) { // connect response is allowed to have any 2xx status code
                                         socket.setDataCallback(null);
                                         socket.setEndCallback(null);
-                                        callback.onConnectCompleted(new IOException("non 200 status line"), socket);
+                                        callback.onConnectCompleted(new IOException("non 2xx status line"), socket);
                                     }
                                 }
-                                else {
+                                else if (TextUtils.isEmpty(s.trim())) { // skip all headers, complete handshake once empty line is received
                                     socket.setDataCallback(null);
                                     socket.setEndCallback(null);
-                                    if (TextUtils.isEmpty(s.trim())) {
-                                        tryHandshake(socket, data, uri, port, callback);
-                                    }
-                                    else {
-                                        callback.onConnectCompleted(new IOException("unknown second status line"), socket);
-                                    }
+                                    tryHandshake(socket, data, uri, port, callback);
                                 }
                             }
                         });

From e32c22dc0c6c739a9ac07158d305cb7950a4f146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20Szyman=CC=81ski?=
 <zbigniew.szymanski@wearezeta.com>
Date: Mon, 15 Dec 2014 15:23:45 +0100
Subject: [PATCH 139/399] Catch Throwable from socket.connect(). Due to
 framework bug nio socket connect method may throw AssertionError if socket is
 already closed on other thread, it would crash the whole app, and should just
 report an error for this request. Catching any Throwwable is the easiest work
 around this problem. Fixes #282

---
 AndroidAsync/src/com/koushikdutta/async/AsyncServer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 1b8ab503d..7245d79f2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -361,11 +361,11 @@ public void run() {
                     ckey.attach(cancel);
                     socket.connect(address);
                 }
-                catch (IOException e) {
+                catch (Throwable e) {
                     if (ckey != null)
                         ckey.cancel();
                     StreamUtility.closeQuietly(socket);
-                    cancel.setComplete(e);
+                    cancel.setComplete(new RuntimeException(e));
                 }
             }
         });

From 6bad7e39df48c94b162a225db75684d511a5d89b Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 19 Dec 2014 21:37:38 -0800
Subject: [PATCH 140/399] random iml stuff.

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index 362642fd6..d92cf7f54 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -78,7 +78,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />

From 8b9c65d5e5382b4feea5b76dc2b61c9858d5a2c9 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 19 Dec 2014 21:38:20 -0800
Subject: [PATCH 141/399] This SNI hack seems to cause issues.

https://github.com/koush/ion/issues/443

Revert "Use reflection to enable SNI in the SSLEngine when available."

This reverts commit fb81e9912307c64a5311d9afb8c42b0e47a3fc73.

Conflicts:
	AndroidAsync/AndroidAsync-AndroidAsync.iml
---
 .../async/http/AsyncHttpClient.java           |  2 +-
 .../async/http/SSLEngineSNIConfigurator.java  | 64 -------------------
 2 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 6382494ea..e2e1404ed 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -73,9 +73,9 @@ public AsyncHttpClient(AsyncServer server) {
         insertMiddleware(socketMiddleware = new AsyncSocketMiddleware(this));
         insertMiddleware(sslSocketMiddleware = new SpdyMiddleware(this));
         insertMiddleware(httpTransportMiddleware = new HttpTransportMiddleware());
-        sslSocketMiddleware.addEngineConfigurator(new SSLEngineSNIConfigurator());
     }
 
+
     @SuppressLint("NewApi")
     private static void setupAndroidProxy(AsyncHttpRequest request) {
         // using a explicit proxy?
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java b/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java
deleted file mode 100644
index 5a87a5616..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.koushikdutta.async.http;
-
-import java.lang.reflect.Field;
-import java.util.Hashtable;
-
-import javax.net.ssl.SSLEngine;
-
-/**
- * Created by koush on 12/8/14.
- */
-public class SSLEngineSNIConfigurator implements AsyncSSLEngineConfigurator {
-    private static class EngineHolder implements AsyncSSLEngineConfigurator {
-        Field peerHost;
-        Field peerPort;
-        Field sslParameters;
-        Field useSni;
-
-        public EngineHolder(Class engineClass) {
-            try {
-                peerHost = engineClass.getSuperclass().getDeclaredField("peerHost");
-                peerHost.setAccessible(true);
-
-                peerPort = engineClass.getSuperclass().getDeclaredField("peerPort");
-                peerPort.setAccessible(true);
-
-                sslParameters = engineClass.getDeclaredField("sslParameters");
-                sslParameters.setAccessible(true);
-
-                useSni = sslParameters.getType().getDeclaredField("useSni");
-                useSni.setAccessible(true);
-            }
-            catch (NoSuchFieldException e) {
-            }
-        }
-
-        @Override
-        public void configureEngine(SSLEngine engine, AsyncHttpClientMiddleware.GetSocketData data, String host, int port) {
-            if (useSni == null)
-                return;
-            try {
-                peerHost.set(engine, host);
-                peerPort.set(engine, port);
-                Object sslp = sslParameters.get(engine);
-                useSni.set(sslp, true);
-            }
-            catch (IllegalAccessException e) {
-            }
-        }
-    }
-
-    Hashtable<String, EngineHolder> holders = new Hashtable<String, EngineHolder>();
-
-    @Override
-    public void configureEngine(SSLEngine engine, AsyncHttpClientMiddleware.GetSocketData data, String host, int port) {
-        String name = engine.getClass().getCanonicalName();
-        EngineHolder holder = holders.get(name);
-        if (holder == null) {
-            holder = new EngineHolder(engine.getClass());
-            holders.put(name, holder);
-        }
-
-        holder.configureEngine(engine, data, host, port);
-    }
-}

From 25aa60f130d5a2e96255eeb6d78b9858586ee476 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 20 Dec 2014 19:10:35 -0800
Subject: [PATCH 142/399] Fix SPDY data fin issue being sent with a 0 length
 packet.

More detailed logging. Note that there is a possible connection termination issue.
---
 .../async/http/AsyncSocketMiddleware.java         |  4 +++-
 .../com/koushikdutta/async/http/spdy/Spdy3.java   | 15 +++++++++++++++
 .../async/http/spdy/SpdyMiddleware.java           |  3 ++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index 4a420fb8c..0f7aa9996 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -213,15 +213,17 @@ public void onCompleted(Exception ex) {
                 });
 
                 for (final InetAddress address: result) {
+                    final String inetSockAddress = String.format("%s:%s", address, port);
                     keepTrying.add(new ContinuationCallback() {
                         @Override
                         public void onContinue(Continuation continuation, final CompletedCallback next) throws Exception {
+                            data.request.logv("attempting connection to " + inetSockAddress);
                             mClient.getServer().connectSocket(new InetSocketAddress(address, port),
                                 wrapCallback(data, uri, port, false, new ConnectCallback() {
                                 @Override
                                 public void onConnectCompleted(Exception ex, AsyncSocket socket) {
                                     if (isDone()) {
-                                        lastException = new Exception("internal error during connect");
+                                        lastException = new Exception("internal error during connect to " + inetSockAddress);
                                         next.onCompleted(null);
                                         return;
                                     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
index ddea2f2f3..51b48904d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
@@ -19,6 +19,7 @@
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.DataEmitterReader;
+import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.util.Charsets;
@@ -130,6 +131,13 @@ static final class Reader implements FrameReader {
             this.handler = handler;
             this.client = client;
 
+            emitter.setEndCallback(new CompletedCallback() {
+                @Override
+                public void onCompleted(Exception ex) {
+                    // TODO: handle termination
+                }
+            });
+
             reader = new DataEmitterReader();
             parseFrameHeader();
         }
@@ -145,6 +153,7 @@ private void parseFrameHeader() {
         int length;
         int streamId;
         boolean inFinished;
+        private final ByteBufferList emptyList = new ByteBufferList();
         private final DataCallback onFrame = new DataCallback() {
             @Override
             public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
@@ -160,6 +169,12 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                     streamId = w1 & 0x7fffffff;
                     inFinished = (flags & FLAG_FIN) != 0;
                     emitter.setDataCallback(onDataFrame);
+
+                    if (length == 0) {
+                        // zero length packet, immediately trigger the data parsing
+                        // fixes the hanging response portion of https://github.com/koush/ion/issues/443#issuecomment-67729152
+                        onDataFrame.onDataAvailable(emitter, emptyList);
+                    }
                 }
                 else {
                     reader.read(length, onFullFrame);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index b45f16a66..6f6c629da 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -186,6 +186,7 @@ public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
 
                     connections.put(data.request.getUri().getHost(), connection);
 
+                    data.request.logv("using new spdy connection for host: " + data.request.getUri().getHost());
                     newSocket(data, connection, callback);
                 }
                 catch (Exception ex) {
@@ -198,7 +199,6 @@ public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
 
     private void newSocket(GetSocketData data, final AsyncSpdyConnection connection, final ConnectCallback callback) {
         final AsyncHttpRequest request = data.request;
-        request.logv("using spdy connection");
 
         data.protocol = connection.protocol.toString();
 
@@ -272,6 +272,7 @@ public Cancellable getSocket(GetSocketData data) {
             return super.getSocket(data);
         }
 
+        data.request.logv("using existing spdy connection for host: " + data.request.getUri().getHost());
         newSocket(data, conn, data.connectCallback);
 
         SimpleCancellable ret = new SimpleCancellable();

From 8aabbd1fb850e4a8cea54c45c8de9dc715c5c70a Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 20 Dec 2014 21:14:51 -0800
Subject: [PATCH 143/399] Fix dangling connection issues in SPDY

---
 .../async/future/MultiFuture.java             | 50 ++++++++++++
 .../async/http/spdy/SpdyMiddleware.java       | 77 +++++++++++++++----
 2 files changed, 111 insertions(+), 16 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/future/MultiFuture.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/MultiFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/MultiFuture.java
new file mode 100644
index 000000000..4ec7b8664
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/future/MultiFuture.java
@@ -0,0 +1,50 @@
+package com.koushikdutta.async.future;
+
+import java.util.ArrayList;
+
+/**
+ * Created by koush on 2/25/14.
+ */
+public class MultiFuture<T> extends SimpleFuture<T> {
+    ArrayList<FutureCallback<T>> callbacks;
+
+    final FutureCallback<T> callback = new FutureCallback<T>() {
+        @Override
+        public void onCompleted(Exception e, T result) {
+            ArrayList<FutureCallback<T>> callbacks;
+            synchronized (MultiFuture.this) {
+                callbacks = MultiFuture.this.callbacks;
+                MultiFuture.this.callbacks = null;
+            }
+
+            if (callbacks == null)
+                return;
+            for (FutureCallback<T> cb: callbacks) {
+                cb.onCompleted(e, result);
+            }
+        }
+    };
+
+    @Override
+    public MultiFuture<T> setCallback(FutureCallback<T> callback) {
+        synchronized (this) {
+            if (callbacks == null)
+                callbacks = new ArrayList<FutureCallback<T>>();
+            callbacks.add(callback);
+        }
+        // so, there is a race condition where this internal callback could get
+        // executed twice, if two callbacks are added at the same time.
+        // however, it doesn't matter, as the actual retrieval and nulling
+        // of the callback list is done in another sync block.
+        // one of the invocations will actually invoke all the callbacks,
+        // while the other will not get a list back.
+
+        // race:
+        // 1-ADD
+        // 2-ADD
+        // 1-INVOKE LIST
+        // 2-INVOKE NULL
+        super.setCallback(this.callback);
+        return this;
+    }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 6f6c629da..515006942 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -10,10 +10,10 @@
 import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.future.Cancellable;
 import com.koushikdutta.async.future.FutureCallback;
+import com.koushikdutta.async.future.MultiFuture;
 import com.koushikdutta.async.future.SimpleCancellable;
 import com.koushikdutta.async.future.TransformFuture;
 import com.koushikdutta.async.http.AsyncHttpClient;
-import com.koushikdutta.async.http.AsyncHttpClientMiddleware;
 import com.koushikdutta.async.http.AsyncHttpRequest;
 import com.koushikdutta.async.http.AsyncSSLEngineConfigurator;
 import com.koushikdutta.async.http.AsyncSSLSocketMiddleware;
@@ -24,6 +24,7 @@
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 import com.koushikdutta.async.util.Charsets;
 
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
@@ -119,7 +120,7 @@ private void configure(SSLEngine engine, GetSocketData data, String host, int po
     Field useSni;
     Method nativeGetNpnNegotiatedProtocol;
     Method nativeGetAlpnNegotiatedProtocol;
-    Hashtable<String, AsyncSpdyConnection> connections = new Hashtable<String, AsyncSpdyConnection>();
+    Hashtable<String, MultiFuture<AsyncSpdyConnection>> connections = new Hashtable<String, MultiFuture<AsyncSpdyConnection>>();
     boolean spdyEnabled;
 
     public boolean getSpdyEnabled() {
@@ -159,6 +160,16 @@ else if (!pathAndQuery.startsWith("/"))
         return pathAndQuery;
     }
 
+    private static class NoSpdyException extends Exception {
+    }
+    private static NoSpdyException NO_SPDY = new NoSpdyException();
+
+    private void noSpdy(String key) {
+        MultiFuture<AsyncSpdyConnection> conn = connections.remove(key);
+        if (conn != null)
+            conn.setComplete(NO_SPDY);
+    }
+
     @Override
     protected AsyncSSLSocketWrapper.HandshakeCallback createHandshakeCallback(final GetSocketData data, final ConnectCallback callback) {
         return new AsyncSSLSocketWrapper.HandshakeCallback() {
@@ -168,30 +179,46 @@ public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
                     callback.onConnectCompleted(e, socket);
                     return;
                 }
+                final String key = data.request.getUri().getHost();
                 try {
                     long ptr = (Long)sslNativePointer.get(socket.getSSLEngine());
                     byte[] proto = (byte[])nativeGetAlpnNegotiatedProtocol.invoke(null, ptr);
                     if (proto == null) {
                         callback.onConnectCompleted(null, socket);
+                        noSpdy(key);
                         return;
                     }
                     String protoString = new String(proto);
                     Protocol p = Protocol.get(protoString);
                     if (p == null) {
                         callback.onConnectCompleted(null, socket);
+                        noSpdy(key);
                         return;
                     }
-                    final AsyncSpdyConnection connection = new AsyncSpdyConnection(socket, Protocol.get(protoString));
-                    connection.sendConnectionPreface();
-
-                    connections.put(data.request.getUri().getHost(), connection);
-
-                    data.request.logv("using new spdy connection for host: " + data.request.getUri().getHost());
-                    newSocket(data, connection, callback);
+                    final AsyncSpdyConnection connection = new AsyncSpdyConnection(socket, Protocol.get(protoString)) {
+                        boolean hasReceivedSettings;
+                        @Override
+                        public void settings(boolean clearPrevious, Settings settings) {
+                            super.settings(clearPrevious, settings);
+                            if (!hasReceivedSettings) {
+                                try {
+                                    sendConnectionPreface();
+                                } catch (IOException e1) {
+                                    e1.printStackTrace();
+                                }
+                                hasReceivedSettings = true;
+
+                                connections.get(key).setComplete(this);
+                                data.request.logv("using new spdy connection for host: " + data.request.getUri().getHost());
+                                newSocket(data, this, callback);
+                            }
+                        }
+                    };
                 }
                 catch (Exception ex) {
                     socket.close();
                     callback.onConnectCompleted(ex, null);
+                    noSpdy(key);
                 }
             }
         };
@@ -248,7 +275,7 @@ private boolean canSpdyRequest(GetSocketData data) {
     }
 
     @Override
-    public Cancellable getSocket(GetSocketData data) {
+    public Cancellable getSocket(final GetSocketData data) {
         if (!spdyEnabled)
             return super.getSocket(data);
 
@@ -266,17 +293,35 @@ public Cancellable getSocket(GetSocketData data) {
 
         // can we use an existing connection to satisfy this, or do we need a new one?
         String host = uri.getHost();
-        AsyncSpdyConnection conn = connections.get(host);
-        if (conn == null || !conn.socket.isOpen()) {
-            connections.remove(host);
+        MultiFuture<AsyncSpdyConnection> conn = connections.get(host);
+        if (conn == null) {
+            conn = new MultiFuture<AsyncSpdyConnection>();
+            connections.put(host, conn);
             return super.getSocket(data);
         }
 
+        final SimpleCancellable ret = new SimpleCancellable();
         data.request.logv("using existing spdy connection for host: " + data.request.getUri().getHost());
-        newSocket(data, conn, data.connectCallback);
+        conn.setCallback(new FutureCallback<AsyncSpdyConnection>() {
+            @Override
+            public void onCompleted(Exception e, AsyncSpdyConnection conn) {
+                if (e instanceof NoSpdyException) {
+                    data.request.logv("spdy not available");
+                    ret.setParent(SpdyMiddleware.super.getSocket(data));
+                    return;
+                }
+                if (e != null) {
+                    data.request.loge("spdy not available", e);
+                    ret.setComplete();
+                    data.connectCallback.onConnectCompleted(e, null);
+                    return;
+                }
+                data.request.logv("spdy connection ready");
+                ret.setComplete();
+                newSocket(data, conn, data.connectCallback);
+            }
+        });
 
-        SimpleCancellable ret = new SimpleCancellable();
-        ret.setComplete();
         return ret;
     }
 

From 5840fd01717e0782f1f3c809579067b7d0556448 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 21 Dec 2014 17:10:01 -0800
Subject: [PATCH 144/399] Fix up various race and reuse issues around spdy.

---
 .../async/http/AsyncSSLSocketMiddleware.java  |  2 +-
 .../async/http/spdy/SpdyMiddleware.java       | 36 +++++++++++++------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
index d557a3104..0a0199ac3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
@@ -68,7 +68,7 @@ protected SSLEngine createConfiguredSSLEngine(GetSocketData data, String host, i
         return sslEngine;
     }
 
-    protected AsyncSSLSocketWrapper.HandshakeCallback createHandshakeCallback(GetSocketData data, final ConnectCallback callback) {
+    protected AsyncSSLSocketWrapper.HandshakeCallback createHandshakeCallback(final GetSocketData data, final ConnectCallback callback) {
         return new AsyncSSLSocketWrapper.HandshakeCallback() {
             @Override
             public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 515006942..ff520d295 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -120,9 +120,14 @@ private void configure(SSLEngine engine, GetSocketData data, String host, int po
     Field useSni;
     Method nativeGetNpnNegotiatedProtocol;
     Method nativeGetAlpnNegotiatedProtocol;
-    Hashtable<String, MultiFuture<AsyncSpdyConnection>> connections = new Hashtable<String, MultiFuture<AsyncSpdyConnection>>();
+    Hashtable<String, SpdyConnectionWaiter> connections = new Hashtable<String, SpdyConnectionWaiter>();
     boolean spdyEnabled;
 
+    private static class SpdyConnectionWaiter {
+        AsyncSpdyConnection conn;
+        MultiFuture<AsyncSpdyConnection> future = new MultiFuture<AsyncSpdyConnection>();
+    }
+
     public boolean getSpdyEnabled() {
         return spdyEnabled;
     }
@@ -162,12 +167,12 @@ else if (!pathAndQuery.startsWith("/"))
 
     private static class NoSpdyException extends Exception {
     }
-    private static NoSpdyException NO_SPDY = new NoSpdyException();
+    private static final NoSpdyException NO_SPDY = new NoSpdyException();
 
     private void noSpdy(String key) {
-        MultiFuture<AsyncSpdyConnection> conn = connections.remove(key);
+        SpdyConnectionWaiter conn = connections.remove(key);
         if (conn != null)
-            conn.setComplete(NO_SPDY);
+            conn.future.setComplete(NO_SPDY);
     }
 
     @Override
@@ -208,7 +213,9 @@ public void settings(boolean clearPrevious, Settings settings) {
                                 }
                                 hasReceivedSettings = true;
 
-                                connections.get(key).setComplete(this);
+                                SpdyConnectionWaiter waiter = connections.get(key);
+                                waiter.conn = this;
+                                waiter.future.setComplete(this);
                                 data.request.logv("using new spdy connection for host: " + data.request.getUri().getHost());
                                 newSocket(data, this, callback);
                             }
@@ -292,17 +299,24 @@ public Cancellable getSocket(final GetSocketData data) {
             return super.getSocket(data);
 
         // can we use an existing connection to satisfy this, or do we need a new one?
-        String host = uri.getHost();
-        MultiFuture<AsyncSpdyConnection> conn = connections.get(host);
+        String key = uri.getHost();
+        SpdyConnectionWaiter conn = connections.get(key);
+        if (conn != null && conn.conn != null && !conn.conn.socket.isOpen()) {
+            connections.remove(key);
+            conn = null;
+        }
+
         if (conn == null) {
-            conn = new MultiFuture<AsyncSpdyConnection>();
-            connections.put(host, conn);
-            return super.getSocket(data);
+            Cancellable superSocket = super.getSocket(data);;
+            // see if we reuse a socket synchronously, otherwise a new connection is being created
+            if (!superSocket.isDone())
+                connections.put(key, new SpdyConnectionWaiter());
+            return superSocket;
         }
 
         final SimpleCancellable ret = new SimpleCancellable();
         data.request.logv("using existing spdy connection for host: " + data.request.getUri().getHost());
-        conn.setCallback(new FutureCallback<AsyncSpdyConnection>() {
+        conn.future.setCallback(new FutureCallback<AsyncSpdyConnection>() {
             @Override
             public void onCompleted(Exception e, AsyncSpdyConnection conn) {
                 if (e instanceof NoSpdyException) {

From e144863b863aba011d72d1498647e43fc5146a09 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 21 Dec 2014 23:26:03 -0800
Subject: [PATCH 145/399] better logging in spdy.

Tweak the ordering of spdy operations so connection are fulfilled in order of initiation.
---
 .../com/koushikdutta/async/future/Future.java | 19 +++++++++++++++++
 .../async/future/SimpleFuture.java            | 20 +++++++++++++-----
 .../async/http/spdy/SpdyMiddleware.java       | 21 +++++++++----------
 3 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Future.java b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
index 430b04e3c..7fc1ccd89 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Future.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
@@ -8,5 +8,24 @@ public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
      * @return
      */
     public Future<T> setCallback(FutureCallback<T> callback);
+
+    /**
+     * Set a callback to be invoked when this Future completes.
+     * @param callback
+     * @param <C>
+     * @return The callback
+     */
     public <C extends FutureCallback<T>> C then(C callback);
+
+    /**
+     * Get the result, if any. Returns null if still in progress.
+     * @return
+     */
+    public T tryGet();
+
+    /**
+     * Get the exception, if any. Returns null if still in progress.
+     * @return
+     */
+    public Exception tryGetException();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
index 11f5df3cf..da046e26e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -59,14 +59,14 @@ public T get() throws InterruptedException, ExecutionException {
         AsyncSemaphore waiter;
         synchronized (this) {
             if (isCancelled() || isDone())
-                return getResult();
+                return getResultOrThrow();
             waiter = ensureWaiterLocked();
         }
         waiter.acquire();
-        return getResult();
+        return getResultOrThrow();
     }
 
-    private T getResult() throws ExecutionException {
+    private T getResultOrThrow() throws ExecutionException {
         if (exception != null)
             throw new ExecutionException(exception);
         return result;
@@ -77,12 +77,12 @@ public T get(long timeout, TimeUnit unit) throws InterruptedException, Execution
         AsyncSemaphore waiter;
         synchronized (this) {
             if (isCancelled() || isDone())
-                return getResult();
+                return getResultOrThrow();
             waiter = ensureWaiterLocked();
         }
         if (!waiter.tryAcquire(timeout, unit))
             throw new TimeoutException();
-        return getResult();
+        return getResultOrThrow();
     }
 
     @Override
@@ -205,4 +205,14 @@ public SimpleFuture<T> reset() {
 
         return this;
     }
+
+    @Override
+    public Exception tryGetException() {
+        return exception;
+    }
+
+    @Override
+    public T tryGet() {
+        return result;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index ff520d295..0f9cdbb5f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -123,9 +123,7 @@ private void configure(SSLEngine engine, GetSocketData data, String host, int po
     Hashtable<String, SpdyConnectionWaiter> connections = new Hashtable<String, SpdyConnectionWaiter>();
     boolean spdyEnabled;
 
-    private static class SpdyConnectionWaiter {
-        AsyncSpdyConnection conn;
-        MultiFuture<AsyncSpdyConnection> future = new MultiFuture<AsyncSpdyConnection>();
+    private static class SpdyConnectionWaiter extends MultiFuture<AsyncSpdyConnection> {
     }
 
     public boolean getSpdyEnabled() {
@@ -172,7 +170,7 @@ private static class NoSpdyException extends Exception {
     private void noSpdy(String key) {
         SpdyConnectionWaiter conn = connections.remove(key);
         if (conn != null)
-            conn.future.setComplete(NO_SPDY);
+            conn.setComplete(NO_SPDY);
     }
 
     @Override
@@ -213,11 +211,11 @@ public void settings(boolean clearPrevious, Settings settings) {
                                 }
                                 hasReceivedSettings = true;
 
-                                SpdyConnectionWaiter waiter = connections.get(key);
-                                waiter.conn = this;
-                                waiter.future.setComplete(this);
                                 data.request.logv("using new spdy connection for host: " + data.request.getUri().getHost());
                                 newSocket(data, this, callback);
+
+                                SpdyConnectionWaiter waiter = connections.get(key);
+                                waiter.setComplete(this);
                             }
                         }
                     };
@@ -301,12 +299,13 @@ public Cancellable getSocket(final GetSocketData data) {
         // can we use an existing connection to satisfy this, or do we need a new one?
         String key = uri.getHost();
         SpdyConnectionWaiter conn = connections.get(key);
-        if (conn != null && conn.conn != null && !conn.conn.socket.isOpen()) {
+        if (conn != null && conn.tryGet() != null && !conn.tryGet().socket.isOpen()) {
             connections.remove(key);
             conn = null;
         }
 
         if (conn == null) {
+            data.request.logv("attempting spdy connection for host: " + data.request.getUri().getHost());
             Cancellable superSocket = super.getSocket(data);;
             // see if we reuse a socket synchronously, otherwise a new connection is being created
             if (!superSocket.isDone())
@@ -314,9 +313,9 @@ public Cancellable getSocket(final GetSocketData data) {
             return superSocket;
         }
 
+        data.request.logv("waiting for potential spdy connection for host: " + data.request.getUri().getHost());
         final SimpleCancellable ret = new SimpleCancellable();
-        data.request.logv("using existing spdy connection for host: " + data.request.getUri().getHost());
-        conn.future.setCallback(new FutureCallback<AsyncSpdyConnection>() {
+        conn.setCallback(new FutureCallback<AsyncSpdyConnection>() {
             @Override
             public void onCompleted(Exception e, AsyncSpdyConnection conn) {
                 if (e instanceof NoSpdyException) {
@@ -330,7 +329,7 @@ public void onCompleted(Exception e, AsyncSpdyConnection conn) {
                     data.connectCallback.onConnectCompleted(e, null);
                     return;
                 }
-                data.request.logv("spdy connection ready");
+                data.request.logv("using existing spdy connection for host: " + data.request.getUri().getHost());
                 ret.setComplete();
                 newSocket(data, conn, data.connectCallback);
             }

From 8eeba502372f0b516147801aaa1960ef0b5791a3 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 8 Dec 2014 16:58:01 -0800
Subject: [PATCH 146/399] Use reflection to enable SNI in the SSLEngine when
 available.

Conflicts:
	AndroidAsync/AndroidAsync-AndroidAsync.iml
---
 .../async/http/AsyncHttpClient.java           |  2 +-
 .../async/http/SSLEngineSNIConfigurator.java  | 64 +++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index e2e1404ed..6382494ea 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -73,9 +73,9 @@ public AsyncHttpClient(AsyncServer server) {
         insertMiddleware(socketMiddleware = new AsyncSocketMiddleware(this));
         insertMiddleware(sslSocketMiddleware = new SpdyMiddleware(this));
         insertMiddleware(httpTransportMiddleware = new HttpTransportMiddleware());
+        sslSocketMiddleware.addEngineConfigurator(new SSLEngineSNIConfigurator());
     }
 
-
     @SuppressLint("NewApi")
     private static void setupAndroidProxy(AsyncHttpRequest request) {
         // using a explicit proxy?
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java b/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java
new file mode 100644
index 000000000..5a87a5616
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java
@@ -0,0 +1,64 @@
+package com.koushikdutta.async.http;
+
+import java.lang.reflect.Field;
+import java.util.Hashtable;
+
+import javax.net.ssl.SSLEngine;
+
+/**
+ * Created by koush on 12/8/14.
+ */
+public class SSLEngineSNIConfigurator implements AsyncSSLEngineConfigurator {
+    private static class EngineHolder implements AsyncSSLEngineConfigurator {
+        Field peerHost;
+        Field peerPort;
+        Field sslParameters;
+        Field useSni;
+
+        public EngineHolder(Class engineClass) {
+            try {
+                peerHost = engineClass.getSuperclass().getDeclaredField("peerHost");
+                peerHost.setAccessible(true);
+
+                peerPort = engineClass.getSuperclass().getDeclaredField("peerPort");
+                peerPort.setAccessible(true);
+
+                sslParameters = engineClass.getDeclaredField("sslParameters");
+                sslParameters.setAccessible(true);
+
+                useSni = sslParameters.getType().getDeclaredField("useSni");
+                useSni.setAccessible(true);
+            }
+            catch (NoSuchFieldException e) {
+            }
+        }
+
+        @Override
+        public void configureEngine(SSLEngine engine, AsyncHttpClientMiddleware.GetSocketData data, String host, int port) {
+            if (useSni == null)
+                return;
+            try {
+                peerHost.set(engine, host);
+                peerPort.set(engine, port);
+                Object sslp = sslParameters.get(engine);
+                useSni.set(sslp, true);
+            }
+            catch (IllegalAccessException e) {
+            }
+        }
+    }
+
+    Hashtable<String, EngineHolder> holders = new Hashtable<String, EngineHolder>();
+
+    @Override
+    public void configureEngine(SSLEngine engine, AsyncHttpClientMiddleware.GetSocketData data, String host, int port) {
+        String name = engine.getClass().getCanonicalName();
+        EngineHolder holder = holders.get(name);
+        if (holder == null) {
+            holder = new EngineHolder(engine.getClass());
+            holders.put(name, holder);
+        }
+
+        holder.configureEngine(engine, data, host, port);
+    }
+}

From cb37d1c169371865f9bb6065c7496d20d3651b4b Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 22 Dec 2014 15:09:15 -0800
Subject: [PATCH 147/399] Fix SSL race condition exposed in new GMS:

wrap can invoke handshake completion, and triggering writable immediately
will end up being a no op, as it is already wrapping, and the callback
returns without writing anything.
---
 .../koushikdutta/async/AsyncSSLSocketWrapper.java   | 13 +++++++++++--
 .../async/http/spdy/SpdyMiddleware.java             |  9 +++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 6b6af4573..90608081d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -325,8 +325,17 @@ private void handleHandshakeStatus(HandshakeStatus status) {
                 }
                 handshakeCallback.onHandshakeCompleted(null, this);
                 handshakeCallback = null;
-                if (mWriteableCallback != null)
-                    mWriteableCallback.onWriteable();
+
+                mSocket.setClosedCallback(null);
+                // handshake can complete during a wrap, so make sure that the call
+                // stack and wrap flag is cleared before invoking writable
+                getServer().post(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (mWriteableCallback != null)
+                            mWriteableCallback.onWriteable();
+                    }
+                });
                 onDataAvailable();
             }
         }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 0f9cdbb5f..40fa618d9 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -178,6 +178,7 @@ protected AsyncSSLSocketWrapper.HandshakeCallback createHandshakeCallback(final
         return new AsyncSSLSocketWrapper.HandshakeCallback() {
             @Override
             public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
+                data.request.logv("checking spdy handshake");
                 if (e != null || nativeGetAlpnNegotiatedProtocol == null) {
                     callback.onConnectCompleted(e, socket);
                     return;
@@ -305,11 +306,15 @@ public Cancellable getSocket(final GetSocketData data) {
         }
 
         if (conn == null) {
-            data.request.logv("attempting spdy connection for host: " + data.request.getUri().getHost());
             Cancellable superSocket = super.getSocket(data);;
             // see if we reuse a socket synchronously, otherwise a new connection is being created
-            if (!superSocket.isDone())
+            if (!superSocket.isDone()) {
+                data.request.logv("waiting for spdy connection for host: " + data.request.getUri().getHost());
                 connections.put(key, new SpdyConnectionWaiter());
+            }
+            else {
+                data.request.logv("attempting spdy connection for host: " + data.request.getUri().getHost());
+            }
             return superSocket;
         }
 

From 42eabc6ca99c4011ed1ce30e4a7e77608f8d96fa Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 22 Dec 2014 15:28:51 -0800
Subject: [PATCH 148/399] Fix https://github.com/koush/AndroidAsync/issues/299

HTTP Message is optional.
---
 .../src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 40fa618d9..47ec2ed77 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -370,7 +370,8 @@ protected void transform(List<Header> result) throws Exception {
                 String status = headers.remove(Header.RESPONSE_STATUS.utf8());
                 String[] statusParts = status.split(" ", 2);
                 data.response.code(Integer.parseInt(statusParts[0]));
-                data.response.message(statusParts[1]);
+                if (statusParts.length == 2)
+                    data.response.message(statusParts[1]);
                 data.response.protocol(headers.remove(Header.VERSION.utf8()));
                 data.response.headers(headers);
                 setComplete(headers);

From 7c50cd7b4bb80256ff86b50bf42c92ed6a842b7f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 26 Dec 2014 00:00:22 -0800
Subject: [PATCH 149/399] 203

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 642c3430a..b537eee4d 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="202"
-    android:versionName="2.0.2">
+    android:versionCode="203"
+    android:versionName="2.0.3">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

From 8fccb744e3661434fafafc4c80e0ba8999a169d5 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 2 Jan 2015 00:40:56 -0800
Subject: [PATCH 150/399] fix ssl hang, even if spdy is disabled

---
 .../koushikdutta/async/http/spdy/SpdyMiddleware.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 47ec2ed77..b5c838e20 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -167,10 +167,11 @@ private static class NoSpdyException extends Exception {
     }
     private static final NoSpdyException NO_SPDY = new NoSpdyException();
 
-    private void noSpdy(String key) {
+    private void noSpdy(final GetSocketData data, String key) {
         SpdyConnectionWaiter conn = connections.remove(key);
         if (conn != null)
             conn.setComplete(NO_SPDY);
+        data.request.logv("not using spdy");
     }
 
     @Override
@@ -178,25 +179,26 @@ protected AsyncSSLSocketWrapper.HandshakeCallback createHandshakeCallback(final
         return new AsyncSSLSocketWrapper.HandshakeCallback() {
             @Override
             public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
+                final String key = data.request.getUri().getHost();
                 data.request.logv("checking spdy handshake");
                 if (e != null || nativeGetAlpnNegotiatedProtocol == null) {
                     callback.onConnectCompleted(e, socket);
+                    noSpdy(data, key);
                     return;
                 }
-                final String key = data.request.getUri().getHost();
                 try {
                     long ptr = (Long)sslNativePointer.get(socket.getSSLEngine());
                     byte[] proto = (byte[])nativeGetAlpnNegotiatedProtocol.invoke(null, ptr);
                     if (proto == null) {
                         callback.onConnectCompleted(null, socket);
-                        noSpdy(key);
+                        noSpdy(data, key);
                         return;
                     }
                     String protoString = new String(proto);
                     Protocol p = Protocol.get(protoString);
                     if (p == null) {
                         callback.onConnectCompleted(null, socket);
-                        noSpdy(key);
+                        noSpdy(data, key);
                         return;
                     }
                     final AsyncSpdyConnection connection = new AsyncSpdyConnection(socket, Protocol.get(protoString)) {
@@ -224,7 +226,7 @@ public void settings(boolean clearPrevious, Settings settings) {
                 catch (Exception ex) {
                     socket.close();
                     callback.onConnectCompleted(ex, null);
-                    noSpdy(key);
+                    noSpdy(data, key);
                 }
             }
         };

From eb02f18a21685ff601ca909033fe3f7f512ddf4e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 2 Jan 2015 00:42:26 -0800
Subject: [PATCH 151/399] 204

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index b537eee4d..205abf3b9 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="203"
-    android:versionName="2.0.3">
+    android:versionCode="204"
+    android:versionName="2.0.4">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

From 76ad32c3ddcb4d40d4fcc21a385d42928891e1c8 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 12 Jan 2015 16:13:55 -0800
Subject: [PATCH 152/399] more logging around proxying

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml                    | 2 --
 AndroidAsync/build.gradle                                     | 4 ++--
 .../com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java | 4 +++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index d92cf7f54..362642fd6 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -78,9 +78,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index be7776f41..a97f9640f 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        maven { url 'http://repo1.maven.org/maven2' }
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:+'
@@ -35,7 +35,7 @@ android {
 //    }
 
     compileSdkVersion 21
-    buildToolsVersion '21.1.1'
+    buildToolsVersion '21.1.2'
 }
 
 // upload to maven task
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
index 9ba7a1c0e..5aaaae4ae 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
@@ -103,6 +103,7 @@ public void onConnectCompleted(Exception ex, final AsyncSocket socket) {
                 // http://stackoverflow.com/a/6594880/704837
                 // some proxies also require 'Host' header, it should be safe to provide it every time
                 String connect = String.format("CONNECT %s:%s HTTP/1.1\r\nHost: %s\r\n\r\n", uri.getHost(), port, uri.getHost());
+                data.request.logv("Proxying: " + connect);
                 Util.writeAll(socket, connect.getBytes(), new CompletedCallback() {
                     @Override
                     public void onCompleted(Exception ex) {
@@ -116,12 +117,13 @@ public void onCompleted(Exception ex) {
                             String statusLine;
                             @Override
                             public void onStringAvailable(String s) {
+                                data.request.logv(s);
                                 if (statusLine == null) {
                                     statusLine = s.trim();
                                     if (!statusLine.matches("HTTP/1.\\d 2\\d\\d .*")) { // connect response is allowed to have any 2xx status code
                                         socket.setDataCallback(null);
                                         socket.setEndCallback(null);
-                                        callback.onConnectCompleted(new IOException("non 2xx status line"), socket);
+                                        callback.onConnectCompleted(new IOException("non 2xx status line: " + statusLine), socket);
                                     }
                                 }
                                 else if (TextUtils.isEmpty(s.trim())) { // skip all headers, complete handshake once empty line is received

From 66ba7f3cc4f3cf14f8ce0367bed9e93fe4bc653a Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 12 Jan 2015 16:25:12 -0800
Subject: [PATCH 153/399] 205

---
 AndroidAsync/AndroidManifest.xml                              | 4 ++--
 .../com/koushikdutta/async/http/AsyncSocketMiddleware.java    | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 205abf3b9..f0d42f30b 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="204"
-    android:versionName="2.0.4">
+    android:versionCode="205"
+    android:versionName="2.0.5">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index 0f7aa9996..3f5135f36 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -182,6 +182,9 @@ else if (proxyHost != null) {
                 unresolvedHost = uri.getHost();
                 unresolvedPort = port;
             }
+            if (proxied) {
+                data.request.logv("Using proxy: " + unresolvedHost + ":" + unresolvedPort);
+            }
             return mClient.getServer().connectSocket(unresolvedHost, unresolvedPort,
                 wrapCallback(data, uri, port, proxied, data.connectCallback));
         }

From 3069bbcb436de674bfb0163f58d3ecf2391afa30 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 19 Jan 2015 20:53:07 -0800
Subject: [PATCH 154/399] fix for keep alive socket stack overflow caused by
 reentrancy.

https://github.com/koush/AndroidAsync/issues/309
---
 AndroidAsync/AndroidAsync-AndroidAsync.iml                      | 2 ++
 .../src/com/koushikdutta/async/http/AsyncSocketMiddleware.java  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index 362642fd6..d92cf7f54 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -78,7 +78,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index 3f5135f36..555005d78 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -279,6 +279,8 @@ private void maybeCleanupConnectionInfo(String lookup) {
             if (idleSocketHolder.idleTime + idleTimeoutMs > System.currentTimeMillis())
                 break;
             info.sockets.pop();
+            // remove the callback, prevent reentrancy.
+            socket.setClosedCallback(null);
             socket.close();
         }
         if (info.openCount == 0 && info.queue.isEmpty() && info.sockets.isEmpty())

From 8777610d5a6e9bd3e9b26322032b0106970d98f8 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 19 Jan 2015 21:27:52 -0800
Subject: [PATCH 155/399] Fix other potential reentrancy issues.

---
 .../com/koushikdutta/async/http/AsyncSocketMiddleware.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index 555005d78..7b642e642 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -141,11 +141,11 @@ public Cancellable getSocket(final GetSocketData data) {
 
             info.openCount++;
 
-
             while (!info.sockets.isEmpty()) {
                 IdleSocketHolder idleSocketHolder = info.sockets.pop();
                 final AsyncSocket socket = idleSocketHolder.socket;
                 if (idleSocketHolder.idleTime + idleTimeoutMs < System.currentTimeMillis()) {
+                    socket.setClosedCallback(null);
                     socket.close();
                     continue;
                 }
@@ -305,7 +305,6 @@ private void recycleSocket(final AsyncSocket socket, AsyncHttpRequest request) {
             public void onCompleted(Exception ex) {
                 synchronized (AsyncSocketMiddleware.this) {
                     sockets.remove(idleSocketHolder);
-                    socket.setClosedCallback(null);
                     maybeCleanupConnectionInfo(lookup);
                 }
             }
@@ -317,6 +316,7 @@ private void idleSocket(final AsyncSocket socket) {
         socket.setEndCallback(new CompletedCallback() {
             @Override
             public void onCompleted(Exception ex) {
+                socket.setClosedCallback(null);
                 socket.close();
             }
         });
@@ -328,6 +328,7 @@ public void onCompleted(Exception ex) {
             public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                 super.onDataAvailable(emitter, bb);
                 bb.recycle();
+                socket.setClosedCallback(null);
                 socket.close();
             }
         });
@@ -364,12 +365,14 @@ public void onResponseComplete(final OnResponseCompleteDataOnRequestSentData dat
 
             if (data.exception != null || !data.socket.isOpen()) {
                 data.request.logv("closing out socket (exception)");
+                data.socket.setClosedCallback(null);
                 data.socket.close();
                 return;
             }
             if (!HttpUtil.isKeepAlive(data.response.protocol(), data.response.headers())
                 || !HttpUtil.isKeepAlive(Protocol.HTTP_1_1, data.request.getHeaders())) {
                 data.request.logv("closing out socket (not keep alive)");
+                data.socket.setClosedCallback(null);
                 data.socket.close();
                 return;
             }

From f4ee3fdaad4312de0c4c0f7b55543cda56b8aa52 Mon Sep 17 00:00:00 2001
From: Urmil Parikh <urmil@klarsys.com>
Date: Tue, 27 Jan 2015 12:11:48 +0530
Subject: [PATCH 156/399] FileBody: Allow setting custom content-type

---
 .../com/koushikdutta/async/http/body/FileBody.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/FileBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/FileBody.java
index 0d412779f..cf2b07ffd 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/FileBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/FileBody.java
@@ -13,10 +13,17 @@
  */
 public class FileBody implements AsyncHttpRequestBody<File> {
     File file;
+    String contentType = "application/binary";
+
     public FileBody(File file) {
         this.file = file;
     }
 
+    public FileBody(File file, String contentType) {
+        this.file = file;
+        this.contentType = contentType;
+    }
+
     @Override
     public void write(AsyncHttpRequest request, DataSink sink, CompletedCallback completed) {
         Util.pump(file, sink, completed);
@@ -27,10 +34,13 @@ public void parse(DataEmitter emitter, CompletedCallback completed) {
         throw new AssertionError("not implemented");
     }
 
-    public static final String CONTENT_TYPE = "application/binary";
     @Override
     public String getContentType() {
-        return CONTENT_TYPE;
+        return contentType;
+    }
+
+    public void setContentType(String contentType) {
+        this.contentType = contentType;
     }
 
     @Override

From 4f3e7de63a6a3715dbf9c08c8d032ab0667e116e Mon Sep 17 00:00:00 2001
From: Urmil Parikh <urmil@klarsys.com>
Date: Tue, 27 Jan 2015 12:18:23 +0530
Subject: [PATCH 157/399] Add AsyncHttpPut class for PUT operations

---
 .../com/koushikdutta/async/http/AsyncHttpPut.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpPut.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpPut.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpPut.java
new file mode 100644
index 000000000..a4e893721
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpPut.java
@@ -0,0 +1,15 @@
+package com.koushikdutta.async.http;
+
+import android.net.Uri;
+
+public class AsyncHttpPut extends AsyncHttpRequest {
+    public static final String METHOD = "PUT";
+    
+    public AsyncHttpPut(String uri) {
+        this(Uri.parse(uri));
+    }
+
+    public AsyncHttpPut(Uri uri) {
+        super(uri, METHOD);
+    }
+}

From 564252803d99f0f636a3523b98d28ca0ca697c64 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 30 Jan 2015 15:04:56 -0800
Subject: [PATCH 158/399] iml

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index d92cf7f54..e9527e977 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -9,6 +9,7 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
@@ -24,6 +25,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />

From 9c7ab52991f3ee2151cef4295d4d9f320f445ee8 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 30 Jan 2015 15:05:58 -0800
Subject: [PATCH 159/399] reexpose default content type for file bodies

---
 .../src/com/koushikdutta/async/http/body/FileBody.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/FileBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/FileBody.java
index cf2b07ffd..dfea1b9dd 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/FileBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/FileBody.java
@@ -12,8 +12,10 @@
  * Created by koush on 10/14/13.
  */
 public class FileBody implements AsyncHttpRequestBody<File> {
+    public static final String CONTENT_TYPE = "application/binary";
+
     File file;
-    String contentType = "application/binary";
+    String contentType = CONTENT_TYPE;
 
     public FileBody(File file) {
         this.file = file;

From b7113268d17513fb1dbe05a7315c836490180194 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 11 Feb 2015 21:05:52 -0800
Subject: [PATCH 160/399] watch for cr or lf

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml     | 18 +++++++++---------
 .../com/koushikdutta/async/http/Headers.java   |  2 ++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index e9527e977..d1b73c2f2 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -12,9 +12,9 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
@@ -25,7 +25,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -34,12 +34,12 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
index df1b07500..b289a4b31 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
@@ -44,6 +44,8 @@ public String get(String header) {
     }
 
     public Headers set(String header, String value) {
+        if (value.contains("\n") || value.contains("\r"))
+            throw new IllegalArgumentException("value must not contain a new line or line feed");
         String lc = header.toLowerCase();
         map.put(lc, value);
         TaggedList<String> list = (TaggedList<String>)map.get(lc);

From f0b68cf59f117a160e9247ecb1883cea2a1b0cc6 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 11 Feb 2015 21:07:07 -0800
Subject: [PATCH 161/399] null check header

---
 AndroidAsync/src/com/koushikdutta/async/http/Headers.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
index b289a4b31..92c2b195e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
@@ -44,7 +44,7 @@ public String get(String header) {
     }
 
     public Headers set(String header, String value) {
-        if (value.contains("\n") || value.contains("\r"))
+        if (value != null && (value.contains("\n") || value.contains("\r")))
             throw new IllegalArgumentException("value must not contain a new line or line feed");
         String lc = header.toLowerCase();
         map.put(lc, value);

From bd2147e130b5ce1aa3cd0ec5e1eed6154264d3ba Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 15 Feb 2015 10:53:31 -0800
Subject: [PATCH 162/399] pushparser fix for 0 len byte array

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml    |  2 --
 .../com/koushikdutta/async/PushParser.java    |  7 ++++++-
 AndroidAsyncSample/AndroidAsyncSample.iml     | 19 ++++++++++---------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index d1b73c2f2..c5d0925e9 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -80,9 +80,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
diff --git a/AndroidAsync/src/com/koushikdutta/async/PushParser.java b/AndroidAsync/src/com/koushikdutta/async/PushParser.java
index 51a79cc3f..27bece421 100644
--- a/AndroidAsync/src/com/koushikdutta/async/PushParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/PushParser.java
@@ -47,7 +47,8 @@ static class ByteArrayWaiter extends Waiter {
         ParseCallback<byte[]> callback;
         public ByteArrayWaiter(int length, ParseCallback<byte[]> callback) {
             super(length);
-            if (length <= 0) throw new IllegalArgumentException("length should be > 0");
+            if (length <= 0)
+                throw new IllegalArgumentException("length should be > 0");
             this.callback = callback;
         }
 
@@ -71,6 +72,10 @@ public LenByteArrayWaiter(ParseCallback<byte[]> callback) {
         @Override
         public Waiter onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             int length = bb.getInt();
+            if (length == 0) {
+                callback.parsed(new byte[0]);
+                return null;
+            }
             return new ByteArrayWaiter(length, callback);
         }
     }
diff --git a/AndroidAsyncSample/AndroidAsyncSample.iml b/AndroidAsyncSample/AndroidAsyncSample.iml
index 21fa9a433..8a2f8e30a 100644
--- a/AndroidAsyncSample/AndroidAsyncSample.iml
+++ b/AndroidAsyncSample/AndroidAsyncSample.iml
@@ -9,19 +9,20 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -30,12 +31,12 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />

From 81a3c9f8f9ab85b7c6c6237d113617522b9209cd Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 15 Feb 2015 10:53:40 -0800
Subject: [PATCH 163/399] basic auth middleware sample

---
 AndroidAsync.iml                              | 16 +++++++++
 .../middleware/BasicAuthMiddleware.java       | 36 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 AndroidAsync.iml
 create mode 100644 AndroidAsyncSample/src/com/koushikdutta/async/sample/middleware/BasicAuthMiddleware.java

diff --git a/AndroidAsync.iml b/AndroidAsync.iml
new file mode 100644
index 000000000..eaa4a88f3
--- /dev/null
+++ b/AndroidAsync.iml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Gradle" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":AndroidAsync" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/AndroidAsyncSample/src/com/koushikdutta/async/sample/middleware/BasicAuthMiddleware.java b/AndroidAsyncSample/src/com/koushikdutta/async/sample/middleware/BasicAuthMiddleware.java
new file mode 100644
index 000000000..f106386fe
--- /dev/null
+++ b/AndroidAsyncSample/src/com/koushikdutta/async/sample/middleware/BasicAuthMiddleware.java
@@ -0,0 +1,36 @@
+package com.koushikdutta.async.sample.middleware;
+
+import android.text.TextUtils;
+import android.util.Base64;
+
+import com.koushikdutta.async.http.AsyncHttpClient;
+import com.koushikdutta.async.http.SimpleMiddleware;
+
+import java.util.Hashtable;
+
+/**
+ * Created by koush on 2/15/15.
+ */
+public class BasicAuthMiddleware extends SimpleMiddleware {
+    // insert this using
+    public static BasicAuthMiddleware add(AsyncHttpClient client) {
+        BasicAuthMiddleware ret = new BasicAuthMiddleware();
+        client.getMiddleware().add(ret);
+        return ret;
+    }
+
+    @Override
+    public void onRequest(OnRequestData data) {
+        super.onRequest(data);
+        // do more checking here, since uri may not necessarily be http or have a host, etc.
+        String auth = auths.get(data.request.getUri().getHost());
+        if (!TextUtils.isEmpty(auth))
+            data.request.setHeader("Authorization", auth);
+    }
+
+    Hashtable<String, String> auths = new Hashtable<String, String>();
+    public void setAuthorizationForHost(String host, String username, String password) {
+        String auth = "Basic " + Base64.encodeToString(String.format("%s:%s", username, password).getBytes(), Base64.NO_WRAP);
+        auths.put(host, auth);
+    }
+}

From 520640b53a8b9717095bf38dfb361d297fc31ad4 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 15 Feb 2015 10:58:12 -0800
Subject: [PATCH 164/399] cache middleware sample

---
 .../middleware/CacheOverrideMiddleware.java   | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 AndroidAsyncSample/src/com/koushikdutta/async/sample/middleware/CacheOverrideMiddleware.java

diff --git a/AndroidAsyncSample/src/com/koushikdutta/async/sample/middleware/CacheOverrideMiddleware.java b/AndroidAsyncSample/src/com/koushikdutta/async/sample/middleware/CacheOverrideMiddleware.java
new file mode 100644
index 000000000..86d65ff17
--- /dev/null
+++ b/AndroidAsyncSample/src/com/koushikdutta/async/sample/middleware/CacheOverrideMiddleware.java
@@ -0,0 +1,44 @@
+package com.koushikdutta.async.sample.middleware;
+
+import android.text.TextUtils;
+import android.util.Base64;
+
+import com.koushikdutta.async.http.AsyncHttpClient;
+import com.koushikdutta.async.http.AsyncHttpClientMiddleware;
+import com.koushikdutta.async.http.SimpleMiddleware;
+
+import java.util.Hashtable;
+
+/**
+ * Created by koush on 2/15/15.
+ */
+public class CacheOverrideMiddleware extends SimpleMiddleware {
+    // insert this using
+    public static CacheOverrideMiddleware add(AsyncHttpClient client) {
+        CacheOverrideMiddleware ret = new CacheOverrideMiddleware();
+        // add this first so it gets called before everything else
+        client.getMiddleware().add(0, ret);
+        return ret;
+    }
+
+    @Override
+    public void onHeadersReceived(OnHeadersReceivedDataOnRequestSentData data) {
+        super.onHeadersReceived(data);
+
+        // do more checking here, since uri may not necessarily be http or have a host, etc.
+        String cache = cacheHeaders.get(data.request.getUri().getHost());
+        if (!TextUtils.isEmpty(cache))
+            data.request.setHeader("Cache-Control", cache);
+    }
+
+    Hashtable<String, String> cacheHeaders = new Hashtable<String, String>();
+
+    /**
+     * Override cache-control directives
+     * @param host
+     * @param cacheControl a Cache-Control value, like "max-age=300" to cache for 5 minutes
+     */
+    public void setCacheControlForHost(String host, String cacheControl) {
+        cacheHeaders.put(host, cacheControl);
+    }
+}

From 547a5edb1440cf1f7c02e5152af0c5a914c38cfc Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 15 Feb 2015 10:59:11 -0800
Subject: [PATCH 165/399] cache middleware sample

---
 .../async/sample/middleware/CacheOverrideMiddleware.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsyncSample/src/com/koushikdutta/async/sample/middleware/CacheOverrideMiddleware.java b/AndroidAsyncSample/src/com/koushikdutta/async/sample/middleware/CacheOverrideMiddleware.java
index 86d65ff17..593ce5c92 100644
--- a/AndroidAsyncSample/src/com/koushikdutta/async/sample/middleware/CacheOverrideMiddleware.java
+++ b/AndroidAsyncSample/src/com/koushikdutta/async/sample/middleware/CacheOverrideMiddleware.java
@@ -28,7 +28,7 @@ public void onHeadersReceived(OnHeadersReceivedDataOnRequestSentData data) {
         // do more checking here, since uri may not necessarily be http or have a host, etc.
         String cache = cacheHeaders.get(data.request.getUri().getHost());
         if (!TextUtils.isEmpty(cache))
-            data.request.setHeader("Cache-Control", cache);
+            data.response.headers().set("Cache-Control", cache);
     }
 
     Hashtable<String, String> cacheHeaders = new Hashtable<String, String>();

From 2ec170541343eae8b59a7011b2c910454823e8c6 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 15 Feb 2015 21:26:02 -0800
Subject: [PATCH 166/399] potential fix for issue 484

https://github.com/koush/ion/issues/484
---
 .../async/http/AsyncSocketMiddleware.java     |   4 +-
 .../async/http/spdy/SpdyMiddleware.java       | 149 +++++++++++-------
 AndroidAsyncSample/AndroidAsyncSample.iml     |  87 ----------
 3 files changed, 97 insertions(+), 143 deletions(-)
 delete mode 100644 AndroidAsyncSample/AndroidAsyncSample.iml

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index 7b642e642..4fc23b033 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -198,7 +198,7 @@ else if (proxyHost != null) {
             @Override
             protected void error(Exception e) {
                 super.error(e);
-                data.connectCallback.onConnectCompleted(e, null);
+                wrapCallback(data, uri, port, false, data.connectCallback).onConnectCompleted(e, null);
             }
 
             @Override
@@ -210,7 +210,7 @@ public void onCompleted(Exception ex) {
                         if (lastException == null)
                             lastException = new ConnectionFailedException("Unable to connect to remote address");
                         if (setComplete(lastException)) {
-                            data.connectCallback.onConnectCompleted(lastException, null);
+                            wrapCallback(data, uri, port, false, data.connectCallback).onConnectCompleted(lastException, null);
                         }
                     }
                 });
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index b5c838e20..692c4b10b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -5,6 +5,7 @@
 
 import com.koushikdutta.async.AsyncSSLSocket;
 import com.koushikdutta.async.AsyncSSLSocketWrapper;
+import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.callback.ConnectCallback;
@@ -124,6 +125,7 @@ private void configure(SSLEngine engine, GetSocketData data, String host, int po
     boolean spdyEnabled;
 
     private static class SpdyConnectionWaiter extends MultiFuture<AsyncSpdyConnection> {
+        SimpleCancellable originalCancellable = new SimpleCancellable();
     }
 
     public boolean getSpdyEnabled() {
@@ -167,67 +169,78 @@ private static class NoSpdyException extends Exception {
     }
     private static final NoSpdyException NO_SPDY = new NoSpdyException();
 
-    private void noSpdy(final GetSocketData data, String key) {
+    private void noSpdy(String key) {
         SpdyConnectionWaiter conn = connections.remove(key);
         if (conn != null)
             conn.setComplete(NO_SPDY);
-        data.request.logv("not using spdy");
+    }
+
+    private void invokeConnect(String key, final ConnectCallback callback, Exception e, AsyncSSLSocket socket) {
+        SpdyConnectionWaiter waiter = connections.get(key);
+        if (waiter.originalCancellable.setComplete())
+            callback.onConnectCompleted(e, socket);
     }
 
     @Override
     protected AsyncSSLSocketWrapper.HandshakeCallback createHandshakeCallback(final GetSocketData data, final ConnectCallback callback) {
+        final String key = data.state.get("spdykey");
+        if (key == null)
+            return super.createHandshakeCallback(data, callback);
+
         return new AsyncSSLSocketWrapper.HandshakeCallback() {
             @Override
             public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
-                final String key = data.request.getUri().getHost();
                 data.request.logv("checking spdy handshake");
                 if (e != null || nativeGetAlpnNegotiatedProtocol == null) {
-                    callback.onConnectCompleted(e, socket);
-                    noSpdy(data, key);
+                    invokeConnect(key, callback, e, socket);
+                    noSpdy(key);
                     return;
                 }
+                String protoString;
                 try {
                     long ptr = (Long)sslNativePointer.get(socket.getSSLEngine());
                     byte[] proto = (byte[])nativeGetAlpnNegotiatedProtocol.invoke(null, ptr);
                     if (proto == null) {
-                        callback.onConnectCompleted(null, socket);
-                        noSpdy(data, key);
+                        invokeConnect(key, callback, null, socket);
+                        noSpdy(key);
                         return;
                     }
-                    String protoString = new String(proto);
+                    protoString = new String(proto);
                     Protocol p = Protocol.get(protoString);
                     if (p == null) {
-                        callback.onConnectCompleted(null, socket);
-                        noSpdy(data, key);
+                        invokeConnect(key, callback, null, socket);
+                        noSpdy(key);
                         return;
                     }
-                    final AsyncSpdyConnection connection = new AsyncSpdyConnection(socket, Protocol.get(protoString)) {
-                        boolean hasReceivedSettings;
-                        @Override
-                        public void settings(boolean clearPrevious, Settings settings) {
-                            super.settings(clearPrevious, settings);
-                            if (!hasReceivedSettings) {
-                                try {
-                                    sendConnectionPreface();
-                                } catch (IOException e1) {
-                                    e1.printStackTrace();
-                                }
-                                hasReceivedSettings = true;
+                }
+                catch (Exception ex) {
+                    throw new AssertionError(ex);
+                }
+
+                final AsyncSpdyConnection connection = new AsyncSpdyConnection(socket, Protocol.get(protoString)) {
+                    boolean hasReceivedSettings;
+                    @Override
+                    public void settings(boolean clearPrevious, Settings settings) {
+                        super.settings(clearPrevious, settings);
+                        if (!hasReceivedSettings) {
+                            try {
+                                sendConnectionPreface();
+                            } catch (IOException e1) {
+                                e1.printStackTrace();
+                            }
+                            hasReceivedSettings = true;
 
+                            SpdyConnectionWaiter waiter = connections.get(key);
+
+                            if (waiter.originalCancellable.setComplete()) {
                                 data.request.logv("using new spdy connection for host: " + data.request.getUri().getHost());
                                 newSocket(data, this, callback);
-
-                                SpdyConnectionWaiter waiter = connections.get(key);
-                                waiter.setComplete(this);
                             }
+
+                            waiter.setComplete(this);
                         }
-                    };
-                }
-                catch (Exception ex) {
-                    socket.close();
-                    callback.onConnectCompleted(ex, null);
-                    noSpdy(data, key);
-                }
+                    }
+                };
             }
         };
     }
@@ -283,16 +296,39 @@ private boolean canSpdyRequest(GetSocketData data) {
     }
 
     @Override
-    public Cancellable getSocket(final GetSocketData data) {
-        if (!spdyEnabled)
-            return super.getSocket(data);
+    protected ConnectCallback wrapCallback(final GetSocketData data, final Uri uri, final int port, final boolean proxied, ConnectCallback callback) {
+        final ConnectCallback superCallback = super.wrapCallback(data, uri, port, proxied, callback);
+        final String key = data.state.get("spdykey");
+        if (key == null)
+            return superCallback;
+
+        // new outgoing connection, try to make this a spdy connection
+        return new ConnectCallback() {
+            @Override
+            public void onConnectCompleted(Exception ex, AsyncSocket socket) {
+                // an exception here is an ssl or network exception... don't rule spdy out yet, but
+                // trigger the waiters
+                if (ex != null) {
+                    final SpdyConnectionWaiter conn = connections.remove(key);
+                    if (conn != null)
+                        conn.setComplete(ex);
+                }
+                superCallback.onConnectCompleted(ex, socket);
+            }
+        };
+    }
 
+    @Override
+    public Cancellable getSocket(final GetSocketData data) {
         final Uri uri = data.request.getUri();
         final int port = getSchemePort(data.request.getUri());
         if (port == -1) {
             return null;
         }
 
+        if (!spdyEnabled)
+            return super.getSocket(data);
+
         // TODO: figure out why POST does not work if sending content-length header
         // see above regarding app engine comment as to why: drive requires content-length
         // but app engine sends a GO_AWAY if it sees a content-length...
@@ -300,24 +336,30 @@ public Cancellable getSocket(final GetSocketData data) {
             return super.getSocket(data);
 
         // can we use an existing connection to satisfy this, or do we need a new one?
-        String key = uri.getHost();
+        String key = uri.getHost() + port;
         SpdyConnectionWaiter conn = connections.get(key);
-        if (conn != null && conn.tryGet() != null && !conn.tryGet().socket.isOpen()) {
-            connections.remove(key);
-            conn = null;
+        if (conn != null) {
+            if (conn.tryGetException() instanceof NoSpdyException)
+                return super.getSocket(data);
+
+            // dead connection check
+            if (conn.tryGet() != null && !conn.tryGet().socket.isOpen()) {
+                // old spdy connection is derped, kill it with fire.
+                connections.remove(key);
+                conn = null;
+            }
         }
 
         if (conn == null) {
-            Cancellable superSocket = super.getSocket(data);;
-            // see if we reuse a socket synchronously, otherwise a new connection is being created
-            if (!superSocket.isDone()) {
-                data.request.logv("waiting for spdy connection for host: " + data.request.getUri().getHost());
-                connections.put(key, new SpdyConnectionWaiter());
-            }
-            else {
-                data.request.logv("attempting spdy connection for host: " + data.request.getUri().getHost());
-            }
-            return superSocket;
+            // no connection has ever been attempted (or previous one had a network death), so attempt one
+            data.state.put("spdykey", key);
+            // if we got something back synchronously, it's a keep alive socket
+            Cancellable ret = super.getSocket(data);
+            if (ret.isDone() || ret.isCancelled())
+                return ret;
+            conn = new SpdyConnectionWaiter();
+            connections.put(key, conn);
+            return conn.originalCancellable;
         }
 
         data.request.logv("waiting for potential spdy connection for host: " + data.request.getUri().getHost());
@@ -331,14 +373,13 @@ public void onCompleted(Exception e, AsyncSpdyConnection conn) {
                     return;
                 }
                 if (e != null) {
-                    data.request.loge("spdy not available", e);
-                    ret.setComplete();
-                    data.connectCallback.onConnectCompleted(e, null);
+                    if (ret.setComplete())
+                        data.connectCallback.onConnectCompleted(e, null);
                     return;
                 }
                 data.request.logv("using existing spdy connection for host: " + data.request.getUri().getHost());
-                ret.setComplete();
-                newSocket(data, conn, data.connectCallback);
+                if (ret.setComplete())
+                    newSocket(data, conn, data.connectCallback);
             }
         });
 
diff --git a/AndroidAsyncSample/AndroidAsyncSample.iml b/AndroidAsyncSample/AndroidAsyncSample.iml
deleted file mode 100644
index 8a2f8e30a..000000000
--- a/AndroidAsyncSample/AndroidAsyncSample.iml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="Gradle.AndroidAsync" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":AndroidAsync:AndroidAsyncSample" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="AndroidAsync-AndroidAsync" exported="" />
-  </component>
-</module>
-

From c4b0164a66d141fe24a8797a42b50a024f44191f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 15 Feb 2015 21:36:17 -0800
Subject: [PATCH 167/399] 206

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index f0d42f30b..5ee95c425 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="205"
-    android:versionName="2.0.5">
+    android:versionCode="206"
+    android:versionName="2.0.6">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

From f3da7a7d5e2238648700e976e179d7e7568d7bf5 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 15 Feb 2015 22:20:34 -0800
Subject: [PATCH 168/399] fix multipart setContentType not actually doing
 anything.

https://github.com/koush/ion/issues/398
---
 AndroidAsync/AndroidAsync-AndroidAsync.iml                      | 2 ++
 .../com/koushikdutta/async/http/body/MultipartFormDataBody.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index c5d0925e9..d1b73c2f2 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -80,7 +80,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
index 0a8a26d3d..34ea06db9 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
@@ -184,7 +184,7 @@ public String getContentType() {
         if (getBoundary() == null) {
             setBoundary("----------------------------" + UUID.randomUUID().toString().replace("-", ""));
         }
-        return CONTENT_TYPE + "; boundary=" + getBoundary();
+        return contentType + "; boundary=" + getBoundary();
     }
 
     @Override

From 80c9a2c90570a73924e4683b5f8b518f001ef57e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 15 Feb 2015 22:26:08 -0800
Subject: [PATCH 169/399] allow forcing a charset for string parsing.

---
 .../koushikdutta/async/parser/StringParser.java    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
index 89a611c3c..5a9f880ce 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
@@ -13,6 +13,15 @@
  * Created by koush on 5/27/13.
  */
 public class StringParser implements AsyncParser<String> {
+    Charset forcedCharset;
+
+    public StringParser() {
+    }
+
+    public StringParser(Charset charset) {
+        this.forcedCharset = charset;
+    }
+
     @Override
     public Future<String> parse(DataEmitter emitter) {
         final String charset = emitter.charset();
@@ -20,7 +29,10 @@ public Future<String> parse(DataEmitter emitter) {
         .then(new TransformFuture<String, ByteBufferList>() {
             @Override
             protected void transform(ByteBufferList result) throws Exception {
-                setComplete(result.readString(charset != null ? Charset.forName(charset) : null));
+                Charset charsetToUse = forcedCharset;
+                if (charsetToUse == null && charset != null)
+                    charsetToUse = Charset.forName(charset);
+                setComplete(result.readString(charsetToUse));
             }
         });
     }

From 3ec62330de0231d6ac62156bb6cc4b96fa70679e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 18 Feb 2015 18:06:38 -0800
Subject: [PATCH 170/399] initial stetho support

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml    |  18 +-
 AndroidAsync/build.gradle                     |   2 +-
 AndroidAsyncStetho/.classpath                 |   9 +
 AndroidAsyncStetho/.project                   |  33 +++
 AndroidAsyncStetho/AndroidAsyncStetho.iml     |  95 +++++++++
 AndroidAsyncStetho/AndroidManifest.xml        |  11 +
 AndroidAsyncStetho/build.gradle               |  42 ++++
 AndroidAsyncStetho/res/.gitignore             |   0
 .../stetho/NetworkEventReporterWrapper.java   | 149 +++++++++++++
 .../async/stetho/StethoMiddleware.java        | 196 ++++++++++++++++++
 10 files changed, 545 insertions(+), 10 deletions(-)
 create mode 100644 AndroidAsyncStetho/.classpath
 create mode 100644 AndroidAsyncStetho/.project
 create mode 100644 AndroidAsyncStetho/AndroidAsyncStetho.iml
 create mode 100644 AndroidAsyncStetho/AndroidManifest.xml
 create mode 100644 AndroidAsyncStetho/build.gradle
 create mode 100644 AndroidAsyncStetho/res/.gitignore
 create mode 100644 AndroidAsyncStetho/src/com/koushikdutta/async/stetho/NetworkEventReporterWrapper.java
 create mode 100644 AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index d1b73c2f2..e9527e977 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -12,9 +12,9 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
@@ -25,7 +25,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -34,12 +34,12 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index a97f9640f..1be4d51c9 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:+'
+        classpath 'com.android.tools.build:gradle:1.0.1'
     }
 }
 apply plugin: 'com.android.library'
diff --git a/AndroidAsyncStetho/.classpath b/AndroidAsyncStetho/.classpath
new file mode 100644
index 000000000..51769745b
--- /dev/null
+++ b/AndroidAsyncStetho/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/AndroidAsyncStetho/.project b/AndroidAsyncStetho/.project
new file mode 100644
index 000000000..4e6d9d160
--- /dev/null
+++ b/AndroidAsyncStetho/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>AndroidAsync</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/AndroidAsyncStetho/AndroidAsyncStetho.iml b/AndroidAsyncStetho/AndroidAsyncStetho.iml
new file mode 100644
index 000000000..3bad7bc71
--- /dev/null
+++ b/AndroidAsyncStetho/AndroidAsyncStetho.iml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="Gradle.AndroidAsync" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":AndroidAsync:AndroidAsyncStetho" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+        <option name="LIBRARY_PROJECT" value="true" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="jsr305-2.0.1" level="project" />
+    <orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />
+    <orderEntry type="library" exported="" name="stetho-1.0.0" level="project" />
+    <orderEntry type="module" module-name="AndroidAsync-AndroidAsync" exported="" />
+  </component>
+</module>
+
diff --git a/AndroidAsyncStetho/AndroidManifest.xml b/AndroidAsyncStetho/AndroidManifest.xml
new file mode 100644
index 000000000..691994ea3
--- /dev/null
+++ b/AndroidAsyncStetho/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.koushikdutta.async.stetho"
+    android:versionCode="206"
+    android:versionName="2.0.6">
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <application>
+    </application>
+
+</manifest>
diff --git a/AndroidAsyncStetho/build.gradle b/AndroidAsyncStetho/build.gradle
new file mode 100644
index 000000000..a68fcee25
--- /dev/null
+++ b/AndroidAsyncStetho/build.gradle
@@ -0,0 +1,42 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.0.1'
+    }
+}
+apply plugin: 'com.android.library'
+
+dependencies {
+    compile project(':AndroidAsync:AndroidAsync')
+    compile "com.facebook.stetho:stetho:+"
+}
+
+android {
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java {
+                srcDir 'src/'
+            }
+        }
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    defaultConfig {
+        targetSdkVersion 21
+        minSdkVersion 9
+    }
+
+    compileSdkVersion 21
+    buildToolsVersion '21.1.2'
+}
+
+// upload to maven task
+if (System.getenv().I_AM_KOUSH == 'true') {
+  apply from: 'https://raw.githubusercontent.com/koush/mvn-repo/master/maven.gradle'
+}
diff --git a/AndroidAsyncStetho/res/.gitignore b/AndroidAsyncStetho/res/.gitignore
new file mode 100644
index 000000000..e69de29bb
diff --git a/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/NetworkEventReporterWrapper.java b/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/NetworkEventReporterWrapper.java
new file mode 100644
index 000000000..b1c7e5854
--- /dev/null
+++ b/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/NetworkEventReporterWrapper.java
@@ -0,0 +1,149 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+package com.koushikdutta.async.stetho;
+
+import com.facebook.stetho.inspector.network.NetworkEventReporter;
+import com.facebook.stetho.inspector.network.NetworkPeerManager;
+import com.facebook.stetho.inspector.network.ResponseHandler;
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.DataEmitter;
+import com.koushikdutta.async.FilteredDataEmitter;
+import com.koushikdutta.async.util.StreamUtility;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+
+import javax.annotation.Nullable;
+
+/**
+ * Implementation of {@link NetworkEventReporter} which allows callers to inform the Stetho
+ * system of network traffic.  Callers can safely eagerly access this class and store a
+ * reference if they wish.  When WebKit Inspector clients are connected, the internal
+ * implementation will be automatically wired up to them.
+ */
+class NetworkEventReporterWrapper implements NetworkEventReporter {
+    NetworkEventReporter wrapped = com.facebook.stetho.inspector.network.NetworkEventReporterImpl.get();
+
+    private static NetworkEventReporterWrapper instance;
+    public synchronized static NetworkEventReporterWrapper get() {
+        if (instance == null)
+            instance = new NetworkEventReporterWrapper();
+        return instance;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return wrapped.isEnabled();
+    }
+
+    @Override
+    public void requestWillBeSent(InspectorRequest inspectorRequest) {
+        wrapped.requestWillBeSent(inspectorRequest);
+    }
+
+    @Override
+    public void responseHeadersReceived(InspectorResponse inspectorResponse) {
+        wrapped.responseHeadersReceived(inspectorResponse);
+    }
+
+    @Override
+    public void httpExchangeFailed(String s, String s2) {
+        wrapped.httpExchangeFailed(s, s2);
+    }
+
+    @Nullable
+    @Override
+    public InputStream interpretResponseStream(
+    String requestId,
+    @Nullable String contentType,
+    @Nullable String contentEncoding,
+    @Nullable InputStream availableInputStream,
+    ResponseHandler responseHandler) {
+        return null;
+    }
+
+    @Nullable
+    private NetworkPeerManager getPeerManagerIfEnabled() {
+        NetworkPeerManager peerManager = NetworkPeerManager.getInstanceOrNull();
+        if (peerManager != null && peerManager.hasRegisteredPeers()) {
+            return peerManager;
+        }
+        return null;
+    }
+
+    public DataEmitter interpretResponseEmitter(
+    final String requestId,
+    @Nullable DataEmitter body
+    ) {
+        final NetworkPeerManager peerManager = getPeerManagerIfEnabled();
+        if (peerManager == null)
+            return null;
+
+        final FileChannel channel;
+        try {
+            channel = ((FileOutputStream)peerManager.getResponseBodyFileManager().openResponseBodyFile(requestId, false)).getChannel();
+        }
+        catch (IOException e) {
+            return null;
+        }
+
+        FilteredDataEmitter ret = new FilteredDataEmitter() {
+            ByteBufferList pending = new ByteBufferList();
+
+            @Override
+            protected void report(Exception e) {
+                super.report(e);
+                StreamUtility.closeQuietly(channel);
+                if (e == null)
+                    responseReadFinished(requestId);
+                else
+                    responseReadFailed(requestId, e.toString());
+            }
+
+            @Override
+            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+                int amount = bb.remaining();
+                ByteBuffer[] original = bb.getAllArray();
+                ByteBuffer[] copy = new ByteBuffer[original.length];
+                for (int i = 0; i < original.length; i++) {
+                    copy[i] = original[i].duplicate();
+                }
+                try {
+                    channel.write(copy);
+                }
+                catch (IOException ignored) {
+                    StreamUtility.closeQuietly(channel);
+                }
+                pending.addAll(original);
+                dataReceived(requestId, amount, amount);
+                super.onDataAvailable(emitter, pending);
+            }
+        };
+        ret.setDataEmitter(body);
+        return ret;
+    }
+
+
+    @Override
+    public void responseReadFailed(String s, String s2) {
+        wrapped.responseReadFailed(s, s2);
+    }
+
+    @Override
+    public void responseReadFinished(String s) {
+        wrapped.responseReadFinished(s);
+    }
+
+    @Override
+    public void dataSent(String s, int i, int i2) {
+        wrapped.dataSent(s, i, i2);
+    }
+
+    @Override
+    public void dataReceived(String s, int i, int i2) {
+        wrapped.dataReceived(s, i, i2);
+    }
+}
diff --git a/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java b/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java
new file mode 100644
index 000000000..14ec31c24
--- /dev/null
+++ b/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java
@@ -0,0 +1,196 @@
+package com.koushikdutta.async.stetho;
+
+import com.facebook.stetho.inspector.network.NetworkEventReporter;
+import com.koushikdutta.async.DataEmitter;
+import com.koushikdutta.async.http.AsyncHttpRequest;
+import com.koushikdutta.async.http.SimpleMiddleware;
+
+import org.apache.http.Header;
+import org.apache.http.NameValuePair;
+import org.apache.http.message.BasicHeader;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
+
+/**
+ * Created by koush on 2/18/15.
+ */
+public class StethoMiddleware extends SimpleMiddleware {
+    private final NetworkEventReporterWrapper eventReporter = NetworkEventReporterWrapper.get();
+
+    private static class AsyncInspectorRequest implements NetworkEventReporter.InspectorRequest {
+        AsyncHttpRequest request;
+        String id = UUID.randomUUID().toString();
+        Header[] headers;
+        AsyncInspectorResponse response;
+
+        public AsyncInspectorRequest(AsyncHttpRequest request) {
+            this.request = request;
+            headers = request.asHttpRequest().getAllHeaders();
+        }
+
+        @Override
+        public String id() {
+            return id;
+        }
+
+        @Override
+        public String friendlyName() {
+            return request.getLogTag() != null ? request.getLogTag() : id;
+        }
+
+        @Nullable
+        @Override
+        public Integer friendlyNameExtra() {
+            return null;
+        }
+
+        @Override
+        public String url() {
+            return request.getUri().toString();
+        }
+
+        @Override
+        public String method() {
+            return request.getMethod();
+        }
+
+        @Nullable
+        @Override
+        public byte[] body() throws IOException {
+            return null;
+        }
+
+        @Override
+        public int headerCount() {
+            return headers.length;
+        }
+
+        @Override
+        public String headerName(int i) {
+            return headers[i].getName();
+        }
+
+        @Override
+        public String headerValue(int i) {
+            return headers[i].getValue();
+        }
+
+        @Nullable
+        @Override
+        public String firstHeaderValue(String s) {
+            return request.getHeaders().get(s);
+        }
+    }
+
+    private static class AsyncInspectorResponse implements NetworkEventReporter.InspectorResponse {
+        ResponseHead head;
+        AsyncInspectorRequest request;
+        Header[] headers;
+
+        public AsyncInspectorResponse(ResponseHead head, AsyncInspectorRequest request) {
+            this.request = request;
+            this.head = head;
+            ArrayList<Header> a = new ArrayList<Header>();
+            for (NameValuePair nvp: head.headers().getMultiMap()) {
+                a.add(new BasicHeader(nvp.getName(), nvp.getValue()));
+            }
+            headers = a.toArray(new Header[a.size()]);
+        }
+
+        @Override
+        public String requestId() {
+            return request.id();
+        }
+
+        @Override
+        public int statusCode() {
+            return head.code();
+        }
+
+        @Override
+        public String reasonPhrase() {
+            return head.message();
+        }
+
+        @Override
+        public boolean connectionReused() {
+            return false;
+        }
+
+        @Override
+        public int connectionId() {
+            return 0;
+        }
+
+        @Override
+        public boolean fromDiskCache() {
+            return false;
+        }
+
+        @Override
+        public String url() {
+            return request.url();
+        }
+
+        @Override
+        public int headerCount() {
+            return headers.length;
+        }
+
+        @Override
+        public String headerName(int i) {
+            return headers[i].getName();
+        }
+
+        @Override
+        public String headerValue(int i) {
+            return headers[i].getValue();
+        }
+
+        @Nullable
+        @Override
+        public String firstHeaderValue(String s) {
+            return head.headers().get(s);
+        }
+    }
+
+    @Override
+    public void onRequest(OnRequestData data) {
+        super.onRequest(data);
+
+        if (!data.request.getUri().getScheme().startsWith("http"))
+            return;
+
+        AsyncInspectorRequest inspect = new AsyncInspectorRequest(data.request);
+        data.state.put("inspect", inspect);
+        eventReporter.requestWillBeSent(inspect);
+    }
+
+    @Override
+    public void onHeadersReceived(OnHeadersReceivedDataOnRequestSentData data) {
+        super.onHeadersReceived(data);
+        AsyncInspectorRequest inspect = data.state.get("inspect");
+        if (inspect == null)
+            return;
+
+        inspect.response = new AsyncInspectorResponse(data.response, inspect);
+        eventReporter.responseHeadersReceived(inspect.response);
+    }
+
+    @Override
+    public void onBodyDecoder(OnBodyDataOnRequestSentData data) {
+        super.onBodyDecoder(data);
+
+        AsyncInspectorRequest inspect = data.state.get("inspect");
+        if (inspect == null)
+            return;
+
+        DataEmitter emitter = eventReporter.interpretResponseEmitter(inspect.id(), data.bodyEmitter);
+        if (emitter != null)
+            data.bodyEmitter = emitter;
+    }
+}

From a83cbc8441c4466b20d1941073337ff435e64b23 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 21 Feb 2015 01:31:38 -0800
Subject: [PATCH 171/399] fix npe

---
 .../src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 692c4b10b..eccd8cf70 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -177,7 +177,7 @@ private void noSpdy(String key) {
 
     private void invokeConnect(String key, final ConnectCallback callback, Exception e, AsyncSSLSocket socket) {
         SpdyConnectionWaiter waiter = connections.get(key);
-        if (waiter.originalCancellable.setComplete())
+        if (waiter != null && waiter.originalCancellable.setComplete())
             callback.onConnectCompleted(e, socket);
     }
 

From 58fe476ac478996d79902d17955ac5a42a15133d Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 21 Feb 2015 01:32:11 -0800
Subject: [PATCH 172/399] 207

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 5ee95c425..13c0611bf 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="206"
-    android:versionName="2.0.6">
+    android:versionCode="207"
+    android:versionName="2.0.7">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

From 7b12b29536ebc08c2c790a1f16b2cd369fb6eb14 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 21 Feb 2015 01:34:07 -0800
Subject: [PATCH 173/399] 207: better npe fix. handle callback

---
 .../src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index eccd8cf70..cd7f630e3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -177,7 +177,7 @@ private void noSpdy(String key) {
 
     private void invokeConnect(String key, final ConnectCallback callback, Exception e, AsyncSSLSocket socket) {
         SpdyConnectionWaiter waiter = connections.get(key);
-        if (waiter != null && waiter.originalCancellable.setComplete())
+        if (waiter == null || waiter.originalCancellable.setComplete())
             callback.onConnectCompleted(e, socket);
     }
 

From 453a7f978a0076708ef35037dd2f05a729866c64 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 24 Feb 2015 15:06:19 -0800
Subject: [PATCH 174/399] 208

---
 AndroidAsync/AndroidManifest.xml       | 4 ++--
 AndroidAsyncStetho/AndroidManifest.xml | 4 ++--
 AndroidAsyncStetho/README.md           | 7 +++++++
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 AndroidAsyncStetho/README.md

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 13c0611bf..642646a72 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="207"
-    android:versionName="2.0.7">
+    android:versionCode="208"
+    android:versionName="2.0.8">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/AndroidAsyncStetho/AndroidManifest.xml b/AndroidAsyncStetho/AndroidManifest.xml
index 691994ea3..2146fce91 100644
--- a/AndroidAsyncStetho/AndroidManifest.xml
+++ b/AndroidAsyncStetho/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async.stetho"
-    android:versionCode="206"
-    android:versionName="2.0.6">
+    android:versionCode="208"
+    android:versionName="2.0.8">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/AndroidAsyncStetho/README.md b/AndroidAsyncStetho/README.md
new file mode 100644
index 000000000..fb452349c
--- /dev/null
+++ b/AndroidAsyncStetho/README.md
@@ -0,0 +1,7 @@
+        Stetho.initialize(
+        Stetho.newInitializerBuilder(this)
+        .enableDumpapp(Stetho.defaultDumperPluginsProvider(this))
+        .enableWebKitInspector(Stetho.defaultInspectorModulesProvider(this))
+        .build());
+        Ion.getDefault(this).getHttpClient().getMiddleware()
+        .add(new StethoMiddleware());
\ No newline at end of file

From fefce9f98217cb8683dd355abecbb57aece4d02d Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 24 Feb 2015 15:31:29 -0800
Subject: [PATCH 175/399] b64 images for stetho preview

---
 .../stetho/NetworkEventReporterWrapper.java   | 25 +++++++++++++------
 .../async/stetho/StethoMiddleware.java        |  4 ++-
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/NetworkEventReporterWrapper.java b/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/NetworkEventReporterWrapper.java
index b1c7e5854..b826d36da 100644
--- a/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/NetworkEventReporterWrapper.java
+++ b/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/NetworkEventReporterWrapper.java
@@ -2,6 +2,9 @@
 
 package com.koushikdutta.async.stetho;
 
+import android.util.Base64;
+import android.util.Base64OutputStream;
+
 import com.facebook.stetho.inspector.network.NetworkEventReporter;
 import com.facebook.stetho.inspector.network.NetworkPeerManager;
 import com.facebook.stetho.inspector.network.ResponseHandler;
@@ -10,11 +13,14 @@
 import com.koushikdutta.async.FilteredDataEmitter;
 import com.koushikdutta.async.util.StreamUtility;
 
+import java.io.ByteArrayOutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
+import java.nio.channels.WritableByteChannel;
 
 import javax.annotation.Nullable;
 
@@ -74,17 +80,20 @@ private NetworkPeerManager getPeerManagerIfEnabled() {
         return null;
     }
 
-    public DataEmitter interpretResponseEmitter(
-    final String requestId,
-    @Nullable DataEmitter body
-    ) {
+    public DataEmitter interpretResponseEmitter(final String requestId, @Nullable DataEmitter body, final boolean b64Encode) {
         final NetworkPeerManager peerManager = getPeerManagerIfEnabled();
         if (peerManager == null)
             return null;
 
-        final FileChannel channel;
+        final WritableByteChannel channel;
         try {
-            channel = ((FileOutputStream)peerManager.getResponseBodyFileManager().openResponseBodyFile(requestId, false)).getChannel();
+            if (b64Encode) {
+                final Base64OutputStream b64out = new Base64OutputStream(peerManager.getResponseBodyFileManager().openResponseBodyFile(requestId, false), Base64.DEFAULT);
+                channel = Channels.newChannel(b64out);
+            }
+            else {
+                channel = ((FileOutputStream)peerManager.getResponseBodyFileManager().openResponseBodyFile(requestId, false)).getChannel();
+            }
         }
         catch (IOException e) {
             return null;
@@ -112,7 +121,9 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                     copy[i] = original[i].duplicate();
                 }
                 try {
-                    channel.write(copy);
+                    for (ByteBuffer c: copy) {
+                        channel.write(c);
+                    }
                 }
                 catch (IOException ignored) {
                     StreamUtility.closeQuietly(channel);
diff --git a/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java b/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java
index 14ec31c24..3bf4c4c13 100644
--- a/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java
+++ b/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java
@@ -189,7 +189,9 @@ public void onBodyDecoder(OnBodyDataOnRequestSentData data) {
         if (inspect == null)
             return;
 
-        DataEmitter emitter = eventReporter.interpretResponseEmitter(inspect.id(), data.bodyEmitter);
+        String ct = data.response.headers().get("Content-Type");
+        boolean isImage = ct != null && ct.startsWith("image/");
+        DataEmitter emitter = eventReporter.interpretResponseEmitter(inspect.id(), data.bodyEmitter, isImage);
         if (emitter != null)
             data.bodyEmitter = emitter;
     }

From 9f2ff8e9c5320392dd24c88cd15acea316c67d15 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koush@koushikdutta.com>
Date: Tue, 24 Feb 2015 15:34:04 -0800
Subject: [PATCH 176/399] Update README.md

---
 AndroidAsyncStetho/README.md | 38 +++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/AndroidAsyncStetho/README.md b/AndroidAsyncStetho/README.md
index fb452349c..d52d7954f 100644
--- a/AndroidAsyncStetho/README.md
+++ b/AndroidAsyncStetho/README.md
@@ -1,7 +1,31 @@
-        Stetho.initialize(
-        Stetho.newInitializerBuilder(this)
-        .enableDumpapp(Stetho.defaultDumperPluginsProvider(this))
-        .enableWebKitInspector(Stetho.defaultInspectorModulesProvider(this))
-        .build());
-        Ion.getDefault(this).getHttpClient().getMiddleware()
-        .add(new StethoMiddleware());
\ No newline at end of file
+# AndroidAsync and Ion Stetho support
+
+[Stetho](https://github.com/facebook/stetho) is a tool that lets you log and view your network requests and more on Android.
+
+### Using Stetho with Ion
+
+```java
+// typical initialization of Stetho
+Stetho.initialize(
+Stetho.newInitializerBuilder(this)
+.enableDumpapp(Stetho.defaultDumperPluginsProvider(this))
+.enableWebKitInspector(Stetho.defaultInspectorModulesProvider(this))
+.build());
+
+Ion.getDefault(this).getHttpClient().getMiddleware()
+.add(new StethoMiddleware());
+```
+
+### Using Stetho with AndroidAsync
+
+```java
+// typical initialization of Stetho
+Stetho.initialize(
+Stetho.newInitializerBuilder(this)
+.enableDumpapp(Stetho.defaultDumperPluginsProvider(this))
+.enableWebKitInspector(Stetho.defaultInspectorModulesProvider(this))
+.build());
+
+AsyncHttpClient.getDefaultInstance().getMiddleware()
+.add(new StethoMiddleware());
+```

From af5618a96ecab34f04b6ce079d789dda79b49700 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 24 Feb 2015 16:02:27 -0800
Subject: [PATCH 177/399] fix up some derpage for sonatype

---
 AndroidAsyncStetho/AndroidAsyncStetho.iml | 2 ++
 AndroidAsyncStetho/AndroidManifest.xml    | 2 +-
 AndroidAsyncStetho/build.gradle           | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/AndroidAsyncStetho/AndroidAsyncStetho.iml b/AndroidAsyncStetho/AndroidAsyncStetho.iml
index 3bad7bc71..adc2d4e70 100644
--- a/AndroidAsyncStetho/AndroidAsyncStetho.iml
+++ b/AndroidAsyncStetho/AndroidAsyncStetho.iml
@@ -81,7 +81,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
diff --git a/AndroidAsyncStetho/AndroidManifest.xml b/AndroidAsyncStetho/AndroidManifest.xml
index 2146fce91..642646a72 100644
--- a/AndroidAsyncStetho/AndroidManifest.xml
+++ b/AndroidAsyncStetho/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.koushikdutta.async.stetho"
+    package="com.koushikdutta.async"
     android:versionCode="208"
     android:versionName="2.0.8">
 
diff --git a/AndroidAsyncStetho/build.gradle b/AndroidAsyncStetho/build.gradle
index a68fcee25..eabcaf225 100644
--- a/AndroidAsyncStetho/build.gradle
+++ b/AndroidAsyncStetho/build.gradle
@@ -10,7 +10,7 @@ apply plugin: 'com.android.library'
 
 dependencies {
     compile project(':AndroidAsync:AndroidAsync')
-    compile "com.facebook.stetho:stetho:+"
+    compile "com.facebook.stetho:stetho:1.0.0"
 }
 
 android {

From 03139b2dbde91b863b0d56faea72304b593779d6 Mon Sep 17 00:00:00 2001
From: Andhie Wong <andhiewong@gmail.com>
Date: Thu, 26 Feb 2015 17:28:53 +0800
Subject: [PATCH 178/399] Display Request Payload in Chrome Inspector

---
 .../src/com/koushikdutta/async/stetho/StethoMiddleware.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java b/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java
index 3bf4c4c13..883dc8db7 100644
--- a/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java
+++ b/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java
@@ -61,7 +61,7 @@ public String method() {
         @Nullable
         @Override
         public byte[] body() throws IOException {
-            return null;
+            return request.getBody() != null ? request.getBody().toString().getBytes("UTF-8") : null;
         }
 
         @Override

From e26525dc0e3dc759c550fc79e43eb49330175d4e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 2 Mar 2015 23:52:28 -0800
Subject: [PATCH 179/399] FutureThread constructor

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml    |  2 -
 .../async/future/FutureThread.java            | 16 +++
 AndroidAsyncStetho/AndroidAsyncStetho.iml     | 97 -------------------
 3 files changed, 16 insertions(+), 99 deletions(-)
 delete mode 100644 AndroidAsyncStetho/AndroidAsyncStetho.iml

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index e9527e977..9b372cda7 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -80,9 +80,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/FutureThread.java b/AndroidAsync/src/com/koushikdutta/async/future/FutureThread.java
index 37091e6e1..5f527e0ab 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/FutureThread.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/FutureThread.java
@@ -1,5 +1,7 @@
 package com.koushikdutta.async.future;
 
+import java.util.concurrent.ExecutorService;
+
 /**
  * Created by koush on 12/22/13.
  */
@@ -8,6 +10,20 @@ public FutureThread(final FutureRunnable<T> runnable) {
         this(runnable, "FutureThread");
     }
 
+    public FutureThread(final ExecutorService pool, final FutureRunnable<T> runnable) {
+        pool.submit(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    setComplete(runnable.run());
+                }
+                catch (Exception e) {
+                    setComplete(e);
+                }
+            }
+        });
+    }
+
     public FutureThread(final FutureRunnable<T> runnable, String name) {
         new Thread(new Runnable() {
             @Override
diff --git a/AndroidAsyncStetho/AndroidAsyncStetho.iml b/AndroidAsyncStetho/AndroidAsyncStetho.iml
deleted file mode 100644
index adc2d4e70..000000000
--- a/AndroidAsyncStetho/AndroidAsyncStetho.iml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="Gradle.AndroidAsync" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":AndroidAsync:AndroidAsyncStetho" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBRARY_PROJECT" value="true" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="jsr305-2.0.1" level="project" />
-    <orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />
-    <orderEntry type="library" exported="" name="stetho-1.0.0" level="project" />
-    <orderEntry type="module" module-name="AndroidAsync-AndroidAsync" exported="" />
-  </component>
-</module>
-

From 17ddc21484f7461d901bc90a8f40a508243c9fe9 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 4 Mar 2015 18:27:27 -1000
Subject: [PATCH 180/399] 209

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml | 20 +++++++++++---------
 AndroidAsync/AndroidManifest.xml           |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index 9b372cda7..d1b73c2f2 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -12,9 +12,9 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
@@ -25,7 +25,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -34,12 +34,12 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -80,7 +80,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 642646a72..80dfcb74b 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="208"
-    android:versionName="2.0.8">
+    android:versionCode="209"
+    android:versionName="2.0.9">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

From 6ae6e0c38b025fe87c3ace8599d92b055231b738 Mon Sep 17 00:00:00 2001
From: glennporter-examtime <glenn.porter@examtime.com>
Date: Thu, 5 Mar 2015 12:14:44 +0000
Subject: [PATCH 181/399] Redirected requests now keep the same request method,
 body and headers as the original one.

---
 .../async/http/AsyncHttpClient.java             | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 6382494ea..f08d99a27 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -27,6 +27,7 @@
 import com.koushikdutta.async.parser.StringParser;
 import com.koushikdutta.async.stream.OutputStreamDataCallback;
 
+import org.apache.http.NameValuePair;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -356,7 +357,7 @@ public void setDataEmitter(DataEmitter emitter) {
                 Headers headers = mHeaders;
                 int responseCode = code();
                 if ((responseCode == HttpURLConnection.HTTP_MOVED_PERM || responseCode == HttpURLConnection.HTTP_MOVED_TEMP || responseCode == 307) && request.getFollowRedirect()) {
-                    String location = headers.get("Location");
+                	String location = headers.get("Location");
                     Uri redirect;
                     try {
                         redirect = Uri.parse(location);
@@ -368,7 +369,7 @@ public void setDataEmitter(DataEmitter emitter) {
                         reportConnectedCompleted(cancel, e, this, request, callback);
                         return;
                     }
-                    final String method = request.getMethod().equals(AsyncHttpHead.METHOD) ? AsyncHttpHead.METHOD : AsyncHttpGet.METHOD;
+                    final String method = request.getMethod();
                     AsyncHttpRequest newReq = new AsyncHttpRequest(redirect, method);
                     newReq.executionTime = request.executionTime;
                     newReq.logLevel = request.logLevel;
@@ -376,8 +377,16 @@ public void setDataEmitter(DataEmitter emitter) {
                     newReq.proxyHost = request.proxyHost;
                     newReq.proxyPort = request.proxyPort;
                     setupAndroidProxy(newReq);
-                    copyHeader(request, newReq, "User-Agent");
-                    copyHeader(request, newReq, "Range");
+                     
+                    // Copy all headers from the old request to the new one (except for "host" -
+                    // keeping this in will make the redirect happen again!
+                    for (NameValuePair entry : request.getHeaders().getMultiMap()) {
+                    	if (!entry.getName().toLowerCase().equals("host")) {
+                    		copyHeader(request, newReq, entry.getName());
+                    	}
+                    }
+                    
+                    newReq.setBody(request.getBody());
                     request.logi("Redirecting");
                     newReq.logi("Redirected");
                     execute(newReq, redirectCount + 1, cancel, callback);

From 4c85f8686eaf5dd33597d22b3ffa2f8e6f0db211 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 7 Mar 2015 11:21:46 -1000
Subject: [PATCH 182/399] Add getType to AsyncParser.

---
 .../com/koushikdutta/async/parser/AsyncParser.java  |  1 +
 .../koushikdutta/async/parser/AsyncParserBase.java  | 13 +++++++++++++
 .../async/parser/ByteBufferListParser.java          |  2 +-
 .../koushikdutta/async/parser/DocumentParser.java   |  2 +-
 .../koushikdutta/async/parser/JSONArrayParser.java  |  2 +-
 .../koushikdutta/async/parser/JSONObjectParser.java |  2 +-
 .../com/koushikdutta/async/parser/StringParser.java |  2 +-
 .../com/koushikdutta/async/test/ParserTests.java    |  8 ++++++++
 8 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java
index bcbb440fe..44e1a830a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java
@@ -11,4 +11,5 @@
 public interface AsyncParser<T> {
     Future<T> parse(DataEmitter emitter);
     void write(DataSink sink, T value, CompletedCallback completed);
+    Class<T> getType();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java
new file mode 100644
index 000000000..d6a7f3547
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java
@@ -0,0 +1,13 @@
+package com.koushikdutta.async.parser;
+
+import java.lang.reflect.ParameterizedType;
+
+/**
+ * Created by koush on 3/6/15.
+ */
+public abstract class AsyncParserBase<T> implements AsyncParser<T> {
+    @Override
+    public Class<T> getType() {
+        return (Class<T>)((ParameterizedType)getClass().getGenericSuperclass()).getActualTypeArguments()[0];
+    }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
index abfaa8787..72260627d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
@@ -12,7 +12,7 @@
 /**
  * Created by koush on 5/27/13.
  */
-public class ByteBufferListParser implements AsyncParser<ByteBufferList> {
+public class ByteBufferListParser extends AsyncParserBase<ByteBufferList> {
     @Override
     public Future<ByteBufferList> parse(final DataEmitter emitter) {
         final ByteBufferList bb = new ByteBufferList();
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
index fe54e0456..c64a30075 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
@@ -17,7 +17,7 @@
 /**
  * Created by koush on 8/3/13.
  */
-public class DocumentParser implements AsyncParser<Document> {
+public class DocumentParser extends AsyncParserBase<Document> {
     @Override
     public Future<Document> parse(DataEmitter emitter) {
         return new ByteBufferListParser().parse(emitter)
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
index d8eb7e5b2..687435a01 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
@@ -12,7 +12,7 @@
 /**
  * Created by koush on 5/27/13.
  */
-public class JSONArrayParser implements AsyncParser<JSONArray> {
+public class JSONArrayParser extends AsyncParserBase<JSONArray> {
     @Override
     public Future<JSONArray> parse(DataEmitter emitter) {
         return new StringParser().parse(emitter)
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
index dbdcbef38..5bd1eb001 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
@@ -10,7 +10,7 @@
 /**
  * Created by koush on 5/27/13.
  */
-public class JSONObjectParser implements AsyncParser<JSONObject> {
+public class JSONObjectParser extends AsyncParserBase<JSONObject> {
     @Override
     public Future<JSONObject> parse(DataEmitter emitter) {
         return new StringParser().parse(emitter)
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
index 5a9f880ce..f8d82b621 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
@@ -12,7 +12,7 @@
 /**
  * Created by koush on 5/27/13.
  */
-public class StringParser implements AsyncParser<String> {
+public class StringParser extends AsyncParserBase<String> {
     Charset forcedCharset;
 
     public StringParser() {
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java
index 3374eff90..13773ea0b 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java
@@ -3,11 +3,14 @@
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.FilteredDataEmitter;
 import com.koushikdutta.async.future.Future;
+import com.koushikdutta.async.parser.DocumentParser;
 import com.koushikdutta.async.parser.StringParser;
 import com.koushikdutta.async.util.Charsets;
 
 import junit.framework.TestCase;
 
+import org.w3c.dom.Document;
+
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
@@ -53,4 +56,9 @@ public boolean isPaused() {
         String s = ret.get();
         assertEquals(s, "æææ");
     }
+
+    public void testAsyncParserBase() throws Exception {
+        DocumentParser parser = new DocumentParser();
+        assertEquals(parser.getType(), Document.class);
+    }
 }

From d9975f4f5b51ccc3f3dcfaca0221f8cd0639ddbb Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 7 Mar 2015 14:03:03 -1000
Subject: [PATCH 183/399] Reverting as this is causing tests to fail. Common
 behavior is to accept the POST and then redirect to another page. This causes
 the POST to happen twice.

Revert "Redirected requests now keep the same request method, body and headers as the original one."

This reverts commit 6ae6e0c38b025fe87c3ace8599d92b055231b738.
---
 .../async/http/AsyncHttpClient.java             | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index f08d99a27..6382494ea 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -27,7 +27,6 @@
 import com.koushikdutta.async.parser.StringParser;
 import com.koushikdutta.async.stream.OutputStreamDataCallback;
 
-import org.apache.http.NameValuePair;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -357,7 +356,7 @@ public void setDataEmitter(DataEmitter emitter) {
                 Headers headers = mHeaders;
                 int responseCode = code();
                 if ((responseCode == HttpURLConnection.HTTP_MOVED_PERM || responseCode == HttpURLConnection.HTTP_MOVED_TEMP || responseCode == 307) && request.getFollowRedirect()) {
-                	String location = headers.get("Location");
+                    String location = headers.get("Location");
                     Uri redirect;
                     try {
                         redirect = Uri.parse(location);
@@ -369,7 +368,7 @@ public void setDataEmitter(DataEmitter emitter) {
                         reportConnectedCompleted(cancel, e, this, request, callback);
                         return;
                     }
-                    final String method = request.getMethod();
+                    final String method = request.getMethod().equals(AsyncHttpHead.METHOD) ? AsyncHttpHead.METHOD : AsyncHttpGet.METHOD;
                     AsyncHttpRequest newReq = new AsyncHttpRequest(redirect, method);
                     newReq.executionTime = request.executionTime;
                     newReq.logLevel = request.logLevel;
@@ -377,16 +376,8 @@ public void setDataEmitter(DataEmitter emitter) {
                     newReq.proxyHost = request.proxyHost;
                     newReq.proxyPort = request.proxyPort;
                     setupAndroidProxy(newReq);
-                     
-                    // Copy all headers from the old request to the new one (except for "host" -
-                    // keeping this in will make the redirect happen again!
-                    for (NameValuePair entry : request.getHeaders().getMultiMap()) {
-                    	if (!entry.getName().toLowerCase().equals("host")) {
-                    		copyHeader(request, newReq, entry.getName());
-                    	}
-                    }
-                    
-                    newReq.setBody(request.getBody());
+                    copyHeader(request, newReq, "User-Agent");
+                    copyHeader(request, newReq, "Range");
                     request.logi("Redirecting");
                     newReq.logi("Redirected");
                     execute(newReq, redirectCount + 1, cancel, callback);

From 2f8678ddb2530d582d7f50245272604d916f2609 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 7 Mar 2015 15:17:15 -1000
Subject: [PATCH 184/399] Revert "Add getType to AsyncParser."

This reverts commit 4c85f8686eaf5dd33597d22b3ffa2f8e6f0db211.
---
 .../com/koushikdutta/async/parser/AsyncParser.java  |  1 -
 .../koushikdutta/async/parser/AsyncParserBase.java  | 13 -------------
 .../async/parser/ByteBufferListParser.java          |  2 +-
 .../koushikdutta/async/parser/DocumentParser.java   |  2 +-
 .../koushikdutta/async/parser/JSONArrayParser.java  |  2 +-
 .../koushikdutta/async/parser/JSONObjectParser.java |  2 +-
 .../com/koushikdutta/async/parser/StringParser.java |  2 +-
 .../com/koushikdutta/async/test/ParserTests.java    |  8 --------
 8 files changed, 5 insertions(+), 27 deletions(-)
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java
index 44e1a830a..bcbb440fe 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java
@@ -11,5 +11,4 @@
 public interface AsyncParser<T> {
     Future<T> parse(DataEmitter emitter);
     void write(DataSink sink, T value, CompletedCallback completed);
-    Class<T> getType();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java
deleted file mode 100644
index d6a7f3547..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.koushikdutta.async.parser;
-
-import java.lang.reflect.ParameterizedType;
-
-/**
- * Created by koush on 3/6/15.
- */
-public abstract class AsyncParserBase<T> implements AsyncParser<T> {
-    @Override
-    public Class<T> getType() {
-        return (Class<T>)((ParameterizedType)getClass().getGenericSuperclass()).getActualTypeArguments()[0];
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
index 72260627d..abfaa8787 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
@@ -12,7 +12,7 @@
 /**
  * Created by koush on 5/27/13.
  */
-public class ByteBufferListParser extends AsyncParserBase<ByteBufferList> {
+public class ByteBufferListParser implements AsyncParser<ByteBufferList> {
     @Override
     public Future<ByteBufferList> parse(final DataEmitter emitter) {
         final ByteBufferList bb = new ByteBufferList();
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
index c64a30075..fe54e0456 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
@@ -17,7 +17,7 @@
 /**
  * Created by koush on 8/3/13.
  */
-public class DocumentParser extends AsyncParserBase<Document> {
+public class DocumentParser implements AsyncParser<Document> {
     @Override
     public Future<Document> parse(DataEmitter emitter) {
         return new ByteBufferListParser().parse(emitter)
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
index 687435a01..d8eb7e5b2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
@@ -12,7 +12,7 @@
 /**
  * Created by koush on 5/27/13.
  */
-public class JSONArrayParser extends AsyncParserBase<JSONArray> {
+public class JSONArrayParser implements AsyncParser<JSONArray> {
     @Override
     public Future<JSONArray> parse(DataEmitter emitter) {
         return new StringParser().parse(emitter)
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
index 5bd1eb001..dbdcbef38 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
@@ -10,7 +10,7 @@
 /**
  * Created by koush on 5/27/13.
  */
-public class JSONObjectParser extends AsyncParserBase<JSONObject> {
+public class JSONObjectParser implements AsyncParser<JSONObject> {
     @Override
     public Future<JSONObject> parse(DataEmitter emitter) {
         return new StringParser().parse(emitter)
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
index f8d82b621..5a9f880ce 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
@@ -12,7 +12,7 @@
 /**
  * Created by koush on 5/27/13.
  */
-public class StringParser extends AsyncParserBase<String> {
+public class StringParser implements AsyncParser<String> {
     Charset forcedCharset;
 
     public StringParser() {
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java
index 13773ea0b..3374eff90 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java
@@ -3,14 +3,11 @@
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.FilteredDataEmitter;
 import com.koushikdutta.async.future.Future;
-import com.koushikdutta.async.parser.DocumentParser;
 import com.koushikdutta.async.parser.StringParser;
 import com.koushikdutta.async.util.Charsets;
 
 import junit.framework.TestCase;
 
-import org.w3c.dom.Document;
-
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
@@ -56,9 +53,4 @@ public boolean isPaused() {
         String s = ret.get();
         assertEquals(s, "æææ");
     }
-
-    public void testAsyncParserBase() throws Exception {
-        DocumentParser parser = new DocumentParser();
-        assertEquals(parser.getType(), Document.class);
-    }
 }

From bc36ff0e85066ddf76e9a3d2af6c0baa8727d420 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 7 Mar 2015 15:18:28 -1000
Subject: [PATCH 185/399] Revert "Revert "Add getType to AsyncParser.""

This reverts commit 2f8678ddb2530d582d7f50245272604d916f2609.
---
 .../com/koushikdutta/async/parser/AsyncParser.java  |  1 +
 .../koushikdutta/async/parser/AsyncParserBase.java  | 13 +++++++++++++
 .../async/parser/ByteBufferListParser.java          |  2 +-
 .../koushikdutta/async/parser/DocumentParser.java   |  2 +-
 .../koushikdutta/async/parser/JSONArrayParser.java  |  2 +-
 .../koushikdutta/async/parser/JSONObjectParser.java |  2 +-
 .../com/koushikdutta/async/parser/StringParser.java |  2 +-
 .../com/koushikdutta/async/test/ParserTests.java    |  8 ++++++++
 8 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java
index bcbb440fe..44e1a830a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java
@@ -11,4 +11,5 @@
 public interface AsyncParser<T> {
     Future<T> parse(DataEmitter emitter);
     void write(DataSink sink, T value, CompletedCallback completed);
+    Class<T> getType();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java
new file mode 100644
index 000000000..d6a7f3547
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java
@@ -0,0 +1,13 @@
+package com.koushikdutta.async.parser;
+
+import java.lang.reflect.ParameterizedType;
+
+/**
+ * Created by koush on 3/6/15.
+ */
+public abstract class AsyncParserBase<T> implements AsyncParser<T> {
+    @Override
+    public Class<T> getType() {
+        return (Class<T>)((ParameterizedType)getClass().getGenericSuperclass()).getActualTypeArguments()[0];
+    }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
index abfaa8787..72260627d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
@@ -12,7 +12,7 @@
 /**
  * Created by koush on 5/27/13.
  */
-public class ByteBufferListParser implements AsyncParser<ByteBufferList> {
+public class ByteBufferListParser extends AsyncParserBase<ByteBufferList> {
     @Override
     public Future<ByteBufferList> parse(final DataEmitter emitter) {
         final ByteBufferList bb = new ByteBufferList();
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
index fe54e0456..c64a30075 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
@@ -17,7 +17,7 @@
 /**
  * Created by koush on 8/3/13.
  */
-public class DocumentParser implements AsyncParser<Document> {
+public class DocumentParser extends AsyncParserBase<Document> {
     @Override
     public Future<Document> parse(DataEmitter emitter) {
         return new ByteBufferListParser().parse(emitter)
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
index d8eb7e5b2..687435a01 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
@@ -12,7 +12,7 @@
 /**
  * Created by koush on 5/27/13.
  */
-public class JSONArrayParser implements AsyncParser<JSONArray> {
+public class JSONArrayParser extends AsyncParserBase<JSONArray> {
     @Override
     public Future<JSONArray> parse(DataEmitter emitter) {
         return new StringParser().parse(emitter)
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
index dbdcbef38..5bd1eb001 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
@@ -10,7 +10,7 @@
 /**
  * Created by koush on 5/27/13.
  */
-public class JSONObjectParser implements AsyncParser<JSONObject> {
+public class JSONObjectParser extends AsyncParserBase<JSONObject> {
     @Override
     public Future<JSONObject> parse(DataEmitter emitter) {
         return new StringParser().parse(emitter)
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
index 5a9f880ce..f8d82b621 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
@@ -12,7 +12,7 @@
 /**
  * Created by koush on 5/27/13.
  */
-public class StringParser implements AsyncParser<String> {
+public class StringParser extends AsyncParserBase<String> {
     Charset forcedCharset;
 
     public StringParser() {
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java
index 3374eff90..13773ea0b 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java
@@ -3,11 +3,14 @@
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.FilteredDataEmitter;
 import com.koushikdutta.async.future.Future;
+import com.koushikdutta.async.parser.DocumentParser;
 import com.koushikdutta.async.parser.StringParser;
 import com.koushikdutta.async.util.Charsets;
 
 import junit.framework.TestCase;
 
+import org.w3c.dom.Document;
+
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
@@ -53,4 +56,9 @@ public boolean isPaused() {
         String s = ret.get();
         assertEquals(s, "æææ");
     }
+
+    public void testAsyncParserBase() throws Exception {
+        DocumentParser parser = new DocumentParser();
+        assertEquals(parser.getType(), Document.class);
+    }
 }

From e53e1b267ea919cb0ac3e39533ac9de9a4ed7cfc Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 7 Mar 2015 22:48:48 -1000
Subject: [PATCH 186/399] Change AsyncParser.getType to Type and not class.

---
 .../src/com/koushikdutta/async/parser/AsyncParser.java       | 4 +++-
 .../src/com/koushikdutta/async/parser/AsyncParserBase.java   | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java
index 44e1a830a..491590379 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java
@@ -5,11 +5,13 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.future.Future;
 
+import java.lang.reflect.Type;
+
 /**
  * Created by koush on 5/27/13.
  */
 public interface AsyncParser<T> {
     Future<T> parse(DataEmitter emitter);
     void write(DataSink sink, T value, CompletedCallback completed);
-    Class<T> getType();
+    Type getType();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java
index d6a7f3547..337c4c1ee 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java
@@ -1,13 +1,14 @@
 package com.koushikdutta.async.parser;
 
 import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 
 /**
  * Created by koush on 3/6/15.
  */
 public abstract class AsyncParserBase<T> implements AsyncParser<T> {
     @Override
-    public Class<T> getType() {
-        return (Class<T>)((ParameterizedType)getClass().getGenericSuperclass()).getActualTypeArguments()[0];
+    public Type getType() {
+        return ((ParameterizedType)getClass().getGenericSuperclass()).getActualTypeArguments()[0];
     }
 }

From 27b79145410969bcfbfeb29dcc8b48cf36ca77bd Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 9 Mar 2015 23:32:29 -1000
Subject: [PATCH 187/399] 210

---
 AndroidAsync/AndroidAsync-AndroidAsync.iml | 2 --
 AndroidAsync/AndroidManifest.xml           | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
index d1b73c2f2..c5d0925e9 100644
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml
@@ -80,9 +80,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 80dfcb74b..d401d2653 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="209"
-    android:versionName="2.0.9">
+    android:versionCode="210"
+    android:versionName="2.1.0">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

From 1aefa5901908abd1014630ea60bd46c5c137238e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 12 Mar 2015 16:01:50 -0700
Subject: [PATCH 188/399] remove iml

---
 .gitignore                                 |  1 +
 AndroidAsync.iml                           | 16 ----
 AndroidAsync/AndroidAsync-AndroidAsync.iml | 90 ----------------------
 AndroidAsync/AndroidAsync.iml              | 73 ------------------
 4 files changed, 1 insertion(+), 179 deletions(-)
 delete mode 100644 AndroidAsync.iml
 delete mode 100644 AndroidAsync/AndroidAsync-AndroidAsync.iml
 delete mode 100644 AndroidAsync/AndroidAsync.iml

diff --git a/.gitignore b/.gitignore
index cc439fd96..67da1af32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ build
 okhttp/
 okio/
 libs
+*.iml
diff --git a/AndroidAsync.iml b/AndroidAsync.iml
deleted file mode 100644
index eaa4a88f3..000000000
--- a/AndroidAsync.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Gradle" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":AndroidAsync" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml
deleted file mode 100644
index c5d0925e9..000000000
--- a/AndroidAsync/AndroidAsync-AndroidAsync.iml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="Gradle.AndroidAsync" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":AndroidAsync:AndroidAsync" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBRARY_PROJECT" value="true" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/test/src" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
diff --git a/AndroidAsync/AndroidAsync.iml b/AndroidAsync/AndroidAsync.iml
deleted file mode 100644
index edb7738b9..000000000
--- a/AndroidAsync/AndroidAsync.iml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="LIBRARY_PROJECT" value="true" />
-        <proGuardCfgFiles>
-          <file>file://$APPLICATION_HOME_DIR$/sdk/tools/proguard/proguard-android.txt</file>
-        </proGuardCfgFiles>
-        <option name="UPDATE_PROPERTY_FILES" value="true" />
-        <notImportedProperties>
-          <property>MANIFEST_FILE_PATH</property>
-          <property>RESOURCES_DIR_PATH</property>
-          <property>ASSETS_DIR_PATH</property>
-          <property>NATIVE_LIBS_DIR_PATH</property>
-        </notImportedProperties>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/r/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/exploded-bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-

From c682ac78096b5a496541101dcbdcfa07f724a804 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 12 Mar 2015 23:46:46 -0700
Subject: [PATCH 189/399] 211

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index d401d2653..024a8812b 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="210"
-    android:versionName="2.1.0">
+    android:versionCode="211"
+    android:versionName="2.1.1">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

From f453c6566998be2e9326a4e65139ab2d0f472152 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 14 Mar 2015 00:09:27 -0700
Subject: [PATCH 190/399] tighten up gradle files with android studio project
 defaults

---
 AndroidAsync/build.gradle       |  8 --------
 AndroidAsyncSample/build.gradle | 18 +++---------------
 AndroidAsyncStetho/build.gradle | 14 +++-----------
 3 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 1be4d51c9..578f83827 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -1,11 +1,3 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.1'
-    }
-}
 apply plugin: 'com.android.library'
 
 android {
diff --git a/AndroidAsyncSample/build.gradle b/AndroidAsyncSample/build.gradle
index 6bbfb2ad0..1f868433a 100644
--- a/AndroidAsyncSample/build.gradle
+++ b/AndroidAsyncSample/build.gradle
@@ -1,17 +1,5 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:+'
-    }
-}
 apply plugin: 'com.android.application'
 
-repositories {
-    mavenCentral()
-}
-
 dependencies {
     compile project(':AndroidAsync:AndroidAsync')
 }
@@ -26,11 +14,11 @@ android {
     }
 
     defaultConfig {
-        targetSdkVersion 21
+        targetSdkVersion 22
         minSdkVersion 9
     }
 
-    compileSdkVersion 21
-    buildToolsVersion "21.1.0"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.0"
 }
 
diff --git a/AndroidAsyncStetho/build.gradle b/AndroidAsyncStetho/build.gradle
index eabcaf225..8e285f875 100644
--- a/AndroidAsyncStetho/build.gradle
+++ b/AndroidAsyncStetho/build.gradle
@@ -1,11 +1,3 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.1'
-    }
-}
 apply plugin: 'com.android.library'
 
 dependencies {
@@ -28,12 +20,12 @@ android {
     }
 
     defaultConfig {
-        targetSdkVersion 21
+        targetSdkVersion 22
         minSdkVersion 9
     }
 
-    compileSdkVersion 21
-    buildToolsVersion '21.1.2'
+    compileSdkVersion 22
+    buildToolsVersion '22.0.0'
 }
 
 // upload to maven task

From 912d561166483823dcf55d16c401f1f81536d7c6 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 14 Mar 2015 13:30:09 -0700
Subject: [PATCH 191/399] Fix proguard issues:

https://github.com/koush/ion/issues/515
---
 AndroidAsync/AndroidManifest.xml                   |  4 ++--
 .../koushikdutta/async/parser/AsyncParserBase.java | 14 --------------
 .../async/parser/ByteBufferListParser.java         |  9 ++++++++-
 .../koushikdutta/async/parser/DocumentParser.java  |  9 ++++++++-
 .../koushikdutta/async/parser/JSONArrayParser.java |  9 ++++++++-
 .../async/parser/JSONObjectParser.java             |  9 ++++++++-
 .../koushikdutta/async/parser/StringParser.java    |  8 +++++++-
 7 files changed, 41 insertions(+), 21 deletions(-)
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 024a8812b..30615a2ed 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="211"
-    android:versionName="2.1.1">
+    android:versionCode="212"
+    android:versionName="2.1.2">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java
deleted file mode 100644
index 337c4c1ee..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.koushikdutta.async.parser;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-/**
- * Created by koush on 3/6/15.
- */
-public abstract class AsyncParserBase<T> implements AsyncParser<T> {
-    @Override
-    public Type getType() {
-        return ((ParameterizedType)getClass().getGenericSuperclass()).getActualTypeArguments()[0];
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
index 72260627d..11bd7fbc6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
@@ -9,10 +9,12 @@
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.SimpleFuture;
 
+import java.lang.reflect.Type;
+
 /**
  * Created by koush on 5/27/13.
  */
-public class ByteBufferListParser extends AsyncParserBase<ByteBufferList> {
+public class ByteBufferListParser implements AsyncParser<ByteBufferList> {
     @Override
     public Future<ByteBufferList> parse(final DataEmitter emitter) {
         final ByteBufferList bb = new ByteBufferList();
@@ -53,4 +55,9 @@ public void onCompleted(Exception ex) {
     public void write(DataSink sink, ByteBufferList value, CompletedCallback completed) {
         Util.writeAll(sink, value, completed);
     }
+
+    @Override
+    public Type getType() {
+        return ByteBufferList.class;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
index c64a30075..de9053dae 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
@@ -11,13 +11,15 @@
 
 import org.w3c.dom.Document;
 
+import java.lang.reflect.Type;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 /**
  * Created by koush on 8/3/13.
  */
-public class DocumentParser extends AsyncParserBase<Document> {
+public class DocumentParser implements AsyncParser<Document> {
     @Override
     public Future<Document> parse(DataEmitter emitter) {
         return new ByteBufferListParser().parse(emitter)
@@ -35,4 +37,9 @@ protected void transform(ByteBufferList result) throws Exception {
     public void write(DataSink sink, Document value, CompletedCallback completed) {
         new DocumentBody(value).write(null, sink, completed);
     }
+
+    @Override
+    public Type getType() {
+        return Document.class;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
index 687435a01..4a351c01c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
@@ -9,10 +9,12 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import java.lang.reflect.Type;
+
 /**
  * Created by koush on 5/27/13.
  */
-public class JSONArrayParser extends AsyncParserBase<JSONArray> {
+public class JSONArrayParser implements AsyncParser<JSONArray> {
     @Override
     public Future<JSONArray> parse(DataEmitter emitter) {
         return new StringParser().parse(emitter)
@@ -28,4 +30,9 @@ protected void transform(String result) throws Exception {
     public void write(DataSink sink, JSONArray value, CompletedCallback completed) {
         new StringParser().write(sink, value.toString(), completed);
     }
+
+    @Override
+    public Type getType() {
+        return JSONArray.class;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
index 5bd1eb001..e02db2c2e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
@@ -7,10 +7,12 @@
 import com.koushikdutta.async.future.TransformFuture;
 import org.json.JSONObject;
 
+import java.lang.reflect.Type;
+
 /**
  * Created by koush on 5/27/13.
  */
-public class JSONObjectParser extends AsyncParserBase<JSONObject> {
+public class JSONObjectParser implements AsyncParser<JSONObject> {
     @Override
     public Future<JSONObject> parse(DataEmitter emitter) {
         return new StringParser().parse(emitter)
@@ -26,4 +28,9 @@ protected void transform(String result) throws Exception {
     public void write(DataSink sink, JSONObject value, CompletedCallback completed) {
         new StringParser().write(sink, value.toString(), completed);
     }
+
+    @Override
+    public Type getType() {
+        return JSONObject.class;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
index f8d82b621..257d60334 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
@@ -7,12 +7,13 @@
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.TransformFuture;
 
+import java.lang.reflect.Type;
 import java.nio.charset.Charset;
 
 /**
  * Created by koush on 5/27/13.
  */
-public class StringParser extends AsyncParserBase<String> {
+public class StringParser implements AsyncParser<String> {
     Charset forcedCharset;
 
     public StringParser() {
@@ -41,4 +42,9 @@ protected void transform(ByteBufferList result) throws Exception {
     public void write(DataSink sink, String value, CompletedCallback completed) {
         new ByteBufferListParser().write(sink, new ByteBufferList(value.getBytes()), completed);
     }
+
+    @Override
+    public Type getType() {
+        return String.class;
+    }
 }

From 98a9d50ec4e466ee8d84be47e0a7bab6434e7d0f Mon Sep 17 00:00:00 2001
From: mkoslacz <mateusz.koslacz@gmail.com>
Date: Mon, 16 Mar 2015 17:14:54 +0100
Subject: [PATCH 192/399] fix issue 461

I have managed to apply workaround to issue #461 mentioned here: https://github.com/koush/ion/issues/461 based on this commit https://github.com/candrews/HttpResponseCache/commit/a93c92d1d8b87778ac7bb2fa2fe2759e7ca06219
I use local copy of MessageDigest in com.koushikdutta.async.util.FileCache instead of getting instance of MessageDigest each time. It prevents from occuring java.util.ConcurrentModificationException at com.koushikdutta.async.util.FileCache.toKeyString().
---
 .../http/cache/ResponseCacheMiddleware.java   |  4 +-
 .../koushikdutta/async/util/FileCache.java    | 49 +++++++++++++------
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index 614ba40b9..ee2a108b5 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -104,7 +104,7 @@ public Cancellable getSocket(final GetSocketData data) {
             return null;
         }
 
-        String key = FileCache.toKeyString(data.request.getUri());
+        String key = cache.toKeyString(data.request.getUri());
         FileInputStream[] snapshot = null;
         long contentLength;
         Entry entry;
@@ -267,7 +267,7 @@ public void onBodyDecoder(OnBodyDataOnRequestSentData data) {
             return;
         }
 
-        String key = FileCache.toKeyString(data.request.getUri());
+        String key = cache.toKeyString(data.request.getUri());
         RawHeaders varyHeaders = requestHeaders.getHeaders().getAll(networkResponse.getVaryFields());
         Entry entry = new Entry(data.request.getUri(), varyHeaders, data.request, networkResponse.getHeaders());
         BodyCacher cacher = new BodyCacher();
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java b/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java
index d1171083e..548924f90 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java
@@ -19,6 +19,9 @@
  * Created by koush on 4/12/14.
  */
 public class FileCache {
+
+    private MessageDigest messageDigest;
+
     class CacheEntry {
         final long size;
         public CacheEntry(File file) {
@@ -62,23 +65,16 @@ private static MessageDigest findAlternativeMessageDigest() {
         return null;
     }
 
-    public static String toKeyString(Object... parts) {
-        MessageDigest messageDigest;
-        synchronized (FileCache.class) {
-            try {
-                messageDigest = MessageDigest.getInstance(hashAlgorithm);
-            } catch (NoSuchAlgorithmException e) {
-                messageDigest = findAlternativeMessageDigest();
-                if (null == messageDigest)
-                    throw new RuntimeException(e);
+    public String toKeyString(Object... parts) {
+        synchronized (FileCache.class) {    // I spreaded synchronized block to whole method to assure
+                                            // that only one thread deals with our copy of MessageDigest
+                                            // instance
+            for (Object part : parts) {
+                messageDigest.update(part.toString().getBytes());
             }
+            byte[] md5bytes = messageDigest.digest();
+            return new BigInteger(1, md5bytes).toString(16);
         }
-
-        for (Object part : parts) {
-            messageDigest.update(part.toString().getBytes());
-        }
-        byte[] md5bytes = messageDigest.digest();
-        return new BigInteger(1, md5bytes).toString(16);
     }
 
     boolean loadAsync;
@@ -275,10 +271,33 @@ public FileCache(File directory, long size, boolean loadAsync) {
         this.loadAsync = loadAsync;
         cache = new InternalCache();
 
+        try {
+            messageDigest = (MessageDigest) MessageDigest.getInstance(hashAlgorithm);
+            cloneMessageDigest(messageDigest);
+        } catch (NoSuchAlgorithmException e1) {
+            messageDigest = findAlternativeMessageDigest();
+            if (null == messageDigest)
+                throw new RuntimeException(e1);
+            cloneMessageDigest(messageDigest);
+        }
+
         directory.mkdirs();
         doLoad();
     }
 
+    // taken from https://github.com/candrews/HttpResponseCache/commit/a93c92d1d8b87778ac7bb2fa2fe2759e7ca06219
+    private void cloneMessageDigest(MessageDigest messageDigest){
+        try {
+            // clone the messageDigest instance as a workaround for
+            // java.security.MessageDigest.getInstance(String) not being thread safe in Android
+            // see https://code.google.com/p/android/issues/detail?id=37937
+            messageDigest = (MessageDigest) messageDigest.clone();
+        } catch (CloneNotSupportedException e) {
+            // ignore the exception and use the original messageDigest.
+            // hopefully whatever platform we're on doesn't have the bug that requires the cloning workaround
+        }
+    }
+
     public long size() {
         return cache.size();
     }

From aabefa293391d35e112c6f14f7a53ef5e2259956 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 16 Mar 2015 16:12:39 -0700
Subject: [PATCH 193/399] Revert "fix issue 461"

This reverts commit 98a9d50ec4e466ee8d84be47e0a7bab6434e7d0f.
---
 .../http/cache/ResponseCacheMiddleware.java   |  4 +-
 .../koushikdutta/async/util/FileCache.java    | 49 ++++++-------------
 2 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index ee2a108b5..614ba40b9 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -104,7 +104,7 @@ public Cancellable getSocket(final GetSocketData data) {
             return null;
         }
 
-        String key = cache.toKeyString(data.request.getUri());
+        String key = FileCache.toKeyString(data.request.getUri());
         FileInputStream[] snapshot = null;
         long contentLength;
         Entry entry;
@@ -267,7 +267,7 @@ public void onBodyDecoder(OnBodyDataOnRequestSentData data) {
             return;
         }
 
-        String key = cache.toKeyString(data.request.getUri());
+        String key = FileCache.toKeyString(data.request.getUri());
         RawHeaders varyHeaders = requestHeaders.getHeaders().getAll(networkResponse.getVaryFields());
         Entry entry = new Entry(data.request.getUri(), varyHeaders, data.request, networkResponse.getHeaders());
         BodyCacher cacher = new BodyCacher();
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java b/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java
index 548924f90..d1171083e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java
@@ -19,9 +19,6 @@
  * Created by koush on 4/12/14.
  */
 public class FileCache {
-
-    private MessageDigest messageDigest;
-
     class CacheEntry {
         final long size;
         public CacheEntry(File file) {
@@ -65,16 +62,23 @@ private static MessageDigest findAlternativeMessageDigest() {
         return null;
     }
 
-    public String toKeyString(Object... parts) {
-        synchronized (FileCache.class) {    // I spreaded synchronized block to whole method to assure
-                                            // that only one thread deals with our copy of MessageDigest
-                                            // instance
-            for (Object part : parts) {
-                messageDigest.update(part.toString().getBytes());
+    public static String toKeyString(Object... parts) {
+        MessageDigest messageDigest;
+        synchronized (FileCache.class) {
+            try {
+                messageDigest = MessageDigest.getInstance(hashAlgorithm);
+            } catch (NoSuchAlgorithmException e) {
+                messageDigest = findAlternativeMessageDigest();
+                if (null == messageDigest)
+                    throw new RuntimeException(e);
             }
-            byte[] md5bytes = messageDigest.digest();
-            return new BigInteger(1, md5bytes).toString(16);
         }
+
+        for (Object part : parts) {
+            messageDigest.update(part.toString().getBytes());
+        }
+        byte[] md5bytes = messageDigest.digest();
+        return new BigInteger(1, md5bytes).toString(16);
     }
 
     boolean loadAsync;
@@ -271,33 +275,10 @@ public FileCache(File directory, long size, boolean loadAsync) {
         this.loadAsync = loadAsync;
         cache = new InternalCache();
 
-        try {
-            messageDigest = (MessageDigest) MessageDigest.getInstance(hashAlgorithm);
-            cloneMessageDigest(messageDigest);
-        } catch (NoSuchAlgorithmException e1) {
-            messageDigest = findAlternativeMessageDigest();
-            if (null == messageDigest)
-                throw new RuntimeException(e1);
-            cloneMessageDigest(messageDigest);
-        }
-
         directory.mkdirs();
         doLoad();
     }
 
-    // taken from https://github.com/candrews/HttpResponseCache/commit/a93c92d1d8b87778ac7bb2fa2fe2759e7ca06219
-    private void cloneMessageDigest(MessageDigest messageDigest){
-        try {
-            // clone the messageDigest instance as a workaround for
-            // java.security.MessageDigest.getInstance(String) not being thread safe in Android
-            // see https://code.google.com/p/android/issues/detail?id=37937
-            messageDigest = (MessageDigest) messageDigest.clone();
-        } catch (CloneNotSupportedException e) {
-            // ignore the exception and use the original messageDigest.
-            // hopefully whatever platform we're on doesn't have the bug that requires the cloning workaround
-        }
-    }
-
     public long size() {
         return cache.size();
     }

From 904fe689364b0ad25a7a7ce531230ef18de61bc8 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 16 Mar 2015 16:16:11 -0700
Subject: [PATCH 194/399] Another approach to the message digest fix.

Keep a static instance
Wrap in synchronized block
Reset on every use
---
 .../koushikdutta/async/util/FileCache.java    | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java b/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java
index d1171083e..0d2046256 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java
@@ -62,18 +62,24 @@ private static MessageDigest findAlternativeMessageDigest() {
         return null;
     }
 
-    public static String toKeyString(Object... parts) {
-        MessageDigest messageDigest;
-        synchronized (FileCache.class) {
-            try {
-                messageDigest = MessageDigest.getInstance(hashAlgorithm);
-            } catch (NoSuchAlgorithmException e) {
-                messageDigest = findAlternativeMessageDigest();
-                if (null == messageDigest)
-                    throw new RuntimeException(e);
-            }
+    static MessageDigest messageDigest;
+    static {
+        try {
+            messageDigest = MessageDigest.getInstance(hashAlgorithm);
+        } catch (NoSuchAlgorithmException e) {
+            messageDigest = findAlternativeMessageDigest();
+            if (null == messageDigest)
+                throw new RuntimeException(e);
+        }
+        try {
+            messageDigest = (MessageDigest)messageDigest.clone();
+        }
+        catch (CloneNotSupportedException e) {
         }
+    }
 
+    public static synchronized String toKeyString(Object... parts) {
+        messageDigest.reset();
         for (Object part : parts) {
             messageDigest.update(part.toString().getBytes());
         }

From dbf0be16e7004c3b175174d3f6a6e01fd02f7a06 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 25 Mar 2015 10:48:03 -0700
Subject: [PATCH 195/399] 213

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 30615a2ed..6110b2bc7 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="212"
-    android:versionName="2.1.2">
+    android:versionCode="213"
+    android:versionName="2.1.3">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

From 7160cd9f8299d614e703541792d75871685bd6a8 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 18 Apr 2015 15:50:49 -0700
Subject: [PATCH 196/399] Fix proxying to not require transparent proxying.
 This was a regression.

At some point getProxyRequestLine call was removed.
---
 .../async/AsyncSSLSocketWrapper.java          |  2 +-
 .../async/http/AsyncHttpRequest.java          | 26 ++-----------------
 .../async/http/AsyncSocketMiddleware.java     |  7 ++---
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 90608081d..3dd741598 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -58,7 +58,7 @@ public interface HandshakeCallback {
             // https://groups.google.com/forum/?fromgroups=#!topic/netty/UCfqPPk5O4s
             // certs that use this extension will throw in Cipher.java.
             // fallback is to use a custom SSLContext, and hack around the x509 extension.
-            if (Build.VERSION.SDK_INT <= 15)
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
                 throw new Exception();
             defaultSSLContext = SSLContext.getInstance("Default");
         }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
index 95dd21d1a..35fb19375 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
@@ -37,6 +37,8 @@ public String getMethod() {
 
             @Override
             public String toString() {
+                if (proxyHost != null)
+                    return String.format("%s %s HTTP/1.1", mMethod, AsyncHttpRequest.this.getUri());
                 String path = AsyncHttpRequest.this.getUri().getEncodedPath();
                 if (path == null || path.length() == 0)
                     path = "/";
@@ -49,30 +51,6 @@ public String toString() {
         };
     }
 
-    public RequestLine getProxyRequestLine() {
-        return new RequestLine() {
-            @Override
-            public String getUri() {
-                return AsyncHttpRequest.this.getUri().toString();
-            }
-
-            @Override
-            public ProtocolVersion getProtocolVersion() {
-                return new ProtocolVersion("HTTP", 1, 1);
-            }
-
-            @Override
-            public String getMethod() {
-                return mMethod;
-            }
-
-            @Override
-            public String toString() {
-                return String.format("%s %s HTTP/1.1", mMethod, AsyncHttpRequest.this.getUri());
-            }
-        };
-    }
-
     protected static String getDefaultUserAgent() {
         String agent = System.getProperty("http.agent");
         return agent != null ? agent : ("Java" + System.getProperty("java.version"));
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index 4fc23b033..e8676c541 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -168,16 +168,13 @@ public Cancellable getSocket(final GetSocketData data) {
             String unresolvedHost;
             int unresolvedPort;
             boolean proxied = false;
+            if (data.request.getProxyHost() == null && proxyHost != null)
+                data.request.enableProxy(proxyHost, proxyPort);
             if (data.request.getProxyHost() != null) {
                 unresolvedHost = data.request.getProxyHost();
                 unresolvedPort = data.request.getProxyPort();
                 proxied = true;
             }
-            else if (proxyHost != null) {
-                unresolvedHost = proxyHost;
-                unresolvedPort = proxyPort;
-                proxied = true;
-            }
             else {
                 unresolvedHost = uri.getHost();
                 unresolvedPort = port;

From 13d7784c7c4101de9404f22d856d16798dee87d9 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 12 May 2015 20:53:41 -0700
Subject: [PATCH 197/399] Fix spdy negotiation.

https://github.com/koush/ion/issues/559#issuecomment-101411986
---
 AndroidAsync/AndroidManifest.xml               |  4 ++--
 .../com/koushikdutta/async/http/Protocol.java  | 18 ++++++++++++++++--
 .../async/http/spdy/SpdyMiddleware.java        |  3 +--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 6110b2bc7..a142fb5dc 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="213"
-    android:versionName="2.1.3">
+    android:versionCode="214"
+    android:versionName="2.1.4">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Protocol.java b/AndroidAsync/src/com/koushikdutta/async/http/Protocol.java
index 46134280c..6f714f233 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Protocol.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Protocol.java
@@ -40,7 +40,12 @@ public enum Protocol {
      * 3.1</a>. Future releases of OkHttp may use this identifier for a newer draft
      * of the SPDY spec.
      */
-    SPDY_3("spdy/3.1"),
+    SPDY_3("spdy/3.1") {
+        @Override
+        public boolean needsSpdyConnection() {
+            return true;
+        }
+    },
 
     /**
      * The IETF's binary-framed protocol that includes header compression,
@@ -54,7 +59,12 @@ public enum Protocol {
      * 6</a>. Future releases of OkHttp may use this identifier for a newer draft
      * of these specs.
      */
-    HTTP_2("h2-13");
+    HTTP_2("h2-13") {
+        @Override
+        public boolean needsSpdyConnection() {
+            return true;
+        }
+    };
 
     private final String protocol;
     private static final Hashtable<String, Protocol> protocols = new Hashtable<String, Protocol>();
@@ -88,4 +98,8 @@ public static Protocol get(String protocol) {
     public String toString() {
         return protocol;
     }
+
+    public boolean needsSpdyConnection() {
+        return false;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index cd7f630e3..0aa6e1fa8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -94,7 +94,6 @@ private void configure(SSLEngine engine, GetSocketData data, String host, int po
         if (sslParameters != null) {
             try {
                 byte[] protocols = concatLengthPrefixed(
-                Protocol.HTTP_1_1,
                 Protocol.SPDY_3
                 );
 
@@ -207,7 +206,7 @@ public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
                     }
                     protoString = new String(proto);
                     Protocol p = Protocol.get(protoString);
-                    if (p == null) {
+                    if (p == null || !p.needsSpdyConnection()) {
                         invokeConnect(key, callback, null, socket);
                         noSpdy(key);
                         return;

From ac968b019869acd6ff2e4244756ddab0c6d859c1 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 20 May 2015 18:31:29 -0700
Subject: [PATCH 198/399] Add ISO-8859-1 charset.

---
 AndroidAsync/src/com/koushikdutta/async/util/Charsets.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/util/Charsets.java b/AndroidAsync/src/com/koushikdutta/async/util/Charsets.java
index c3a1e44ff..f354aee24 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/Charsets.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/Charsets.java
@@ -6,4 +6,5 @@
 public class Charsets {
   public static final Charset US_ASCII = Charset.forName("US-ASCII");
   public static final Charset UTF_8 = Charset.forName("UTF-8");
+  public static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
 }

From 71a4ffff19186b9c9e89f0b20be032d43f71210f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 21 May 2015 23:08:39 -0700
Subject: [PATCH 199/399] min sdk, explicitly choose charset

---
 AndroidAsync/build.gradle                                 | 8 ++++----
 .../com/koushikdutta/async/http/body/DocumentBody.java    | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 578f83827..74ae497d9 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -21,10 +21,10 @@ android {
         abortOnError false
     }
 
-//    defaultConfig {
-//        targetSdkVersion 21
-//        minSdkVersion 9
-//    }
+    defaultConfig {
+        targetSdkVersion 22
+        minSdkVersion 9
+    }
 
     compileSdkVersion 21
     buildToolsVersion '21.1.2'
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/DocumentBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/DocumentBody.java
index 91f2b180c..a64b1cdfc 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/DocumentBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/DocumentBody.java
@@ -7,6 +7,7 @@
 import com.koushikdutta.async.future.FutureCallback;
 import com.koushikdutta.async.http.AsyncHttpRequest;
 import com.koushikdutta.async.parser.DocumentParser;
+import com.koushikdutta.async.util.Charsets;
 
 import org.w3c.dom.Document;
 
@@ -40,7 +41,7 @@ private void prepare() {
             TransformerFactory tf = TransformerFactory.newInstance();
             Transformer transformer = tf.newTransformer();
             bout = new ByteArrayOutputStream();
-            OutputStreamWriter writer = new OutputStreamWriter(bout);
+            OutputStreamWriter writer = new OutputStreamWriter(bout, Charsets.UTF_8);
             StreamResult result = new StreamResult(writer);
             transformer.transform(source, result);
             writer.flush();

From 4114e9f37b0a52af345c5f2f238da783a888e2ee Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 27 May 2015 23:48:49 -0700
Subject: [PATCH 200/399] mimes on streams. no chunked necessary for
 connection:close

---
 .../koushikdutta/async/http/HttpTransportMiddleware.java   | 6 +++++-
 .../src/com/koushikdutta/async/http/body/StreamBody.java   | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
index 9dacb55de..a1ee8ba34 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
@@ -28,7 +28,11 @@ public boolean exchangeHeaders(final OnExchangeHeaderData data) {
             if (requestBody.length() >= 0) {
                 request.getHeaders().set("Content-Length", String.valueOf(requestBody.length()));
                 data.response.sink(data.socket);
-            } else {
+            }
+            else if ("close".equals(request.getHeaders().get("Connection"))) {
+                data.response.sink(data.socket);
+            }
+            else {
                 request.getHeaders().set("Transfer-Encoding", "Chunked");
                 data.response.sink(new ChunkedOutputFilter(data.socket));
             }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/StreamBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/StreamBody.java
index 13c15a76a..4678d7aeb 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/StreamBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/StreamBody.java
@@ -11,6 +11,7 @@
 public class StreamBody implements AsyncHttpRequestBody<InputStream> {
     InputStream stream;
     int length;
+    String contentType = CONTENT_TYPE;
 
     /**
      * Construct an http body from a stream
@@ -35,7 +36,11 @@ public void parse(DataEmitter emitter, CompletedCallback completed) {
     public static final String CONTENT_TYPE = "application/binary";
     @Override
     public String getContentType() {
-        return CONTENT_TYPE;
+        return contentType;
+    }
+    public StreamBody setContentType(String contentType) {
+        this.contentType = contentType;
+        return this;
     }
 
     @Override

From e49bd233c187e3e754e96dc6481b6047bf98f112 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 9 Jun 2015 14:05:14 -0700
Subject: [PATCH 201/399] 215:

supress debug exceptions
---
 AndroidAsync/AndroidManifest.xml                  | 4 ++--
 AndroidAsync/src/com/koushikdutta/async/Util.java | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index a142fb5dc..10e5898e9 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="214"
-    android:versionName="2.1.4">
+    android:versionCode="215"
+    android:versionName="2.1.5">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/Util.java b/AndroidAsync/src/com/koushikdutta/async/Util.java
index d9808ae59..e8b88fa0b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/Util.java
+++ b/AndroidAsync/src/com/koushikdutta/async/Util.java
@@ -15,6 +15,7 @@
 import java.nio.ByteBuffer;
 
 public class Util {
+    static boolean SUPRESS_DEBUG_EXCEPTIONS = false;
     public static void emitAllData(DataEmitter emitter, ByteBufferList list) {
         int remaining;
         DataCallback handler = null;
@@ -32,6 +33,9 @@ public static void emitAllData(DataEmitter emitter, ByteBufferList list) {
 
 //                System.out.println("Data: " + list.peekString());
                 System.out.println("handler: " + handler);
+                list.recycle();
+                if (SUPRESS_DEBUG_EXCEPTIONS)
+                    return;
                 assert false;
                 throw new RuntimeException("mDataHandler failed to consume data, yet remains the mDataHandler.");
             }
@@ -43,6 +47,9 @@ public static void emitAllData(DataEmitter emitter, ByteBufferList list) {
 //            System.out.println("Data: " + list.peekString());
             System.out.println("handler: " + handler);
             System.out.println("emitter: " + emitter);
+            list.recycle();
+            if (SUPRESS_DEBUG_EXCEPTIONS)
+                return;
             assert false;
             throw new RuntimeException("Not all data was consumed by Util.emitAllData");
         }

From 7bbab2658982988938c4d4f50cc4b2bf51b0511c Mon Sep 17 00:00:00 2001
From: Diego GomezOlvera <diego.gomezolvera@booking.com>
Date: Fri, 12 Jun 2015 16:11:55 +0200
Subject: [PATCH 202/399] Synchronise access to mMiddleware.

---
 .../src/com/koushikdutta/async/http/AsyncHttpClient.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 6382494ea..345395e66 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -58,10 +58,14 @@ public static AsyncHttpClient getDefaultInstance() {
 
     final ArrayList<AsyncHttpClientMiddleware> mMiddleware = new ArrayList<AsyncHttpClientMiddleware>();
     public ArrayList<AsyncHttpClientMiddleware> getMiddleware() {
-        return mMiddleware;
+        synchronized (mMiddleware) {
+            return mMiddleware;
+        }
     }
     public void insertMiddleware(AsyncHttpClientMiddleware middleware) {
-        mMiddleware.add(0, middleware);
+        synchronized (mMiddleware) {
+            mMiddleware.add(0, middleware);
+        }
     }
 
     SpdyMiddleware sslSocketMiddleware;

From a37deb2715e4ff3ca46e2e7ca0170624905e4ce3 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 12 Jun 2015 12:58:38 -0700
Subject: [PATCH 203/399] 216

---
 AndroidAsync/AndroidManifest.xml                  | 4 ++--
 AndroidAsync/src/com/koushikdutta/async/Util.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 10e5898e9..124e4220f 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="215"
-    android:versionName="2.1.5">
+    android:versionCode="216"
+    android:versionName="2.1.6">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/Util.java b/AndroidAsync/src/com/koushikdutta/async/Util.java
index e8b88fa0b..5e6ef5760 100644
--- a/AndroidAsync/src/com/koushikdutta/async/Util.java
+++ b/AndroidAsync/src/com/koushikdutta/async/Util.java
@@ -15,7 +15,7 @@
 import java.nio.ByteBuffer;
 
 public class Util {
-    static boolean SUPRESS_DEBUG_EXCEPTIONS = false;
+    public static boolean SUPRESS_DEBUG_EXCEPTIONS = false;
     public static void emitAllData(DataEmitter emitter, ByteBufferList list) {
         int remaining;
         DataCallback handler = null;

From a2195bb51b891b872aaa89fc411ffd4f33fb16f0 Mon Sep 17 00:00:00 2001
From: chengg11 <chengg11@yahoo.com>
Date: Fri, 19 Jun 2015 15:51:15 -0700
Subject: [PATCH 204/399] add onPing() support to client can be ware of the
 pings sent by server

---
 .../src/com/koushikdutta/async/http/HybiParser.java  |  4 +++-
 .../src/com/koushikdutta/async/http/WebSocket.java   |  5 +++++
 .../com/koushikdutta/async/http/WebSocketImpl.java   | 12 ++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java b/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
index e1b401590..071fe6e96 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
@@ -440,8 +440,9 @@ private void emitFrame() throws IOException {
         } else if (opcode == OP_PING) {
             if (payload.length > 125) { throw new ProtocolError("Ping payload too large"); }
 //            Log.d(TAG, "Sending pong!!");
+            String message = encode(payload);
             sendFrame(frame(OP_PONG, payload, -1));
-
+            onPing(message);
         } else if (opcode == OP_PONG) {
             String message = encode(payload);
             onPong(message);
@@ -452,6 +453,7 @@ private void emitFrame() throws IOException {
     protected abstract void onMessage(byte[] payload);
     protected abstract void onMessage(String payload);
     protected abstract void onPong(String payload);
+    protected abstract void onPing(String payload);
     protected abstract void onDisconnect(int code, String reason);
     protected abstract void report(Exception ex);
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java
index 1aaafa6d2..90f37ee9c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java
@@ -7,6 +7,9 @@ public interface WebSocket extends AsyncSocket {
     static public interface StringCallback {
         public void onStringAvailable(String s);
     }
+    static public interface PingCallback {
+        public void onPingReceived(String s);
+    }
     static public interface PongCallback {
         public void onPongReceived(String s);
     }
@@ -19,6 +22,8 @@ static public interface PongCallback {
     public void setStringCallback(StringCallback callback);
     public StringCallback getStringCallback();
 
+    public void setPingCallback(PingCallback callback);
+    
     public void setPongCallback(PongCallback callback);
     public PongCallback getPongCallback();
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
index 1b82ef09d..6bbd2e59c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
@@ -98,6 +98,12 @@ protected void sendFrame(byte[] frame) {
                 mSink.write(new ByteBufferList(frame));
             }
 
+            @Override
+            protected void onPing(String payload) {
+                if (WebSocketImpl.this.mPingCallback != null)
+                    WebSocketImpl.this.mPingCallback.onPingReceived(payload);
+            }
+
             @Override
             protected void onPong(String payload) {
                 if (WebSocketImpl.this.mPongCallback != null)
@@ -255,6 +261,12 @@ public StringCallback getStringCallback() {
         return mStringCallback;
     }
 
+    private PingCallback mPingCallback;
+    @Override
+    public void setPingCallback(PingCallback callback) {
+        mPingCallback = callback;
+    }
+
     private PongCallback mPongCallback;
     @Override
     public void setPongCallback(PongCallback callback) {

From 7a2bad81051ffed50bbdcfcce309e36805bdd1b9 Mon Sep 17 00:00:00 2001
From: Diego GomezOlvera <diego.gomezolvera@booking.com>
Date: Mon, 22 Jun 2015 17:40:12 +0200
Subject: [PATCH 205/399] Use thread safe List implementation for middleware
 items

---
 .../async/http/AsyncHttpClient.java           | 69 +++++++------------
 1 file changed, 26 insertions(+), 43 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 345395e66..0fa995079 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -43,8 +43,9 @@
 import java.net.ProxySelector;
 import java.net.URI;
 import java.net.URL;
-import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeoutException;
 
 public class AsyncHttpClient {
@@ -56,16 +57,12 @@ public static AsyncHttpClient getDefaultInstance() {
         return mDefaultInstance;
     }
 
-    final ArrayList<AsyncHttpClientMiddleware> mMiddleware = new ArrayList<AsyncHttpClientMiddleware>();
-    public ArrayList<AsyncHttpClientMiddleware> getMiddleware() {
-        synchronized (mMiddleware) {
-            return mMiddleware;
-        }
+    final List<AsyncHttpClientMiddleware> mMiddleware = new CopyOnWriteArrayList<>();
+    public Collection<AsyncHttpClientMiddleware> getMiddleware() {
+        return mMiddleware;
     }
     public void insertMiddleware(AsyncHttpClientMiddleware middleware) {
-        synchronized (mMiddleware) {
-            mMiddleware.add(0, middleware);
-        }
+        mMiddleware.add(0, middleware);
     }
 
     SpdyMiddleware sslSocketMiddleware;
@@ -221,10 +218,8 @@ private void executeAffinity(final AsyncHttpRequest request, final int redirectC
 
         request.logd("Executing request.");
 
-        synchronized (mMiddleware) {
-            for (AsyncHttpClientMiddleware middleware: mMiddleware) {
-                middleware.onRequest(data);
-            }
+        for (AsyncHttpClientMiddleware middleware: mMiddleware) {
+            middleware.onRequest(data);
         }
 
         // flow:
@@ -302,17 +297,15 @@ public void onConnectCompleted(Exception ex, AsyncSocket socket) {
         }
 
         final Exception unsupportedURI;
-        synchronized (mMiddleware) {
-            for (AsyncHttpClientMiddleware middleware: mMiddleware) {
-                Cancellable socketCancellable = middleware.getSocket(data);
-                if (socketCancellable != null) {
-                    data.socketCancellable = socketCancellable;
-                    cancel.setParent(socketCancellable);
-                    return;
-                }
+        for (AsyncHttpClientMiddleware middleware: mMiddleware) {
+            Cancellable socketCancellable = middleware.getSocket(data);
+            if (socketCancellable != null) {
+                data.socketCancellable = socketCancellable;
+                cancel.setParent(socketCancellable);
+                return;
             }
-            unsupportedURI = new IllegalArgumentException("invalid uri="+request.getUri()+" middlewares="+mMiddleware);
         }
+        unsupportedURI = new IllegalArgumentException("invalid uri="+request.getUri()+" middlewares="+mMiddleware);
         reportConnectedCompleted(cancel, unsupportedURI, null, request, callback);
     }
 
@@ -339,20 +332,16 @@ protected void onRequestCompleted(Exception ex) {
                     cancel.scheduled = mServer.postDelayed(cancel.timeoutRunnable, getTimeoutRemaining(request));
                 }
 
-                synchronized (mMiddleware) {
-                    for (AsyncHttpClientMiddleware middleware: mMiddleware) {
-                        middleware.onRequestSent(data);
-                    }
+                for (AsyncHttpClientMiddleware middleware: mMiddleware) {
+                    middleware.onRequestSent(data);
                 }
             }
 
             @Override
             public void setDataEmitter(DataEmitter emitter) {
                 data.bodyEmitter = emitter;
-                synchronized (mMiddleware) {
-                    for (AsyncHttpClientMiddleware middleware: mMiddleware) {
-                        middleware.onBodyDecoder(data);
-                    }
+                for (AsyncHttpClientMiddleware middleware: mMiddleware) {
+                    middleware.onBodyDecoder(data);
                 }
 
                 super.setDataEmitter(data.bodyEmitter);
@@ -408,10 +397,8 @@ protected void onHeadersReceived() {
                 // allow the middleware to massage the headers before the body is decoded
                 request.logv("Received headers:\n" + toString());
 
-                synchronized (mMiddleware) {
-                    for (AsyncHttpClientMiddleware middleware: mMiddleware) {
-                        middleware.onHeadersReceived(data);
-                    }
+                for (AsyncHttpClientMiddleware middleware: mMiddleware) {
+                    middleware.onHeadersReceived(data);
                 }
 
                 // drop through, and setDataEmitter will be called for the body decoder.
@@ -441,10 +428,8 @@ protected void report(Exception ex) {
                 }
 
                 data.exception = ex;
-                synchronized (mMiddleware) {
-                    for (AsyncHttpClientMiddleware middleware: mMiddleware) {
-                        middleware.onResponseComplete(data);
-                    }
+                for (AsyncHttpClientMiddleware middleware: mMiddleware) {
+                    middleware.onResponseComplete(data);
                 }
             }
 
@@ -484,11 +469,9 @@ public void onCompleted(Exception ex) {
         data.response = ret;
         ret.setSocket(data.socket);
 
-        synchronized (mMiddleware) {
-            for (AsyncHttpClientMiddleware middleware: mMiddleware) {
-                if (middleware.exchangeHeaders(data))
-                    break;
-            }
+        for (AsyncHttpClientMiddleware middleware : mMiddleware) {
+            if (middleware.exchangeHeaders(data))
+                break;
         }
     }
 

From 1bc7905b07821f840068089343e6b77a8686d1ab Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 12 Jun 2015 13:31:50 -0700
Subject: [PATCH 206/399] Manually closing AsyncHttpResponse should also
 terminate the socket.

---
 .../async/http/AsyncHttpResponseImpl.java     | 20 ++++++++++++++-----
 .../http/cache/ResponseCacheMiddleware.java   | 18 ++++++++---------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index c161f3060..c6f02a10b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -74,10 +74,7 @@ public AsyncHttpClientMiddleware.ResponseHead emitter(DataEmitter emitter) {
         return this;
     }
 
-    @Override
-    protected void report(Exception e) {
-        super.report(e);
-
+    private void terminate() {
         // DISCONNECT. EVERYTHING.
         // should not get any data after this point...
         // if so, eat it and disconnect.
@@ -88,12 +85,25 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                 mSocket.close();
             }
         });
+    }
+
+    @Override
+    protected void report(Exception e) {
+        super.report(e);
+
+        terminate();
         mSocket.setWriteableCallback(null);
         mSocket.setClosedCallback(null);
         mSocket.setEndCallback(null);
         mCompleted = true;
     }
-    
+
+    @Override
+    public void close() {
+        super.close();
+        terminate();
+    }
+
     private AsyncHttpRequest mRequest;
     private AsyncSocket mSocket;
     protected Headers mHeaders;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index 614ba40b9..71abcf031 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -169,7 +169,7 @@ public Cancellable getSocket(final GetSocketData data) {
                 @Override
                 public void run() {
                     data.connectCallback.onConnectCompleted(null, socket);
-                    socket.spewInternal();
+                    socket.sendCachedDataOnNetworkThread();
                 }
             });
             cacheHitCount++;
@@ -243,7 +243,7 @@ public void onBodyDecoder(OnBodyDataOnRequestSentData data) {
                 CachedBodyEmitter bodySpewer = new CachedBodyEmitter(cacheData.candidate, cacheData.contentLength);
                 bodySpewer.setDataEmitter(data.bodyEmitter);
                 data.bodyEmitter = bodySpewer;
-                bodySpewer.spew();
+                bodySpewer.sendCachedData();
                 return;
             }
 
@@ -416,14 +416,14 @@ public CachedBodyEmitter(EntryCacheResponse cacheResponse, long contentLength) {
             allocator.setCurrentAlloc((int)contentLength);
         }
 
-        Runnable spewRunnable = new Runnable() {
+        Runnable sendCachedDataRunnable = new Runnable() {
             @Override
             public void run() {
-                spewInternal();
+                sendCachedDataOnNetworkThread();
             }
         };
 
-        void spewInternal() {
+        void sendCachedDataOnNetworkThread() {
             if (pending.remaining() > 0) {
                 super.onDataAvailable(CachedBodyEmitter.this, pending);
                 if (pending.remaining() > 0)
@@ -456,17 +456,17 @@ void spewInternal() {
                 return;
             // this limits max throughput to 256k (aka max alloc) * 100 per second...
             // roughly 25MB/s
-            getServer().postDelayed(spewRunnable, 10);
+            getServer().postDelayed(sendCachedDataRunnable, 10);
         }
 
-        void spew() {
-            getServer().post(spewRunnable);
+        void sendCachedData() {
+            getServer().post(sendCachedDataRunnable);
         }
 
         @Override
         public void resume() {
             paused = false;
-            spew();
+            sendCachedData();
         }
 
         @Override

From f585d5b7e48ae6ec87992185a0281ac92ba10d5d Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 28 Jun 2015 14:25:49 -0700
Subject: [PATCH 207/399] Properly bubble up any exceptions during handshake
 failure.

Related to diagnosing: https://github.com/koush/ion/issues/559#issuecomment-116263055
---
 .../src/com/koushikdutta/async/AsyncSSLSocketWrapper.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 3dd741598..f7ac99e38 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -103,7 +103,10 @@ public static void handshake(AsyncSocket socket,
         socket.setClosedCallback(new CompletedCallback() {
             @Override
             public void onCompleted(Exception ex) {
-                callback.onHandshakeCompleted(new SSLException(ex), null);
+                if (ex != null)
+                    callback.onHandshakeCompleted(ex, null);
+                else
+                    callback.onHandshakeCompleted(new SSLException("socket closed during handshake"), null);
             }
         });
         try {
@@ -421,6 +424,8 @@ private void report(Exception e) {
             handshakeCallback = null;
             mSocket.setDataCallback(new DataCallback.NullDataCallback());
             mSocket.end();
+            // handshake sets this callback. unset it.
+            mSocket.setClosedCallback(null);
             mSocket.close();
             hs.onHandshakeCompleted(e, null);
             return;

From d68d7908edf1430db39d0d396edbadffaf163445 Mon Sep 17 00:00:00 2001
From: Jason Adams <jason@ninjanetic.com>
Date: Fri, 24 Jul 2015 17:56:42 -0400
Subject: [PATCH 208/399] Handle cases where the transport becomes null during
 the socketIO heartbeat.

---
 .../koushikdutta/async/http/socketio/SocketIOConnection.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
index 0407f2260..cd74560e8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
@@ -176,8 +176,11 @@ void setupHeartbeat() {
             public void run() {
                 if (heartbeat <= 0 || ts != transport || ts == null || !ts.isConnected())
                     return;
+
                 transport.send("2:::");
-                transport.getServer().postDelayed(this, heartbeat);
+
+                if (transport != null)
+                    transport.getServer().postDelayed(this, heartbeat);
             }
         };
         heartbeatRunner.run();

From f47b588f7b2a94183c6a14c718b0ffcae301276f Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Fri, 21 Aug 2015 16:52:08 -0400
Subject: [PATCH 209/399] Update README.md

`onDataAvailable` has a different signature now.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d19487ade..4c353f4fb 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ AsyncHttpClient.getDefaultInstance().websocket(get, "my-protocol", new WebSocket
             }
         });
         webSocket.setDataCallback(new DataCallback() {
-            public void onDataAvailable(ByteBufferList byteBufferList) {
+            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                 System.out.println("I got some bytes!");
                 // note that this data has been read
                 byteBufferList.recycle();

From 2ad70c7b3502ed47708cd80636acd3c267666136 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Fri, 21 Aug 2015 16:53:00 -0400
Subject: [PATCH 210/399] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4c353f4fb..181bf4dd5 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ AsyncHttpClient.getDefaultInstance().websocket(get, "my-protocol", new WebSocket
             }
         });
         webSocket.setDataCallback(new DataCallback() {
-            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+            public void onDataAvailable(DataEmitter emitter, ByteBufferList byteBufferList) {
                 System.out.println("I got some bytes!");
                 // note that this data has been read
                 byteBufferList.recycle();

From e6573be00feb27b2b16446c07d16c37d3d69d3c9 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 30 Aug 2015 20:45:09 -0700
Subject: [PATCH 211/399] api 23, remove deprecated apache http stuff.

---
 AndroidAsync/build.gradle                     |   6 +-
 .../com/koushikdutta/async/AsyncServer.java   |   1 +
 .../koushikdutta/async/ByteBufferList.java    |   7 +-
 .../koushikdutta/async/dns/DnsResponse.java   |   3 -
 .../async/http/AsyncHttpRequest.java          | 139 ---------
 .../async/http/BasicNameValuePair.java        | 174 +++++++++++
 .../com/koushikdutta/async/http/Headers.java  |  16 -
 .../com/koushikdutta/async/http/Multimap.java |   1 -
 .../async/http/NameValuePair.java             | 108 +++++++
 .../async/http/ProtocolVersion.java           | 286 ++++++++++++++++++
 .../koushikdutta/async/http/RequestLine.java  |  53 ++++
 .../async/http/body/FilePart.java             |   3 +-
 .../async/http/server/AsyncHttpServer.java    |  15 +
 .../async/util/StreamUtility.java             |  11 +-
 14 files changed, 657 insertions(+), 166 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/BasicNameValuePair.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/ProtocolVersion.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/RequestLine.java

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 74ae497d9..2f87f538a 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -22,12 +22,12 @@ android {
     }
 
     defaultConfig {
-        targetSdkVersion 22
+        targetSdkVersion 23
         minSdkVersion 9
     }
 
-    compileSdkVersion 21
-    buildToolsVersion '21.1.2'
+    compileSdkVersion 23
+    buildToolsVersion '23.0.0'
 }
 
 // upload to maven task
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 7245d79f2..03c69fe32 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -317,6 +317,7 @@ public void stop() {
                     });
                 }
                 catch (IOException e) {
+                    Log.e(LOGTAG, "wtf", e);
                     StreamUtility.closeQuietly(closeableWrapper, closeableServer);
                     handler.onCompleted(e);
                 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index b42a58a19..af6ed56fd 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -412,8 +412,11 @@ public int compare(ByteBuffer byteBuffer, ByteBuffer byteBuffer2) {
     static PriorityQueue<ByteBuffer> reclaimed = new PriorityQueue<ByteBuffer>(8, new Reclaimer());
 
     private static PriorityQueue<ByteBuffer> getReclaimed() {
-        if (Thread.currentThread() == Looper.getMainLooper().getThread())
-            return null;
+        Looper mainLooper = Looper.getMainLooper();
+        if (mainLooper != null) {
+            if (Thread.currentThread() == mainLooper.getThread())
+                return null;
+        }
         return reclaimed;
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/dns/DnsResponse.java b/AndroidAsync/src/com/koushikdutta/async/dns/DnsResponse.java
index d708089de..06caf7b1e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/dns/DnsResponse.java
+++ b/AndroidAsync/src/com/koushikdutta/async/dns/DnsResponse.java
@@ -3,9 +3,6 @@
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.http.Multimap;
 
-import org.apache.http.NameValuePair;
-import org.apache.http.message.BasicNameValuePair;
-
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
index 35fb19375..412463b58 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
@@ -6,17 +6,6 @@
 import com.koushikdutta.async.AsyncSSLException;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 
-import org.apache.http.Header;
-import org.apache.http.HeaderIterator;
-import org.apache.http.HttpRequest;
-import org.apache.http.ProtocolVersion;
-import org.apache.http.RequestLine;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.params.HttpParams;
-
-import java.util.List;
-import java.util.Map;
-
 public class AsyncHttpRequest {
     public RequestLine getRequestLine() {
         return new RequestLine() {
@@ -140,134 +129,6 @@ public AsyncHttpRequest setTimeout(int timeout) {
         mTimeout = timeout;
         return this;
     }
-    
-    public static AsyncHttpRequest create(HttpRequest request) {
-        AsyncHttpRequest ret = new AsyncHttpRequest(Uri.parse(request.getRequestLine().getUri()), request.getRequestLine().getMethod());
-        for (Header header: request.getAllHeaders()) {
-            ret.getHeaders().add(header.getName(), header.getValue());
-        }
-        return ret;
-    }
-
-    private static class HttpRequestWrapper implements HttpRequest {
-        AsyncHttpRequest request;
-
-        @Override
-        public RequestLine getRequestLine() {
-            return request.getRequestLine();
-        }
-
-        public HttpRequestWrapper(AsyncHttpRequest request) {
-            this.request = request;
-        }
-
-
-        @Override
-        public void addHeader(Header header) {
-            request.getHeaders().add(header.getName(), header.getValue());
-        }
-
-        @Override
-        public void addHeader(String name, String value) {
-            request.getHeaders().add(name, value);
-        }
-
-        @Override
-        public boolean containsHeader(String name) {
-            return request.getHeaders().get(name) != null;
-        }
-
-        @Override
-        public Header[] getAllHeaders() {
-            return request.getHeaders().toHeaderArray();
-        }
-
-        @Override
-        public Header getFirstHeader(String name) {
-            String value = request.getHeaders().get(name);
-            if (value == null)
-                return null;
-            return new BasicHeader(name, value);
-        }
-
-        @Override
-        public Header[] getHeaders(String name) {
-            Map<String, List<String>> map = request.getHeaders().getMultiMap();
-            List<String> vals = map.get(name);
-            if (vals == null)
-                return new Header[0];
-            Header[] ret = new Header[vals.size()];
-            for (int i = 0; i < ret.length; i++)
-                ret[i] = new BasicHeader(name, vals.get(i));
-            return ret;
-        }
-
-        @Override
-        public Header getLastHeader(String name) {
-            Header[] vals = getHeaders(name);
-            if (vals.length == 0)
-                return null;
-            return vals[vals.length - 1];
-        }
-
-        HttpParams params;
-        @Override
-        public HttpParams getParams() {
-            return params;
-        }
-
-        @Override
-        public ProtocolVersion getProtocolVersion() {
-            return new ProtocolVersion("HTTP", 1, 1);
-        }
-
-        @Override
-        public HeaderIterator headerIterator() {
-            assert false;
-            return null;
-        }
-
-        @Override
-        public HeaderIterator headerIterator(String name) {
-            assert false;
-            return null;
-        }
-
-        @Override
-        public void removeHeader(Header header) {
-            request.getHeaders().remove(header.getName());
-        }
-
-        @Override
-        public void removeHeaders(String name) {
-            request.getHeaders().remove(name);
-        }
-
-        @Override
-        public void setHeader(Header header) {
-            setHeader(header.getName(), header.getValue());
-        }
-
-        @Override
-        public void setHeader(String name, String value) {
-            request.getHeaders().set(name, value);
-        }
-
-        @Override
-        public void setHeaders(Header[] headers) {
-            for (Header header: headers)
-                setHeader(header);
-        }
-
-        @Override
-        public void setParams(HttpParams params) {
-            this.params = params;
-        }
-    }
-
-    public HttpRequest asHttpRequest() {
-        return new HttpRequestWrapper(this);
-    }
 
     public AsyncHttpRequest setHeader(String name, String value) {
         getHeaders().set(name, value);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/BasicNameValuePair.java b/AndroidAsync/src/com/koushikdutta/async/http/BasicNameValuePair.java
new file mode 100644
index 000000000..546575ba2
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/BasicNameValuePair.java
@@ -0,0 +1,174 @@
+/*
+ * $HeadURL: http://svn.apache.org/repos/asf/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicNameValuePair.java $
+ * $Revision: 604625 $
+ * $Date: 2007-12-16 06:11:11 -0800 (Sun, 16 Dec 2007) $
+ *
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package com.koushikdutta.async.http;
+
+import android.text.TextUtils;
+
+import org.apache.http.NameValuePair;
+
+/**
+ * A simple class encapsulating an attribute/value pair.
+ * <p>
+ *  This class comforms to the generic grammar and formatting rules outlined in the 
+ *  <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2">Section 2.2</a>
+ *  and  
+ *  <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.6">Section 3.6</a>
+ *  of <a href="http://www.w3.org/Protocols/rfc2616/rfc2616.txt">RFC 2616</a>
+ * </p>
+ * <h>2.2 Basic Rules</h>
+ * <p>
+ *  The following rules are used throughout this specification to describe basic parsing constructs. 
+ *  The US-ASCII coded character set is defined by ANSI X3.4-1986.
+ * </p>
+ * <pre>
+ *     OCTET          = <any 8-bit sequence of data>
+ *     CHAR           = <any US-ASCII character (octets 0 - 127)>
+ *     UPALPHA        = <any US-ASCII uppercase letter "A".."Z">
+ *     LOALPHA        = <any US-ASCII lowercase letter "a".."z">
+ *     ALPHA          = UPALPHA | LOALPHA
+ *     DIGIT          = <any US-ASCII digit "0".."9">
+ *     CTL            = <any US-ASCII control character
+ *                      (octets 0 - 31) and DEL (127)>
+ *     CR             = <US-ASCII CR, carriage return (13)>
+ *     LF             = <US-ASCII LF, linefeed (10)>
+ *     SP             = <US-ASCII SP, space (32)>
+ *     HT             = <US-ASCII HT, horizontal-tab (9)>
+ *     <">            = <US-ASCII double-quote mark (34)>
+ * </pre>
+ * <p>
+ *  Many HTTP/1.1 header field values consist of words separated by LWS or special 
+ *  characters. These special characters MUST be in a quoted string to be used within 
+ *  a parameter value (as defined in section 3.6).
+ * <p>
+ * <pre>
+ * token          = 1*<any CHAR except CTLs or separators>
+ * separators     = "(" | ")" | "<" | ">" | "@"
+ *                | "," | ";" | ":" | "\" | <">
+ *                | "/" | "[" | "]" | "?" | "="
+ *                | "{" | "}" | SP | HT
+ * </pre>
+ * <p>
+ *  A string of text is parsed as a single word if it is quoted using double-quote marks.
+ * </p>
+ * <pre>
+ * quoted-string  = ( <"> *(qdtext | quoted-pair ) <"> )
+ * qdtext         = <any TEXT except <">>
+ * </pre>
+ * <p>
+ *  The backslash character ("\") MAY be used as a single-character quoting mechanism only 
+ *  within quoted-string and comment constructs.
+ * </p>
+ * <pre>
+ * quoted-pair    = "\" CHAR
+ * </pre>
+ * <h>3.6 Transfer Codings</h>
+ * <p>
+ *  Parameters are in the form of attribute/value pairs.
+ * </p>
+ * <pre>
+ * parameter               = attribute "=" value
+ * attribute               = token
+ * value                   = token | quoted-string
+ * </pre> 
+ * 
+ * @author <a href="mailto:oleg at ural.com">Oleg Kalnichevski</a>
+ * 
+ */
+public class BasicNameValuePair implements NameValuePair, Cloneable {
+
+    private final String name;
+    private final String value;
+
+    /**
+     * Default Constructor taking a name and a value. The value may be null.
+     * 
+     * @param name The name.
+     * @param value The value.
+     */
+    public BasicNameValuePair(final String name, final String value) {
+        super();
+        if (name == null) {
+            throw new IllegalArgumentException("Name may not be null");
+        }
+        this.name = name;
+        this.value = value;
+    }
+
+    /**
+     * Returns the name.
+     *
+     * @return String name The name
+     */
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * Returns the value.
+     *
+     * @return String value The current value.
+     */
+    public String getValue() {
+        return this.value;
+    }
+
+    
+    /**
+     * Get a string representation of this pair.
+     * 
+     * @return A string representation.
+     */
+    public String toString() {
+        return name + "=" + value;
+    }
+
+    public boolean equals(final Object object) {
+        if (object == null) return false;
+        if (this == object) return true;
+        if (object instanceof NameValuePair) {
+            BasicNameValuePair that = (BasicNameValuePair) object;
+            return this.name.equals(that.name)
+                  && TextUtils.equals(this.value, that.value);
+        } else {
+            return false;
+        }
+    }
+
+    public int hashCode() {
+        return name.hashCode() ^ value.hashCode();
+    }
+    
+    public Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
+ 
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
index 92c2b195e..7d56edbef 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
@@ -3,13 +3,8 @@
 
 import android.text.TextUtils;
 
-import com.koushikdutta.async.http.server.AsyncHttpServer;
 import com.koushikdutta.async.util.TaggedList;
 
-import org.apache.http.Header;
-import org.apache.http.message.BasicHeader;
-
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -113,17 +108,6 @@ public Headers removeAll(Collection<String> headers) {
         return this;
     }
 
-    public Header[] toHeaderArray() {
-        ArrayList<Header> ret = new ArrayList<Header>();
-        for (String key: map.keySet()) {
-            TaggedList<String> list = (TaggedList<String>)map.get(key);
-            for (String v: map.get(key)) {
-                ret.add(new BasicHeader((String)list.tag(), v));
-            }
-        }
-        return ret.toArray(new Header[ret.size()]);
-    }
-
     public StringBuilder toStringBuilder() {
         StringBuilder result = new StringBuilder(256);
         for (String key: map.keySet()) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
index 111b336d0..89932dbca 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
@@ -3,7 +3,6 @@
 import android.net.Uri;
 
 import org.apache.http.NameValuePair;
-import org.apache.http.message.BasicNameValuePair;
 
 import java.net.URLDecoder;
 import java.util.ArrayList;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java b/AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java
new file mode 100644
index 000000000..28300b390
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java
@@ -0,0 +1,108 @@
+/*
+ * $HeadURL: http://svn.apache.org/repos/asf/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/NameValuePair.java $
+ * $Revision: 496070 $
+ * $Date: 2007-01-14 04:18:34 -0800 (Sun, 14 Jan 2007) $
+ *
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http;
+
+/**
+ * A simple class encapsulating an attribute/value pair.
+ * <p>
+ *  This class comforms to the generic grammar and formatting rules outlined in the 
+ *  <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2">Section 2.2</a>
+ *  and  
+ *  <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.6">Section 3.6</a>
+ *  of <a href="http://www.w3.org/Protocols/rfc2616/rfc2616.txt">RFC 2616</a>
+ * </p>
+ * <h>2.2 Basic Rules</h>
+ * <p>
+ *  The following rules are used throughout this specification to describe basic parsing constructs. 
+ *  The US-ASCII coded character set is defined by ANSI X3.4-1986.
+ * </p>
+ * <pre>
+ *     OCTET          = <any 8-bit sequence of data>
+ *     CHAR           = <any US-ASCII character (octets 0 - 127)>
+ *     UPALPHA        = <any US-ASCII uppercase letter "A".."Z">
+ *     LOALPHA        = <any US-ASCII lowercase letter "a".."z">
+ *     ALPHA          = UPALPHA | LOALPHA
+ *     DIGIT          = <any US-ASCII digit "0".."9">
+ *     CTL            = <any US-ASCII control character
+ *                      (octets 0 - 31) and DEL (127)>
+ *     CR             = <US-ASCII CR, carriage return (13)>
+ *     LF             = <US-ASCII LF, linefeed (10)>
+ *     SP             = <US-ASCII SP, space (32)>
+ *     HT             = <US-ASCII HT, horizontal-tab (9)>
+ *     <">            = <US-ASCII double-quote mark (34)>
+ * </pre>
+ * <p>
+ *  Many HTTP/1.1 header field values consist of words separated by LWS or special 
+ *  characters. These special characters MUST be in a quoted string to be used within 
+ *  a parameter value (as defined in section 3.6).
+ * <p>
+ * <pre>
+ * token          = 1*<any CHAR except CTLs or separators>
+ * separators     = "(" | ")" | "<" | ">" | "@"
+ *                | "," | ";" | ":" | "\" | <">
+ *                | "/" | "[" | "]" | "?" | "="
+ *                | "{" | "}" | SP | HT
+ * </pre>
+ * <p>
+ *  A string of text is parsed as a single word if it is quoted using double-quote marks.
+ * </p>
+ * <pre>
+ * quoted-string  = ( <"> *(qdtext | quoted-pair ) <"> )
+ * qdtext         = <any TEXT except <">>
+ * </pre>
+ * <p>
+ *  The backslash character ("\") MAY be used as a single-character quoting mechanism only 
+ *  within quoted-string and comment constructs.
+ * </p>
+ * <pre>
+ * quoted-pair    = "\" CHAR
+ * </pre>
+ * <h>3.6 Transfer Codings</h>
+ * <p>
+ *  Parameters are in the form of attribute/value pairs.
+ * </p>
+ * <pre>
+ * parameter               = attribute "=" value
+ * attribute               = token
+ * value                   = token | quoted-string
+ * </pre> 
+ *
+ * @author <a href="mailto:oleg at ural.com">Oleg Kalnichevski</a>
+ *
+ */
+public interface NameValuePair {
+
+    String getName();
+
+    String getValue();
+
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/ProtocolVersion.java b/AndroidAsync/src/com/koushikdutta/async/http/ProtocolVersion.java
new file mode 100644
index 000000000..b4c150bf4
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/ProtocolVersion.java
@@ -0,0 +1,286 @@
+/*
+ * $HeadURL: http://svn.apache.org/repos/asf/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/ProtocolVersion.java $
+ * $Revision: 609106 $
+ * $Date: 2008-01-05 01:15:42 -0800 (Sat, 05 Jan 2008) $
+ *
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package com.koushikdutta.async.http;
+
+import java.io.Serializable;
+
+
+/**
+ * Represents a protocol version, as specified in RFC 2616.
+ * RFC 2616 specifies only HTTP versions, like "HTTP/1.1" and "HTTP/1.0".
+ * RFC 3261 specifies a message format that is identical to HTTP except
+ * for the protocol name. It defines a protocol version "SIP/2.0".
+ * There are some nitty-gritty differences between the interpretation
+ * of versions in HTTP and SIP. In those cases, HTTP takes precedence.
+ * <p>
+ * This class defines a protocol version as a combination of
+ * protocol name, major version number, and minor version number.
+ * Note that {@link #equals} and {@link #hashCode} are defined as
+ * final here, they cannot be overridden in derived classes.
+ * 
+ * @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
+ * @author <a href="mailto:rolandw at apache.org">Roland Weber</a>
+ * 
+ * @version $Revision: 609106 $
+ */
+public class ProtocolVersion implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 8950662842175091068L;
+
+
+    /** Name of the protocol. */
+    protected final String protocol;
+
+    /** Major version number of the protocol */
+    protected final int major;
+
+    /** Minor version number of the protocol */
+    protected final int minor;
+
+    
+    /**
+     * Create a protocol version designator.
+     *
+     * @param protocol   the name of the protocol, for example "HTTP"
+     * @param major      the major version number of the protocol
+     * @param minor      the minor version number of the protocol
+     */
+    public ProtocolVersion(String protocol, int major, int minor) {
+        if (protocol == null) {
+            throw new IllegalArgumentException
+                ("Protocol name must not be null.");
+        }
+        if (major < 0) {
+            throw new IllegalArgumentException
+                ("Protocol major version number must not be negative.");
+        }
+        if (minor < 0) {
+            throw new IllegalArgumentException
+                ("Protocol minor version number may not be negative");
+        }
+        this.protocol = protocol;
+        this.major = major;
+        this.minor = minor;
+    }
+
+    /**
+     * Returns the name of the protocol.
+     * 
+     * @return the protocol name
+     */
+    public final String getProtocol() {
+        return protocol;
+    }
+
+    /**
+     * Returns the major version number of the protocol.
+     * 
+     * @return the major version number.
+     */
+    public final int getMajor() {
+        return major;
+    }
+
+    /**
+     * Returns the minor version number of the HTTP protocol.
+     * 
+     * @return the minor version number.
+     */
+    public final int getMinor() {
+        return minor;
+    }
+
+
+    /**
+     * Obtains a specific version of this protocol.
+     * This can be used by derived classes to instantiate themselves instead
+     * of the base class, and to define constants for commonly used versions.
+     * <br/>
+     * The default implementation in this class returns <code>this</code>
+     * if the version matches, and creates a new {@link ProtocolVersion}
+     * otherwise.
+     *
+     * @param major     the major version
+     * @param minor     the minor version
+     *
+     * @return  a protocol version with the same protocol name
+     *          and the argument version
+     */
+    public ProtocolVersion forVersion(int major, int minor) {
+
+        if ((major == this.major) && (minor == this.minor)) {
+            return this;
+        }
+
+        // argument checking is done in the constructor
+        return new ProtocolVersion(this.protocol, major, minor);
+    }
+
+
+    /**
+     * Obtains a hash code consistent with {@link #equals}.
+     *
+     * @return  the hashcode of this protocol version
+     */
+    public final int hashCode() {
+        return this.protocol.hashCode() ^ (this.major * 100000) ^ this.minor;
+    }
+
+        
+    /**
+     * Checks equality of this protocol version with an object.
+     * The object is equal if it is a protocl version with the same
+     * protocol name, major version number, and minor version number.
+     * The specific class of the object is <i>not</i> relevant,
+     * instances of derived classes with identical attributes are
+     * equal to instances of the base class and vice versa.
+     *
+     * @param obj       the object to compare with
+     *
+     * @return  <code>true</code> if the argument is the same protocol version,
+     *          <code>false</code> otherwise
+     */
+    public final boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof ProtocolVersion)) {
+            return false;
+        }
+        ProtocolVersion that = (ProtocolVersion) obj;
+
+        return ((this.protocol.equals(that.protocol)) &&
+                (this.major == that.major) &&
+                (this.minor == that.minor));
+    }
+
+
+    /**
+     * Checks whether this protocol can be compared to another one.
+     * Only protocol versions with the same protocol name can be
+     * {@link #compareToVersion compared}.
+     *
+     * @param that      the protocol version to consider
+     *
+     * @return  <code>true</code> if {@link #compareToVersion compareToVersion}
+     *          can be called with the argument, <code>false</code> otherwise
+     */
+    public boolean isComparable(ProtocolVersion that) {
+        return (that != null) && this.protocol.equals(that.protocol);
+    }
+
+
+    /**
+     * Compares this protocol version with another one.
+     * Only protocol versions with the same protocol name can be compared.
+     * This method does <i>not</i> define a total ordering, as it would be
+     * required for {@link java.lang.Comparable}.
+     *
+     * @param that      the protocl version to compare with
+     *  
+     * @return   a negative integer, zero, or a positive integer
+     *           as this version is less than, equal to, or greater than
+     *           the argument version.
+     *
+     * @throws IllegalArgumentException
+     *         if the argument has a different protocol name than this object,
+     *         or if the argument is <code>null</code>
+     */
+    public int compareToVersion(ProtocolVersion that) {
+        if (that == null) {
+            throw new IllegalArgumentException
+                ("Protocol version must not be null."); 
+        }
+        if (!this.protocol.equals(that.protocol)) {
+            throw new IllegalArgumentException
+                ("Versions for different protocols cannot be compared. " +
+                 this + " " + that);
+        }
+
+        int delta = getMajor() - that.getMajor();
+        if (delta == 0) {
+            delta = getMinor() - that.getMinor();
+        }
+        return delta;
+    }
+
+
+    /**
+     * Tests if this protocol version is greater or equal to the given one.
+     *
+     * @param version   the version against which to check this version
+     *
+     * @return  <code>true</code> if this protocol version is
+     *          {@link #isComparable comparable} to the argument
+     *          and {@link #compareToVersion compares} as greater or equal,
+     *          <code>false</code> otherwise
+     */
+    public final boolean greaterEquals(ProtocolVersion version) {
+        return isComparable(version) && (compareToVersion(version) >= 0);
+    }
+
+
+    /**
+     * Tests if this protocol version is less or equal to the given one.
+     *
+     * @param version   the version against which to check this version
+     *
+     * @return  <code>true</code> if this protocol version is
+     *          {@link #isComparable comparable} to the argument
+     *          and {@link #compareToVersion compares} as less or equal,
+     *          <code>false</code> otherwise
+     */
+    public final boolean lessEquals(ProtocolVersion version) {
+        return isComparable(version) && (compareToVersion(version) <= 0);
+    }
+
+
+    /**
+     * Converts this protocol version to a string.
+     *
+     * @return  a protocol version string, like "HTTP/1.1"
+     */
+    public String toString() {
+        StringBuilder buffer = new StringBuilder();
+        buffer.append(this.protocol); 
+        buffer.append('/'); 
+        buffer.append(Integer.toString(this.major)); 
+        buffer.append('.'); 
+        buffer.append(Integer.toString(this.minor)); 
+        return buffer.toString();
+    }
+
+    public Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
+    
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/RequestLine.java b/AndroidAsync/src/com/koushikdutta/async/http/RequestLine.java
new file mode 100644
index 000000000..63bda121a
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/RequestLine.java
@@ -0,0 +1,53 @@
+/*
+ * $HeadURL: http://svn.apache.org/repos/asf/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/RequestLine.java $
+ * $Revision: 573864 $
+ * $Date: 2007-09-08 08:53:25 -0700 (Sat, 08 Sep 2007) $
+ *
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package com.koushikdutta.async.http;
+
+/**
+ * The first line of an {@link HttpRequest HttpRequest}.
+ * It contains the method, URI, and HTTP version of the request.
+ * For details, see RFC 2616.
+ *
+ * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
+ *
+ * @version $Revision: 573864 $
+ * 
+ * @since 4.0
+ */
+public interface RequestLine {
+
+    String getMethod();
+
+    ProtocolVersion getProtocolVersion();
+
+    String getUri();
+    
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java b/AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java
index 20cfe1fd3..aed1ced84 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java
@@ -1,7 +1,8 @@
 package com.koushikdutta.async.http.body;
 
+import com.koushikdutta.async.http.BasicNameValuePair;
+
 import org.apache.http.NameValuePair;
-import org.apache.http.message.BasicNameValuePair;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 27ba4e57d..d987c910d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -283,6 +283,21 @@ private static class Pair {
     }
     
     final Hashtable<String, ArrayList<Pair>> mActions = new Hashtable<String, ArrayList<Pair>>();
+
+    public void removeAction(String action, String regex) {
+        synchronized (mActions) {
+            ArrayList<Pair> pairs = mActions.get(action);
+            if (pairs == null)
+                return;
+            for (int i = 0; i < pairs.size(); i++) {
+                Pair p = pairs.get(i);
+                if (regex.equals(p.regex.toString())) {
+                    pairs.remove(i);
+                    return;
+                }
+            }
+        }
+    }
     
     public void addAction(String action, String regex, HttpServerRequestCallback callback) {
         Pair p = new Pair();
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/StreamUtility.java b/AndroidAsync/src/com/koushikdutta/async/util/StreamUtility.java
index 4d55e2f17..2955a8649 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/StreamUtility.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/StreamUtility.java
@@ -65,7 +65,16 @@ public static String readToEnd(InputStream input) throws IOException
     static public String readFile(String filename) throws IOException {
         return readFile(new File(filename));
     }
-    
+
+    static public String readFileSilent(String filename) {
+        try {
+            return readFile(new File(filename));
+        }
+        catch (IOException e) {
+            return null;
+        }
+    }
+
     static public String readFile(File file) throws IOException {
         byte[] buffer = new byte[(int) file.length()];
         DataInputStream input = null;

From 9872921bce9cfd91b4ad5cdf91c27146df1fd6d0 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 1 Sep 2015 15:05:17 -0700
Subject: [PATCH 212/399] Thread affinity fixes for BufferedDataSink

---
 .../koushikdutta/async/BufferedDataSink.java  | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
index 8daa83637..3c074c572 100644
--- a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
@@ -49,18 +49,23 @@ public void write(ByteBufferList bb) {
         write(bb, false);
     }
     
-    protected void write(ByteBufferList bb, boolean ignoreBuffer) {
-        if (!mPendingWrites.hasRemaining())
-            mDataSink.write(bb);
+    protected void write(final ByteBufferList bb, final boolean ignoreBuffer) {
+        getServer().run(new Runnable() {
+            @Override
+            public void run() {
+                if (!mPendingWrites.hasRemaining())
+                    mDataSink.write(bb);
 
-        if (bb.remaining() > 0) {
-            int toRead = Math.min(bb.remaining(), mMaxBuffer);
-            if (ignoreBuffer)
-                toRead = bb.remaining();
-            if (toRead > 0) {
-                bb.get(mPendingWrites, toRead);
+                if (bb.remaining() > 0) {
+                    int toRead = Math.min(bb.remaining(), mMaxBuffer);
+                    if (ignoreBuffer)
+                        toRead = bb.remaining();
+                    if (toRead > 0) {
+                        bb.get(mPendingWrites, toRead);
+                    }
+                }
             }
-        }
+        });
     }
 
     WritableCallback mWritable;
@@ -96,11 +101,16 @@ public boolean isOpen() {
     boolean endPending;
     @Override
     public void end() {
-        if (mPendingWrites.hasRemaining()) {
-            endPending = true;
-            return;
-        }
-        mDataSink.end();
+        getServer().run(new Runnable() {
+            @Override
+            public void run() {
+                if (mPendingWrites.hasRemaining()) {
+                    endPending = true;
+                    return;
+                }
+                mDataSink.end();
+            }
+        });
     }
 
     @Override

From c6095db1312045f798dad54c46190de8c5d419ef Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 14 Sep 2015 11:18:03 -0700
Subject: [PATCH 213/399] apache http is deperacated, comment out test until
 rewritten add AsyncServerHttpResponse.send(byte[])

---
 .../http/server/AsyncHttpServerResponse.java  |  1 +
 .../server/AsyncHttpServerResponseImpl.java   | 30 +++++++++++--------
 .../async/test/HttpServerTests.java           | 29 +++++++-----------
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
index 58b8fbc23..f66c7a29d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
@@ -13,6 +13,7 @@
 
 public interface AsyncHttpServerResponse extends DataSink, CompletedCallback {
     public void end();
+    public void send(String contentType, byte[] bytes);
     public void send(String contentType, String string);
     public void send(String string);
     public void send(JSONObject json);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index 1454a85c4..beaf7a0d5 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -196,24 +196,28 @@ public void setContentType(String contentType) {
         mRawHeaders.set("Content-Type", contentType);
     }
 
+    @Override
+    public void send(String contentType, byte[] bytes) {
+        assert mContentLength < 0;
+        mContentLength = bytes.length;
+        mRawHeaders.set("Content-Length", Integer.toString(bytes.length));
+        mRawHeaders.set("Content-Type", contentType);
+
+        Util.writeAll(this, bytes, new CompletedCallback() {
+            @Override
+            public void onCompleted(Exception ex) {
+                onEnd();
+            }
+        });
+    }
+
     @Override
     public void send(String contentType, final String string) {
         try {
-            assert mContentLength < 0;
-            byte[] bytes = string.getBytes("UTF-8");
-            mContentLength = bytes.length;
-            mRawHeaders.set("Content-Length", Integer.toString(bytes.length));
-            mRawHeaders.set("Content-Type", contentType);
-
-            Util.writeAll(this, string.getBytes(), new CompletedCallback() {
-                @Override
-                public void onCompleted(Exception ex) {
-                    onEnd();
-                }
-            });
+            send(contentType, string.getBytes("UTF-8"));
         }
         catch (UnsupportedEncodingException e) {
-            assert false;
+            throw new AssertionError(e);
         }
     }
     
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpServerTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpServerTests.java
index 7139cafce..e47e231d3 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpServerTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpServerTests.java
@@ -16,19 +16,12 @@
 
 import junit.framework.TestCase;
 
-import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicNameValuePair;
 import org.json.JSONObject;
 
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.List;
 
 public class HttpServerTests extends TestCase {
     AsyncHttpServer httpServer;
@@ -105,17 +98,17 @@ public void testString() throws Exception {
         assertEquals(json.getString("foo"), "bar");
     }
 
-    public void testUrlEncodedFormBody() throws Exception {
-        List<NameValuePair> params = new ArrayList<NameValuePair>();
-        params.add(new BasicNameValuePair("foo", "bar"));
-        HttpPost post = new HttpPost("http://localhost:5000/echo");
-        post.setEntity(new UrlEncodedFormEntity(params));
-
-        HttpResponse response = new DefaultHttpClient().execute(post);
-        String contents = StreamUtility.readToEnd(response.getEntity().getContent());
-        JSONObject json = new JSONObject(contents);
-        assertEquals(json.getString("foo"), "bar");
-    }
+//    public void testUrlEncodedFormBody() throws Exception {
+//        List<NameValuePair> params = new ArrayList<NameValuePair>();
+//        params.add(new BasicNameValuePair("foo", "bar"));
+//        HttpPost post = new HttpPost("http://localhost:5000/echo");
+//        post.setEntity(new UrlEncodedFormEntity(params));
+//
+//        HttpResponse response = new DefaultHttpClient().execute(post);
+//        String contents = StreamUtility.readToEnd(response.getEntity().getContent());
+//        JSONObject json = new JSONObject(contents);
+//        assertEquals(json.getString("foo"), "bar");
+//    }
     
     public void testServerHello() throws Exception {
         URL url = new URL("http://localhost:5000/hello");

From 15dd8fdee1f63435d63fcc0f982badae20682fbc Mon Sep 17 00:00:00 2001
From: Nicolas Brocard <nbrocard@freebox.fr>
Date: Fri, 18 Sep 2015 14:12:06 +0200
Subject: [PATCH 214/399] handle custom hostname verifyer result to deny
 request if hostname is not allowed

---
 .../src/com/koushikdutta/async/AsyncSSLSocketWrapper.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index f7ac99e38..91374d722 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -302,7 +302,9 @@ private void handleHandshakeStatus(HandshakeStatus status) {
                                     verifier.verify(mHost, StrictHostnameVerifier.getCNs(peerCertificates[0]), StrictHostnameVerifier.getDNSSubjectAlts(peerCertificates[0]));
                                 }
                                 else {
-                                    hostnameVerifier.verify(mHost, engine.getSession());
+                                    if (!hostnameVerifier.verify(mHost, engine.getSession())) {
+                                        throw new SSLException("hostname <" + mHost + "> has been denied");
+                                    }
                                 }
                             }
                             trusted = true;

From fea6f9b96954c0da629a731a887905779c3a8c73 Mon Sep 17 00:00:00 2001
From: panxw <panxw@163.com>
Date: Tue, 29 Sep 2015 10:12:50 +0800
Subject: [PATCH 215/399] fix package error

---
 AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java b/AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java
index 28300b390..f8a1198ee 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java
@@ -29,7 +29,7 @@
  *
  */
 
-package org.apache.http;
+package com.koushikdutta.async.http;
 
 /**
  * A simple class encapsulating an attribute/value pair.

From 401893be10a1c548d43612fe2f619f9f54cddbe3 Mon Sep 17 00:00:00 2001
From: Ahmed Nuaman <ahmed@ahmednuaman.com>
Date: Sun, 4 Oct 2015 09:11:30 +0100
Subject: [PATCH 216/399] fixed typo relating to callback in
 multipart/form-data example

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 181bf4dd5..19ecda84d 100644
--- a/README.md
+++ b/README.md
@@ -187,8 +187,8 @@ body.addStringPart("foo", "bar");
 post.setBody(body);
 AsyncHttpClient.getDefaultInstance().execute(post, new StringCallback() {
     @Override
-    public void onCompleted(Exception e, AsyncHttpResponse source, String result) {
-        if (e != null) {
+    public void onCompleted(Exception ex, AsyncHttpResponse source, String result) {
+        if (ex != null) {
             ex.printStackTrace();
             return;
         }

From aaf87c8cabd9d4579485520eb6e5180ffe705f2e Mon Sep 17 00:00:00 2001
From: Yunarta Kartawahyudi <yunarta@vcube.co.jp>
Date: Thu, 5 Nov 2015 18:38:59 +0800
Subject: [PATCH 217/399] set Locale.ENGLISH to all format related functions

---
 .../koushikdutta/async/http/AsyncHttpRequest.java   |  8 +++++---
 .../async/http/AsyncSSLSocketMiddleware.java        |  3 ++-
 .../async/http/AsyncSocketMiddleware.java           |  3 ++-
 .../src/com/koushikdutta/async/http/body/Part.java  |  5 +++--
 .../async/http/cache/ResponseCacheMiddleware.java   |  3 ++-
 .../async/http/filter/GZIPInputFilter.java          |  3 ++-
 .../http/server/AsyncHttpServerResponseImpl.java    |  7 ++++---
 .../async/http/socketio/SocketIOConnection.java     | 10 +++++-----
 .../com/koushikdutta/async/http/spdy/BitArray.java  |  5 +++--
 .../koushikdutta/async/http/spdy/ByteString.java    |  5 +++--
 .../com/koushikdutta/async/http/spdy/Header.java    |  4 +++-
 .../koushikdutta/async/http/spdy/Http20Draft13.java | 13 +++++++------
 .../src/com/koushikdutta/async/http/spdy/Spdy3.java |  3 ++-
 .../src/com/koushikdutta/async/util/LruCache.java   |  3 ++-
 14 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
index 412463b58..122583ffa 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
@@ -6,6 +6,8 @@
 import com.koushikdutta.async.AsyncSSLException;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 
+import java.util.Locale;
+
 public class AsyncHttpRequest {
     public RequestLine getRequestLine() {
         return new RequestLine() {
@@ -27,7 +29,7 @@ public String getMethod() {
             @Override
             public String toString() {
                 if (proxyHost != null)
-                    return String.format("%s %s HTTP/1.1", mMethod, AsyncHttpRequest.this.getUri());
+                    return String.format(Locale.ENGLISH, "%s %s HTTP/1.1", mMethod, AsyncHttpRequest.this.getUri());
                 String path = AsyncHttpRequest.this.getUri().getEncodedPath();
                 if (path == null || path.length() == 0)
                     path = "/";
@@ -35,7 +37,7 @@ public String toString() {
                 if (query != null && query.length() != 0) {
                     path += "?" + query;
                 }
-                return String.format("%s %s HTTP/1.1", mMethod, path);
+                return String.format(Locale.ENGLISH, "%s %s HTTP/1.1", mMethod, path);
             }
         };
     }
@@ -187,7 +189,7 @@ private String getLogMessage(String message) {
             elapsed = System.currentTimeMillis() - executionTime;
         else
             elapsed = 0;
-        return String.format("(%d ms) %s: %s", elapsed, getUri(), message);
+        return String.format(Locale.ENGLISH, "(%d ms) %s: %s", elapsed, getUri(), message);
     }
     public void logi(String message) {
         if (LOGTAG == null)
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
index 5aaaae4ae..5ca5227ad 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
@@ -14,6 +14,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
@@ -102,7 +103,7 @@ public void onConnectCompleted(Exception ex, final AsyncSocket socket) {
                 // this SSL connection is proxied, must issue a CONNECT request to the proxy server
                 // http://stackoverflow.com/a/6594880/704837
                 // some proxies also require 'Host' header, it should be safe to provide it every time
-                String connect = String.format("CONNECT %s:%s HTTP/1.1\r\nHost: %s\r\n\r\n", uri.getHost(), port, uri.getHost());
+                String connect = String.format(Locale.ENGLISH, "CONNECT %s:%s HTTP/1.1\r\nHost: %s\r\n\r\n", uri.getHost(), port, uri.getHost());
                 data.request.logv("Proxying: " + connect);
                 Util.writeAll(socket, connect.getBytes(), new CompletedCallback() {
                     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index e8676c541..2eff984d3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -18,6 +18,7 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.Hashtable;
+import java.util.Locale;
 
 public class AsyncSocketMiddleware extends SimpleMiddleware {
     String scheme;
@@ -213,7 +214,7 @@ public void onCompleted(Exception ex) {
                 });
 
                 for (final InetAddress address: result) {
-                    final String inetSockAddress = String.format("%s:%s", address, port);
+                    final String inetSockAddress = String.format(Locale.ENGLISH, "%s:%s", address, port);
                     keepTrying.add(new ContinuationCallback() {
                         @Override
                         public void onContinue(Continuation continuation, final CompletedCallback next) throws Exception {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java b/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java
index b66c711e0..11041b45b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java
@@ -9,6 +9,7 @@
 
 import java.io.File;
 import java.util.List;
+import java.util.Locale;
 
 public class Part {
     public static final String CONTENT_DISPOSITION = "Content-Disposition";
@@ -28,10 +29,10 @@ public String getName() {
     public Part(String name, long length, List<NameValuePair> contentDisposition) {
         this.length = length;
         mHeaders = new Headers();
-        StringBuilder builder = new StringBuilder(String.format("form-data; name=\"%s\"", name));
+        StringBuilder builder = new StringBuilder(String.format(Locale.ENGLISH, "form-data; name=\"%s\"", name));
         if (contentDisposition != null) {
             for (NameValuePair pair: contentDisposition) {
-                builder.append(String.format("; %s=\"%s\"", pair.getName(), pair.getValue()));
+                builder.append(String.format(Locale.ENGLISH, "; %s=\"%s\"", pair.getName(), pair.getValue()));
             }
         }
         mHeaders.set(CONTENT_DISPOSITION, builder.toString());
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index 71abcf031..05ee2c06d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -43,6 +43,7 @@
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.net.ssl.SSLEngine;
@@ -226,7 +227,7 @@ public void onBodyDecoder(OnBodyDataOnRequestSentData data) {
         CacheData cacheData = data.state.get("cache-data");
         RawHeaders rh = RawHeaders.fromMultimap(data.response.headers().getMultiMap());
         rh.removeAll("Content-Length");
-        rh.setStatusLine(String.format("%s %s %s", data.response.protocol(), data.response.code(), data.response.message()));
+        rh.setStatusLine(String.format(Locale.ENGLISH, "%s %s %s", data.response.protocol(), data.response.code(), data.response.message()));
         ResponseHeaders networkResponse = new ResponseHeaders(data.request.getUri(), rh);
         data.state.put("response-headers", networkResponse);
         if (cacheData != null) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java b/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java
index 8f76dbe73..01529b038 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/filter/GZIPInputFilter.java
@@ -9,6 +9,7 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.util.Locale;
 import java.util.zip.CRC32;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.Inflater;
@@ -55,7 +56,7 @@ public void onDataAvailable(final DataEmitter emitter, ByteBufferList bb) {
                 public void parsed(byte[] header) {
                     short magic = peekShort(header, 0, ByteOrder.LITTLE_ENDIAN);
                     if (magic != (short) GZIPInputStream.GZIP_MAGIC) {
-                        report(new IOException(String.format("unknown format (magic number %x)", magic)));
+                        report(new IOException(String.format(Locale.ENGLISH, "unknown format (magic number %x)", magic)));
                         emitter.setDataCallback(new NullDataCallback());
                         return;
                     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index beaf7a0d5..61a8aa347 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -26,6 +26,7 @@
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.util.Locale;
 
 public class AsyncHttpServerResponseImpl implements AsyncHttpServerResponse {
     private Headers mRawHeaders = new Headers();
@@ -96,7 +97,7 @@ void initFirstWrite() {
             isChunked = false;
         }
 
-        String statusLine = String.format("HTTP/1.1 %s %s", code, AsyncHttpServer.getResponseCodeDescription(code));
+        String statusLine = String.format(Locale.ENGLISH, "HTTP/1.1 %s %s", code, AsyncHttpServer.getResponseCodeDescription(code));
         String rh = mRawHeaders.toPrefixString(statusLine);
 
         Util.writeAll(mSocket, rh.getBytes(), new CompletedCallback() {
@@ -270,7 +271,7 @@ public void sendStream(final InputStream inputStream, long totalLength) {
                     end = totalLength - 1;
 
                 code(206);
-                getHeaders().set("Content-Range", String.format("bytes %d-%d/%d", start, end, totalLength));
+                getHeaders().set("Content-Range", String.format(Locale.ENGLISH, "bytes %d-%d/%d", start, end, totalLength));
             }
             catch (Exception e) {
                 code(416);
@@ -392,7 +393,7 @@ public AsyncServer getServer() {
     public String toString() {
         if (mRawHeaders == null)
             return super.toString();
-        String statusLine = String.format("HTTP/1.1 %s %s", code, AsyncHttpServer.getResponseCodeDescription(code));
+        String statusLine = String.format(Locale.ENGLISH, "HTTP/1.1 %s %s", code, AsyncHttpServer.getResponseCodeDescription(code));
         return mRawHeaders.toPrefixString(statusLine);
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
index cd74560e8..ddf7ccc5b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
@@ -6,7 +6,6 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.future.Cancellable;
 import com.koushikdutta.async.future.DependentCancellable;
-import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.FutureCallback;
 import com.koushikdutta.async.future.SimpleFuture;
 import com.koushikdutta.async.future.TransformFuture;
@@ -23,6 +22,7 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Hashtable;
+import java.util.Locale;
 
 /**
  * Created by koush on 7/1/13.
@@ -54,13 +54,13 @@ public void emitRaw(int type, SocketIOClient client, String message, Acknowledge
             ack =  id + "+";
             acknowledges.put(id, acknowledge);
         }
-        transport.send(String.format("%d:%s:%s:%s", type, ack, client.endpoint, message));
+        transport.send(String.format(Locale.ENGLISH, "%d:%s:%s:%s", type, ack, client.endpoint, message));
     }
 
     public void connect(SocketIOClient client) {
         if (!clients.contains(client))
             clients.add(client);
-        transport.send(String.format("1::%s", client.endpoint));
+        transport.send(String.format(Locale.ENGLISH, "1::%s", client.endpoint));
     }
 
     public void disconnect(SocketIOClient client) {
@@ -79,7 +79,7 @@ public void disconnect(SocketIOClient client) {
         }
 
         if (needsEndpointDisconnect && transport != null)
-            transport.send(String.format("0::%s", client.endpoint));
+            transport.send(String.format(Locale.ENGLISH, "0::%s", client.endpoint));
 
         // and see if we can disconnect the socket completely
         if (clients.size() > 0 || transport == null)
@@ -360,7 +360,7 @@ public void onSelect(SocketIOClient client) {
                     });
                     return;
                 }
-                transport.send(String.format("6:::%s%s", messageId, data));
+                transport.send(String.format(Locale.ENGLISH, "6:::%s%s", messageId, data));
             }
         };
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/BitArray.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/BitArray.java
index 1aa55b0dc..5894ae371 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/BitArray.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/BitArray.java
@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 
 import static java.lang.String.format;
 
@@ -68,7 +69,7 @@ public BitArray toVariableCapacity() {
 
     private static int checkInput(int index) {
       if (index < 0 || index > 63) {
-        throw new IllegalArgumentException(format("input must be between 0 and 63: %s", index));
+        throw new IllegalArgumentException(format(Locale.ENGLISH, "input must be between 0 and 63: %s", index));
       }
       return index;
     }
@@ -169,7 +170,7 @@ List<Integer> toIntegerList() {
 
     private static int checkInput(int index) {
       if (index < 0) {
-        throw new IllegalArgumentException(format("input must be a positive number: %s", index));
+        throw new IllegalArgumentException(format(Locale.ENGLISH, "input must be a positive number: %s", index));
       }
       return index;
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteString.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteString.java
index 263b41bc0..ce7c6c832 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteString.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteString.java
@@ -30,6 +30,7 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
+import java.util.Locale;
 
 /**
  * An immutable sequence of bytes.
@@ -253,11 +254,11 @@ public void write(OutputStream out) throws IOException {
     }
 
     if (data.length <= 16) {
-      return String.format("ByteString[size=%s data=%s]", data.length, hex());
+      return String.format(Locale.ENGLISH, "ByteString[size=%s data=%s]", data.length, hex());
     }
 
     try {
-      return String.format("ByteString[size=%s md5=%s]", data.length,
+      return String.format(Locale.ENGLISH, "ByteString[size=%s md5=%s]", data.length,
           ByteString.of(MessageDigest.getInstance("MD5").digest(data)).hex());
     } catch (NoSuchAlgorithmException e) {
       throw new AssertionError();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Header.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Header.java
index 610c816b3..a5f4dd269 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Header.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Header.java
@@ -1,6 +1,8 @@
 package com.koushikdutta.async.http.spdy;
 
 
+import java.util.Locale;
+
 /** HTTP header: the name is an ASCII string, but the value can be UTF-8. */
 final class Header {
   // Special header names defined in the SPDY and HTTP/2 specs.
@@ -50,6 +52,6 @@ public Header(ByteString name, ByteString value) {
   }
 
   @Override public String toString() {
-    return String.format("%s: %s", name.utf8(), value.utf8());
+    return String.format(Locale.ENGLISH, "%s: %s", name.utf8(), value.utf8());
   }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Http20Draft13.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Http20Draft13.java
index d1ec33948..ebd04cd58 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Http20Draft13.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Http20Draft13.java
@@ -26,6 +26,7 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.List;
+import java.util.Locale;
 import java.util.logging.Logger;
 
 import static com.koushikdutta.async.http.spdy.Http20Draft13.FrameLogger.formatHeader;
@@ -431,7 +432,7 @@ public synchronized void connectionPreface() throws IOException {
             if (closed) throw new IOException("closed");
             if (!client) return; // Nothing to write; servers don't send connection headers!
             if (logger.isLoggable(FINE)) {
-                logger.fine(format(">> CONNECTION %s", CONNECTION_PREFACE.hex()));
+                logger.fine(format(Locale.ENGLISH, ">> CONNECTION %s", CONNECTION_PREFACE.hex()));
             }
             sink.write(new ByteBufferList(CONNECTION_PREFACE.toByteArray()));
         }
@@ -632,11 +633,11 @@ void frameHeader(int streamId, int length, byte type, byte flags) throws IOExcep
     }
 
     private static IllegalArgumentException illegalArgument(String message, Object... args) {
-        throw new IllegalArgumentException(format(message, args));
+        throw new IllegalArgumentException(format(Locale.ENGLISH, message, args));
     }
 
     private static IOException ioException(String message, Object... args) throws IOException {
-        throw new IOException(format(message, args));
+        throw new IOException(format(Locale.ENGLISH, message, args));
     }
 
     private static short lengthWithoutPadding(short length, byte flags, short padding)
@@ -669,9 +670,9 @@ private static short lengthWithoutPadding(short length, byte flags, short paddin
     static final class FrameLogger {
 
         static String formatHeader(boolean inbound, int streamId, int length, byte type, byte flags) {
-            String formattedType = type < TYPES.length ? TYPES[type] : format("0x%02x", type);
+            String formattedType = type < TYPES.length ? TYPES[type] : format(Locale.ENGLISH, "0x%02x", type);
             String formattedFlags = formatFlags(type, flags);
-            return format("%s 0x%08x %5d %-13s %s", inbound ? "<<" : ">>", streamId, length,
+            return format(Locale.ENGLISH, "%s 0x%08x %5d %-13s %s", inbound ? "<<" : ">>", streamId, length,
             formattedType, formattedFlags);
         }
 
@@ -727,7 +728,7 @@ static String formatFlags(byte type, byte flags) {
 
         static {
             for (int i = 0; i < BINARY.length; i++) {
-                BINARY[i] = format("%8s", Integer.toBinaryString(i)).replace(' ', '0');
+                BINARY[i] = format(Locale.ENGLISH, "%8s", Integer.toBinaryString(i)).replace(' ', '0');
             }
 
             FLAGS[FLAG_NONE] = "";
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
index 51b48904d..2c66b09b1 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
@@ -30,6 +30,7 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.List;
+import java.util.Locale;
 import java.util.zip.Deflater;
 
 
@@ -351,7 +352,7 @@ private void readSettings(ByteBufferList source, int flags, int length) throws I
         }
 
         private static IOException ioException(String message, Object... args) throws IOException {
-            throw new IOException(String.format(message, args));
+            throw new IOException(String.format(Locale.ENGLISH, message, args));
         }
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/LruCache.java b/AndroidAsync/src/com/koushikdutta/async/util/LruCache.java
index 203913c71..52af2eaa6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/LruCache.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/LruCache.java
@@ -17,6 +17,7 @@
 package com.koushikdutta.async.util;
 
 import java.util.LinkedHashMap;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -321,7 +322,7 @@ public synchronized final Map<K, V> snapshot() {
     @Override public synchronized final String toString() {
         int accesses = hitCount + missCount;
         int hitPercent = accesses != 0 ? (100 * hitCount / accesses) : 0;
-        return String.format("LruCache[maxSize=%d,hits=%d,misses=%d,hitRate=%d%%]",
+        return String.format(Locale.ENGLISH, "LruCache[maxSize=%d,hits=%d,misses=%d,hitRate=%d%%]",
                 maxSize, hitCount, missCount, hitPercent);
     }
 }

From dc7d3de07999bd601f824069849fb115cdb8eb01 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Sun, 22 Nov 2015 12:51:44 -0500
Subject: [PATCH 218/399] fix AndroidAsync NameValuePair class defining a
 duplicate org.apache.http.NameValuePair

---
 .../src/com/koushikdutta/async/http/BasicNameValuePair.java  | 2 --
 AndroidAsync/src/com/koushikdutta/async/http/Multimap.java   | 2 --
 .../src/com/koushikdutta/async/http/NameValuePair.java       | 2 +-
 .../src/com/koushikdutta/async/http/body/FilePart.java       | 5 ++---
 AndroidAsync/src/com/koushikdutta/async/http/body/Part.java  | 3 +--
 .../src/com/koushikdutta/async/http/body/StreamPart.java     | 3 +--
 .../com/koushikdutta/async/http/body/UrlEncodedFormBody.java | 3 +--
 7 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/BasicNameValuePair.java b/AndroidAsync/src/com/koushikdutta/async/http/BasicNameValuePair.java
index 546575ba2..bc656354d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/BasicNameValuePair.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/BasicNameValuePair.java
@@ -33,8 +33,6 @@
 
 import android.text.TextUtils;
 
-import org.apache.http.NameValuePair;
-
 /**
  * A simple class encapsulating an attribute/value pair.
  * <p>
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
index 89932dbca..7108e3ed4 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
@@ -2,8 +2,6 @@
 
 import android.net.Uri;
 
-import org.apache.http.NameValuePair;
-
 import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java b/AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java
index 28300b390..f8a1198ee 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java
@@ -29,7 +29,7 @@
  *
  */
 
-package org.apache.http;
+package com.koushikdutta.async.http;
 
 /**
  * A simple class encapsulating an attribute/value pair.
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java b/AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java
index aed1ced84..aa02c78e5 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java
@@ -1,8 +1,7 @@
 package com.koushikdutta.async.http.body;
 
 import com.koushikdutta.async.http.BasicNameValuePair;
-
-import org.apache.http.NameValuePair;
+import com.koushikdutta.async.http.NameValuePair;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -19,7 +18,7 @@ public FilePart(String name, final File file) {
             }
         });
 
-//        getRawHeaders().set("Content-Type", "application/xml");
+//        getRawHeaders().setString("Content-Type", "application/xml");
 
         this.file = file;
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java b/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java
index b66c711e0..d3d108919 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java
@@ -4,8 +4,7 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.Multimap;
-
-import org.apache.http.NameValuePair;
+import com.koushikdutta.async.http.NameValuePair;
 
 import java.io.File;
 import java.util.List;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/StreamPart.java b/AndroidAsync/src/com/koushikdutta/async/http/body/StreamPart.java
index d48704bf6..c67ce2079 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/StreamPart.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/StreamPart.java
@@ -4,10 +4,9 @@
 import java.io.InputStream;
 import java.util.List;
 
-import org.apache.http.NameValuePair;
-
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.callback.CompletedCallback;
+import com.koushikdutta.async.http.NameValuePair;
 
 public abstract class StreamPart extends Part {
     public StreamPart(String name, long length, List<NameValuePair> contentDisposition) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
index 8ffba5327..8df5472d3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
@@ -8,10 +8,9 @@
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.http.AsyncHttpRequest;
 import com.koushikdutta.async.http.Multimap;
+import com.koushikdutta.async.http.NameValuePair;
 import com.koushikdutta.async.util.Charsets;
 
-import org.apache.http.NameValuePair;
-
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.List;

From 7d18b4a526dcc3fad1ddc93ecec54c653c216a22 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Sun, 22 Nov 2015 12:52:52 -0500
Subject: [PATCH 219/399] fix AndroidAsync NameValuePair class defining a
 duplicate org.apache.http.NameValuePair

---
 AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java b/AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java
index aa02c78e5..cc850e864 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java
@@ -18,7 +18,7 @@ public FilePart(String name, final File file) {
             }
         });
 
-//        getRawHeaders().setString("Content-Type", "application/xml");
+//        getRawHeaders().set("Content-Type", "application/xml");
 
         this.file = file;
     }

From dd0383b34c7930cf26213e4345fed2db00acecdb Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 29 Nov 2015 16:56:06 -0800
Subject: [PATCH 220/399] Fix spin locking in AsyncServer

---
 .../com/koushikdutta/async/AsyncNetworkSocket.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
index 6423774fc..845eadeb8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
@@ -48,10 +48,14 @@ ChannelWrapper getChannel() {
     
     public void onDataWritable() {
 //        assert mWriteableHandler != null;
+        if (!mChannel.isChunked()) {
+            // turn write off
+            mKey.interestOps(~SelectionKey.OP_WRITE & mKey.interestOps());
+        }
         if (mWriteableHandler != null)
             mWriteableHandler.onWriteable();
     }
-    
+
     private ChannelWrapper mChannel;
     private SelectionKey mKey;
     private AsyncServer mServer;
@@ -99,10 +103,12 @@ private void handleRemaining(int remaining) throws IOException {
             // chunked channels should not fail
             assert !mChannel.isChunked();
             // register for a write notification if a write fails
-            mKey.interestOps(SelectionKey.OP_READ | SelectionKey.OP_WRITE);
+            // turn write on
+            mKey.interestOps(SelectionKey.OP_WRITE | mKey.interestOps());
         }
         else {
-            mKey.interestOps(SelectionKey.OP_READ);
+            // turn write off
+            mKey.interestOps(~SelectionKey.OP_WRITE & mKey.interestOps());
         }
     }
     private ByteBufferList pending = new ByteBufferList();

From bbd843650f0bb744ba174ef542c7cab60126d244 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 29 Nov 2015 20:40:12 -0800
Subject: [PATCH 221/399] HttpTransport: try to fit a request and request body
 into a single packet if possible.

MTU is usually 1540 (I think), so if the request body is small enough, wait to flush headers
until the request body is written in the callback.
---
 .../koushikdutta/async/BufferedDataSink.java  | 14 ++++++--
 .../async/http/HttpTransportMiddleware.java   | 34 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
index 3c074c572..67431dcfc 100644
--- a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
@@ -12,13 +12,20 @@ public BufferedDataSink(DataSink datasink) {
     }
 
     public boolean isBuffering() {
-        return mPendingWrites.hasRemaining();
+        return mPendingWrites.hasRemaining() || forceBuffering;
     }
     
     public DataSink getDataSink() {
         return mDataSink;
     }
 
+    boolean forceBuffering;
+    public void forceBuffering(boolean forceBuffering) {
+        this.forceBuffering = forceBuffering;
+        if (!forceBuffering)
+            writePending();
+    }
+
     public void setDataSink(DataSink datasink) {
         mDataSink = datasink;
         mDataSink.setWriteableCallback(new WritableCallback() {
@@ -30,6 +37,9 @@ public void onWriteable() {
     }
 
     private void writePending() {
+        if (forceBuffering)
+            return;
+
 //        Log.i("NIO", "Writing to buffer...");
         if (mPendingWrites.hasRemaining()) {
             mDataSink.write(mPendingWrites);
@@ -53,7 +63,7 @@ protected void write(final ByteBufferList bb, final boolean ignoreBuffer) {
         getServer().run(new Runnable() {
             @Override
             public void run() {
-                if (!mPendingWrites.hasRemaining())
+                if (!isBuffering())
                     mDataSink.write(bb);
 
                 if (bb.remaining() > 0) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
index a1ee8ba34..fe3524523 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
@@ -3,9 +3,12 @@
 import android.text.TextUtils;
 
 import com.koushikdutta.async.AsyncSocket;
+import com.koushikdutta.async.BufferedDataSink;
 import com.koushikdutta.async.DataEmitter;
+import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.LineEmitter;
 import com.koushikdutta.async.Util;
+import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 import com.koushikdutta.async.http.filter.ChunkedOutputFilter;
 
@@ -38,11 +41,40 @@ else if ("close".equals(request.getHeaders().get("Connection"))) {
             }
         }
 
+        // try to get the request body in the same packet as the request headers... if it will fit
+        // in the max MTU (1540 or whatever).
+        final boolean waitForBody = requestBody != null && requestBody.length() >= 0 && requestBody.length() < 1024;
+        final BufferedDataSink bsink;
+        final DataSink headerSink;
+        if (waitForBody) {
+            // force buffering of headers
+            bsink = new BufferedDataSink(data.response.sink());
+            bsink.forceBuffering(true);
+            data.response.sink(bsink);
+            headerSink = bsink;
+        }
+        else {
+            bsink = null;
+            headerSink = data.socket;
+        }
+
         String rl = request.getRequestLine().toString();
         String rs = request.getHeaders().toPrefixString(rl);
         request.logv("\n" + rs);
 
-        Util.writeAll(data.socket, rs.getBytes(), data.sendHeadersCallback);
+        if (bsink != null)
+            bsink.setMaxBuffer(1024);
+
+        final CompletedCallback sentCallback = data.sendHeadersCallback;
+        Util.writeAll(headerSink, rs.getBytes(), new CompletedCallback() {
+            @Override
+            public void onCompleted(Exception ex) {
+                Util.end(sentCallback, ex);
+                // flush headers and any request body that was written by the callback
+                if (bsink != null)
+                    bsink.forceBuffering(false);
+            }
+        });
 
         LineEmitter.StringCallback headerCallback = new LineEmitter.StringCallback() {
             Headers mRawHeaders = new Headers();

From 3b1df487ca6b4219eb43eb236c7d6a7e286a2d2f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 29 Nov 2015 21:51:47 -0800
Subject: [PATCH 222/399] Fix NameValuePair package.

https://github.com/koush/AndroidAsync/issues/411
---
 AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java b/AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java
index 28300b390..f8a1198ee 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/NameValuePair.java
@@ -29,7 +29,7 @@
  *
  */
 
-package org.apache.http;
+package com.koushikdutta.async.http;
 
 /**
  * A simple class encapsulating an attribute/value pair.

From d69769a4b0e998629ad9f03f9ff1ed9e6f46ccf7 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 29 Nov 2015 22:30:25 -0800
Subject: [PATCH 223/399] Fix thread affinity issue with cancelling cached
 responses.

https://github.com/koush/AndroidAsync/issues/358
---
 .../koushikdutta/async/BufferedDataSink.java  | 56 +++++++++++--------
 .../http/cache/ResponseCacheMiddleware.java   | 11 ++++
 2 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
index 67431dcfc..d7b16f53e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
@@ -60,22 +60,27 @@ public void write(ByteBufferList bb) {
     }
     
     protected void write(final ByteBufferList bb, final boolean ignoreBuffer) {
-        getServer().run(new Runnable() {
-            @Override
-            public void run() {
-                if (!isBuffering())
-                    mDataSink.write(bb);
-
-                if (bb.remaining() > 0) {
-                    int toRead = Math.min(bb.remaining(), mMaxBuffer);
-                    if (ignoreBuffer)
-                        toRead = bb.remaining();
-                    if (toRead > 0) {
-                        bb.get(mPendingWrites, toRead);
-                    }
+        if (getServer().getAffinity() != Thread.currentThread()) {
+            getServer().run(new Runnable() {
+                @Override
+                public void run() {
+                    write(bb, ignoreBuffer);
                 }
+            });
+            return;
+        }
+
+        if (!isBuffering())
+            mDataSink.write(bb);
+
+        if (bb.remaining() > 0) {
+            int toRead = Math.min(bb.remaining(), mMaxBuffer);
+            if (ignoreBuffer)
+                toRead = bb.remaining();
+            if (toRead > 0) {
+                bb.get(mPendingWrites, toRead);
             }
-        });
+        }
     }
 
     WritableCallback mWritable;
@@ -111,16 +116,21 @@ public boolean isOpen() {
     boolean endPending;
     @Override
     public void end() {
-        getServer().run(new Runnable() {
-            @Override
-            public void run() {
-                if (mPendingWrites.hasRemaining()) {
-                    endPending = true;
-                    return;
+        if (getServer().getAffinity() != Thread.currentThread()) {
+            getServer().run(new Runnable() {
+                @Override
+                public void run() {
+                    end();
                 }
-                mDataSink.end();
-            }
-        });
+            });
+            return;
+        }
+
+        if (mPendingWrites.hasRemaining()) {
+            endPending = true;
+            return;
+        }
+        mDataSink.end();
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index 71abcf031..4612b4e19 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -476,6 +476,17 @@ public boolean isPaused() {
 
         @Override
         public void close() {
+            if (getServer().getAffinity() != Thread.currentThread()) {
+                getServer().post(new Runnable() {
+                    @Override
+                    public void run() {
+                        close();
+                    }
+                });
+                return;
+            }
+
+            pending.recycle();
             StreamUtility.closeQuietly(cacheResponse.getBody());
             super.close();
         }

From 2cd731b514b3cb239df3813aa93eaaf6bcbd89f0 Mon Sep 17 00:00:00 2001
From: "arash.sahebolamri" <arash.sahebolamri@gmail.com>
Date: Mon, 7 Dec 2015 18:21:24 +0330
Subject: [PATCH 224/399] fixed the issue with the way handshake failure was
 handled in web socket futures

Fixed the issue where in creating web socket clients, if the handshake
failed, the failure wouldn't be reported to the callback (it would be
called with a null exception parameter).
---
 .../async/http/AsyncHttpClient.java           |  3 +-
 .../test/IssueWithWebSocketFuturesTests.java  | 59 +++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 AndroidAsync/test/src/com/koushikdutta/async/test/IssueWithWebSocketFuturesTests.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 6382494ea..a6ac23023 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -688,7 +688,8 @@ public void onConnectCompleted(Exception ex, AsyncHttpResponse response) {
                 }
                 WebSocket ws = WebSocketImpl.finishHandshake(req.getHeaders(), response);
                 if (ws == null) {
-                    if (!ret.setComplete(new WebSocketHandshakeException("Unable to complete websocket handshake")))
+                    ex = new WebSocketHandshakeException("Unable to complete websocket handshake");
+                    if (!ret.setComplete(ex))
                         return;
                 }
                 else {
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/IssueWithWebSocketFuturesTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/IssueWithWebSocketFuturesTests.java
new file mode 100644
index 000000000..5475f276a
--- /dev/null
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/IssueWithWebSocketFuturesTests.java
@@ -0,0 +1,59 @@
+package com.koushikdutta.async.test;
+
+import com.koushikdutta.async.future.Future;
+import com.koushikdutta.async.http.AsyncHttpClient;
+import com.koushikdutta.async.http.WebSocket;
+import com.koushikdutta.async.http.server.AsyncHttpServer;
+import com.koushikdutta.async.http.server.AsyncHttpServerRequest;
+
+import junit.framework.TestCase;
+
+import java.util.concurrent.CountDownLatch;
+
+
+public class IssueWithWebSocketFuturesTests extends TestCase {
+
+    //testing that websocket callback gets called with the correct parameters.
+    public void testWebSocketFutureWithHandshakeFailureCallback() throws Exception {
+
+        //creating a faulty server!
+        AsyncHttpServer httpServer = new AsyncHttpServer();
+        httpServer.websocket(".*", new AsyncHttpServer.WebSocketRequestCallback() {
+            @Override
+            public void onConnected(WebSocket webSocket, AsyncHttpServerRequest request) {
+
+            }
+        });
+        httpServer.listen(6666);
+
+
+
+        final Exception[] callbackException = {null};
+        final WebSocket[] callbackWs = {null};
+        final CountDownLatch countDownLatch = new CountDownLatch(1);
+
+
+        //for some reason, it fails with a WebSocketHandshakeException.
+        //But in general, if the handshake fails, the callback must be called with an exception.
+        Future<WebSocket> wsFuture = AsyncHttpClient.getDefaultInstance().websocket("ws://127.0.0.1:6666", "ws", new AsyncHttpClient.WebSocketConnectCallback() {
+            @Override
+            public void onCompleted(Exception ex, WebSocket webSocket) {
+                callbackException[0] = ex;
+                callbackWs[0] = webSocket;
+                countDownLatch.countDown();
+            }
+        });
+
+
+        //wait for the future to complete
+        countDownLatch.await();
+
+        //exactly one mut be null
+        assertTrue(callbackWs[0] == null ^ callbackException[0] == null);
+
+        //callback parameters must be the same as the future's result
+        assertEquals(wsFuture.tryGet(), callbackWs[0]);
+        assertEquals(wsFuture.tryGetException(), callbackException[0]);
+
+    }
+}

From d0170648d971229316cf4fed9e8841749838265a Mon Sep 17 00:00:00 2001
From: Laurent Meyer <laurent.m.meyer@gmail.com>
Date: Tue, 15 Dec 2015 22:06:59 +0100
Subject: [PATCH 225/399] Update README.md

---
 README.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 19ecda84d..c1b4a85f6 100644
--- a/README.md
+++ b/README.md
@@ -185,16 +185,16 @@ MultipartFormDataBody body = new MultipartFormDataBody();
 body.addFilePart("my-file", new File("/path/to/file.txt");
 body.addStringPart("foo", "bar");
 post.setBody(body);
-AsyncHttpClient.getDefaultInstance().execute(post, new StringCallback() {
-    @Override
-    public void onCompleted(Exception ex, AsyncHttpResponse source, String result) {
-        if (ex != null) {
-            ex.printStackTrace();
-            return;
+AsyncHttpClient.getDefaultInstance().executeString(post, new AsyncHttpClient.StringCallback(){
+        @Override
+        public void onCompleted(Exception ex, AsyncHttpResponse source, String result) {
+            if (ex != null) {
+                ex.printStackTrace();
+                return;
+            }
+            System.out.println("Server says: " + result);
         }
-        System.out.println("Server says: " + result);
-    }
-});
+    });
 ```
 
 

From 5ca80421fa69d7ff161f1dfa8a506e01cc04f9d4 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 3 Jan 2016 12:26:46 -0800
Subject: [PATCH 226/399] Fix SPDY race condition reported by Versoworks

---
 .../koushikdutta/async/http/spdy/SpdyMiddleware.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 0aa6e1fa8..c1aab2beb 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -222,11 +222,6 @@ public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
                     public void settings(boolean clearPrevious, Settings settings) {
                         super.settings(clearPrevious, settings);
                         if (!hasReceivedSettings) {
-                            try {
-                                sendConnectionPreface();
-                            } catch (IOException e1) {
-                                e1.printStackTrace();
-                            }
                             hasReceivedSettings = true;
 
                             SpdyConnectionWaiter waiter = connections.get(key);
@@ -240,6 +235,12 @@ public void settings(boolean clearPrevious, Settings settings) {
                         }
                     }
                 };
+
+                try {
+                    connection.sendConnectionPreface();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
             }
         };
     }

From 8120535ef5cb053059b55f8e1c4fbe6c627ab160 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 3 Jan 2016 12:27:18 -0800
Subject: [PATCH 227/399] Completely turn off buffering after request body has
 been sent

---
 .../com/koushikdutta/async/http/HttpTransportMiddleware.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
index fe3524523..ff68a5473 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
@@ -71,8 +71,10 @@ else if ("close".equals(request.getHeaders().get("Connection"))) {
             public void onCompleted(Exception ex) {
                 Util.end(sentCallback, ex);
                 // flush headers and any request body that was written by the callback
-                if (bsink != null)
+                if (bsink != null) {
                     bsink.forceBuffering(false);
+                    bsink.setMaxBuffer(0);
+                }
             }
         });
 

From b874b267f41bde6aa696ee028197821a21d36441 Mon Sep 17 00:00:00 2001
From: peetron <campbell@gramble.com>
Date: Thu, 28 Jan 2016 13:52:34 +0100
Subject: [PATCH 228/399] adding explicit ping response

---
 AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java | 4 ++++
 AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java  | 1 +
 .../src/com/koushikdutta/async/http/WebSocketImpl.java       | 5 +++++
 3 files changed, 10 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java b/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
index 071fe6e96..b875bc0d8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
@@ -306,6 +306,10 @@ public byte[] pingFrame(String data) {
         return frame(OP_PING, data, -1);
     }
 
+    public byte[] pongFrame(String data) {
+        return frame(OP_PONG, data, -1);
+    }
+
     /**
      * Flip the opcode so to avoid the name collision with the public method
      * 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java
index 90f37ee9c..672a9a5e0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java
@@ -18,6 +18,7 @@ static public interface PongCallback {
     public void send(String string);
     public void send(byte [] bytes, int offset, int len);
     public void ping(String message);
+    public void pong(String message);
     
     public void setStringCallback(StringCallback callback);
     public StringCallback getStringCallback();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
index 6bbd2e59c..ab1404d87 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
@@ -244,6 +244,11 @@ public void ping(String string) {
         mSink.write(new ByteBufferList(ByteBuffer.wrap(mParser.pingFrame(string))));
     }
 
+    @Override
+    public void pong(String string) {
+        mSink.write(new ByteBufferList(ByteBuffer.wrap(mParser.pongFrame(string))));
+    }
+
     private StringCallback mStringCallback;
     @Override
     public void setStringCallback(StringCallback callback) {

From 9681597d219b411ed4a4f9182dce6bf6330798ec Mon Sep 17 00:00:00 2001
From: Andhie Wong <andhiewong@gmail.com>
Date: Thu, 18 Feb 2016 09:26:17 +0800
Subject: [PATCH 229/399] Remove apache http stuff

Changes to be compatible with AndroidAsync commit e6573be00feb27b2b16446c07d16c37d3d69d3c9
---
 .../async/stetho/StethoMiddleware.java        | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java b/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java
index 883dc8db7..dfa50ac3d 100644
--- a/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java
+++ b/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java
@@ -3,12 +3,10 @@
 import com.facebook.stetho.inspector.network.NetworkEventReporter;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.http.AsyncHttpRequest;
+import com.koushikdutta.async.http.BasicNameValuePair;
+import com.koushikdutta.async.http.NameValuePair;
 import com.koushikdutta.async.http.SimpleMiddleware;
 
-import org.apache.http.Header;
-import org.apache.http.NameValuePair;
-import org.apache.http.message.BasicHeader;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.UUID;
@@ -24,12 +22,16 @@ public class StethoMiddleware extends SimpleMiddleware {
     private static class AsyncInspectorRequest implements NetworkEventReporter.InspectorRequest {
         AsyncHttpRequest request;
         String id = UUID.randomUUID().toString();
-        Header[] headers;
+        NameValuePair[] headers;
         AsyncInspectorResponse response;
 
         public AsyncInspectorRequest(AsyncHttpRequest request) {
             this.request = request;
-            headers = request.asHttpRequest().getAllHeaders();
+            ArrayList<BasicNameValuePair> a = new ArrayList<>();
+            for (NameValuePair nvp : request.getHeaders().getMultiMap()) {
+                a.add(new BasicNameValuePair(nvp.getName(), nvp.getValue()));
+            }
+            headers = a.toArray(new BasicNameValuePair[a.size()]);
         }
 
         @Override
@@ -89,16 +91,16 @@ public String firstHeaderValue(String s) {
     private static class AsyncInspectorResponse implements NetworkEventReporter.InspectorResponse {
         ResponseHead head;
         AsyncInspectorRequest request;
-        Header[] headers;
+        NameValuePair[] headers;
 
         public AsyncInspectorResponse(ResponseHead head, AsyncInspectorRequest request) {
             this.request = request;
             this.head = head;
-            ArrayList<Header> a = new ArrayList<Header>();
-            for (NameValuePair nvp: head.headers().getMultiMap()) {
-                a.add(new BasicHeader(nvp.getName(), nvp.getValue()));
+            ArrayList<BasicNameValuePair> a = new ArrayList<>();
+            for (NameValuePair nvp : head.headers().getMultiMap()) {
+                a.add(new BasicNameValuePair(nvp.getName(), nvp.getValue()));
             }
-            headers = a.toArray(new Header[a.size()]);
+            headers = a.toArray(new BasicNameValuePair[a.size()]);
         }
 
         @Override

From 01255465d94fbd8b70df4a821508e70268fd7853 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 23 May 2016 17:00:18 -0400
Subject: [PATCH 230/399] Fix get incorrectly handling null bytes

When get(byte[], int, int) is called with null as the first parameter, it doesn't move the buffer pointer as expected. This issue breaks skip(int).
---
 AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index af6ed56fd..3765d390e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -162,8 +162,12 @@ public void get(byte[] bytes, int offset, int length) {
         while (need > 0) {
             ByteBuffer b = mBuffers.peek();
             int read = Math.min(b.remaining(), need);
-            if (bytes != null)
+            if (bytes != null){
                 b.get(bytes, offset, read);
+            } else {
+                //when bytes is null, just skip data.
+                b.position(b.position() + read);
+            }
             need -= read;
             offset += read;
             if (b.remaining() == 0) {

From 9b718c179175e719fbfd1247c5afd5587e7d4a7e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 24 May 2016 09:51:23 -0700
Subject: [PATCH 231/399] build.gradle updates

---
 AndroidAsync/AndroidManifest.xml                              | 4 ++--
 AndroidAsync/build.gradle                                     | 2 +-
 .../test/src/com/koushikdutta/async/test/HttpServerTests.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 124e4220f..40d2a0073 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="216"
-    android:versionName="2.1.6">
+    android:versionCode="217"
+    android:versionName="2.1.7">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 2f87f538a..8e5469a57 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -27,7 +27,7 @@ android {
     }
 
     compileSdkVersion 23
-    buildToolsVersion '23.0.0'
+    buildToolsVersion '23.0.3'
 }
 
 // upload to maven task
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpServerTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpServerTests.java
index e47e231d3..26f259140 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpServerTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpServerTests.java
@@ -4,6 +4,7 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.http.AsyncHttpClient;
 import com.koushikdutta.async.http.AsyncHttpPost;
+import com.koushikdutta.async.http.NameValuePair;
 import com.koushikdutta.async.http.body.JSONObjectBody;
 import com.koushikdutta.async.http.body.MultipartFormDataBody;
 import com.koushikdutta.async.http.body.StringBody;
@@ -16,7 +17,6 @@
 
 import junit.framework.TestCase;
 
-import org.apache.http.NameValuePair;
 import org.json.JSONObject;
 
 import java.io.InputStream;

From fca40fa7788c83e96b72125a1750a3331bb7f417 Mon Sep 17 00:00:00 2001
From: Shivam Verma <shivam.bitsgoa@gmail.com>
Date: Sat, 4 Jun 2016 18:41:00 +0800
Subject: [PATCH 232/399] Typo fix in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c1b4a85f6..493614f78 100644
--- a/README.md
+++ b/README.md
@@ -227,7 +227,7 @@ server.websocket("/live", new WebSocketRequestCallback() {
         _sockets.add(webSocket);
         
         //Use this to clean up any references to your websocket
-        websocket.setClosedCallback(new CompletedCallback() {
+        webSocket.setClosedCallback(new CompletedCallback() {
             @Override
             public void onCompleted(Exception ex) {
                 try {

From 9c5af48f8f800c8430b79bbefcc79d956934ecfa Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 10 Jun 2016 01:34:31 -0700
Subject: [PATCH 233/399] fix potential encoding issues with line emitter.

---
 .../com/koushikdutta/async/LineEmitter.java   | 34 +++++++++++++++----
 .../async/test/LineEmitterTests.java          | 32 +++++++++++++++++
 2 files changed, 59 insertions(+), 7 deletions(-)
 create mode 100644 AndroidAsync/test/src/com/koushikdutta/async/test/LineEmitterTests.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/LineEmitter.java b/AndroidAsync/src/com/koushikdutta/async/LineEmitter.java
index 2fcb6d008..1bf811d23 100644
--- a/AndroidAsync/src/com/koushikdutta/async/LineEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/LineEmitter.java
@@ -1,13 +1,28 @@
 package com.koushikdutta.async;
 
+import android.util.Log;
+
 import com.koushikdutta.async.callback.DataCallback;
 
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+
 public class LineEmitter implements DataCallback {
-    static public interface StringCallback {
-        public void onStringAvailable(String s);
+    public interface StringCallback {
+        void onStringAvailable(String s);
+    }
+
+    public LineEmitter() {
+        this(null);
     }
 
-    StringBuilder data = new StringBuilder();
+    public LineEmitter(Charset charset) {
+        this.charset = charset;
+    }
+
+    Charset charset;
+
+    ByteBufferList data = new ByteBufferList();
 
     StringCallback mLineCallback;
     public void setLineCallback(StringCallback callback) {
@@ -20,17 +35,22 @@ public StringCallback getLineCallback() {
 
     @Override
     public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+        ByteBuffer buffer = ByteBuffer.allocate(bb.remaining());
         while (bb.remaining() > 0) {
             byte b = bb.get();
             if (b == '\n') {
                 assert mLineCallback != null;
-                mLineCallback.onStringAvailable(data.toString());
-                data = new StringBuilder();
+                buffer.flip();
+                data.add(buffer);
+                mLineCallback.onStringAvailable(data.readString(charset));
+                data = new ByteBufferList();
                 return;
             }
             else {
-                data.append((char)b);
+                buffer.put(b);
             }
-        }        
+        }
+        buffer.flip();
+        data.add(buffer);
     }
 }
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/LineEmitterTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/LineEmitterTests.java
new file mode 100644
index 000000000..ba844deda
--- /dev/null
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/LineEmitterTests.java
@@ -0,0 +1,32 @@
+package com.koushikdutta.async.test;
+
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.LineEmitter;
+import com.koushikdutta.async.util.Charsets;
+
+import junit.framework.TestCase;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.util.concurrent.Semaphore;
+
+/**
+ * Created by koush on 6/9/16.
+ */
+public class LineEmitterTests extends TestCase {
+    public void testFunnyCharacter() {
+        final String stuff = "é\n";
+        LineEmitter emitter = new LineEmitter(Charsets.UTF_8);
+        emitter.setLineCallback(new LineEmitter.StringCallback() {
+            @Override
+            public void onStringAvailable(String s) {
+                assertEquals(s + '\n', stuff);
+            }
+        });
+
+
+        assertEquals(stuff.charAt(0), 233);
+        ByteBufferList bb = new ByteBufferList(ByteBuffer.wrap(stuff.getBytes(Charsets.UTF_8)));
+        emitter.onDataAvailable(null, bb);
+    }
+}

From 718f9aba5e0cd6393266c2ffaad41c1cc941f397 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 10 Jun 2016 12:24:12 -0700
Subject: [PATCH 234/399] Apparently MDNS client only applications can query
 from any port, 5353 not required.

Also fix reflection related bug that happens in Android N due to internal method protection level change.
---
 AndroidAsync/src/com/koushikdutta/async/dns/Dns.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/dns/Dns.java b/AndroidAsync/src/com/koushikdutta/async/dns/Dns.java
index bc276d668..76f366bb0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/dns/Dns.java
+++ b/AndroidAsync/src/com/koushikdutta/async/dns/Dns.java
@@ -103,11 +103,11 @@ public static Future<DnsResponse> lookup(AsyncServer server, String host, final
             }
             else {
 //                System.out.println("multicast dns...");
-                dgram = AsyncServer.getDefault().openDatagram(new InetSocketAddress(5353), true);
+                dgram = AsyncServer.getDefault().openDatagram(new InetSocketAddress(0), true);
                 Field field = DatagramSocket.class.getDeclaredField("impl");
                 field.setAccessible(true);
                 Object impl = field.get(dgram.getSocket());
-                Method method = impl.getClass().getMethod("join", InetAddress.class);
+                Method method = impl.getClass().getDeclaredMethod("join", InetAddress.class);
                 method.setAccessible(true);
                 method.invoke(impl, InetAddress.getByName("224.0.0.251"));
                 ((DatagramSocket)dgram.getSocket()).setBroadcast(true);

From 46f5c11d324decc133f8a0bff29f44c82fa589c0 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 13 Jun 2016 20:05:43 -0700
Subject: [PATCH 235/399] ResponseCacheMiddleware: method to remove one url
 from the cache

---
 .../async/http/cache/ResponseCacheMiddleware.java            | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index 6a0bfff2b..22f4c9533 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -93,6 +93,11 @@ public void setCaching(boolean caching) {
         this.caching = caching;
     }
 
+    public void removeFromCache(Uri uri) {
+        String key = FileCache.toKeyString(uri);
+        getFileCache().remove(key);
+    }
+
     // step 1) see if we can serve request from the cache directly.
     // also see if this can be turned into a conditional cache request.
     @Override

From 54c55a47e14653e62ddfe96489d25b28cb079268 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 13 Jun 2016 21:38:26 -0700
Subject: [PATCH 236/399] 218

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 40d2a0073..fcb012e84 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="217"
-    android:versionName="2.1.7">
+    android:versionCode="218"
+    android:versionName="2.1.8">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

From 630d8bee328bb08dba774e449304b5515d22363f Mon Sep 17 00:00:00 2001
From: dsnatochy <dennis@poynt.co>
Date: Fri, 17 Jun 2016 16:59:17 -0700
Subject: [PATCH 237/399] Update AsyncHttpServer.java

Added response code description for HTTP 202
---
 .../src/com/koushikdutta/async/http/server/AsyncHttpServer.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index d987c910d..bb0df4157 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -511,6 +511,7 @@ public void onCompleted(Exception ex) {
     private static Hashtable<Integer, String> mCodes = new Hashtable<Integer, String>();
     static {
         mCodes.put(200, "OK");
+        mCodes.put(202, "Accepted");
         mCodes.put(206, "Partial Content");
         mCodes.put(101, "Switching Protocols");
         mCodes.put(301, "Moved Permanently");

From c7471a679cb54a011ab757ec1e6a090ebebb389f Mon Sep 17 00:00:00 2001
From: Matthew Zavislak <elevenfive@users.noreply.github.com>
Date: Mon, 20 Jun 2016 13:52:13 -0700
Subject: [PATCH 238/399] Update build

---
 AndroidAsync/build.gradle                |   6 +-
 AndroidAsyncSample/build.gradle          |   6 +-
 AndroidAsyncStetho/build.gradle          |   4 +-
 build.gradle                             |  17 +++
 gradle.properties                        |   4 +
 gradle/wrapper/gradle-wrapper.jar        | Bin 0 -> 53636 bytes
 gradle/wrapper/gradle-wrapper.properties |   6 +
 gradlew                                  | 160 +++++++++++++++++++++++
 gradlew.bat                              |  90 +++++++++++++
 settings.gradle                          |   2 +
 10 files changed, 287 insertions(+), 8 deletions(-)
 create mode 100644 build.gradle
 create mode 100644 gradle.properties
 create mode 100644 gradle/wrapper/gradle-wrapper.jar
 create mode 100644 gradle/wrapper/gradle-wrapper.properties
 create mode 100755 gradlew
 create mode 100644 gradlew.bat
 create mode 100644 settings.gradle

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 8e5469a57..ff9f881aa 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -22,12 +22,12 @@ android {
     }
 
     defaultConfig {
-        targetSdkVersion 23
+        targetSdkVersion 24
         minSdkVersion 9
     }
 
-    compileSdkVersion 23
-    buildToolsVersion '23.0.3'
+    compileSdkVersion 24
+    buildToolsVersion '24.0.0'
 }
 
 // upload to maven task
diff --git a/AndroidAsyncSample/build.gradle b/AndroidAsyncSample/build.gradle
index 1f868433a..7e02534d8 100644
--- a/AndroidAsyncSample/build.gradle
+++ b/AndroidAsyncSample/build.gradle
@@ -14,11 +14,11 @@ android {
     }
 
     defaultConfig {
-        targetSdkVersion 22
+        targetSdkVersion 24
         minSdkVersion 9
     }
 
-    compileSdkVersion 22
-    buildToolsVersion "22.0.0"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
 }
 
diff --git a/AndroidAsyncStetho/build.gradle b/AndroidAsyncStetho/build.gradle
index 8e285f875..0626921fb 100644
--- a/AndroidAsyncStetho/build.gradle
+++ b/AndroidAsyncStetho/build.gradle
@@ -24,8 +24,8 @@ android {
         minSdkVersion 9
     }
 
-    compileSdkVersion 22
-    buildToolsVersion '22.0.0'
+    compileSdkVersion 24
+    buildToolsVersion '24.0.0'
 }
 
 // upload to maven task
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 000000000..fc8c9bfa1
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,17 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.2'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 000000000..07c2eac09
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,4 @@
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.configureondemand=true
+org.gradle.jvmargs=-Xmx1048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..13372aef5e24af05341d49695ee84e5f9b594659
GIT binary patch
literal 53636
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
H-+%o-(+5aQ

literal 0
HcmV?d00001

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..473ebd531
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 000000000..9d82f7891
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 000000000..aec99730b
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 000000000..c999ae252
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,2 @@
+include 'AndroidAsync'
+

From 47accbda9008f8bab6c542bfd43df4263100a937 Mon Sep 17 00:00:00 2001
From: Matthew Zavislak <elevenfive@users.noreply.github.com>
Date: Mon, 20 Jun 2016 13:52:48 -0700
Subject: [PATCH 239/399] Avoid npe in SocketIOConnection

- I have seen many crashes in the wild
  where transport is null
---
 .../async/http/socketio/SocketIOConnection.java     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
index ddf7ccc5b..9288d2f0c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
@@ -32,6 +32,7 @@ class SocketIOConnection {
     int heartbeat;
     long reconnectDelay;
     ArrayList<SocketIOClient> clients = new ArrayList<SocketIOClient>();
+
     SocketIOTransport transport;
     SocketIORequest request;
 
@@ -170,19 +171,19 @@ public void onCompleted(Exception e, SocketIOTransport result) {
     }
 
     void setupHeartbeat() {
-        final SocketIOTransport ts = transport;
         Runnable heartbeatRunner = new Runnable() {
             @Override
             public void run() {
-                if (heartbeat <= 0 || ts != transport || ts == null || !ts.isConnected())
-                    return;
+                final SocketIOTransport ts = transport;
 
-                transport.send("2:::");
+                if (heartbeat <= 0 || ts == null || !ts.isConnected())
+                    return;
 
-                if (transport != null)
-                    transport.getServer().postDelayed(this, heartbeat);
+                ts.send("2:::");
+                ts.getServer().postDelayed(this, heartbeat);
             }
         };
+
         heartbeatRunner.run();
     }
 

From 925e4a26653450bdc94ee47040524211e0ede95f Mon Sep 17 00:00:00 2001
From: Matthew Zavislak <elevenfive@users.noreply.github.com>
Date: Mon, 20 Jun 2016 13:53:03 -0700
Subject: [PATCH 240/399] Fix leak in HybiParser

In strict mode, was getting warning:

java.lang.Throwable: Explicit termination method 'end' not called
   at dalvik.system.CloseGuard.open(CloseGuard.java:184)
   at java.util.zip.Inflater.<init>(Inflater.java:82)
---
 .../koushikdutta/async/http/HybiParser.java   | 50 +++++++++++--------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java b/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
index b875bc0d8..dce1b2780 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
@@ -64,9 +64,8 @@ abstract class HybiParser {
 
     private boolean mClosed = false;
 
-    private ByteArrayOutputStream mBuffer = new ByteArrayOutputStream();
-    private Inflater mInflater = new Inflater(true);
-    private byte[] mInflateBuffer = new byte[4096];
+    private final ByteArrayOutputStream mBuffer = new ByteArrayOutputStream();
+    private final byte[] mInflateBuffer = new byte[4096];
 
     private static final int BYTE   = 255;
     private static final int FIN    = 128;
@@ -116,19 +115,26 @@ private static byte[] mask(byte[] payload, byte[] mask, int offset) {
     private byte[] inflate(byte[] payload) throws DataFormatException {
         ByteArrayOutputStream inflated = new ByteArrayOutputStream();
 
-        mInflater.setInput(payload);
-        while (!mInflater.needsInput()) {
-            int chunkSize = mInflater.inflate(mInflateBuffer);
+        Inflater inflater = new Inflater(true);
+        inflater.setInput(payload);
+
+        while (!inflater.needsInput()) {
+            int chunkSize = inflater.inflate(mInflateBuffer);
             inflated.write(mInflateBuffer, 0, chunkSize);
         }
 
-        mInflater.setInput(new byte[] { 0, 0, -1, -1 });
-        while (!mInflater.needsInput()) {
-            int chunkSize = mInflater.inflate(mInflateBuffer);
+        inflater.setInput(new byte[] { 0, 0, -1, -1 });
+
+        while (!inflater.needsInput()) {
+            int chunkSize = inflater.inflate(mInflateBuffer);
             inflated.write(mInflateBuffer, 0, chunkSize);
         }
 
-        return inflated.toByteArray();
+        try {
+            return inflated.toByteArray();
+        } finally {
+            inflater.end();
+        }
     }
 
     public void setMasking(boolean masking) {
@@ -152,7 +158,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             parse();
         }
     };
-    
+
     DataCallback mStage1 = new DataCallback() {
         @Override
         public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
@@ -160,7 +166,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             parse();
         }
     };
-    
+
     DataCallback mStage2 = new DataCallback() {
         @Override
         public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
@@ -176,7 +182,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             parse();
         }
     };
-    
+
     DataCallback mStage3 = new DataCallback() {
         @Override
         public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
@@ -204,7 +210,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             parse();
         }
     };
-    
+
     void parse() {
         switch (mStage) {
         case 0:
@@ -224,7 +230,7 @@ void parse() {
             break;
         }
     }
-    
+
     private DataEmitterReader mReader = new DataEmitterReader();
 
 	private static final long BASE = 2;
@@ -297,7 +303,7 @@ public byte[] frame(String data) {
     public byte[] frame(byte[] data) {
         return frame(OP_BINARY, data, -1);
     }
-    
+
     public byte[] frame(byte[] data, int offset, int length) {
     	return frame(OP_BINARY, data, -1, offset, length);
     }
@@ -312,7 +318,7 @@ public byte[] pongFrame(String data) {
 
     /**
      * Flip the opcode so to avoid the name collision with the public method
-     * 
+     *
      * @param opcode
      * @param data
      * @param errorCode
@@ -324,7 +330,7 @@ private byte[] frame(int opcode, byte[] data, int errorCode)  {
 
     /**
      * Don't actually need the flipped method signature, trying to keep it in line with the byte[] version
-     * 
+     *
      * @param opcode
      * @param data
      * @param errorCode
@@ -333,7 +339,7 @@ private byte[] frame(int opcode, byte[] data, int errorCode)  {
     private byte[] frame(int opcode, String data, int errorCode) {
         return frame(opcode, decode(data), errorCode);
     }
-    
+
     private byte[] frame(int opcode, byte [] data, int errorCode, int dataOffset, int dataLength) {
         if (mClosed) return null;
 
@@ -355,7 +361,7 @@ private byte[] frame(int opcode, byte [] data, int errorCode, int dataOffset, in
             frame[2] = (byte) (length / 256);
             frame[3] = (byte) (length & BYTE);
         } else {
-        	
+
         	frame[1] = (byte) (masked | 127);
             frame[2] = (byte) (( length / _2_TO_56_) & BYTE);
             frame[3] = (byte) (( length / _2_TO_48_) & BYTE);
@@ -371,7 +377,7 @@ private byte[] frame(int opcode, byte [] data, int errorCode, int dataOffset, in
             frame[offset] = (byte) ((errorCode / 256) & BYTE);
             frame[offset+1] = (byte) (errorCode & BYTE);
         }
-        
+
         System.arraycopy(buffer, dataOffset, frame, offset + insert, dataLength - dataOffset);
 
         if (mMasking) {
@@ -453,7 +459,7 @@ private void emitFrame() throws IOException {
 //            Log.d(TAG, "Got pong! " + message);
         }
     }
-    
+
     protected abstract void onMessage(byte[] payload);
     protected abstract void onMessage(String payload);
     protected abstract void onPong(String payload);

From ea3d623bc8212cd2dac27e23adee7b2dea0aad09 Mon Sep 17 00:00:00 2001
From: Matthew Zavislak <elevenfive@users.noreply.github.com>
Date: Thu, 28 Jul 2016 13:06:50 -0700
Subject: [PATCH 241/399] Avoid npe in SocketIOConnection

- Seeing crashes in the wild:

- java.lang.NullPointerException: Attempt to invoke interface method
  'void com.koushikdutta.async.http.socketio.transport.SocketIOTransport.setClosedCallback(
   com.koushikdutta.async.callback.CompletedCallback)' on a null object reference

   at com.koushikdutta.async.http.socketio.SocketIOConnection.disconnect (SocketIOConnection.java:89)
   at com.koushikdutta.async.http.socketio.SocketIOClient.disconnect (SocketIOClient.java:170)
---
 .../async/http/socketio/SocketIOConnection.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
index 9288d2f0c..a48d24b43 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
@@ -79,16 +79,18 @@ public void disconnect(SocketIOClient client) {
             }
         }
 
-        if (needsEndpointDisconnect && transport != null)
-            transport.send(String.format(Locale.ENGLISH, "0::%s", client.endpoint));
+        final SocketIOTransport ts = transport;
+
+        if (needsEndpointDisconnect && ts != null)
+            ts.send(String.format(Locale.ENGLISH, "0::%s", client.endpoint));
 
         // and see if we can disconnect the socket completely
-        if (clients.size() > 0 || transport == null)
+        if (clients.size() > 0 || ts == null)
             return;
 
-        transport.setStringCallback(null);
-        transport.setClosedCallback(null);
-        transport.disconnect();
+        ts.setStringCallback(null);
+        ts.setClosedCallback(null);
+        ts.disconnect();
         transport = null;
     }
 

From 6843905a9439e75bfc5e0721071abd24cce3ec77 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 28 Jul 2016 15:13:42 -0700
Subject: [PATCH 242/399] AsyncServer

Fix bug where multiple posts could end up being inserted in the wrong
order if some posts are run to completion before another one was posted.

getAllByName DNS lookup now prefers IPv4 addresses. This seems to be
a non-deterministic return on Android.
---
 .../com/koushikdutta/async/AsyncServer.java   | 35 +++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 03c69fe32..8a0a040ca 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -15,6 +15,8 @@
 import com.koushikdutta.async.util.StreamUtility;
 
 import java.io.IOException;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -25,6 +27,7 @@
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 import java.nio.channels.spi.SelectorProvider;
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.PriorityQueue;
 import java.util.Set;
@@ -140,6 +143,7 @@ public void run() {
         });
     }
 
+    int postCounter = 0;
     public Object postDelayed(Runnable runnable, long delay) {
         Scheduled s;
         synchronized (this) {
@@ -152,10 +156,14 @@ public Object postDelayed(Runnable runnable, long delay) {
             // as it will always be less than the current time and also remain
             // behind all other immediately run queue items.
             long time;
-            if (delay != 0)
+            if (delay > 0)
                 time = System.currentTimeMillis() + delay;
+            else if (delay == 0)
+                time = postCounter++;
+            else if (mQueue.size() > 0)
+                time = Math.min(0, mQueue.peek().time - 1);
             else
-                time = mQueue.size();
+                time = 0;
             mQueue.add(s = new Scheduled(runnable, time));
             // start the server up if necessary
             if (mSelector == null)
@@ -167,6 +175,14 @@ public Object postDelayed(Runnable runnable, long delay) {
         return s;
     }
 
+    public Object postImmediate(Runnable runnable) {
+        if (Thread.currentThread() == getAffinity()) {
+            runnable.run();
+            return null;
+        }
+        return postDelayed(runnable, -1);
+    }
+
     public Object post(Runnable runnable) {
         return postDelayed(runnable, 0);
     }
@@ -409,6 +425,19 @@ private static ExecutorService newSynchronousWorkers() {
         return tpe;
     }
 
+    private static final Comparator<InetAddress> ipSorter = new Comparator<InetAddress>() {
+        @Override
+        public int compare(InetAddress lhs, InetAddress rhs) {
+            if (lhs instanceof Inet4Address && rhs instanceof Inet4Address)
+                return 0;
+            if (lhs instanceof Inet6Address && rhs instanceof Inet6Address)
+                return 0;
+            if (lhs instanceof Inet4Address && rhs instanceof Inet6Address)
+                return -1;
+            return 1;
+        }
+    };
+
     private static ExecutorService synchronousWorkers = newSynchronousWorkers();
     public Future<InetAddress[]> getAllByName(final String host) {
         final SimpleFuture<InetAddress[]> ret = new SimpleFuture<InetAddress[]>();
@@ -417,6 +446,7 @@ public Future<InetAddress[]> getAllByName(final String host) {
             public void run() {
                 try {
                     final InetAddress[] result = InetAddress.getAllByName(host);
+                    Arrays.sort(result, ipSorter);
                     if (result == null || result.length == 0)
                         throw new HostnameResolutionException("no addresses for host");
                     post(new Runnable() {
@@ -709,6 +739,7 @@ private static long lockAndRunQueue(final AsyncServer server, final PriorityQueu
             run.runnable.run();
         }
 
+        server.postCounter = 0;
         return wait;
     }
 

From be28a1583e2bd4b9c3f2a1ecb292ceaf1088b934 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 6 Sep 2016 08:12:22 -0700
Subject: [PATCH 243/399] fix https://github.com/koush/ion/issues/714

---
 .../koushikdutta/async/callback/ValueCallback.java |  8 ++++++++
 .../async/http/HttpTransportMiddleware.java        | 14 +++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/callback/ValueCallback.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/callback/ValueCallback.java b/AndroidAsync/src/com/koushikdutta/async/callback/ValueCallback.java
new file mode 100644
index 000000000..6cfda86e7
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/callback/ValueCallback.java
@@ -0,0 +1,8 @@
+package com.koushikdutta.async.callback;
+
+/**
+ * Created by koush on 7/5/16.
+ */
+public interface ValueCallback<T> {
+    void onResult(T value);
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
index ff68a5473..9ed333b92 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
@@ -41,9 +41,14 @@ else if ("close".equals(request.getHeaders().get("Connection"))) {
             }
         }
 
+        String rl = request.getRequestLine().toString();
+        String rs = request.getHeaders().toPrefixString(rl);
+
+        byte[] rsBytes = rs.getBytes();
+
         // try to get the request body in the same packet as the request headers... if it will fit
         // in the max MTU (1540 or whatever).
-        final boolean waitForBody = requestBody != null && requestBody.length() >= 0 && requestBody.length() < 1024;
+        final boolean waitForBody = requestBody != null && requestBody.length() >= 0 && requestBody.length() + rsBytes.length < 1024;
         final BufferedDataSink bsink;
         final DataSink headerSink;
         if (waitForBody) {
@@ -58,15 +63,10 @@ else if ("close".equals(request.getHeaders().get("Connection"))) {
             headerSink = data.socket;
         }
 
-        String rl = request.getRequestLine().toString();
-        String rs = request.getHeaders().toPrefixString(rl);
         request.logv("\n" + rs);
 
-        if (bsink != null)
-            bsink.setMaxBuffer(1024);
-
         final CompletedCallback sentCallback = data.sendHeadersCallback;
-        Util.writeAll(headerSink, rs.getBytes(), new CompletedCallback() {
+        Util.writeAll(headerSink, rsBytes, new CompletedCallback() {
             @Override
             public void onCompleted(Exception ex) {
                 Util.end(sentCallback, ex);

From 16b2b556ca96edbefe06991541d937c5eddeeb18 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 6 Sep 2016 08:13:30 -0700
Subject: [PATCH 244/399] 219

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index fcb012e84..e93f9fc97 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="218"
-    android:versionName="2.1.8">
+    android:versionCode="219"
+    android:versionName="2.1.9">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

From 04ec0059ad2d4b50b125f2c2bba5f440f0eb509f Mon Sep 17 00:00:00 2001
From: rayworks <crayzhou@gmail.com>
Date: Thu, 8 Sep 2016 22:39:36 +0800
Subject: [PATCH 245/399] Sync sample project as AndroidSync library has been
 updated.

---
 AndroidAsyncSample/build.gradle                              | 2 +-
 .../src/com/koushikdutta/async/sample/MainActivity.java      | 5 ++---
 .../async/sample/middleware/CacheOverrideMiddleware.java     | 2 +-
 AndroidAsyncStetho/AndroidManifest.xml                       | 2 +-
 AndroidAsyncStetho/build.gradle                              | 2 +-
 settings.gradle                                              | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/AndroidAsyncSample/build.gradle b/AndroidAsyncSample/build.gradle
index 7e02534d8..5bdb22343 100644
--- a/AndroidAsyncSample/build.gradle
+++ b/AndroidAsyncSample/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 dependencies {
-    compile project(':AndroidAsync:AndroidAsync')
+    compile project(':AndroidAsync')
 }
 
 android {
diff --git a/AndroidAsyncSample/src/com/koushikdutta/async/sample/MainActivity.java b/AndroidAsyncSample/src/com/koushikdutta/async/sample/MainActivity.java
index ac37803d4..f474d2aee 100644
--- a/AndroidAsyncSample/src/com/koushikdutta/async/sample/MainActivity.java
+++ b/AndroidAsyncSample/src/com/koushikdutta/async/sample/MainActivity.java
@@ -20,12 +20,11 @@
 import com.koushikdutta.async.http.AsyncHttpGet;
 import com.koushikdutta.async.http.AsyncHttpPost;
 import com.koushikdutta.async.http.AsyncHttpResponse;
+import com.koushikdutta.async.http.BasicNameValuePair;
+import com.koushikdutta.async.http.NameValuePair;
 import com.koushikdutta.async.http.body.UrlEncodedFormBody;
 import com.koushikdutta.async.http.cache.ResponseCacheMiddleware;
 
-import org.apache.http.NameValuePair;
-import org.apache.http.message.BasicNameValuePair;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/AndroidAsyncSample/src/com/koushikdutta/async/sample/middleware/CacheOverrideMiddleware.java b/AndroidAsyncSample/src/com/koushikdutta/async/sample/middleware/CacheOverrideMiddleware.java
index 593ce5c92..7f3e3a13d 100644
--- a/AndroidAsyncSample/src/com/koushikdutta/async/sample/middleware/CacheOverrideMiddleware.java
+++ b/AndroidAsyncSample/src/com/koushikdutta/async/sample/middleware/CacheOverrideMiddleware.java
@@ -17,7 +17,7 @@ public class CacheOverrideMiddleware extends SimpleMiddleware {
     public static CacheOverrideMiddleware add(AsyncHttpClient client) {
         CacheOverrideMiddleware ret = new CacheOverrideMiddleware();
         // add this first so it gets called before everything else
-        client.getMiddleware().add(0, ret);
+        client.getMiddleware().add(ret);
         return ret;
     }
 
diff --git a/AndroidAsyncStetho/AndroidManifest.xml b/AndroidAsyncStetho/AndroidManifest.xml
index 642646a72..2146fce91 100644
--- a/AndroidAsyncStetho/AndroidManifest.xml
+++ b/AndroidAsyncStetho/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.koushikdutta.async"
+    package="com.koushikdutta.async.stetho"
     android:versionCode="208"
     android:versionName="2.0.8">
 
diff --git a/AndroidAsyncStetho/build.gradle b/AndroidAsyncStetho/build.gradle
index 0626921fb..3e01b0933 100644
--- a/AndroidAsyncStetho/build.gradle
+++ b/AndroidAsyncStetho/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 dependencies {
-    compile project(':AndroidAsync:AndroidAsync')
+    compile project(':AndroidAsync')
     compile "com.facebook.stetho:stetho:1.0.0"
 }
 
diff --git a/settings.gradle b/settings.gradle
index c999ae252..120c70c84 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
-include 'AndroidAsync'
+include 'AndroidAsync', 'AndroidAsyncSample', 'AndroidAsyncStetho'
 

From d2404181a2dd480f88f631d1bcfdfb2003da25bc Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 13 Sep 2016 22:02:15 -0700
Subject: [PATCH 246/399] gradle

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index fc8c9bfa1..44afcb1e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.1.3'
     }
 }
 

From 777909b0fa3d035105b1b5033bf1575f668f8b3e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 13 Sep 2016 22:02:41 -0700
Subject: [PATCH 247/399] My suspicion was correct. Must use same instance of
 Inflater.

https://github.com/koush/AndroidAsync/issues/482#issuecomment-246641959

Revert "Fix leak in HybiParser"

This reverts commit 925e4a26653450bdc94ee47040524211e0ede95f.
---
 .../koushikdutta/async/http/HybiParser.java   | 50 ++++++++-----------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java b/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
index dce1b2780..b875bc0d8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
@@ -64,8 +64,9 @@ abstract class HybiParser {
 
     private boolean mClosed = false;
 
-    private final ByteArrayOutputStream mBuffer = new ByteArrayOutputStream();
-    private final byte[] mInflateBuffer = new byte[4096];
+    private ByteArrayOutputStream mBuffer = new ByteArrayOutputStream();
+    private Inflater mInflater = new Inflater(true);
+    private byte[] mInflateBuffer = new byte[4096];
 
     private static final int BYTE   = 255;
     private static final int FIN    = 128;
@@ -115,26 +116,19 @@ private static byte[] mask(byte[] payload, byte[] mask, int offset) {
     private byte[] inflate(byte[] payload) throws DataFormatException {
         ByteArrayOutputStream inflated = new ByteArrayOutputStream();
 
-        Inflater inflater = new Inflater(true);
-        inflater.setInput(payload);
-
-        while (!inflater.needsInput()) {
-            int chunkSize = inflater.inflate(mInflateBuffer);
+        mInflater.setInput(payload);
+        while (!mInflater.needsInput()) {
+            int chunkSize = mInflater.inflate(mInflateBuffer);
             inflated.write(mInflateBuffer, 0, chunkSize);
         }
 
-        inflater.setInput(new byte[] { 0, 0, -1, -1 });
-
-        while (!inflater.needsInput()) {
-            int chunkSize = inflater.inflate(mInflateBuffer);
+        mInflater.setInput(new byte[] { 0, 0, -1, -1 });
+        while (!mInflater.needsInput()) {
+            int chunkSize = mInflater.inflate(mInflateBuffer);
             inflated.write(mInflateBuffer, 0, chunkSize);
         }
 
-        try {
-            return inflated.toByteArray();
-        } finally {
-            inflater.end();
-        }
+        return inflated.toByteArray();
     }
 
     public void setMasking(boolean masking) {
@@ -158,7 +152,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             parse();
         }
     };
-
+    
     DataCallback mStage1 = new DataCallback() {
         @Override
         public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
@@ -166,7 +160,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             parse();
         }
     };
-
+    
     DataCallback mStage2 = new DataCallback() {
         @Override
         public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
@@ -182,7 +176,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             parse();
         }
     };
-
+    
     DataCallback mStage3 = new DataCallback() {
         @Override
         public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
@@ -210,7 +204,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             parse();
         }
     };
-
+    
     void parse() {
         switch (mStage) {
         case 0:
@@ -230,7 +224,7 @@ void parse() {
             break;
         }
     }
-
+    
     private DataEmitterReader mReader = new DataEmitterReader();
 
 	private static final long BASE = 2;
@@ -303,7 +297,7 @@ public byte[] frame(String data) {
     public byte[] frame(byte[] data) {
         return frame(OP_BINARY, data, -1);
     }
-
+    
     public byte[] frame(byte[] data, int offset, int length) {
     	return frame(OP_BINARY, data, -1, offset, length);
     }
@@ -318,7 +312,7 @@ public byte[] pongFrame(String data) {
 
     /**
      * Flip the opcode so to avoid the name collision with the public method
-     *
+     * 
      * @param opcode
      * @param data
      * @param errorCode
@@ -330,7 +324,7 @@ private byte[] frame(int opcode, byte[] data, int errorCode)  {
 
     /**
      * Don't actually need the flipped method signature, trying to keep it in line with the byte[] version
-     *
+     * 
      * @param opcode
      * @param data
      * @param errorCode
@@ -339,7 +333,7 @@ private byte[] frame(int opcode, byte[] data, int errorCode)  {
     private byte[] frame(int opcode, String data, int errorCode) {
         return frame(opcode, decode(data), errorCode);
     }
-
+    
     private byte[] frame(int opcode, byte [] data, int errorCode, int dataOffset, int dataLength) {
         if (mClosed) return null;
 
@@ -361,7 +355,7 @@ private byte[] frame(int opcode, byte [] data, int errorCode, int dataOffset, in
             frame[2] = (byte) (length / 256);
             frame[3] = (byte) (length & BYTE);
         } else {
-
+        	
         	frame[1] = (byte) (masked | 127);
             frame[2] = (byte) (( length / _2_TO_56_) & BYTE);
             frame[3] = (byte) (( length / _2_TO_48_) & BYTE);
@@ -377,7 +371,7 @@ private byte[] frame(int opcode, byte [] data, int errorCode, int dataOffset, in
             frame[offset] = (byte) ((errorCode / 256) & BYTE);
             frame[offset+1] = (byte) (errorCode & BYTE);
         }
-
+        
         System.arraycopy(buffer, dataOffset, frame, offset + insert, dataLength - dataOffset);
 
         if (mMasking) {
@@ -459,7 +453,7 @@ private void emitFrame() throws IOException {
 //            Log.d(TAG, "Got pong! " + message);
         }
     }
-
+    
     protected abstract void onMessage(byte[] payload);
     protected abstract void onMessage(String payload);
     protected abstract void onPong(String payload);

From 62f3c773fdbf80348a24e105ac9eec7c5f98794b Mon Sep 17 00:00:00 2001
From: Matthew Zavislak <elevenfive@users.noreply.github.com>
Date: Sat, 24 Sep 2016 16:33:05 -0700
Subject: [PATCH 248/399] Update build, fix lints

- Was calling api that is 19+ despite project min of 9
- Reliance upon default locale can cause issues
- Update gradle plugin 2.1.3 -> 2.2.0
- Update gradle 2.14 -> 3.1
- Update build tools 24.0.0 -> 24.0.2
---
 AndroidAsync/build.gradle                           |  2 +-
 .../src/com/koushikdutta/async/http/Headers.java    | 13 +++++++------
 .../src/com/koushikdutta/async/http/Protocol.java   |  3 ++-
 .../async/http/cache/ResponseHeaders.java           |  3 ++-
 .../src/com/koushikdutta/async/http/spdy/Spdy3.java | 12 +++++++++++-
 .../async/http/spdy/SpdyMiddleware.java             |  5 +++--
 .../koushikdutta/async/http/spdy/SpdyTransport.java |  5 +++--
 AndroidAsyncSample/AndroidManifest.xml              |  3 +--
 build.gradle                                        |  2 +-
 gradle/wrapper/gradle-wrapper.properties            |  2 +-
 10 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index ff9f881aa..604a36aeb 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -27,7 +27,7 @@ android {
     }
 
     compileSdkVersion 24
-    buildToolsVersion '24.0.0'
+    buildToolsVersion '24.0.2'
 }
 
 // upload to maven task
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
index 7d56edbef..ffa9cb891 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
@@ -7,6 +7,7 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -31,17 +32,17 @@ public Multimap getMultiMap() {
     }
 
     public List<String> getAll(String header) {
-        return map.get(header.toLowerCase());
+        return map.get(header.toLowerCase(Locale.US));
     }
 
     public String get(String header) {
-        return map.getString(header.toLowerCase());
+        return map.getString(header.toLowerCase(Locale.US));
     }
 
     public Headers set(String header, String value) {
         if (value != null && (value.contains("\n") || value.contains("\r")))
             throw new IllegalArgumentException("value must not contain a new line or line feed");
-        String lc = header.toLowerCase();
+        String lc = header.toLowerCase(Locale.US);
         map.put(lc, value);
         TaggedList<String> list = (TaggedList<String>)map.get(lc);
         list.tagNull(header);
@@ -49,7 +50,7 @@ public Headers set(String header, String value) {
     }
 
     public Headers add(String header, String value) {
-        String lc = header.toLowerCase();
+        String lc = header.toLowerCase(Locale.US);
         map.add(lc, value);
         TaggedList<String> list = (TaggedList<String>)map.get(lc);
         list.tagNull(header);
@@ -91,11 +92,11 @@ public Headers addAll(Headers headers) {
     }
 
     public List<String> removeAll(String header) {
-        return map.remove(header.toLowerCase());
+        return map.remove(header.toLowerCase(Locale.US));
     }
 
     public String remove(String header) {
-        List<String> r = removeAll(header.toLowerCase());
+        List<String> r = removeAll(header.toLowerCase(Locale.US));
         if (r == null || r.size() == 0)
             return null;
         return r.get(0);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Protocol.java b/AndroidAsync/src/com/koushikdutta/async/http/Protocol.java
index 6f714f233..db42f8ce7 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Protocol.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Protocol.java
@@ -1,6 +1,7 @@
 package com.koushikdutta.async.http;
 
 import java.util.Hashtable;
+import java.util.Locale;
 
 /**
  * Protocols that OkHttp implements for <a
@@ -87,7 +88,7 @@ public boolean needsSpdyConnection() {
     public static Protocol get(String protocol) {
         if (protocol == null)
             return null;
-        return protocols.get(protocol.toLowerCase());
+        return protocols.get(protocol.toLowerCase(Locale.US));
     }
 
     /**
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseHeaders.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseHeaders.java
index d71cf9df9..a344ca597 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseHeaders.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseHeaders.java
@@ -24,6 +24,7 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
@@ -160,7 +161,7 @@ public ResponseHeaders(Uri uri, RawHeaders headers) {
                     varyFields = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
                 }
                 for (String varyField : value.split(",")) {
-                    varyFields.add(varyField.trim().toLowerCase());
+                    varyFields.add(varyField.trim().toLowerCase(Locale.US));
                 }
             } else if ("Content-Encoding".equalsIgnoreCase(fieldName)) {
                 contentEncoding = value;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
index 2c66b09b1..13914541e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
@@ -15,7 +15,10 @@
  */
 package com.koushikdutta.async.http.spdy;
 
+import android.os.Build;
+
 import com.koushikdutta.async.BufferedDataSink;
+import com.koushikdutta.async.BuildConfig;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.DataEmitterReader;
@@ -508,7 +511,14 @@ private ByteBufferList writeNameValueBlockToBuffer(List<Header> headerBlock) thr
             deflater.setInput(headerBlockOut.array(), 0, headerBlockOut.remaining());
             while (!deflater.needsInput()) {
                 ByteBuffer deflated = ByteBufferList.obtain(headerBlockOut.capacity()).order(ByteOrder.BIG_ENDIAN);
-                int read = deflater.deflate(deflated.array(), 0, deflated.capacity(), Deflater.SYNC_FLUSH);
+                final int read;
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                    read = deflater.deflate(deflated.array(), 0, deflated.capacity(), Deflater.SYNC_FLUSH);
+                } else {
+                    read = deflater.deflate(deflated.array(), 0, deflated.capacity());
+                }
+
                 deflated.limit(read);
                 headerBlockList.add(deflated);
             }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index c1aab2beb..7cad58f6b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -32,6 +32,7 @@
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
+import java.util.Locale;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
@@ -279,7 +280,7 @@ private void newSocket(GetSocketData data, final AsyncSpdyConnection connection,
             if (SpdyTransport.isProhibitedHeader(connection.protocol, key))
                 continue;
             for (String value: mm.get(key)) {
-                headers.add(new Header(key.toLowerCase(), value));
+                headers.add(new Header(key.toLowerCase(Locale.US), value));
             }
         }
 
@@ -439,4 +440,4 @@ public void onRequestSent(OnRequestSentData data) {
         if (data.request.getBody() != null)
             data.response.sink().end();
     }
-}
\ No newline at end of file
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
index fe07e7887..ce18555de 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
@@ -20,6 +20,7 @@
 import com.koushikdutta.async.http.Protocol;
 
 import java.util.List;
+import java.util.Locale;
 
 
 final class SpdyTransport {
@@ -45,9 +46,9 @@ final class SpdyTransport {
   /** When true, this header should not be emitted or consumed. */
   static boolean isProhibitedHeader(Protocol protocol, String name) {
     if (protocol == Protocol.SPDY_3) {
-      return SPDY_3_PROHIBITED_HEADERS.contains(name.toLowerCase());
+      return SPDY_3_PROHIBITED_HEADERS.contains(name.toLowerCase(Locale.US));
     } else if (protocol == Protocol.HTTP_2) {
-      return HTTP_2_PROHIBITED_HEADERS.contains(name.toLowerCase());
+      return HTTP_2_PROHIBITED_HEADERS.contains(name.toLowerCase(Locale.US));
     } else {
       throw new AssertionError(protocol);
     }
diff --git a/AndroidAsyncSample/AndroidManifest.xml b/AndroidAsyncSample/AndroidManifest.xml
index 1cda0a5a0..13285f9f5 100644
--- a/AndroidAsyncSample/AndroidManifest.xml
+++ b/AndroidAsyncSample/AndroidManifest.xml
@@ -10,7 +10,6 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
-        android:debuggable="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
@@ -24,4 +23,4 @@
             </intent-filter>
         </activity>
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/build.gradle b/build.gradle
index 44afcb1e8..34cf7a4ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 473ebd531..5642922c5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip

From 6c213ceaf0e47a8cc17e89f7a4a9bba621955d37 Mon Sep 17 00:00:00 2001
From: Matthew Zavislak <elevenfive@users.noreply.github.com>
Date: Sat, 24 Sep 2016 17:01:59 -0700
Subject: [PATCH 249/399] Call Inflater#end in HybiParser finalizer

---
 .../koushikdutta/async/http/HybiParser.java   | 42 +++++++++++++------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java b/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
index b875bc0d8..f8b2e0910 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
@@ -30,6 +30,8 @@
 
 package com.koushikdutta.async.http;
 
+import android.util.Log;
+
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.DataEmitterReader;
@@ -152,7 +154,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             parse();
         }
     };
-    
+
     DataCallback mStage1 = new DataCallback() {
         @Override
         public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
@@ -160,7 +162,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             parse();
         }
     };
-    
+
     DataCallback mStage2 = new DataCallback() {
         @Override
         public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
@@ -176,7 +178,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             parse();
         }
     };
-    
+
     DataCallback mStage3 = new DataCallback() {
         @Override
         public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
@@ -204,7 +206,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
             parse();
         }
     };
-    
+
     void parse() {
         switch (mStage) {
         case 0:
@@ -224,7 +226,7 @@ void parse() {
             break;
         }
     }
-    
+
     private DataEmitterReader mReader = new DataEmitterReader();
 
 	private static final long BASE = 2;
@@ -297,7 +299,7 @@ public byte[] frame(String data) {
     public byte[] frame(byte[] data) {
         return frame(OP_BINARY, data, -1);
     }
-    
+
     public byte[] frame(byte[] data, int offset, int length) {
     	return frame(OP_BINARY, data, -1, offset, length);
     }
@@ -312,7 +314,7 @@ public byte[] pongFrame(String data) {
 
     /**
      * Flip the opcode so to avoid the name collision with the public method
-     * 
+     *
      * @param opcode
      * @param data
      * @param errorCode
@@ -324,7 +326,7 @@ private byte[] frame(int opcode, byte[] data, int errorCode)  {
 
     /**
      * Don't actually need the flipped method signature, trying to keep it in line with the byte[] version
-     * 
+     *
      * @param opcode
      * @param data
      * @param errorCode
@@ -333,7 +335,7 @@ private byte[] frame(int opcode, byte[] data, int errorCode)  {
     private byte[] frame(int opcode, String data, int errorCode) {
         return frame(opcode, decode(data), errorCode);
     }
-    
+
     private byte[] frame(int opcode, byte [] data, int errorCode, int dataOffset, int dataLength) {
         if (mClosed) return null;
 
@@ -355,7 +357,7 @@ private byte[] frame(int opcode, byte [] data, int errorCode, int dataOffset, in
             frame[2] = (byte) (length / 256);
             frame[3] = (byte) (length & BYTE);
         } else {
-        	
+
         	frame[1] = (byte) (masked | 127);
             frame[2] = (byte) (( length / _2_TO_56_) & BYTE);
             frame[3] = (byte) (( length / _2_TO_48_) & BYTE);
@@ -371,7 +373,7 @@ private byte[] frame(int opcode, byte [] data, int errorCode, int dataOffset, in
             frame[offset] = (byte) ((errorCode / 256) & BYTE);
             frame[offset+1] = (byte) (errorCode & BYTE);
         }
-        
+
         System.arraycopy(buffer, dataOffset, frame, offset + insert, dataLength - dataOffset);
 
         if (mMasking) {
@@ -453,7 +455,7 @@ private void emitFrame() throws IOException {
 //            Log.d(TAG, "Got pong! " + message);
         }
     }
-    
+
     protected abstract void onMessage(byte[] payload);
     protected abstract void onMessage(String payload);
     protected abstract void onPong(String payload);
@@ -498,6 +500,21 @@ private byte[] slice(byte[] array, int start) {
         return copy;
     }
 
+    @Override
+    protected void finalize() throws Throwable {
+        Inflater inflater = mInflater;
+
+        if (inflater != null) {
+            try {
+                inflater.end();
+            } catch (Exception e) {
+                Log.e(TAG, "inflater.end failed", e);
+            }
+        }
+
+        super.finalize();
+    }
+
     public static class ProtocolError extends IOException {
         public ProtocolError(String detailMessage) {
             super(detailMessage);
@@ -515,5 +532,4 @@ private static long byteArrayToLong(byte[] b, int offset, int length) {
         }
         return value;
     }
-
 }

From 7e6c9d01fb6367bb7671ca696cbf21f9f62eb6f6 Mon Sep 17 00:00:00 2001
From: Teun van Run <teun@fiftytwodegreesnorth.com>
Date: Tue, 4 Oct 2016 12:02:12 +0200
Subject: [PATCH 250/399] #487 Separate worker for DNS resolve

---
 AndroidAsync/src/com/koushikdutta/async/AsyncServer.java | 9 +++++----
 AndroidAsyncSample/build.gradle                          | 2 +-
 AndroidAsyncStetho/build.gradle                          | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 8a0a040ca..e877325e6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -129,6 +129,7 @@ public void removeAllCallbacks(Object scheduled) {
         }
     }
 
+    private static ExecutorService synchronousWorkers = newSynchronousWorkers("AsyncServer-worker-");
     private static void wakeup(final SelectorWrapper selector) {
         synchronousWorkers.execute(new Runnable() {
             @Override
@@ -418,8 +419,8 @@ public Cancellable connectSocket(final String host, final int port, final Connec
         return connectSocket(InetSocketAddress.createUnresolved(host, port), callback);
     }
 
-    private static ExecutorService newSynchronousWorkers() {
-        ThreadFactory tf = new NamedThreadFactory("AsyncServer-worker-");
+    private static ExecutorService newSynchronousWorkers(String prefix) {
+        ThreadFactory tf = new NamedThreadFactory(prefix);
         ThreadPoolExecutor tpe = new ThreadPoolExecutor(1, 4, 10L,
             TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), tf);
         return tpe;
@@ -438,10 +439,10 @@ public int compare(InetAddress lhs, InetAddress rhs) {
         }
     };
 
-    private static ExecutorService synchronousWorkers = newSynchronousWorkers();
+    private static ExecutorService synchronousResolverWorkers = newSynchronousWorkers("AsyncServer-resolver-");
     public Future<InetAddress[]> getAllByName(final String host) {
         final SimpleFuture<InetAddress[]> ret = new SimpleFuture<InetAddress[]>();
-        synchronousWorkers.execute(new Runnable() {
+        synchronousResolverWorkers.execute(new Runnable() {
             @Override
             public void run() {
                 try {
diff --git a/AndroidAsyncSample/build.gradle b/AndroidAsyncSample/build.gradle
index 5bdb22343..ac83a9117 100644
--- a/AndroidAsyncSample/build.gradle
+++ b/AndroidAsyncSample/build.gradle
@@ -19,6 +19,6 @@ android {
     }
 
     compileSdkVersion 24
-    buildToolsVersion "24.0.0"
+    buildToolsVersion "24.0.2"
 }
 
diff --git a/AndroidAsyncStetho/build.gradle b/AndroidAsyncStetho/build.gradle
index 3e01b0933..7d5619b7d 100644
--- a/AndroidAsyncStetho/build.gradle
+++ b/AndroidAsyncStetho/build.gradle
@@ -25,7 +25,7 @@ android {
     }
 
     compileSdkVersion 24
-    buildToolsVersion '24.0.0'
+    buildToolsVersion '24.0.2'
 }
 
 // upload to maven task

From 22c46e07a387173dc6e26acd28c6f52f22a7cd5b Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 5 Jan 2017 16:44:23 -0800
Subject: [PATCH 251/399] gradle

---
 AndroidAsync/build.gradle       | 4 ++--
 AndroidAsyncSample/build.gradle | 4 ++--
 AndroidAsyncStetho/build.gradle | 5 +++--
 build.gradle                    | 9 ++++++---
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 604a36aeb..40efeac5c 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -26,8 +26,8 @@ android {
         minSdkVersion 9
     }
 
-    compileSdkVersion 24
-    buildToolsVersion '24.0.2'
+    compileSdkVersion project.hasProperty('global_compileSdkVersion') ? global_compileSdkVersion : 25
+    buildToolsVersion project.hasProperty('global_buildToolsVersion') ? global_buildToolsVersion : '25.0.2'
 }
 
 // upload to maven task
diff --git a/AndroidAsyncSample/build.gradle b/AndroidAsyncSample/build.gradle
index ac83a9117..71418545d 100644
--- a/AndroidAsyncSample/build.gradle
+++ b/AndroidAsyncSample/build.gradle
@@ -18,7 +18,7 @@ android {
         minSdkVersion 9
     }
 
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion project.hasProperty('global_compileSdkVersion') ? global_compileSdkVersion : 25
+    buildToolsVersion project.hasProperty('global_buildToolsVersion') ? global_buildToolsVersion : '25.0.2'
 }
 
diff --git a/AndroidAsyncStetho/build.gradle b/AndroidAsyncStetho/build.gradle
index 7d5619b7d..3c6565c21 100644
--- a/AndroidAsyncStetho/build.gradle
+++ b/AndroidAsyncStetho/build.gradle
@@ -24,8 +24,9 @@ android {
         minSdkVersion 9
     }
 
-    compileSdkVersion 24
-    buildToolsVersion '24.0.2'
+    compileSdkVersion project.hasProperty('global_compileSdkVersion') ? global_compileSdkVersion : 25
+    buildToolsVersion project.hasProperty('global_buildToolsVersion') ? global_buildToolsVersion : '25.0.2'
+
 }
 
 // upload to maven task
diff --git a/build.gradle b/build.gradle
index 34cf7a4ab..aaf7f63c2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,15 +3,18 @@ buildscript {
         jcenter()
         mavenCentral()
     }
-
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath project.hasProperty('global_gradleAndroidPlugin') ? global_gradleAndroidPlugin : 'com.android.tools.build:gradle:2.2.3'
     }
 }
 
-allprojects {
+subprojects {
     repositories {
         jcenter()
         mavenCentral()
     }
+
+    ext.global_compileSdkVersion = project.hasProperty('global_compileSdkVersion') ? global_compileSdkVersion : 25
+    ext.global_buildToolsVersion = project.hasProperty('global_buildToolsVersion') ? global_buildToolsVersion : '25.0.2'
+    ext.global_gradleAndroidPlugin = project.hasProperty('global_gradleAndroidPlugin') ? global_gradleAndroidPlugin : 'com.android.tools.build:gradle:2.2.3'
 }

From 71511ef114d9a00e4795be828a49959718f04e51 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 15 Jun 2017 00:04:34 -0700
Subject: [PATCH 252/399] Add a way for Conscrypt to be able to create an
 SSLEngine with peerHost and peerPort specified.

Not sure why this is not done globally. I think I had a reason, but do not recall. /jeffsessions

I think it had something to do with non-conscrypt platform SSLEngine implementations on some android revisions.
---
 .../async/http/AsyncSSLEngineConfigurator.java        |  4 +++-
 .../async/http/AsyncSSLSocketMiddleware.java          | 11 ++++++++++-
 .../async/http/SSLEngineSNIConfigurator.java          | 11 +++++++++++
 .../koushikdutta/async/http/spdy/SpdyMiddleware.java  |  5 +++++
 gradle.properties                                     |  4 ----
 5 files changed, 29 insertions(+), 6 deletions(-)
 delete mode 100644 gradle.properties

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLEngineConfigurator.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLEngineConfigurator.java
index 755a50d3d..93db12f38 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLEngineConfigurator.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLEngineConfigurator.java
@@ -1,7 +1,9 @@
 package com.koushikdutta.async.http;
 
+import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 
 public interface AsyncSSLEngineConfigurator {
-    public void configureEngine(SSLEngine engine, AsyncHttpClientMiddleware.GetSocketData data, String host, int port);
+    SSLEngine createEngine(SSLContext sslContext, String peerHost, int peerPort);
+    void configureEngine(SSLEngine engine, AsyncHttpClientMiddleware.GetSocketData data, String host, int port);
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
index 5ca5227ad..4c7cd322c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
@@ -60,7 +60,16 @@ public void clearEngineConfigurators() {
 
     protected SSLEngine createConfiguredSSLEngine(GetSocketData data, String host, int port) {
         SSLContext sslContext = getSSLContext();
-        SSLEngine sslEngine = sslContext.createSSLEngine();
+        SSLEngine sslEngine = null;
+
+        for (AsyncSSLEngineConfigurator configurator : engineConfigurators) {
+            sslEngine = configurator.createEngine(sslContext, host, port);
+            if (sslEngine != null)
+                break;
+        }
+
+        if (sslEngine == null)
+            sslEngine = sslContext.createSSLEngine();
 
         for (AsyncSSLEngineConfigurator configurator : engineConfigurators) {
             configurator.configureEngine(sslEngine, data, host, port);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java b/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java
index 5a87a5616..279b105c9 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java
@@ -3,6 +3,7 @@
 import java.lang.reflect.Field;
 import java.util.Hashtable;
 
+import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 
 /**
@@ -15,6 +16,11 @@ private static class EngineHolder implements AsyncSSLEngineConfigurator {
         Field sslParameters;
         Field useSni;
 
+        @Override
+        public SSLEngine createEngine(SSLContext sslContext, String peerHost, int peerPort) {
+            return null;
+        }
+
         public EngineHolder(Class engineClass) {
             try {
                 peerHost = engineClass.getSuperclass().getDeclaredField("peerHost");
@@ -50,6 +56,11 @@ public void configureEngine(SSLEngine engine, AsyncHttpClientMiddleware.GetSocke
 
     Hashtable<String, EngineHolder> holders = new Hashtable<String, EngineHolder>();
 
+    @Override
+    public SSLEngine createEngine(SSLContext sslContext, String peerHost, int peerPort) {
+        return null;
+    }
+
     @Override
     public void configureEngine(SSLEngine engine, AsyncHttpClientMiddleware.GetSocketData data, String host, int port) {
         String name = engine.getClass().getCanonicalName();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 7cad58f6b..1a95f9279 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -41,6 +41,11 @@ public class SpdyMiddleware extends AsyncSSLSocketMiddleware {
     public SpdyMiddleware(AsyncHttpClient client) {
         super(client);
         addEngineConfigurator(new AsyncSSLEngineConfigurator() {
+            @Override
+            public SSLEngine createEngine(SSLContext sslContext, String peerHost, int peerPort) {
+                return null;
+            }
+
             @Override
             public void configureEngine(SSLEngine engine, GetSocketData data, String host, int port) {
                 configure(engine, data, host, port);
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index 07c2eac09..000000000
--- a/gradle.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-org.gradle.daemon=true
-org.gradle.parallel=true
-org.gradle.configureondemand=true
-org.gradle.jvmargs=-Xmx1048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

From 0786f0155e9109d2091e2227b1a5618afe502069 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 15 Jun 2017 00:13:16 -0700
Subject: [PATCH 253/399] 220

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index e93f9fc97..c56fd6a8d 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="219"
-    android:versionName="2.1.9">
+    android:versionCode="220"
+    android:versionName="2.2.0">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

From 10abb692d0fecb51a14ddba209a3f1adb0c77316 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 20 Jun 2017 18:21:59 -0700
Subject: [PATCH 254/399] Implement Conscrypt awareness in AndroidAsync

createSSLEngine(host, port) will be used if using GMSCore_OpenSSL or on Android M+.
---
 .../async/http/AsyncSSLSocketMiddleware.java  |  4 +---
 .../async/http/SSLEngineSNIConfigurator.java  | 23 +++++++++++++++----
 .../async/test/HttpClientTests.java           | 16 ++++++++++++-
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
index 4c7cd322c..daa92aa30 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
@@ -1,6 +1,7 @@
 package com.koushikdutta.async.http;
 
 import android.net.Uri;
+import android.os.Build;
 import android.text.TextUtils;
 
 import com.koushikdutta.async.AsyncSSLSocket;
@@ -68,9 +69,6 @@ protected SSLEngine createConfiguredSSLEngine(GetSocketData data, String host, i
                 break;
         }
 
-        if (sslEngine == null)
-            sslEngine = sslContext.createSSLEngine();
-
         for (AsyncSSLEngineConfigurator configurator : engineConfigurators) {
             configurator.configureEngine(sslEngine, data, host, port);
         }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java b/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java
index 279b105c9..aa3c39aed 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java
@@ -1,5 +1,7 @@
 package com.koushikdutta.async.http;
 
+import android.os.Build;
+
 import java.lang.reflect.Field;
 import java.util.Hashtable;
 
@@ -15,6 +17,7 @@ private static class EngineHolder implements AsyncSSLEngineConfigurator {
         Field peerPort;
         Field sslParameters;
         Field useSni;
+        boolean skipReflection;
 
         @Override
         public SSLEngine createEngine(SSLContext sslContext, String peerHost, int peerPort) {
@@ -41,7 +44,7 @@ public EngineHolder(Class engineClass) {
 
         @Override
         public void configureEngine(SSLEngine engine, AsyncHttpClientMiddleware.GetSocketData data, String host, int port) {
-            if (useSni == null)
+            if (useSni == null || skipReflection)
                 return;
             try {
                 peerHost.set(engine, host);
@@ -58,18 +61,30 @@ public void configureEngine(SSLEngine engine, AsyncHttpClientMiddleware.GetSocke
 
     @Override
     public SSLEngine createEngine(SSLContext sslContext, String peerHost, int peerPort) {
-        return null;
+        // pre M, must use reflection to enable SNI, otherwise createSSLEngine(peerHost, peerPort) works.
+        SSLEngine engine;
+        boolean skipReflection = "GmsCore_OpenSSL".equals(sslContext.getProvider().getName()) || Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
+        if (skipReflection)
+            engine = sslContext.createSSLEngine(peerHost, peerPort);
+        else
+            engine = sslContext.createSSLEngine();
+        ensureHolder(engine).skipReflection = skipReflection;
+        return engine;
     }
 
-    @Override
-    public void configureEngine(SSLEngine engine, AsyncHttpClientMiddleware.GetSocketData data, String host, int port) {
+    EngineHolder ensureHolder(SSLEngine engine) {
         String name = engine.getClass().getCanonicalName();
         EngineHolder holder = holders.get(name);
         if (holder == null) {
             holder = new EngineHolder(engine.getClass());
             holders.put(name, holder);
         }
+        return holder;
+    }
 
+    @Override
+    public void configureEngine(SSLEngine engine, AsyncHttpClientMiddleware.GetSocketData data, String host, int port) {
+        EngineHolder holder = ensureHolder(engine);
         holder.configureEngine(engine, data, host, port);
     }
 }
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
index 4ba7c7d30..8c5f02162 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
@@ -1,11 +1,11 @@
 package com.koushikdutta.async.test;
 
 import android.net.Uri;
-import android.os.Environment;
 import android.test.AndroidTestCase;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.google.android.gms.security.ProviderInstaller;
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.AsyncServerSocket;
 import com.koushikdutta.async.ByteBufferList;
@@ -39,6 +39,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import javax.net.ssl.SSLContext;
+
 public class HttpClientTests extends AndroidTestCase {
     AsyncHttpClient client;
     AsyncServer server = new AsyncServer();
@@ -177,6 +179,18 @@ public void testGithubRandomDataWithFuture() throws Exception {
         assertEquals(md5.digest(), dataNameAndHash);
     }
 
+    public void testSni() throws Exception {
+//        ProviderInstaller.installIfNeeded(getContext());
+//        AsyncHttpClient.getDefaultInstance().getSSLSocketMiddleware().setSSLContext(SSLContext.getInstance("TLS"));
+
+        // this server requires SNI as it serves multiple SSL certificates
+        // LOLLIPOP_MR1 and lower requires SSLEngineSNIConfigurator to set the appropriate fields via reflection.
+        // Higher than LOLLIPOP_MR1 can use createSSLEngine(host, port) as it is based off recent-ish versions of Conscrypt
+        // Conscrypt, if it is being used in GPS ProviderInstaller, can also use createSSLEngine(host, port)
+        Future<String> string = client.executeString(new AsyncHttpGet("https://koush.com/"), null);
+        string.get(TIMEOUT, TimeUnit.MILLISECONDS);
+    }
+
     public void testGithubHelloWithFuture() throws Exception {
         Future<String> string = client.executeString(new AsyncHttpGet("https://" + githubPath + "hello.txt"), null);
         assertEquals(string.get(TIMEOUT, TimeUnit.MILLISECONDS), "hello world");

From 0ce329dbca0ee5294ad4cbc47a89d3ab6844ecba Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 22 Jun 2017 00:31:38 -0700
Subject: [PATCH 255/399] 221

---
 AndroidAsync/AndroidManifest.xml                              | 4 ++--
 .../com/koushikdutta/async/http/SSLEngineSNIConfigurator.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index c56fd6a8d..5480224cd 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="220"
-    android:versionName="2.2.0">
+    android:versionCode="221"
+    android:versionName="2.2.1">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java b/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java
index aa3c39aed..39e40fb37 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/SSLEngineSNIConfigurator.java
@@ -68,7 +68,7 @@ public SSLEngine createEngine(SSLContext sslContext, String peerHost, int peerPo
             engine = sslContext.createSSLEngine(peerHost, peerPort);
         else
             engine = sslContext.createSSLEngine();
-        ensureHolder(engine).skipReflection = skipReflection;
+//        ensureHolder(engine).skipReflection = skipReflection;
         return engine;
     }
 

From d588e94ae91f7cf63813d27a6cf465b5681ecf67 Mon Sep 17 00:00:00 2001
From: Jakub Turcovsky <jakubturcovsky@dotykacka.cz>
Date: Tue, 12 Sep 2017 14:25:14 +0200
Subject: [PATCH 256/399] UTF-8 set as the default encoding

---
 AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index 3765d390e..07481569f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -369,7 +369,7 @@ public String peekString() {
     // not doing toString as this is really nasty in the debugger...
     public String peekString(Charset charset) {
         if (charset == null)
-            charset = Charsets.US_ASCII;
+            charset = Charsets.UTF_8;
         StringBuilder builder = new StringBuilder();
         for (ByteBuffer bb: mBuffers) {
             byte[] bytes;

From 0a55848c56f7af3942f8ae1798ab8c06c371273f Mon Sep 17 00:00:00 2001
From: Mustafa Ali <mustafa.ali@shopify.com>
Date: Fri, 22 Sep 2017 14:21:56 -0400
Subject: [PATCH 257/399] Add more detail to WebSocket Server section

Updates the WebSocket Server section to include a more comprehensive
code snippet, changes the sequence of sections slightly to improve
readability.
---
 README.md | 58 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 493614f78..bcc755387 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,6 @@ AsyncHttpClient.getDefaultInstance().getFile(url, filename, new AsyncHttpClient.
 ```
 
 
-
 ### Caching is supported too
 
 ```java
@@ -115,6 +114,27 @@ ResponseCacheMiddleware.addCache(AsyncHttpClient.getDefaultInstance(),
 ```
 
 
+### Need to do multipart/form-data uploads? That works too.
+
+```java
+AsyncHttpPost post = new AsyncHttpPost("http://myservercom/postform.html");
+MultipartFormDataBody body = new MultipartFormDataBody();
+body.addFilePart("my-file", new File("/path/to/file.txt");
+body.addStringPart("foo", "bar");
+post.setBody(body);
+AsyncHttpClient.getDefaultInstance().executeString(post, new AsyncHttpClient.StringCallback(){
+        @Override
+        public void onCompleted(Exception ex, AsyncHttpResponse source, String result) {
+            if (ex != null) {
+                ex.printStackTrace();
+                return;
+            }
+            System.out.println("Server says: " + result);
+        }
+    });
+```
+
+
 ### Can also create web sockets:
 
 ```java
@@ -177,27 +197,6 @@ SocketIOClient.connect(AsyncHttpClient.getDefaultInstance(), "http://192.168.1.2
 ```
 
 
-### Need to do multipart/form-data uploads? That works too.
-
-```java
-AsyncHttpPost post = new AsyncHttpPost("http://myservercom/postform.html");
-MultipartFormDataBody body = new MultipartFormDataBody();
-body.addFilePart("my-file", new File("/path/to/file.txt");
-body.addStringPart("foo", "bar");
-post.setBody(body);
-AsyncHttpClient.getDefaultInstance().executeString(post, new AsyncHttpClient.StringCallback(){
-        @Override
-        public void onCompleted(Exception ex, AsyncHttpResponse source, String result) {
-            if (ex != null) {
-                ex.printStackTrace();
-                return;
-            }
-            System.out.println("Server says: " + result);
-        }
-    });
-```
-
-
 ### AndroidAsync also let's you create simple HTTP servers:
 
 ```java
@@ -221,9 +220,18 @@ server.listen(5000);
 ### And WebSocket Servers:
 
 ```java
-server.websocket("/live", new WebSocketRequestCallback() {
-    @Override
-    public void onConnected(final WebSocket webSocket, AsyncHttpServerRequest request) {
+AsyncHttpServer httpServer = new AsyncHttpServer();
+httpServer.setErrorCallback(new CompletedCallback() {
+            @Override
+            public void onCompleted(Exception ex) {
+                callback.updateStatus("Error callback completed");
+            }
+        });
+        httpServer.listen(AsyncServer.getDefault(), port);
+
+        httpServer.websocket("/live", new AsyncHttpServer.WebSocketRequestCallback() {
+            @Override
+            public void onConnected(final WebSocket webSocket, AsyncHttpServerRequest request) {
         _sockets.add(webSocket);
         
         //Use this to clean up any references to your websocket

From a1029eb22e488d43879eceefe2770add141ae02f Mon Sep 17 00:00:00 2001
From: Mustafa Ali <mustafa.ali@shopify.com>
Date: Fri, 22 Sep 2017 14:33:19 -0400
Subject: [PATCH 258/399] Update code snippet with proper error logging

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index bcc755387..3dc79f5a3 100644
--- a/README.md
+++ b/README.md
@@ -224,7 +224,7 @@ AsyncHttpServer httpServer = new AsyncHttpServer();
 httpServer.setErrorCallback(new CompletedCallback() {
             @Override
             public void onCompleted(Exception ex) {
-                callback.updateStatus("Error callback completed");
+                Log.e("WebSocket", "An error occurred", ex);
             }
         });
         httpServer.listen(AsyncServer.getDefault(), port);
@@ -240,7 +240,7 @@ httpServer.setErrorCallback(new CompletedCallback() {
             public void onCompleted(Exception ex) {
                 try {
                     if (ex != null)
-                        Log.e("WebSocket", "Error");
+                        Log.e("WebSocket", "An error occurred", ex);
                 } finally {
                     _sockets.remove(webSocket);
                 }

From 7a4cfb2fbf41c6345df6c8fa4d0eff04c29177f4 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 15 Oct 2018 18:19:14 -0700
Subject: [PATCH 259/399] update gradle

---
 AndroidAsync/build.gradle                     |   6 +-
 .../async/util/ThrottleTimeout.java           |  88 ++++++++++++++++++
 gradle/wrapper/gradle-wrapper.jar             | Bin 53636 -> 0 bytes
 gradle/wrapper/gradle-wrapper.properties      |   6 --
 4 files changed, 91 insertions(+), 9 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
 delete mode 100644 gradle/wrapper/gradle-wrapper.jar
 delete mode 100644 gradle/wrapper/gradle-wrapper.properties

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 40efeac5c..3c022d46b 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -26,11 +26,11 @@ android {
         minSdkVersion 9
     }
 
-    compileSdkVersion project.hasProperty('global_compileSdkVersion') ? global_compileSdkVersion : 25
-    buildToolsVersion project.hasProperty('global_buildToolsVersion') ? global_buildToolsVersion : '25.0.2'
+    compileSdkVersion project.hasProperty('global_compileSdkVersion') ? global_compileSdkVersion : 28
+    buildToolsVersion project.hasProperty('global_buildToolsVersion') ? global_buildToolsVersion : '28.0.3'
 }
 
 // upload to maven task
-if (System.getenv().I_AM_KOUSH == 'true') {
+if (false && System.getenv().I_AM_KOUSH == 'true') {
   apply from: 'https://raw.githubusercontent.com/koush/mvn-repo/master/maven.gradle'
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java b/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
new file mode 100644
index 000000000..bd903b179
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
@@ -0,0 +1,88 @@
+package com.koushikdutta.virtualdisplay;
+
+import android.os.Handler;
+
+import com.koushikdutta.async.AsyncServer;
+import com.koushikdutta.async.callback.ValueCallback;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by koush on 7/19/16.
+ */
+public class ThrottleTimeout<T> {
+    Handlerish handlerish;
+    ValueCallback<List<T>> callback;
+    long delay;
+    ArrayList<T> values = new ArrayList<>();
+
+    private interface Handlerish {
+        void post(Runnable r);
+        Object postDelayed(Runnable r, long delay);
+        void removeAllCallbacks(Object cancellable);
+    }
+
+    public ThrottleTimeout(final AsyncServer server, long delay, ValueCallback<List<T>> callback) {
+        this.delay = delay;
+        this.callback = callback;
+        this.handlerish = new Handlerish() {
+            @Override
+            public void post(Runnable r) {
+                server.post(r);
+            }
+
+            @Override
+            public Object postDelayed(Runnable r, long delay) {
+                return server.postDelayed(r, delay);
+            }
+
+            @Override
+            public void removeAllCallbacks(Object cancellable) {
+                server.removeAllCallbacks(cancellable);
+            }
+        };
+    }
+
+    public ThrottleTimeout(final Handler handler, long delay, ValueCallback<List<T>> callback) {
+        this.delay = delay;
+        this.callback = callback;
+        this.handlerish = new Handlerish() {
+            @Override
+            public void post(Runnable r) {
+                handler.post(r);
+            }
+
+            @Override
+            public Object postDelayed(Runnable r, long delay) {
+                handler.postDelayed(r, delay);
+                return r;
+            }
+
+            @Override
+            public void removeAllCallbacks(Object cancellable) {
+                handler.removeCallbacks((Runnable)cancellable);
+            }
+        };
+    }
+
+    Object cancellable;
+    public synchronized void postThrottled(final T value) {
+        handlerish.post(new Runnable() {
+            @Override
+            public void run() {
+                values.add(value);
+
+                handlerish.removeAllCallbacks(cancellable);
+                cancellable = handlerish.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        ArrayList<T> v = new ArrayList<T>(values);
+                        values.clear();
+                        callback.onResult(v);
+                    }
+                }, delay);
+            }
+        });
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 13372aef5e24af05341d49695ee84e5f9b594659..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 53636
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
H-+%o-(+5aQ

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 5642922c5..000000000
--- a/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Dec 28 10:00:20 PST 2015
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip

From 0ab279aec66b255c496c351ffc18a228be68f4b9 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 15 Oct 2018 18:19:32 -0700
Subject: [PATCH 260/399] convenience methods for starting an ssl server

---
 .../async/AsyncSSLSocketWrapper.java          | 102 ++++++++++++++++++
 1 file changed, 102 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 91374d722..8b7e6e303 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -1,22 +1,34 @@
 package com.koushikdutta.async;
 
 import android.os.Build;
+import android.util.Base64;
+import android.util.Log;
 
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
+import com.koushikdutta.async.callback.ListenCallback;
 import com.koushikdutta.async.callback.WritableCallback;
+import com.koushikdutta.async.http.SSLEngineSNIConfigurator;
 import com.koushikdutta.async.util.Allocator;
 import com.koushikdutta.async.wrapper.AsyncSocketWrapper;
 
 import org.apache.http.conn.ssl.StrictHostnameVerifier;
 
+import java.io.ByteArrayInputStream;
+import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.security.GeneralSecurityException;
+import java.security.KeyFactory;
 import java.security.KeyStore;
 import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.security.spec.PKCS8EncodedKeySpec;
 
 import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLEngineResult;
@@ -28,6 +40,8 @@
 import javax.net.ssl.X509TrustManager;
 
 public class AsyncSSLSocketWrapper implements AsyncSocketWrapper, AsyncSSLSocket {
+    private static final String LOGTAG = "AsyncSSLSocketWrapper";
+
     public interface HandshakeCallback {
         public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket);
     }
@@ -524,4 +538,92 @@ public X509Certificate[] getPeerCertificates() {
     public String charset() {
         return null;
     }
+
+
+    public static AsyncServerSocket listenSecure(AsyncServer server, String keyDer, String certDer, final InetAddress host, final int port, final ListenCallback handler) {
+        return listenSecure(server, Base64.decode(keyDer, Base64.DEFAULT), Base64.decode(certDer, Base64.DEFAULT), host, port, handler);
+    }
+
+
+    private static class ObjectHolder<T> {
+        T held;
+    }
+
+    public static AsyncServerSocket listenSecure(final AsyncServer server, final byte[] keyDer, final byte[] certDer, final InetAddress host, final int port, final ListenCallback handler) {
+        final ObjectHolder<AsyncServerSocket> holder = new ObjectHolder<>();
+        server.run(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    PKCS8EncodedKeySpec key = new PKCS8EncodedKeySpec(keyDer);
+                    Certificate cert = CertificateFactory.getInstance("X.509").generateCertificate(new ByteArrayInputStream(certDer));
+
+                    KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
+                    ks.load(null);
+
+                    PrivateKey pk = KeyFactory.getInstance("RSA").generatePrivate(key);
+                    ks.setKeyEntry("key", pk, null, new Certificate[] { cert });
+
+                    KeyManagerFactory kmf = KeyManagerFactory.getInstance("X509");
+                    kmf.init(ks, "".toCharArray());
+
+                    TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+                    tmf.init(ks);
+
+
+                    SSLContext sslContext = SSLContext.getInstance("TLS");
+                    sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+
+                    holder.held = listenSecure(server, sslContext, host, port, handler);
+                }
+                catch (Exception e) {
+                    handler.onCompleted(e);
+                }
+            }
+        });
+        return holder.held;
+    }
+
+    public static AsyncServerSocket listenSecure(AsyncServer server, final SSLContext sslContext, final InetAddress host, final int port, final ListenCallback handler) {
+        final SSLEngineSNIConfigurator conf = new SSLEngineSNIConfigurator() {
+            @Override
+            public SSLEngine createEngine(SSLContext sslContext, String peerHost, int peerPort) {
+                SSLEngine engine = super.createEngine(sslContext, peerHost, peerPort);
+                String[] ciphers = engine.getEnabledCipherSuites();
+//                for (String cipher: ciphers) {
+//                    Log.i(LOGTAG, cipher);
+//                }
+                engine.setEnabledCipherSuites(new String[] { "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384" });
+                return engine;
+            }
+        };
+        return server.listen(host, port, new ListenCallback() {
+            @Override
+            public void onAccepted(final AsyncSocket socket) {
+                AsyncSSLSocketWrapper.handshake(socket, null, port, conf.createEngine(sslContext, null, port), null, null, false,
+                        new AsyncSSLSocketWrapper.HandshakeCallback() {
+                            @Override
+                            public void onHandshakeCompleted(Exception e, AsyncSSLSocket sslSocket) {
+                                if (e != null) {
+                                    Log.e(LOGTAG, "Error while handshaking", e);
+                                    socket.close();
+                                    return;
+                                }
+                                handler.onAccepted(sslSocket);
+                            }
+                        });
+            }
+
+            @Override
+            public void onListening(AsyncServerSocket socket) {
+                handler.onListening(socket);
+            }
+
+            @Override
+            public void onCompleted(Exception ex) {
+                handler.onCompleted(ex);
+            }
+        });
+    }
+
 }

From 68efd6c06582e2b5174d649ccb49afc89b9c45cc Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 15 Oct 2018 18:20:39 -0700
Subject: [PATCH 261/399] modify openDatagram to take separate host and port

---
 .../com/koushikdutta/async/AsyncServer.java   | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index e877325e6..f4ed082db 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -33,7 +33,6 @@
 import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.ThreadFactory;
@@ -296,7 +295,7 @@ private static class ObjectHolder<T> {
         T held;
     }
     public AsyncServerSocket listen(final InetAddress host, final int port, final ListenCallback handler) {
-        final ObjectHolder<AsyncServerSocket> holder = new ObjectHolder<AsyncServerSocket>();
+        final ObjectHolder<AsyncServerSocket> holder = new ObjectHolder<>();
         run(new Runnable() {
             @Override
             public void run() {
@@ -503,21 +502,34 @@ public void run() {
         return handler;
     }
 
-    public AsyncDatagramSocket openDatagram() throws IOException {
-        return openDatagram(null, false);
+    public AsyncDatagramSocket openDatagram() {
+        return openDatagram(null, 0, false);
     }
 
-    public AsyncDatagramSocket openDatagram(final SocketAddress address, final boolean reuseAddress) throws IOException {
-        final DatagramChannel socket = DatagramChannel.open();
+    public AsyncDatagramSocket openDatagram(final InetAddress host, final int port, final boolean reuseAddress) {
         final AsyncDatagramSocket handler = new AsyncDatagramSocket();
-        handler.attach(socket);
         // ugh.. this should really be post to make it nonblocking...
         // but i want datagrams to be immediately writable.
         // they're not really used anyways.
         run(new Runnable() {
             @Override
             public void run() {
+                final DatagramChannel socket;
                 try {
+                    socket = DatagramChannel.open();
+                }
+                catch (Exception e) {
+                    return;
+                }
+                try {
+                    handler.attach(socket);
+
+                    InetSocketAddress address;
+                    if (host == null)
+                        address = new InetSocketAddress(port);
+                    else
+                        address = new InetSocketAddress(host, port);
+
                     if (reuseAddress)
                         socket.socket().setReuseAddress(reuseAddress);
                     socket.socket().bind(address);

From 52eb1f5c27802b13fdbe8ab8b773fabb32ce0c58 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 15 Oct 2018 18:21:01 -0700
Subject: [PATCH 262/399] fix unnecessary alloc in ByteBufferList.peeks

---
 .../com/koushikdutta/async/ByteBufferList.java   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index 3765d390e..af3927e88 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -98,20 +98,24 @@ public boolean hasRemaining() {
     }
 
     public short peekShort() {
-        return read(2).duplicate().getShort();
+        return read(2).getShort(mBuffers.peekFirst().position());
+    }
+
+    public byte peek() {
+        return read(1).get(mBuffers.peekFirst().position());
     }
 
     public int peekInt() {
-        return read(4).duplicate().getInt();
+        return read(4).getInt(mBuffers.peekFirst().position());
     }
 
     public long peekLong() {
-        return read(8).duplicate().getLong();
+        return read(8).getLong(mBuffers.peekFirst().position());
     }
 
     public byte[] peekBytes(int size) {
         byte[] ret = new byte[size];
-        read(size).duplicate().get(ret);
+        read(size).get(ret, mBuffers.peekFirst().position(), ret.length);
         return ret;
     }
 
@@ -540,6 +544,10 @@ public static void obtainArray(ByteBuffer[] arr, int size) {
         }
     }
 
+    public static ByteBuffer deepCopy(ByteBuffer copyOf) {
+        return (ByteBuffer)obtain(copyOf.remaining()).put(copyOf.duplicate()).flip();
+    }
+
     public static final ByteBuffer EMPTY_BYTEBUFFER = ByteBuffer.allocate(0);
 
     public static void writeOutputStream(OutputStream out, ByteBuffer b) throws IOException {

From 6dba0bb10c0490858b9797d258ccb3842e06e31e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 15 Oct 2018 18:21:38 -0700
Subject: [PATCH 263/399] modify openDatagram to take separate host and port

---
 AndroidAsync/src/com/koushikdutta/async/dns/Dns.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/dns/Dns.java b/AndroidAsync/src/com/koushikdutta/async/dns/Dns.java
index 76f366bb0..2e27de1a5 100644
--- a/AndroidAsync/src/com/koushikdutta/async/dns/Dns.java
+++ b/AndroidAsync/src/com/koushikdutta/async/dns/Dns.java
@@ -103,7 +103,7 @@ public static Future<DnsResponse> lookup(AsyncServer server, String host, final
             }
             else {
 //                System.out.println("multicast dns...");
-                dgram = AsyncServer.getDefault().openDatagram(new InetSocketAddress(0), true);
+                dgram = AsyncServer.getDefault().openDatagram(null, 0, true);
                 Field field = DatagramSocket.class.getDeclaredField("impl");
                 field.setAccessible(true);
                 Object impl = field.get(dgram.getSocket());

From 37dbc29415c53f54de7d510bb40549118c77c7ae Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 15 Oct 2018 18:22:18 -0700
Subject: [PATCH 264/399] http requests can indiciate whether the response
 contains no body.

---
 .../async/http/AsyncHttpHead.java             |  5 ++++
 .../async/http/AsyncHttpRequest.java          | 25 ++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpHead.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpHead.java
index 0b61c6668..f73092af0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpHead.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpHead.java
@@ -10,5 +10,10 @@ public AsyncHttpHead(Uri uri) {
         super(uri, METHOD);
     }
 
+    @Override
+    public boolean hasBody() {
+        return false;
+    }
+
     public static final String METHOD = "HEAD";
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
index 122583ffa..69bc9d54a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
@@ -29,29 +29,46 @@ public String getMethod() {
             @Override
             public String toString() {
                 if (proxyHost != null)
-                    return String.format(Locale.ENGLISH, "%s %s HTTP/1.1", mMethod, AsyncHttpRequest.this.getUri());
-                String path = AsyncHttpRequest.this.getUri().getEncodedPath();
+                    return String.format(Locale.ENGLISH, "%s %s %s", mMethod, AsyncHttpRequest.this.getUri(), requestLineProtocol);
+                String path = getPath();
                 if (path == null || path.length() == 0)
                     path = "/";
                 String query = AsyncHttpRequest.this.getUri().getEncodedQuery();
                 if (query != null && query.length() != 0) {
                     path += "?" + query;
                 }
-                return String.format(Locale.ENGLISH, "%s %s HTTP/1.1", mMethod, path);
+                return String.format(Locale.ENGLISH, "%s %s %s", mMethod, path, requestLineProtocol);
             }
         };
     }
 
+    public boolean hasBody() {
+        return true;
+    }
+
+    public String getPath() {
+        return AsyncHttpRequest.this.getUri().getEncodedPath();
+    }
+
     protected static String getDefaultUserAgent() {
         String agent = System.getProperty("http.agent");
         return agent != null ? agent : ("Java" + System.getProperty("java.version"));
     }
-    
+
+    private String requestLineProtocol = "HTTP/1.1";
     private String mMethod;
     public String getMethod() {
        return mMethod; 
     }
 
+    public void setRequestLineProtocol(String scheme) {
+        this.requestLineProtocol = scheme;
+    }
+
+    public String getRequestLineProtocol() {
+        return requestLineProtocol;
+    }
+
     public AsyncHttpRequest setMethod(String method) {
         if (getClass() != AsyncHttpRequest.class)
             throw new UnsupportedOperationException("can't change method on a subclass of AsyncHttpRequest");

From 6ad2998b7211e90831ce16c56d577aa52d6bf00e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 15 Oct 2018 18:23:13 -0700
Subject: [PATCH 265/399] Watch for response closing before headers are
 received.

---
 .../com/koushikdutta/async/http/AsyncHttpResponseImpl.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index c6f02a10b..2164a1dca 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -50,7 +50,10 @@ protected void onRequestCompleted(Exception ex) {
     private CompletedCallback mReporter = new CompletedCallback() {
         @Override
         public void onCompleted(Exception error) {
-            if (error != null && !mCompleted) {
+            if (headers() == null) {
+                report(new ConnectionClosedException("connection closed before headers received.", error));
+            }
+            else if (error != null && !mCompleted) {
                 report(new ConnectionClosedException("connection closed before response completed.", error));
             }
             else {

From 3ad74eea14510bfc2b8d29fbfc43280846911d7f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 15 Oct 2018 18:24:00 -0700
Subject: [PATCH 266/399] allow extensibility into whether
 AsyncSocketMiddleware sockets support keep alive

---
 .../com/koushikdutta/async/http/AsyncSocketMiddleware.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index 2eff984d3..6f3ab472d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -353,6 +353,10 @@ private void nextConnection(AsyncHttpRequest request) {
         }
     }
 
+    protected boolean isKeepAlive(OnResponseCompleteDataOnRequestSentData data) {
+        return HttpUtil.isKeepAlive(data.response.protocol(), data.response.headers()) && HttpUtil.isKeepAlive(Protocol.HTTP_1_1, data.request.getHeaders());
+    }
+
     @Override
     public void onResponseComplete(final OnResponseCompleteDataOnRequestSentData data) {
         if (data.state.get("socket-owner") != this)
@@ -367,8 +371,7 @@ public void onResponseComplete(final OnResponseCompleteDataOnRequestSentData dat
                 data.socket.close();
                 return;
             }
-            if (!HttpUtil.isKeepAlive(data.response.protocol(), data.response.headers())
-                || !HttpUtil.isKeepAlive(Protocol.HTTP_1_1, data.request.getHeaders())) {
+            if (!isKeepAlive(data)) {
                 data.request.logv("closing out socket (not keep alive)");
                 data.socket.setClosedCallback(null);
                 data.socket.close();

From 00d80c0e81865216d60025f35a55b7c2b266c63b Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 15 Oct 2018 18:24:21 -0700
Subject: [PATCH 267/399] fix Headers bug when instantiating from MultiMap

---
 AndroidAsync/src/com/koushikdutta/async/http/Headers.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
index ffa9cb891..a3055484b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
@@ -18,7 +18,9 @@ public Headers() {
     }
 
     public Headers(Map<String, List<String>> mm) {
-        map.putAll(mm);
+        for (String key: mm.keySet()) {
+            addAll(key, mm.get(key));
+        }
     }
 
     final Multimap map = new Multimap() {

From 1e589b74211e7093bd50d6a5cf4df5e1ea252c9a Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 15 Oct 2018 18:24:37 -0700
Subject: [PATCH 268/399] http requests can indiciate whether the response
 contains no body.

---
 .../com/koushikdutta/async/http/HttpTransportMiddleware.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
index 9ed333b92..9b17ccdca 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
@@ -111,7 +111,7 @@ else if (!TextUtils.isEmpty(s)) {
                         DataEmitter emitter;
                         // HEAD requests must not return any data. They still may
                         // return content length, etc, which will confuse the body decoder
-                        if (AsyncHttpHead.METHOD.equalsIgnoreCase(data.request.getMethod())) {
+                        if (!data.request.hasBody()) {
                             emitter = HttpUtil.EndEmitter.create(socket.getServer(), null);
                         }
                         else {

From c667d6a95ac93af0a58c0026d6711349a43f38c5 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 15 Oct 2018 18:25:23 -0700
Subject: [PATCH 269/399] Muiltimap: convenience method for combining all
 values for a key

---
 .../com/koushikdutta/async/http/Multimap.java | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
index 7108e3ed4..00310e0b9 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
@@ -2,6 +2,8 @@
 
 import android.net.Uri;
 
+import com.koushikdutta.async.util.TaggedList;
+
 import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -26,13 +28,33 @@ public String getString(String name) {
         return ret.get(0);
     }
 
-    public void add(String name, String value) {
+    public String getAllString(String name, String delimiter) {
+        List<String> ret = get(name);
+        if (ret == null || ret.size() == 0)
+            return null;
+        StringBuilder builder = new StringBuilder();
+        boolean first = true;
+        for (String value: ret) {
+            if (!first)
+                builder.append(delimiter);
+
+            builder.append(value);
+            first = false;
+        }
+        return builder.toString();
+    }
+
+    public List<String> ensure(String name) {
         List<String> ret = get(name);
         if (ret == null) {
             ret = newList();
             put(name, ret);
         }
-        ret.add(value);
+        return ret;
+    }
+
+    public void add(String name, String value) {
+        ensure(name).add(value);
     }
 
     public void put(String name, String value) {
@@ -55,12 +77,16 @@ public interface StringDecoder {
     }
 
     public static Multimap parse(String value, String delimiter, boolean unquote, StringDecoder decoder) {
+        return parse(value, delimiter, "=", unquote, decoder);
+    }
+
+    public static Multimap parse(String value, String delimiter, String assigner, boolean unquote, StringDecoder decoder) {
         Multimap map = new Multimap();
         if (value == null)
             return map;
         String[] parts = value.split(delimiter);
         for (String part: parts) {
-            String[] pair = part.split("=", 2);
+            String[] pair = part.split(assigner, 2);
             String key = pair[0].trim();
             String v = null;
             if (pair.length > 1)

From 78353b82aa0dc7051ef65c6bedf93930f164ab95 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 15 Oct 2018 18:25:40 -0700
Subject: [PATCH 270/399] ThrottleTimeout convenience function

---
 .../src/com/koushikdutta/async/util/ThrottleTimeout.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java b/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
index bd903b179..14d27a354 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
@@ -1,4 +1,4 @@
-package com.koushikdutta.virtualdisplay;
+package com.koushikdutta.async.util;
 
 import android.os.Handler;
 

From 2d52803e7fe8e656b2892fd774bcf79ba72d6fa7 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 15 Oct 2018 18:25:48 -0700
Subject: [PATCH 271/399] update gradle

---
 build.gradle | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index aaf7f63c2..b9752b7ff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,11 @@
 buildscript {
     repositories {
         jcenter()
+        google()
         mavenCentral()
     }
     dependencies {
-        classpath project.hasProperty('global_gradleAndroidPlugin') ? global_gradleAndroidPlugin : 'com.android.tools.build:gradle:2.2.3'
+        classpath project.hasProperty('global_gradleAndroidPlugin') ? global_gradleAndroidPlugin : 'com.android.tools.build:gradle:3.2.0'
     }
 }
 
@@ -12,9 +13,10 @@ subprojects {
     repositories {
         jcenter()
         mavenCentral()
+        google()
     }
 
-    ext.global_compileSdkVersion = project.hasProperty('global_compileSdkVersion') ? global_compileSdkVersion : 25
-    ext.global_buildToolsVersion = project.hasProperty('global_buildToolsVersion') ? global_buildToolsVersion : '25.0.2'
-    ext.global_gradleAndroidPlugin = project.hasProperty('global_gradleAndroidPlugin') ? global_gradleAndroidPlugin : 'com.android.tools.build:gradle:2.2.3'
+    ext.global_compileSdkVersion = project.hasProperty('global_compileSdkVersion') ? global_compileSdkVersion : 28
+    ext.global_buildToolsVersion = project.hasProperty('global_buildToolsVersion') ? global_buildToolsVersion : '28.0.3'
+    ext.global_gradleAndroidPlugin = project.hasProperty('global_gradleAndroidPlugin') ? global_gradleAndroidPlugin : 'com.android.tools.build:gradle:3.2.0'
 }

From 78b8b59309c08fad13685e0b182ab8ade1a10e8e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 17 Oct 2018 15:10:15 -0700
Subject: [PATCH 272/399] convenience methods to create/store self signed certs
 for use SSL sockets.

---
 AndroidAsync/build.gradle                     |   6 +
 .../async/AsyncSSLSocketWrapper.java          | 129 ++++++++++++++++++
 2 files changed, 135 insertions(+)

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 3c022d46b..596d04377 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -28,6 +28,12 @@ android {
 
     compileSdkVersion project.hasProperty('global_compileSdkVersion') ? global_compileSdkVersion : 28
     buildToolsVersion project.hasProperty('global_buildToolsVersion') ? global_buildToolsVersion : '28.0.3'
+
+    dependencies {
+        // this is only necessary to get compilation working for self signed certificates. dependency isn't added.
+        compileOnly group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.60'
+        compileOnly group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.60'
+    }
 }
 
 // upload to maven task
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 8b7e6e303..c0eb6fa85 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -1,5 +1,6 @@
 package com.koushikdutta.async;
 
+import android.content.Context;
 import android.os.Build;
 import android.util.Base64;
 import android.util.Log;
@@ -10,22 +11,46 @@
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.http.SSLEngineSNIConfigurator;
 import com.koushikdutta.async.util.Allocator;
+import com.koushikdutta.async.util.StreamUtility;
 import com.koushikdutta.async.wrapper.AsyncSocketWrapper;
 
 import org.apache.http.conn.ssl.StrictHostnameVerifier;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.asn1.x509.BasicConstraints;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
+import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.operator.ContentSigner;
+import org.bouncycastle.operator.OperatorCreationException;
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.math.BigInteger;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.security.GeneralSecurityException;
 import java.security.KeyFactory;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
 import java.security.KeyStore;
 import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.PublicKey;
+import java.security.Security;
 import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.RSAPublicKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Calendar;
+import java.util.Date;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.KeyManagerFactory;
@@ -539,6 +564,110 @@ public String charset() {
         return null;
     }
 
+    private static Certificate selfSign(KeyPair keyPair, String subjectDN) throws Exception
+    {
+        Provider bcProvider = new BouncyCastleProvider();
+        Security.addProvider(bcProvider);
+
+        long now = System.currentTimeMillis();
+        Date startDate = new Date(now);
+
+        X500Name dnName = new X500Name("CN=" + subjectDN);
+        BigInteger certSerialNumber = new BigInteger(Long.toString(now)); // <-- Using the current timestamp as the certificate serial number
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(startDate);
+        calendar.add(Calendar.YEAR, 1); // <-- 1 Yr validity
+
+        Date endDate = calendar.getTime();
+
+        String signatureAlgorithm = "SHA256WithRSA"; // <-- Use appropriate signature algorithm based on your keyPair algorithm.
+
+        ContentSigner contentSigner = new JcaContentSignerBuilder(signatureAlgorithm).build(keyPair.getPrivate());
+
+        JcaX509v3CertificateBuilder certBuilder = new JcaX509v3CertificateBuilder(dnName, certSerialNumber, startDate, endDate, dnName, keyPair.getPublic());
+
+        // Extensions --------------------------
+
+        // Basic Constraints
+        BasicConstraints basicConstraints = new BasicConstraints(true); // <-- true for CA, false for EndEntity
+
+        certBuilder.addExtension(new ASN1ObjectIdentifier("2.5.29.19"), true, basicConstraints); // Basic Constraints is usually marked as critical.
+
+        // -------------------------------------
+
+        return new JcaX509CertificateConverter().setProvider(bcProvider).getCertificate(certBuilder.build(contentSigner));
+    }
+
+    public static AsyncServerSocket listenSecure(final Context context, final AsyncServer server, final String subjectName, final InetAddress host, final int port, final ListenCallback handler) {
+        final ObjectHolder<AsyncServerSocket> holder = new ObjectHolder<>();
+        server.run(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    File keyPath = context.getFileStreamPath(subjectName + "-key.txt");
+                    KeyPair pair;
+                    try {
+                        String[] keyParts = StreamUtility.readFile(keyPath).split("\n");
+                        X509EncodedKeySpec pub = new X509EncodedKeySpec(Base64.decode(keyParts[0], 0));
+                        PKCS8EncodedKeySpec priv = new PKCS8EncodedKeySpec(Base64.decode(keyParts[1], 0));
+
+                        KeyFactory fact = KeyFactory.getInstance("RSA");
+
+                        pair = new KeyPair(fact.generatePublic(pub), fact.generatePrivate(priv));
+                    }
+                    catch (Exception e) {
+                        KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
+                        keyGen.initialize(2048);
+                        pair = keyGen.generateKeyPair();
+                        StreamUtility.writeFile(keyPath,
+                                Base64.encodeToString(pair.getPublic().getEncoded(), Base64.NO_WRAP)
+                                + "\n"
+                                + Base64.encodeToString(pair.getPrivate().getEncoded(), Base64.NO_WRAP));
+                    }
+
+                    holder.held = listenSecure(server, pair, subjectName, host, port, handler);
+                }
+                catch (Exception e) {
+                    handler.onCompleted(e);
+                }
+            }
+        });
+        return holder.held;
+    }
+
+    public static AsyncServerSocket listenSecure(final AsyncServer server, final KeyPair keyPair, final String subjectName, final InetAddress host, final int port, final ListenCallback handler) {
+        final ObjectHolder<AsyncServerSocket> holder = new ObjectHolder<>();
+        server.run(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Certificate cert = selfSign(keyPair, subjectName);
+
+                    KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
+                    ks.load(null);
+
+                    ks.setKeyEntry("key", keyPair.getPrivate(), null, new Certificate[] { cert });
+
+                    KeyManagerFactory kmf = KeyManagerFactory.getInstance("X509");
+                    kmf.init(ks, "".toCharArray());
+
+                    TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+                    tmf.init(ks);
+
+
+                    SSLContext sslContext = SSLContext.getInstance("TLS");
+                    sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+
+                    holder.held = listenSecure(server, sslContext, host, port, handler);
+                }
+                catch (Exception e) {
+                    handler.onCompleted(e);
+                }
+            }
+        });
+        return holder.held;
+    }
 
     public static AsyncServerSocket listenSecure(AsyncServer server, String keyDer, String certDer, final InetAddress host, final int port, final ListenCallback handler) {
         return listenSecure(server, Base64.decode(keyDer, Base64.DEFAULT), Base64.decode(certDer, Base64.DEFAULT), host, port, handler);

From c67382c20e762d22d768ce587b5b448812bc5457 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 4 Nov 2018 18:10:58 -0800
Subject: [PATCH 273/399] Separate the http router from the http server. Add
 helper functions for self signed https server. AsyncHttpServer.send now posts
 onto the AsyncServer thread.

---
 .../async/AsyncSSLSocketWrapper.java          |  60 ++-
 .../async/future/MultiFuture.java             |   8 +
 .../async/http/server/AsyncHttpServer.java    | 281 +-------------
 .../http/server/AsyncHttpServerRequest.java   |  16 +-
 .../server/AsyncHttpServerRequestImpl.java    |  23 +-
 .../server/AsyncHttpServerResponseImpl.java   |  34 +-
 .../http/server/AsyncHttpServerRouter.java    | 342 ++++++++++++++++++
 .../async/http/server/RouteMatcher.java       |   5 +
 8 files changed, 444 insertions(+), 325 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/server/RouteMatcher.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index c0eb6fa85..54e659105 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -607,26 +607,35 @@ public void run() {
                 try {
                     File keyPath = context.getFileStreamPath(subjectName + "-key.txt");
                     KeyPair pair;
+                    Certificate cert;
                     try {
                         String[] keyParts = StreamUtility.readFile(keyPath).split("\n");
                         X509EncodedKeySpec pub = new X509EncodedKeySpec(Base64.decode(keyParts[0], 0));
                         PKCS8EncodedKeySpec priv = new PKCS8EncodedKeySpec(Base64.decode(keyParts[1], 0));
 
+                        cert = CertificateFactory.getInstance("X.509").generateCertificate(new ByteArrayInputStream(Base64.decode(keyParts[2], 0)));
+
                         KeyFactory fact = KeyFactory.getInstance("RSA");
 
                         pair = new KeyPair(fact.generatePublic(pub), fact.generatePrivate(priv));
+
                     }
                     catch (Exception e) {
                         KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
                         keyGen.initialize(2048);
                         pair = keyGen.generateKeyPair();
+
+                        cert = selfSign(pair, subjectName);
+
                         StreamUtility.writeFile(keyPath,
                                 Base64.encodeToString(pair.getPublic().getEncoded(), Base64.NO_WRAP)
                                 + "\n"
-                                + Base64.encodeToString(pair.getPrivate().getEncoded(), Base64.NO_WRAP));
+                                + Base64.encodeToString(pair.getPrivate().getEncoded(), Base64.NO_WRAP)
+                                + "\n"
+                                + Base64.encodeToString(cert.getEncoded(), Base64.NO_WRAP));
                     }
 
-                    holder.held = listenSecure(server, pair, subjectName, host, port, handler);
+                    holder.held = listenSecure(server, pair.getPrivate(), cert, host, port, handler);
                 }
                 catch (Exception e) {
                     handler.onCompleted(e);
@@ -636,30 +645,27 @@ public void run() {
         return holder.held;
     }
 
-    public static AsyncServerSocket listenSecure(final AsyncServer server, final KeyPair keyPair, final String subjectName, final InetAddress host, final int port, final ListenCallback handler) {
+    public static AsyncServerSocket listenSecure(AsyncServer server, String keyDer, String certDer, final InetAddress host, final int port, final ListenCallback handler) {
+        return listenSecure(server, Base64.decode(keyDer, Base64.DEFAULT), Base64.decode(certDer, Base64.DEFAULT), host, port, handler);
+    }
+
+
+    private static class ObjectHolder<T> {
+        T held;
+    }
+
+    public static AsyncServerSocket listenSecure(final AsyncServer server, final byte[] keyDer, final byte[] certDer, final InetAddress host, final int port, final ListenCallback handler) {
         final ObjectHolder<AsyncServerSocket> holder = new ObjectHolder<>();
         server.run(new Runnable() {
             @Override
             public void run() {
                 try {
-                    Certificate cert = selfSign(keyPair, subjectName);
-
-                    KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
-                    ks.load(null);
-
-                    ks.setKeyEntry("key", keyPair.getPrivate(), null, new Certificate[] { cert });
-
-                    KeyManagerFactory kmf = KeyManagerFactory.getInstance("X509");
-                    kmf.init(ks, "".toCharArray());
-
-                    TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-                    tmf.init(ks);
-
+                    PKCS8EncodedKeySpec key = new PKCS8EncodedKeySpec(keyDer);
+                    Certificate cert = CertificateFactory.getInstance("X.509").generateCertificate(new ByteArrayInputStream(certDer));
 
-                    SSLContext sslContext = SSLContext.getInstance("TLS");
-                    sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+                    PrivateKey pk = KeyFactory.getInstance("RSA").generatePrivate(key);
 
-                    holder.held = listenSecure(server, sslContext, host, port, handler);
+                    holder.held = listenSecure(server, pk, cert, host, port, handler);
                 }
                 catch (Exception e) {
                     handler.onCompleted(e);
@@ -669,28 +675,15 @@ public void run() {
         return holder.held;
     }
 
-    public static AsyncServerSocket listenSecure(AsyncServer server, String keyDer, String certDer, final InetAddress host, final int port, final ListenCallback handler) {
-        return listenSecure(server, Base64.decode(keyDer, Base64.DEFAULT), Base64.decode(certDer, Base64.DEFAULT), host, port, handler);
-    }
-
-
-    private static class ObjectHolder<T> {
-        T held;
-    }
-
-    public static AsyncServerSocket listenSecure(final AsyncServer server, final byte[] keyDer, final byte[] certDer, final InetAddress host, final int port, final ListenCallback handler) {
+    public static AsyncServerSocket listenSecure(final AsyncServer server, final PrivateKey pk, final Certificate cert, final InetAddress host, final int port, final ListenCallback handler) {
         final ObjectHolder<AsyncServerSocket> holder = new ObjectHolder<>();
         server.run(new Runnable() {
             @Override
             public void run() {
                 try {
-                    PKCS8EncodedKeySpec key = new PKCS8EncodedKeySpec(keyDer);
-                    Certificate cert = CertificateFactory.getInstance("X.509").generateCertificate(new ByteArrayInputStream(certDer));
-
                     KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
                     ks.load(null);
 
-                    PrivateKey pk = KeyFactory.getInstance("RSA").generatePrivate(key);
                     ks.setKeyEntry("key", pk, null, new Certificate[] { cert });
 
                     KeyManagerFactory kmf = KeyManagerFactory.getInstance("X509");
@@ -699,7 +692,6 @@ public void run() {
                     TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
                     tmf.init(ks);
 
-
                     SSLContext sslContext = SSLContext.getInstance("TLS");
                     sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/MultiFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/MultiFuture.java
index 4ec7b8664..a960a21c7 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/MultiFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/MultiFuture.java
@@ -47,4 +47,12 @@ public MultiFuture<T> setCallback(FutureCallback<T> callback) {
         super.setCallback(this.callback);
         return this;
     }
+
+    public void removeCallback(FutureCallback<T> callback) {
+        synchronized (this) {
+            if (callbacks == null)
+                return;
+            callbacks.remove(callback);
+        }
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index bb0df4157..7a73bb808 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -1,10 +1,7 @@
 package com.koushikdutta.async.http.server;
 
 import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.res.AssetManager;
 import android.os.Build;
-import android.text.TextUtils;
 
 import com.koushikdutta.async.AsyncSSLSocket;
 import com.koushikdutta.async.AsyncSSLSocketWrapper;
@@ -16,34 +13,20 @@
 import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ListenCallback;
-import com.koushikdutta.async.http.AsyncHttpGet;
-import com.koushikdutta.async.http.AsyncHttpHead;
-import com.koushikdutta.async.http.AsyncHttpPost;
 import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.HttpUtil;
 import com.koushikdutta.async.http.Multimap;
 import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.WebSocket;
-import com.koushikdutta.async.http.WebSocketImpl;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
-import com.koushikdutta.async.util.StreamUtility;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.Hashtable;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import javax.net.ssl.SSLContext;
 
 @TargetApi(Build.VERSION_CODES.ECLAIR)
-public class AsyncHttpServer {
+public class AsyncHttpServer extends AsyncHttpServerRouter {
     ArrayList<AsyncServerSocket> mListeners = new ArrayList<AsyncServerSocket>();
     public void stop() {
         if (mListeners != null) {
@@ -70,7 +53,7 @@ protected AsyncHttpRequestBody onUnknownBody(Headers headers) {
         @Override
         public void onAccepted(final AsyncSocket socket) {
             AsyncHttpServerRequestImpl req = new AsyncHttpServerRequestImpl() {
-                HttpServerRequestCallback match;
+                HttpServerRequestCallback requestCallback;
                 String fullPath;
                 String path;
                 boolean responseComplete;
@@ -113,18 +96,10 @@ public void onCompleted(Exception ex) {
                     fullPath = parts[1];
                     path = fullPath.split("\\?")[0];
                     method = parts[0];
-                    synchronized (mActions) {
-                        ArrayList<Pair> pairs = mActions.get(method);
-                        if (pairs != null) {
-                            for (Pair p: pairs) {
-                                Matcher m = p.regex.matcher(path);
-                                if (m.matches()) {
-                                    mMatcher = m;
-                                    match = p.callback;
-                                    break;
-                                }
-                            }
-                        }
+                    RouteMatch route = route(method, path);
+                    if (route != null) {
+                        matcher = route.matcher;
+                        requestCallback = route.callback;
                     }
                     res = new AsyncHttpServerResponseImpl(socket, this) {
                         @Override
@@ -149,17 +124,17 @@ protected void onEnd() {
                     
                     boolean handled = onRequest(this, res);
 
-                    if (match == null && !handled) {
+                    if (requestCallback == null && !handled) {
                         res.code(404);
                         res.end();
                         return;
                     }
 
                     if (!getBody().readFullyOnRequest()) {
-                        onRequest(match, this, res);
+                        onRequest(requestCallback, this, res);
                     }
                     else if (requestComplete) {
-                        onRequest(match, this, res);
+                        onRequest(requestCallback, this, res);
                     }
                 }
 
@@ -182,7 +157,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                     handleOnCompleted();
 
                     if (getBody().readFullyOnRequest()) {
-                        onRequest(match, this, res);
+                        onRequest(requestCallback, this, res);
                     }
                 }
                 
@@ -276,237 +251,6 @@ public void setErrorCallback(CompletedCallback callback) {
     public CompletedCallback getErrorCallback() {
         return mCompletedCallback;
     }
-    
-    private static class Pair {
-        Pattern regex;
-        HttpServerRequestCallback callback;
-    }
-    
-    final Hashtable<String, ArrayList<Pair>> mActions = new Hashtable<String, ArrayList<Pair>>();
-
-    public void removeAction(String action, String regex) {
-        synchronized (mActions) {
-            ArrayList<Pair> pairs = mActions.get(action);
-            if (pairs == null)
-                return;
-            for (int i = 0; i < pairs.size(); i++) {
-                Pair p = pairs.get(i);
-                if (regex.equals(p.regex.toString())) {
-                    pairs.remove(i);
-                    return;
-                }
-            }
-        }
-    }
-    
-    public void addAction(String action, String regex, HttpServerRequestCallback callback) {
-        Pair p = new Pair();
-        p.regex = Pattern.compile("^" + regex);
-        p.callback = callback;
-        
-        synchronized (mActions) {
-            ArrayList<Pair> pairs = mActions.get(action);
-            if (pairs == null) {
-                pairs = new ArrayList<AsyncHttpServer.Pair>();
-                mActions.put(action, pairs);
-            }
-            pairs.add(p);
-        }
-    }
-
-    public static interface WebSocketRequestCallback {
-        public void onConnected(WebSocket webSocket, AsyncHttpServerRequest request);
-    }
-
-    public void websocket(String regex, final WebSocketRequestCallback callback) {
-        websocket(regex, null, callback);
-    }
-
-    public void websocket(String regex, final String protocol, final WebSocketRequestCallback callback) {
-        get(regex, new HttpServerRequestCallback() {
-            @Override
-            public void onRequest(final AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
-                boolean hasUpgrade = false;
-                String connection = request.getHeaders().get("Connection");
-                if (connection != null) {
-                    String[] connections = connection.split(",");
-                    for (String c: connections) {
-                        if ("Upgrade".equalsIgnoreCase(c.trim())) {
-                            hasUpgrade = true;
-                            break;
-                        }
-                    }
-                }
-                if (!"websocket".equalsIgnoreCase(request.getHeaders().get("Upgrade")) || !hasUpgrade) {
-                    response.code(404);
-                    response.end();
-                    return;
-                }
-                String peerProtocol = request.getHeaders().get("Sec-WebSocket-Protocol");
-                if (!TextUtils.equals(protocol, peerProtocol)) {
-                    response.code(404);
-                    response.end();
-                    return;
-                }
-                callback.onConnected(new WebSocketImpl(request, response), request);
-            }
-        });
-    }
-    
-    public void get(String regex, HttpServerRequestCallback callback) {
-        addAction(AsyncHttpGet.METHOD, regex, callback);
-    }
-    
-    public void post(String regex, HttpServerRequestCallback callback) {
-        addAction(AsyncHttpPost.METHOD, regex, callback);
-    }
-
-    public static android.util.Pair<Integer, InputStream> getAssetStream(final Context context, String asset) {
-        AssetManager am = context.getAssets();
-        try {
-            InputStream is = am.open(asset);
-            return new android.util.Pair<Integer, InputStream>(is.available(), is);
-        }
-        catch (IOException e) {
-            return null;
-        }
-    }
-
-    static Hashtable<String, String> mContentTypes = new Hashtable<String, String>();
-    {
-        mContentTypes.put("js", "application/javascript");
-        mContentTypes.put("json", "application/json");
-        mContentTypes.put("png", "image/png");
-        mContentTypes.put("jpg", "image/jpeg");
-        mContentTypes.put("html", "text/html");
-        mContentTypes.put("css", "text/css");
-        mContentTypes.put("mp4", "video/mp4");
-        mContentTypes.put("mov", "video/quicktime");
-        mContentTypes.put("wmv", "video/x-ms-wmv");
-    }
-
-    public static String getContentType(String path) {
-        String type = tryGetContentType(path);
-        if (type != null)
-            return type;
-        return "text/plain";
-    }
-
-    public static String tryGetContentType(String path) {
-        int index = path.lastIndexOf(".");
-        if (index != -1) {
-            String e = path.substring(index + 1);
-            String ct = mContentTypes.get(e);
-            if (ct != null)
-                return ct;
-        }
-        return null;
-    }
-
-    public void directory(Context context, String regex, final String assetPath) {
-        final Context _context = context.getApplicationContext();
-        addAction(AsyncHttpGet.METHOD, regex, new HttpServerRequestCallback() {
-            @Override
-            public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
-                String path = request.getMatcher().replaceAll("");
-                android.util.Pair<Integer, InputStream> pair = getAssetStream(_context, assetPath + path);
-                if (pair == null || pair.second == null) {
-                    response.code(404);
-                    response.end();
-                    return;
-                }
-                final InputStream is = pair.second;
-                response.getHeaders().set("Content-Length", String.valueOf(pair.first));
-                response.code(200);
-                response.getHeaders().add("Content-Type", getContentType(assetPath + path));
-                Util.pump(is, response, new CompletedCallback() {
-                    @Override
-                    public void onCompleted(Exception ex) {
-                        response.end();
-                        StreamUtility.closeQuietly(is);
-                    }
-                });
-            }
-        });
-        addAction(AsyncHttpHead.METHOD, regex, new HttpServerRequestCallback() {
-            @Override
-            public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
-                String path = request.getMatcher().replaceAll("");
-                android.util.Pair<Integer, InputStream> pair = getAssetStream(_context, assetPath + path);
-                if (pair == null || pair.second == null) {
-                    response.code(404);
-                    response.end();
-                    return;
-                }
-                final InputStream is = pair.second;
-                StreamUtility.closeQuietly(is);
-                response.getHeaders().set("Content-Length", String.valueOf(pair.first));
-                response.code(200);
-                response.getHeaders().add("Content-Type", getContentType(assetPath + path));
-                response.writeHead();
-                response.end();
-            }
-        });
-    }
-
-    public void directory(String regex, final File directory) {
-        directory(regex, directory, false);
-    }
-    
-    public void directory(String regex, final File directory, final boolean list) {
-        assert directory.isDirectory();
-        addAction("GET", regex, new HttpServerRequestCallback() {
-            @Override
-            public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
-                String path = request.getMatcher().replaceAll("");
-                File file = new File(directory, path);
-                
-                if (file.isDirectory() && list) {
-                    ArrayList<File> dirs = new ArrayList<File>();
-                    ArrayList<File> files = new ArrayList<File>();
-                    for (File f: file.listFiles()) {
-                        if (f.isDirectory())
-                            dirs.add(f);
-                        else
-                            files.add(f);
-                    }
-                    
-                    Comparator<File> c = new Comparator<File>() {
-                        @Override
-                        public int compare(File lhs, File rhs) {
-                            return lhs.getName().compareTo(rhs.getName());
-                        }
-                    };
-                    
-                    Collections.sort(dirs, c);
-                    Collections.sort(files, c);
-                    
-                    files.addAll(0, dirs);
-                    
-                    return;
-                }
-                if (!file.isFile()) {
-                    response.code(404);
-                    response.end();
-                    return;
-                }
-                try {
-                    FileInputStream is = new FileInputStream(file);
-                    response.code(200);
-                    Util.pump(is, response, new CompletedCallback() {
-                        @Override
-                        public void onCompleted(Exception ex) {
-                            response.end();
-                        }
-                    });
-                }
-                catch (FileNotFoundException ex) {
-                    response.code(404);
-                    response.end();
-                }
-            }
-        });
-    }
 
     private static Hashtable<Integer, String> mCodes = new Hashtable<Integer, String>();
     static {
@@ -525,4 +269,9 @@ public static String getResponseCodeDescription(int code) {
             return "Unknown";
         return d;
     }
+
+    public static interface WebSocketRequestCallback {
+        void onConnected(WebSocket webSocket, AsyncHttpServerRequest request);
+    }
+
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
index 1b0292f39..0920d7123 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
@@ -9,11 +9,13 @@
 import java.util.regex.Matcher;
 
 public interface AsyncHttpServerRequest extends DataEmitter {
-    public Headers getHeaders();
-    public Matcher getMatcher();
-    public AsyncHttpRequestBody getBody();
-    public AsyncSocket getSocket();
-    public String getPath();
-    public Multimap getQuery();
-    public String getMethod();
+    Headers getHeaders();
+    Matcher getMatcher();
+    <T extends AsyncHttpRequestBody> T getBody();
+    AsyncSocket getSocket();
+    String getPath();
+    Multimap getQuery();
+    String getMethod();
+
+    String get(String name);
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
index 6e914a20d..f2182630a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
@@ -9,16 +9,17 @@
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.HttpUtil;
+import com.koushikdutta.async.http.Multimap;
 import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 
+import java.util.Map;
 import java.util.regex.Matcher;
 
 public abstract class AsyncHttpServerRequestImpl extends FilteredDataEmitter implements AsyncHttpServerRequest, CompletedCallback {
     private String statusLine;
     private Headers mRawHeaders = new Headers();
     AsyncSocket mSocket;
-    Matcher mMatcher;
 
     public String getStatusLine() {
         return statusLine;
@@ -121,11 +122,6 @@ public boolean isChunked() {
         return mSocket.isChunked();
     }
 
-    @Override
-    public Matcher getMatcher() {
-        return mMatcher;
-    }
-
     AsyncHttpRequestBody mBody;
     @Override
     public AsyncHttpRequestBody getBody() {
@@ -153,4 +149,19 @@ public String toString() {
             return super.toString();
         return mRawHeaders.toPrefixString(statusLine);
     }
+
+    @Override
+    public String get(String name) {
+        Multimap query = getQuery();
+        String ret = query.getString(name);
+        if (ret != null)
+            return ret;
+        AsyncHttpRequestBody body = getBody();
+        Object bodyObject = body.get();
+        if (bodyObject instanceof Multimap) {
+            Multimap map = (Multimap)bodyObject;
+            return map.getString(name);
+        }
+        return null;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index 61a8aa347..85f133da9 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -198,16 +198,21 @@ public void setContentType(String contentType) {
     }
 
     @Override
-    public void send(String contentType, byte[] bytes) {
+    public void send(final String contentType, final byte[] bytes) {
         assert mContentLength < 0;
-        mContentLength = bytes.length;
-        mRawHeaders.set("Content-Length", Integer.toString(bytes.length));
-        mRawHeaders.set("Content-Type", contentType);
-
-        Util.writeAll(this, bytes, new CompletedCallback() {
+        getServer().post(new Runnable() {
             @Override
-            public void onCompleted(Exception ex) {
-                onEnd();
+            public void run() {
+                mContentLength = bytes.length;
+                mRawHeaders.set("Content-Length", Integer.toString(bytes.length));
+                mRawHeaders.set("Content-Type", contentType);
+
+                Util.writeAll(AsyncHttpServerResponseImpl.this, bytes, new CompletedCallback() {
+                    @Override
+                    public void onCompleted(Exception ex) {
+                        onEnd();
+                    }
+                });
             }
         });
     }
@@ -290,11 +295,16 @@ public void sendStream(final InputStream inputStream, long totalLength) {
                 onEnd();
                 return;
             }
-            Util.pump(inputStream, mContentLength, this, new CompletedCallback() {
+            getServer().post(new Runnable() {
                 @Override
-                public void onCompleted(Exception ex) {
-                    StreamUtility.closeQuietly(inputStream);
-                    onEnd();
+                public void run() {
+                    Util.pump(inputStream, mContentLength, AsyncHttpServerResponseImpl.this, new CompletedCallback() {
+                        @Override
+                        public void onCompleted(Exception ex) {
+                            StreamUtility.closeQuietly(inputStream);
+                            onEnd();
+                        }
+                    });
                 }
             });
         }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
new file mode 100644
index 000000000..9bb48b28a
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
@@ -0,0 +1,342 @@
+package com.koushikdutta.async.http.server;
+
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.text.TextUtils;
+
+import com.koushikdutta.async.Util;
+import com.koushikdutta.async.callback.CompletedCallback;
+import com.koushikdutta.async.http.AsyncHttpGet;
+import com.koushikdutta.async.http.AsyncHttpHead;
+import com.koushikdutta.async.http.AsyncHttpPost;
+import com.koushikdutta.async.http.WebSocket;
+import com.koushikdutta.async.http.WebSocketImpl;
+import com.koushikdutta.async.util.StreamUtility;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Hashtable;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class AsyncHttpServerRouter implements RouteMatcher {
+
+    private static class RouteInfo {
+        String method;
+        Pattern regex;
+        HttpServerRequestCallback callback;
+    }
+
+    final ArrayList<RouteInfo> routes = new ArrayList<>();
+
+    public void removeAction(String action, String regex) {
+        for (int i = 0; i < routes.size(); i++) {
+            RouteInfo p = routes.get(i);
+            if (TextUtils.equals(p.method, action) && regex.equals(p.regex.toString())) {
+                routes.remove(i);
+                return;
+            }
+        }
+    }
+
+    public void addAction(String action, String regex, HttpServerRequestCallback callback) {
+        RouteInfo p = new RouteInfo();
+        p.regex = Pattern.compile("^" + regex);
+        p.callback = callback;
+        p.method = action;
+
+        synchronized (routes) {
+            routes.add(p);
+        }
+    }
+    public void websocket(String regex, final AsyncHttpServer.WebSocketRequestCallback callback) {
+        websocket(regex, null, callback);
+    }
+
+    public void websocket(String regex, final String protocol, final AsyncHttpServer.WebSocketRequestCallback callback) {
+        get(regex, new HttpServerRequestCallback() {
+            @Override
+            public void onRequest(final AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
+                boolean hasUpgrade = false;
+                String connection = request.getHeaders().get("Connection");
+                if (connection != null) {
+                    String[] connections = connection.split(",");
+                    for (String c: connections) {
+                        if ("Upgrade".equalsIgnoreCase(c.trim())) {
+                            hasUpgrade = true;
+                            break;
+                        }
+                    }
+                }
+                if (!"websocket".equalsIgnoreCase(request.getHeaders().get("Upgrade")) || !hasUpgrade) {
+                    response.code(404);
+                    response.end();
+                    return;
+                }
+                String peerProtocol = request.getHeaders().get("Sec-WebSocket-Protocol");
+                if (!TextUtils.equals(protocol, peerProtocol)) {
+                    response.code(404);
+                    response.end();
+                    return;
+                }
+                callback.onConnected(new WebSocketImpl(request, response), request);
+            }
+        });
+    }
+
+    public void get(String regex, HttpServerRequestCallback callback) {
+        addAction(AsyncHttpGet.METHOD, regex, callback);
+    }
+
+    public void post(String regex, HttpServerRequestCallback callback) {
+        addAction(AsyncHttpPost.METHOD, regex, callback);
+    }
+
+    public static class Asset {
+        public Asset(int available, InputStream inputStream, String path) {
+            this.available = available;
+            this.inputStream = inputStream;
+            this.path = path;
+        }
+
+        public int available;
+        public InputStream inputStream;
+        public String path;
+    }
+
+    public static Asset getAssetStream(final Context context, String asset) {
+        AssetManager am = context.getAssets();
+        try {
+            InputStream is = am.open(asset);
+            return new Asset(is.available(), is, asset);
+        }
+        catch (IOException e) {
+            final String[] extensions = new String[] { "/index.htm", "/index.html", "index.htm", "index.html", ".htm", ".html" };
+            for (String ext: extensions) {
+                try {
+                    InputStream is = am.open(asset + ext);
+                    return new Asset(is.available(), is, asset + ext);
+                }
+                catch (IOException ex) {
+                }
+            }
+            return null;
+        }
+    }
+
+    static Hashtable<String, String> mContentTypes = new Hashtable<String, String>();
+    {
+        mContentTypes.put("js", "application/javascript");
+        mContentTypes.put("json", "application/json");
+        mContentTypes.put("png", "image/png");
+        mContentTypes.put("jpg", "image/jpeg");
+        mContentTypes.put("html", "text/html");
+        mContentTypes.put("css", "text/css");
+        mContentTypes.put("mp4", "video/mp4");
+        mContentTypes.put("mov", "video/quicktime");
+        mContentTypes.put("wmv", "video/x-ms-wmv");
+    }
+
+    public static String getContentType(String path) {
+        String type = tryGetContentType(path);
+        if (type != null)
+            return type;
+        return "text/plain";
+    }
+
+    public static String tryGetContentType(String path) {
+        int index = path.lastIndexOf(".");
+        if (index != -1) {
+            String e = path.substring(index + 1);
+            String ct = mContentTypes.get(e);
+            if (ct != null)
+                return ct;
+        }
+        return null;
+    }
+
+    public void directory(Context context, String regex, final String assetPath) {
+        final Context _context = context.getApplicationContext();
+        addAction(AsyncHttpGet.METHOD, regex, new HttpServerRequestCallback() {
+            @Override
+            public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
+                String path = request.getMatcher().replaceAll("");
+                Asset pair = getAssetStream(_context, assetPath + path);
+                if (pair == null || pair.inputStream == null) {
+                    response.code(404);
+                    response.end();
+                    return;
+                }
+                final InputStream is = pair.inputStream;
+                response.getHeaders().set("Content-Length", String.valueOf(pair.available));
+                response.code(200);
+                response.getHeaders().add("Content-Type", getContentType(pair.path));
+                Util.pump(is, response, new CompletedCallback() {
+                    @Override
+                    public void onCompleted(Exception ex) {
+                        response.end();
+                        StreamUtility.closeQuietly(is);
+                    }
+                });
+            }
+        });
+        addAction(AsyncHttpHead.METHOD, regex, new HttpServerRequestCallback() {
+            @Override
+            public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
+                String path = request.getMatcher().replaceAll("");
+                Asset pair = getAssetStream(_context, assetPath + path);
+                if (pair == null || pair.inputStream == null) {
+                    response.code(404);
+                    response.end();
+                    return;
+                }
+                final InputStream is = pair.inputStream;
+                StreamUtility.closeQuietly(is);
+                response.getHeaders().set("Content-Length", String.valueOf(pair.available));
+                response.code(200);
+                response.getHeaders().add("Content-Type", getContentType(pair.path));
+                response.writeHead();
+                response.end();
+            }
+        });
+    }
+
+    public void directory(String regex, final File directory) {
+        directory(regex, directory, false);
+    }
+
+    public void directory(String regex, final File directory, final boolean list) {
+        assert directory.isDirectory();
+        addAction(AsyncHttpGet.METHOD, regex, new HttpServerRequestCallback() {
+            @Override
+            public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
+                String path = request.getMatcher().replaceAll("");
+                File file = new File(directory, path);
+
+                if (file.isDirectory() && list) {
+                    ArrayList<File> dirs = new ArrayList<File>();
+                    ArrayList<File> files = new ArrayList<File>();
+                    for (File f: file.listFiles()) {
+                        if (f.isDirectory())
+                            dirs.add(f);
+                        else
+                            files.add(f);
+                    }
+
+                    Comparator<File> c = new Comparator<File>() {
+                        @Override
+                        public int compare(File lhs, File rhs) {
+                            return lhs.getName().compareTo(rhs.getName());
+                        }
+                    };
+
+                    Collections.sort(dirs, c);
+                    Collections.sort(files, c);
+
+                    files.addAll(0, dirs);
+                    StringBuilder builder = new StringBuilder();
+                    for (File f: files) {
+                        String p = new File(request.getPath(), f.getName()).getAbsolutePath();
+                        builder.append(String.format("<div><a href='%s'>%s</a></div>", p, f.getName()));
+                    }
+                    response.send(builder.toString());
+
+                    return;
+                }
+                if (!file.isFile()) {
+                    response.code(404);
+                    response.end();
+                    return;
+                }
+                try {
+                    FileInputStream is = new FileInputStream(file);
+                    response.code(200);
+                    Util.pump(is, response, new CompletedCallback() {
+                        @Override
+                        public void onCompleted(Exception ex) {
+                            response.end();
+                        }
+                    });
+                }
+                catch (FileNotFoundException ex) {
+                    response.code(404);
+                    response.end();
+                }
+            }
+        });
+    }
+
+    public static class RouteMatch {
+        public final String method;
+        public final String path;
+        public final Matcher matcher;
+        public final HttpServerRequestCallback callback;
+
+
+        private RouteMatch(String method, String path, Matcher matcher, HttpServerRequestCallback callback) {
+            this.method = method;
+            this.path = path;
+            this.matcher = matcher;
+            this.callback = callback;
+        }
+    }
+
+    abstract class AsyncHttpServerRequestImpl extends com.koushikdutta.async.http.server.AsyncHttpServerRequestImpl {
+        Matcher matcher;
+        @Override
+        public Matcher getMatcher() {
+            return matcher;
+        }
+    }
+
+    class Callback implements HttpServerRequestCallback, RouteMatcher {
+        @Override
+        public void onRequest(AsyncHttpServerRequest request, AsyncHttpServerResponse response) {
+            RouteMatch match = route(request.getMethod(), request.getPath());
+            if (match == null) {
+                response.code(404);
+                response.end();
+                return;
+            }
+
+            match.callback.onRequest(request, response);
+        }
+
+        @Override
+        public RouteMatch route(String method, String path) {
+            return AsyncHttpServerRouter.this.route(method, path);
+        }
+    }
+
+    Callback callback = new Callback();
+
+    public HttpServerRequestCallback getCallback() {
+        return callback;
+    }
+
+    @Override
+    public RouteMatch route(String method, String path) {
+        synchronized (routes) {
+            for (RouteInfo p: routes) {
+                // a null method is wildcard. used for nesting routers.
+                if (!TextUtils.equals(method, p.method) && p.method != null)
+                    continue;
+                Matcher m = p.regex.matcher(path);
+                if (m.matches()) {
+                    if (p.callback instanceof RouteMatcher) {
+                        String subPath = m.group(1);
+                        return ((RouteMatcher)p.callback).route(method, subPath);
+                    }
+                    return new RouteMatch(method, path, m, p.callback);
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/RouteMatcher.java b/AndroidAsync/src/com/koushikdutta/async/http/server/RouteMatcher.java
new file mode 100644
index 000000000..2f740463a
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/RouteMatcher.java
@@ -0,0 +1,5 @@
+package com.koushikdutta.async.http.server;
+
+public interface RouteMatcher {
+    AsyncHttpServerRouter.RouteMatch route(String method, String path);
+}
\ No newline at end of file

From 0c03c86fe019ae82a7b7923f357c4ee8dbeb5b33 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 5 Nov 2018 17:55:06 -0800
Subject: [PATCH 274/399] path should be decoded upon parsing

---
 .../com/koushikdutta/async/http/server/AsyncHttpServer.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 7a73bb808..0cc1c3e85 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -20,6 +20,7 @@
 import com.koushikdutta.async.http.WebSocket;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Hashtable;
 
@@ -94,7 +95,7 @@ public void onCompleted(Exception ex) {
                     String statusLine = getStatusLine();
                     String[] parts = statusLine.split(" ");
                     fullPath = parts[1];
-                    path = fullPath.split("\\?")[0];
+                    path = URLDecoder.decode(fullPath.split("\\?")[0]);
                     method = parts[0];
                     RouteMatch route = route(method, path);
                     if (route != null) {

From 377130faf0a6cdde1672c872fa324320b052978c Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 6 Nov 2018 18:50:59 -0800
Subject: [PATCH 275/399] Futures helper

---
 .../koushikdutta/async/future/Futures.java    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/future/Futures.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Futures.java b/AndroidAsync/src/com/koushikdutta/async/future/Futures.java
new file mode 100644
index 000000000..71fe061c7
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Futures.java
@@ -0,0 +1,27 @@
+package com.koushikdutta.async.future;
+
+import java.util.ArrayList;
+
+public class Futures {
+    public static <T> Future<ArrayList<T>> waitAll(final Future<T>... futures) {
+        final ArrayList<T> results = new ArrayList<>();
+        final SimpleFuture<ArrayList<T>> ret = new SimpleFuture<>();
+
+        FutureCallback<T> cb = new FutureCallback<T>() {
+            int count = 0;
+            @Override
+            public void onCompleted(Exception e, T result) {
+                results.add(result);
+                count++;
+                if (count < futures.length)
+                    futures[count].setCallback(this);
+                else
+                    ret.setComplete(results);
+            }
+        };
+
+        futures[0].setCallback(cb);
+
+        return ret;
+    }
+}

From 32261f5e9df9b05c50007b3d4b2b1610381e30cd Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 15 Nov 2018 16:50:29 -0800
Subject: [PATCH 276/399] pass some Accept header hints along when requesting
 json or xml

---
 .../src/com/koushikdutta/async/http/AsyncHttpRequest.java    | 4 +++-
 .../src/com/koushikdutta/async/parser/AsyncParser.java       | 1 +
 .../com/koushikdutta/async/parser/ByteBufferListParser.java  | 5 +++++
 .../src/com/koushikdutta/async/parser/DocumentParser.java    | 5 +++++
 .../src/com/koushikdutta/async/parser/JSONArrayParser.java   | 5 +++++
 .../src/com/koushikdutta/async/parser/JSONObjectParser.java  | 5 +++++
 .../src/com/koushikdutta/async/parser/StringParser.java      | 5 +++++
 7 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
index 69bc9d54a..fd800fab4 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
@@ -91,9 +91,11 @@ public static void setDefaultHeaders(Headers ret, Uri uri) {
         ret.set("User-Agent", getDefaultUserAgent());
         ret.set("Accept-Encoding", "gzip, deflate");
         ret.set("Connection", "keep-alive");
-        ret.set("Accept", "*/*");
+        ret.set("Accept", HEADER_ACCEPT_ALL);
     }
 
+    public static final String HEADER_ACCEPT_ALL = "*/*";
+
     public AsyncHttpRequest(Uri uri, String method, Headers headers) {
         assert uri != null;
         mMethod = method;
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java
index 491590379..197bfb65a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java
@@ -14,4 +14,5 @@ public interface AsyncParser<T> {
     Future<T> parse(DataEmitter emitter);
     void write(DataSink sink, T value, CompletedCallback completed);
     Type getType();
+    String getMime();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
index 11bd7fbc6..d1127749b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
@@ -60,4 +60,9 @@ public void write(DataSink sink, ByteBufferList value, CompletedCallback complet
     public Type getType() {
         return ByteBufferList.class;
     }
+
+    @Override
+    public String getMime() {
+        return null;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
index de9053dae..06bfaf098 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
@@ -42,4 +42,9 @@ public void write(DataSink sink, Document value, CompletedCallback completed) {
     public Type getType() {
         return Document.class;
     }
+
+    @Override
+    public String getMime() {
+        return "text/xml";
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
index 4a351c01c..21bed7e69 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
@@ -35,4 +35,9 @@ public void write(DataSink sink, JSONArray value, CompletedCallback completed) {
     public Type getType() {
         return JSONArray.class;
     }
+
+    @Override
+    public String getMime() {
+        return "application/json";
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
index e02db2c2e..4e567cae8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
@@ -33,4 +33,9 @@ public void write(DataSink sink, JSONObject value, CompletedCallback completed)
     public Type getType() {
         return JSONObject.class;
     }
+
+    @Override
+    public String getMime() {
+        return "application/json";
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
index 257d60334..38ef0be1b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
@@ -47,4 +47,9 @@ public void write(DataSink sink, String value, CompletedCallback completed) {
     public Type getType() {
         return String.class;
     }
+
+    @Override
+    public String getMime() {
+        return null;
+    }
 }

From c804e952438520f2e8134adeeb178325202f1ae8 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 17 Nov 2018 20:22:55 -0800
Subject: [PATCH 277/399] AsyncSSLServerSocket added to inspect the key/cert
 used. Add a state map onto the http server requests for application usage.

---
 .../async/AsyncSSLServerSocket.java           |   9 ++
 .../async/AsyncSSLSocketWrapper.java          | 104 +++++++++++-------
 .../com/koushikdutta/async/http/Multimap.java |   4 +-
 .../async/http/server/AsyncHttpServer.java    |   4 +-
 .../http/server/AsyncHttpServerRequest.java   |   2 +
 .../server/AsyncHttpServerRequestImpl.java    |   7 ++
 .../http/server/AsyncHttpServerResponse.java  |  33 +++---
 .../server/AsyncHttpServerResponseImpl.java   |   5 +
 8 files changed, 112 insertions(+), 56 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/AsyncSSLServerSocket.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLServerSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLServerSocket.java
new file mode 100644
index 000000000..fbcb73cef
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLServerSocket.java
@@ -0,0 +1,9 @@
+package com.koushikdutta.async;
+
+import java.security.PrivateKey;
+import java.security.cert.Certificate;
+
+public interface AsyncSSLServerSocket extends AsyncServerSocket {
+    PrivateKey getPrivateKey();
+    Certificate getCertificate();
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 54e659105..cdbe5da7f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -4,6 +4,7 @@
 import android.os.Build;
 import android.util.Base64;
 import android.util.Log;
+import android.util.Pair;
 
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
@@ -599,41 +600,49 @@ private static Certificate selfSign(KeyPair keyPair, String subjectDN) throws Ex
         return new JcaX509CertificateConverter().setProvider(bcProvider).getCertificate(certBuilder.build(contentSigner));
     }
 
-    public static AsyncServerSocket listenSecure(final Context context, final AsyncServer server, final String subjectName, final InetAddress host, final int port, final ListenCallback handler) {
-        final ObjectHolder<AsyncServerSocket> holder = new ObjectHolder<>();
-        server.run(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    File keyPath = context.getFileStreamPath(subjectName + "-key.txt");
-                    KeyPair pair;
-                    Certificate cert;
-                    try {
-                        String[] keyParts = StreamUtility.readFile(keyPath).split("\n");
-                        X509EncodedKeySpec pub = new X509EncodedKeySpec(Base64.decode(keyParts[0], 0));
-                        PKCS8EncodedKeySpec priv = new PKCS8EncodedKeySpec(Base64.decode(keyParts[1], 0));
+    public static Pair<KeyPair, Certificate> selfSignCertificate(final Context context, String subjectName) throws Exception {
+        File keyPath = context.getFileStreamPath(subjectName + "-key.txt");
+        KeyPair pair;
+        Certificate cert;
+        try {
+            String[] keyParts = StreamUtility.readFile(keyPath).split("\n");
+            X509EncodedKeySpec pub = new X509EncodedKeySpec(Base64.decode(keyParts[0], 0));
+            PKCS8EncodedKeySpec priv = new PKCS8EncodedKeySpec(Base64.decode(keyParts[1], 0));
 
-                        cert = CertificateFactory.getInstance("X.509").generateCertificate(new ByteArrayInputStream(Base64.decode(keyParts[2], 0)));
+            cert = CertificateFactory.getInstance("X.509").generateCertificate(new ByteArrayInputStream(Base64.decode(keyParts[2], 0)));
 
-                        KeyFactory fact = KeyFactory.getInstance("RSA");
+            KeyFactory fact = KeyFactory.getInstance("RSA");
 
-                        pair = new KeyPair(fact.generatePublic(pub), fact.generatePrivate(priv));
+            pair = new KeyPair(fact.generatePublic(pub), fact.generatePrivate(priv));
 
-                    }
-                    catch (Exception e) {
-                        KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
-                        keyGen.initialize(2048);
-                        pair = keyGen.generateKeyPair();
-
-                        cert = selfSign(pair, subjectName);
-
-                        StreamUtility.writeFile(keyPath,
-                                Base64.encodeToString(pair.getPublic().getEncoded(), Base64.NO_WRAP)
-                                + "\n"
-                                + Base64.encodeToString(pair.getPrivate().getEncoded(), Base64.NO_WRAP)
-                                + "\n"
-                                + Base64.encodeToString(cert.getEncoded(), Base64.NO_WRAP));
-                    }
+        }
+        catch (Exception e) {
+            KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
+            keyGen.initialize(2048);
+            pair = keyGen.generateKeyPair();
+
+            cert = selfSign(pair, subjectName);
+
+            StreamUtility.writeFile(keyPath,
+                    Base64.encodeToString(pair.getPublic().getEncoded(), Base64.NO_WRAP)
+                            + "\n"
+                            + Base64.encodeToString(pair.getPrivate().getEncoded(), Base64.NO_WRAP)
+                            + "\n"
+                            + Base64.encodeToString(cert.getEncoded(), Base64.NO_WRAP));
+        }
+
+        return new Pair<>(pair, cert);
+    }
+
+    public static AsyncSSLServerSocket listenSecure(final Context context, final AsyncServer server, final String subjectName, final InetAddress host, final int port, final ListenCallback handler) {
+        final ObjectHolder<AsyncSSLServerSocket> holder = new ObjectHolder<>();
+        server.run(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Pair<KeyPair, Certificate> keyCert = selfSignCertificate(context, subjectName);
+                    KeyPair pair = keyCert.first;
+                    Certificate cert = keyCert.second;
 
                     holder.held = listenSecure(server, pair.getPrivate(), cert, host, port, handler);
                 }
@@ -645,7 +654,7 @@ public void run() {
         return holder.held;
     }
 
-    public static AsyncServerSocket listenSecure(AsyncServer server, String keyDer, String certDer, final InetAddress host, final int port, final ListenCallback handler) {
+    public static AsyncSSLServerSocket listenSecure(AsyncServer server, String keyDer, String certDer, final InetAddress host, final int port, final ListenCallback handler) {
         return listenSecure(server, Base64.decode(keyDer, Base64.DEFAULT), Base64.decode(certDer, Base64.DEFAULT), host, port, handler);
     }
 
@@ -654,8 +663,8 @@ private static class ObjectHolder<T> {
         T held;
     }
 
-    public static AsyncServerSocket listenSecure(final AsyncServer server, final byte[] keyDer, final byte[] certDer, final InetAddress host, final int port, final ListenCallback handler) {
-        final ObjectHolder<AsyncServerSocket> holder = new ObjectHolder<>();
+    public static AsyncSSLServerSocket listenSecure(final AsyncServer server, final byte[] keyDer, final byte[] certDer, final InetAddress host, final int port, final ListenCallback handler) {
+        final ObjectHolder<AsyncSSLServerSocket> holder = new ObjectHolder<>();
         server.run(new Runnable() {
             @Override
             public void run() {
@@ -675,8 +684,8 @@ public void run() {
         return holder.held;
     }
 
-    public static AsyncServerSocket listenSecure(final AsyncServer server, final PrivateKey pk, final Certificate cert, final InetAddress host, final int port, final ListenCallback handler) {
-        final ObjectHolder<AsyncServerSocket> holder = new ObjectHolder<>();
+    public static AsyncSSLServerSocket listenSecure(final AsyncServer server, final PrivateKey pk, final Certificate cert, final InetAddress host, final int port, final ListenCallback handler) {
+        final ObjectHolder<AsyncSSLServerSocket> holder = new ObjectHolder<>();
         server.run(new Runnable() {
             @Override
             public void run() {
@@ -695,7 +704,28 @@ public void run() {
                     SSLContext sslContext = SSLContext.getInstance("TLS");
                     sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
 
-                    holder.held = listenSecure(server, sslContext, host, port, handler);
+                    final AsyncServerSocket socket = listenSecure(server, sslContext, host, port, handler);
+                    holder.held = new AsyncSSLServerSocket() {
+                        @Override
+                        public PrivateKey getPrivateKey() {
+                            return pk;
+                        }
+
+                        @Override
+                        public Certificate getCertificate() {
+                            return cert;
+                        }
+
+                        @Override
+                        public void stop() {
+                            socket.stop();
+                        }
+
+                        @Override
+                        public int getLocalPort() {
+                            return socket.getLocalPort();
+                        }
+                    };
                 }
                 catch (Exception e) {
                     handler.onCompleted(e);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
index 00310e0b9..8ac83cd30 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
@@ -110,7 +110,7 @@ public static Multimap parseCommaDelimited(String header) {
         return parse(header, ",", true, null);
     }
 
-    private static final StringDecoder QUERY_DECODER = new StringDecoder() {
+    public static final StringDecoder QUERY_DECODER = new StringDecoder() {
         @Override
         public String decode(String s) {
             return Uri.decode(s);
@@ -121,7 +121,7 @@ public static Multimap parseQuery(String query) {
         return parse(query, "&", false, QUERY_DECODER);
     }
 
-    private static final StringDecoder URL_DECODER = new StringDecoder() {
+    public static final StringDecoder URL_DECODER = new StringDecoder() {
         @Override
         public String decode(String s) {
             return URLDecoder.decode(s);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 0cc1c3e85..3061e9980 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -124,8 +124,10 @@ protected void onEnd() {
                     };
                     
                     boolean handled = onRequest(this, res);
+                    if (handled)
+                        return;
 
-                    if (requestCallback == null && !handled) {
+                    if (requestCallback == null) {
                         res.code(404);
                         res.end();
                         return;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
index 0920d7123..153181d6d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
@@ -6,6 +6,7 @@
 import com.koushikdutta.async.http.Multimap;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 
+import java.util.Map;
 import java.util.regex.Matcher;
 
 public interface AsyncHttpServerRequest extends DataEmitter {
@@ -18,4 +19,5 @@ public interface AsyncHttpServerRequest extends DataEmitter {
     String getMethod();
 
     String get(String name);
+    Map<String, Object> getState();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
index f2182630a..5b48b2780 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
@@ -13,6 +13,7 @@
 import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 
@@ -20,6 +21,12 @@ public abstract class AsyncHttpServerRequestImpl extends FilteredDataEmitter imp
     private String statusLine;
     private Headers mRawHeaders = new Headers();
     AsyncSocket mSocket;
+    private HashMap<String, Object> state = new HashMap<>();
+
+    @Override
+    public HashMap<String, Object> getState() {
+        return state;
+    }
 
     public String getStatusLine() {
         return statusLine;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
index f66c7a29d..61d7b8d7d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
@@ -12,26 +12,27 @@
 import java.io.InputStream;
 
 public interface AsyncHttpServerResponse extends DataSink, CompletedCallback {
-    public void end();
-    public void send(String contentType, byte[] bytes);
-    public void send(String contentType, String string);
-    public void send(String string);
-    public void send(JSONObject json);
-    public void sendFile(File file);
-    public void sendStream(InputStream inputStream, long totalLength);
-    public AsyncHttpServerResponse code(int code);
-    public int code();
-    public Headers getHeaders();
-    public void writeHead();
-    public void setContentType(String contentType);
-    public void redirect(String location);
+    void end();
+    void send(String contentType, byte[] bytes);
+    void send(String contentType, String string);
+    void send(String string);
+    void send(JSONObject json);
+    void sendFile(File file);
+    void sendStream(InputStream inputStream, long totalLength);
+    AsyncHttpServerResponse code(int code);
+    int code();
+    Headers getHeaders();
+    void writeHead();
+    void setContentType(String contentType);
+    void redirect(String location);
+    AsyncHttpServerRequest getRequest();
 
     // NOT FINAL
-    public void proxy(AsyncHttpResponse response);
+    void proxy(AsyncHttpResponse response);
 
     /**
      * Alias for end. Used with CompletedEmitters
      */
-    public void onCompleted(Exception ex);
-    public AsyncSocket getSocket();
+    void onCompleted(Exception ex);
+    AsyncSocket getSocket();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index 85f133da9..691619a60 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -50,6 +50,11 @@ public AsyncSocket getSocket() {
             mRawHeaders.set("Connection", "Keep-Alive");
     }
 
+    @Override
+    public AsyncHttpServerRequest getRequest() {
+        return mRequest;
+    }
+
     @Override
     public void write(ByteBufferList bb) {
         // order is important here...

From d2b1a1258b8b70d4b0bb7d16507d415f2af28d85 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 20 Nov 2018 15:53:48 -0800
Subject: [PATCH 278/399] get tests working on junit4 remove blind exception
 catching. this is probably hiding a lot of crashes. various formatting and
 import cleanups.

---
 AndroidAsync/build.gradle                     |  13 ++-
 .../async/AsyncNetworkSocket.java             |  69 ++++++------
 .../com/koushikdutta/async/AsyncServer.java   |  13 +--
 .../async/BufferedDataEmitter.java            | 102 ------------------
 .../koushikdutta/async/ByteBufferList.java    |   1 +
 .../com/koushikdutta/async/DataEmitter.java   |  22 ++--
 .../async/DataTrackingEmitter.java            |   2 +-
 .../koushikdutta/async/FileDataEmitter.java   |   1 -
 .../com/koushikdutta/async/LineEmitter.java   |   2 -
 .../koushikdutta/async/SelectorWrapper.java   |   4 +-
 .../com/koushikdutta/async/ThreadQueue.java   |   2 +-
 .../async/http/AsyncSocketMiddleware.java     |   2 +-
 .../server/AsyncHttpServerRequestImpl.java    |  44 ++++----
 .../async/{ => util}/ArrayDeque.java          |   3 +-
 .../koushikdutta/async/{ => util}/Deque.java  |   2 +-
 .../async/util/StreamUtility.java             |   5 +-
 .../koushikdutta/async/test/BodyTests.java    |   9 +-
 .../koushikdutta/async/test/CacheTests.java   |  13 ++-
 .../async/test/CallbackTests.java             |  69 ++++++++++++
 .../async/test/ConscryptTests.java            |  10 +-
 .../async/test/FileCacheTests.java            |  29 ++++-
 .../koushikdutta/async/test/FileTests.java    |  12 ++-
 .../async/test/HttpClientTests.java           |  24 +++--
 .../async/test/MultipartTests.java            |  76 +++++++------
 .../com/koushikdutta/async/test/SSLTests.java |   8 +-
 25 files changed, 286 insertions(+), 251 deletions(-)
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java
 rename AndroidAsync/src/com/koushikdutta/async/{ => util}/ArrayDeque.java (99%)
 rename AndroidAsync/src/com/koushikdutta/async/{ => util}/Deque.java (99%)
 create mode 100644 AndroidAsync/test/src/com/koushikdutta/async/test/CallbackTests.java

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 596d04377..2f729c7ae 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -22,8 +22,10 @@ android {
     }
 
     defaultConfig {
-        targetSdkVersion 24
-        minSdkVersion 9
+        targetSdkVersion 28
+        minSdkVersion 14
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     compileSdkVersion project.hasProperty('global_compileSdkVersion') ? global_compileSdkVersion : 28
@@ -33,6 +35,13 @@ android {
         // this is only necessary to get compilation working for self signed certificates. dependency isn't added.
         compileOnly group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.60'
         compileOnly group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.60'
+
+
+        testImplementation 'junit:junit:4.12'
+        androidTestImplementation 'com.android.support.test:runner:1.0.2'
+        androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+        // for when i wanna test this against gms conscrypt
+        androidTestImplementation 'com.google.android.gms:play-services-base:10.+'
     }
 }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
index 845eadeb8..6a6d0cee3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
@@ -123,49 +123,52 @@ int onReadable() {
         if (mPaused)
             return 0;
         int total = 0;
-        try {
-            boolean closed = false;
+        boolean closed = false;
 
 //            ByteBufferList.obtainArray(buffers, Math.min(Math.max(mToAlloc, 2 << 11), maxAlloc));
-            ByteBuffer b = allocator.allocate();
-            // keep track of the max mount read during this read cycle
-            // so we can be quicker about allocations during the next
-            // time this socket reads.
-            long read = mChannel.read(b);
-            if (read < 0) {
-                closeInternal();
-                closed = true;
-            }
-            else {
-                total += read;
-            }
-            if (read > 0) {
-                allocator.track(read);
-                b.flip();
+        ByteBuffer b = allocator.allocate();
+        // keep track of the max mount read during this read cycle
+        // so we can be quicker about allocations during the next
+        // time this socket reads.
+        long read;
+        try {
+            read = mChannel.read(b);
+        }
+        catch (Exception e) {
+            read = -1;
+            closeInternal();
+            reportEndPending(e);
+            reportClose(e);
+        }
+
+        if (read < 0) {
+            closeInternal();
+            closed = true;
+        }
+        else {
+            total += read;
+        }
+        if (read > 0) {
+            allocator.track(read);
+            b.flip();
 //                for (int i = 0; i < buffers.length; i++) {
 //                    ByteBuffer b = buffers[i];
 //                    buffers[i] = null;
 //                    b.flip();
 //                    pending.add(b);
 //                }
-                pending.add(b);
-                Util.emitAllData(this, pending);
-            }
-            else {
-                ByteBufferList.reclaim(b);
-            }
-
-            if (closed) {
-                reportEndPending(null);
-                reportClose(null);
-            }
+            pending.add(b);
+            Util.emitAllData(this, pending);
         }
-        catch (Exception e) {
-            closeInternal();
-            reportEndPending(e);
-            reportClose(e);
+        else {
+            ByteBufferList.reclaim(b);
         }
-        
+
+        if (closed) {
+            reportEndPending(null);
+            reportClose(null);
+        }
+
         return total;
     }
     
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index f4ed082db..b72b55257 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -617,11 +617,7 @@ public void run() {
                     mAffinity = Thread.currentThread();
                 }
                 if (!addMe()) {
-                    try {
-                        mSelector.close();
-                    }
-                    catch (Exception e) {
-                    }
+                    StreamUtility.closeQuietly(mSelector);
                     mSelector = null;
                     mAffinity = null;
                     return;
@@ -671,12 +667,7 @@ private static void run(final AsyncServer server, final SelectorWrapper selector
             }
             catch (AsyncSelectorException e) {
                 Log.i(LOGTAG, "Selector exception, shutting down", e);
-                try {
-                    // StreamUtility.closeQuiety is throwing ArrayStoreException?
-                    selector.getSelector().close();
-                }
-                catch (Exception ex) {
-                }
+                StreamUtility.closeQuietly(selector);
             }
             // see if we keep looping, this must be in a synchronized block since the queue is accessed.
             synchronized (server) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java b/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java
deleted file mode 100644
index c4f4d81a6..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.koushikdutta.async;
-
-import com.koushikdutta.async.callback.CompletedCallback;
-import com.koushikdutta.async.callback.DataCallback;
-
-public class BufferedDataEmitter implements DataEmitter {
-    DataEmitter mEmitter;
-    public BufferedDataEmitter(DataEmitter emitter) {
-        mEmitter = emitter;
-        mEmitter.setDataCallback(new DataCallback() {
-            @Override
-            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-                bb.get(mBuffers);
-                BufferedDataEmitter.this.onDataAvailable();
-            }
-        });
-
-        mEmitter.setEndCallback(new CompletedCallback() {
-            @Override
-            public void onCompleted(Exception ex) {
-                mEnded = true;
-                mEndException = ex;
-                if (mBuffers.remaining() == 0 && mEndCallback != null)
-                    mEndCallback.onCompleted(ex);
-            }
-        });
-    }
-
-    @Override
-    public void close() {
-        mEmitter.close();
-    }
-
-    boolean mEnded = false;
-    Exception mEndException;
-    
-    public void onDataAvailable() {
-        if (mDataCallback != null && !isPaused() && mBuffers.remaining() > 0)
-            mDataCallback.onDataAvailable(this, mBuffers);
-
-        if (mEnded && !mBuffers.hasRemaining() && mEndCallback != null)
-            mEndCallback.onCompleted(mEndException);
-    }
-    
-    ByteBufferList mBuffers = new ByteBufferList();
-
-    DataCallback mDataCallback;
-    @Override
-    public void setDataCallback(DataCallback callback) {
-        if (mDataCallback != null)
-            throw new RuntimeException("Buffered Data Emitter callback may only be set once");
-        mDataCallback = callback;
-    }
-
-    @Override
-    public DataCallback getDataCallback() {
-        return mDataCallback;
-    }
-
-    @Override
-    public boolean isChunked() {
-        return false;
-    }
-
-    @Override
-    public void pause() {
-        mEmitter.pause();
-    }
-
-    @Override
-    public void resume() {
-        mEmitter.resume();
-        onDataAvailable();
-    }
-
-    @Override
-    public boolean isPaused() {
-        return mEmitter.isPaused();
-    }
-
-
-    CompletedCallback mEndCallback;
-    @Override
-    public void setEndCallback(CompletedCallback callback) {
-        mEndCallback = callback;
-    }
-
-    @Override
-    public CompletedCallback getEndCallback() {
-        return mEndCallback;
-    }
-
-    @Override
-    public AsyncServer getServer() {
-        return mEmitter.getServer();
-    }
-
-    @Override
-    public String charset() {
-        return mEmitter.charset();
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index af3927e88..ddfd47d63 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -4,6 +4,7 @@
 import android.os.Build;
 import android.os.Looper;
 
+import com.koushikdutta.async.util.ArrayDeque;
 import com.koushikdutta.async.util.Charsets;
 
 import java.io.IOException;
diff --git a/AndroidAsync/src/com/koushikdutta/async/DataEmitter.java b/AndroidAsync/src/com/koushikdutta/async/DataEmitter.java
index cf8ac2a53..bbfb74b8e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/DataEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/DataEmitter.java
@@ -4,15 +4,15 @@
 import com.koushikdutta.async.callback.DataCallback;
 
 public interface DataEmitter {
-    public void setDataCallback(DataCallback callback);
-    public DataCallback getDataCallback();
-    public boolean isChunked();
-    public void pause();
-    public void resume();
-    public void close();
-    public boolean isPaused();
-    public void setEndCallback(CompletedCallback callback);
-    public CompletedCallback getEndCallback();
-    public AsyncServer getServer();
-    public String charset();
+    void setDataCallback(DataCallback callback);
+    DataCallback getDataCallback();
+    boolean isChunked();
+    void pause();
+    void resume();
+    void close();
+    boolean isPaused();
+    void setEndCallback(CompletedCallback callback);
+    CompletedCallback getEndCallback();
+    AsyncServer getServer();
+    String charset();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/DataTrackingEmitter.java b/AndroidAsync/src/com/koushikdutta/async/DataTrackingEmitter.java
index aca15e3e5..5b1dfb746 100644
--- a/AndroidAsync/src/com/koushikdutta/async/DataTrackingEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/DataTrackingEmitter.java
@@ -4,7 +4,7 @@
  * Created by koush on 5/28/13.
  */
 public interface DataTrackingEmitter extends DataEmitter {
-    public interface DataTracker {
+    interface DataTracker {
         void onData(int totalBytesRead);
     }
     void setDataTracker(DataTracker tracker);
diff --git a/AndroidAsync/src/com/koushikdutta/async/FileDataEmitter.java b/AndroidAsync/src/com/koushikdutta/async/FileDataEmitter.java
index 15cc4f496..f993faa60 100644
--- a/AndroidAsync/src/com/koushikdutta/async/FileDataEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/FileDataEmitter.java
@@ -1,6 +1,5 @@
 package com.koushikdutta.async;
 
-import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.util.StreamUtility;
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/LineEmitter.java b/AndroidAsync/src/com/koushikdutta/async/LineEmitter.java
index 1bf811d23..4242d99b1 100644
--- a/AndroidAsync/src/com/koushikdutta/async/LineEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/LineEmitter.java
@@ -1,7 +1,5 @@
 package com.koushikdutta.async;
 
-import android.util.Log;
-
 import com.koushikdutta.async.callback.DataCallback;
 
 import java.nio.ByteBuffer;
diff --git a/AndroidAsync/src/com/koushikdutta/async/SelectorWrapper.java b/AndroidAsync/src/com/koushikdutta/async/SelectorWrapper.java
index ceed9e1ff..1318e4a11 100644
--- a/AndroidAsync/src/com/koushikdutta/async/SelectorWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/SelectorWrapper.java
@@ -1,5 +1,6 @@
 package com.koushikdutta.async;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
@@ -10,7 +11,7 @@
 /**
  * Created by koush on 2/13/14.
  */
-public class SelectorWrapper {
+class SelectorWrapper implements Closeable {
     private Selector selector;
     boolean isWaking;
     Semaphore semaphore = new Semaphore(0);
@@ -48,6 +49,7 @@ public Set<SelectionKey> selectedKeys() {
         return selector.selectedKeys();
     }
 
+    @Override
     public void close() throws IOException {
         selector.close();
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/ThreadQueue.java b/AndroidAsync/src/com/koushikdutta/async/ThreadQueue.java
index 7b6a65d86..2d5b58f3d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ThreadQueue.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ThreadQueue.java
@@ -4,7 +4,7 @@
 import java.util.WeakHashMap;
 import java.util.concurrent.Semaphore;
 
-public class ThreadQueue extends LinkedList<Runnable> {
+class ThreadQueue extends LinkedList<Runnable> {
     final private static WeakHashMap<Thread, ThreadQueue> mThreadQueues = new WeakHashMap<Thread, ThreadQueue>();
 
     static ThreadQueue getOrCreateThreadQueue(Thread thread) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index 6f3ab472d..a94d39c24 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -2,7 +2,7 @@
 
 import android.net.Uri;
 
-import com.koushikdutta.async.ArrayDeque;
+import com.koushikdutta.async.util.ArrayDeque;
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
index 5b48b2780..4a56428ab 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
@@ -59,33 +59,29 @@ protected AsyncHttpRequestBody onUnknownBody(Headers headers) {
     StringCallback mHeaderCallback = new StringCallback() {
         @Override
         public void onStringAvailable(String s) {
-            try {
-                if (statusLine == null) {
-                    statusLine = s;
-                    if (!statusLine.contains("HTTP/")) {
-                        onNotHttp();
-                        mSocket.setDataCallback(null);
-                    }
-                }
-                else if (!"\r".equals(s)){
-                    mRawHeaders.addLine(s);
-                }
-                else {
-                    DataEmitter emitter = HttpUtil.getBodyDecoder(mSocket, Protocol.HTTP_1_1, mRawHeaders, true);
-//                    emitter.setEndCallback(mReporter);
-                    mBody = HttpUtil.getBody(emitter, mReporter, mRawHeaders);
-                    if (mBody == null) {
-                        mBody = onUnknownBody(mRawHeaders);
-                        if (mBody == null)
-                            mBody = new UnknownRequestBody(mRawHeaders.get("Content-Type"));
-                    }
-                    mBody.parse(emitter, mReporter);
-                    onHeadersReceived();
+            if (statusLine == null) {
+                statusLine = s;
+                if (!statusLine.contains("HTTP/")) {
+                    onNotHttp();
+                    mSocket.setDataCallback(null);
                 }
+
+                return;
             }
-            catch (Exception ex) {
-                onCompleted(ex);
+            if (!"\r".equals(s)){
+                mRawHeaders.addLine(s);
+                return;
+            }
+
+            DataEmitter emitter = HttpUtil.getBodyDecoder(mSocket, Protocol.HTTP_1_1, mRawHeaders, true);
+            mBody = HttpUtil.getBody(emitter, mReporter, mRawHeaders);
+            if (mBody == null) {
+                mBody = onUnknownBody(mRawHeaders);
+                if (mBody == null)
+                    mBody = new UnknownRequestBody(mRawHeaders.get("Content-Type"));
             }
+            mBody.parse(emitter, mReporter);
+            onHeadersReceived();
         }
     };
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/ArrayDeque.java b/AndroidAsync/src/com/koushikdutta/async/util/ArrayDeque.java
similarity index 99%
rename from AndroidAsync/src/com/koushikdutta/async/ArrayDeque.java
rename to AndroidAsync/src/com/koushikdutta/async/util/ArrayDeque.java
index f0254a02f..a628e88e4 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ArrayDeque.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/ArrayDeque.java
@@ -3,14 +3,13 @@
  * as explained at http://creativecommons.org/publicdomain/zero/1.0/.
  */
 
-package com.koushikdutta.async;
+package com.koushikdutta.async.util;
 
 // BEGIN android-note
 // removed link to collections framework docs
 // END android-note
 
 import java.util.AbstractCollection;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
diff --git a/AndroidAsync/src/com/koushikdutta/async/Deque.java b/AndroidAsync/src/com/koushikdutta/async/util/Deque.java
similarity index 99%
rename from AndroidAsync/src/com/koushikdutta/async/Deque.java
rename to AndroidAsync/src/com/koushikdutta/async/util/Deque.java
index 8d82429c6..9b69d4a86 100644
--- a/AndroidAsync/src/com/koushikdutta/async/Deque.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/Deque.java
@@ -4,7 +4,7 @@
  * at http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-package com.koushikdutta.async;
+package com.koushikdutta.async.util;
 
 // BEGIN android-note
 // removed link to collections framework docs
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/StreamUtility.java b/AndroidAsync/src/com/koushikdutta/async/util/StreamUtility.java
index 2955a8649..d56b05dfc 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/StreamUtility.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/StreamUtility.java
@@ -105,8 +105,11 @@ public static void closeQuietly(Closeable... closeables) {
             if (closeable != null) {
                 try {
                     closeable.close();
-                } catch (IOException e) {
+                } catch (Exception e) {
                     // http://stackoverflow.com/a/156525/9636
+
+                    // also, catch all exceptions because some implementations throw random crap
+                    // like ArrayStoreException
                 }
             }
         }
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/BodyTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/BodyTests.java
index e8038491b..5902e369b 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/BodyTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/BodyTests.java
@@ -1,14 +1,19 @@
 package com.koushikdutta.async.test;
 
-import android.test.AndroidTestCase;
+import android.support.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.http.Multimap;
 import com.koushikdutta.async.http.body.UrlEncodedFormBody;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Created by koush on 3/19/14.
  */
-public class BodyTests extends AndroidTestCase {
+@RunWith(AndroidJUnit4.class)
+public class BodyTests {
+    @Test
     public void testNullValue() throws Exception {
         Multimap mm = new Multimap();
         mm.add("hello", null);
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
index 990d7dded..e13af08e2 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
@@ -1,13 +1,12 @@
 package com.koushikdutta.async.test;
 
-import android.test.AndroidTestCase;
+import android.support.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.AsyncServerSocket;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.FilteredDataEmitter;
-import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.http.AsyncHttpClient;
 import com.koushikdutta.async.http.AsyncHttpGet;
@@ -18,16 +17,24 @@
 import com.koushikdutta.async.http.server.AsyncHttpServerResponse;
 import com.koushikdutta.async.http.server.HttpServerRequestCallback;
 
+import org.junit.runner.RunWith;
+
 import java.io.File;
 import java.nio.ByteBuffer;
 import java.util.Date;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
+import static android.support.test.InstrumentationRegistry.getContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 /**
  * Created by koush on 6/13/13.
  */
-public class CacheTests extends AndroidTestCase {
+@RunWith(AndroidJUnit4.class)
+public class CacheTests {
     public void testMaxAgePrivate() throws Exception {
         AsyncHttpClient client = new AsyncHttpClient(AsyncServer.getDefault());
         ResponseCacheMiddleware cache = ResponseCacheMiddleware.addCache(client, new File(getContext().getFilesDir(), "AndroidAsyncTest"), 1024 * 1024 * 10);
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/CallbackTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/CallbackTests.java
new file mode 100644
index 000000000..3534a675e
--- /dev/null
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/CallbackTests.java
@@ -0,0 +1,69 @@
+package com.koushikdutta.async.test;
+
+import android.support.test.runner.AndroidJUnit4;
+
+import com.koushikdutta.async.AsyncServer;
+import com.koushikdutta.async.AsyncServerSocket;
+import com.koushikdutta.async.AsyncSocket;
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.DataEmitter;
+import com.koushikdutta.async.Util;
+import com.koushikdutta.async.callback.CompletedCallback;
+import com.koushikdutta.async.callback.ConnectCallback;
+import com.koushikdutta.async.callback.DataCallback;
+import com.koushikdutta.async.callback.ListenCallback;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.fail;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class CallbackTests {
+    @Test
+    public void testThrow() throws Exception {
+        int port = AsyncServer.getDefault().listen(null, 0, new ListenCallback() {
+            @Override
+            public void onAccepted(AsyncSocket socket) {
+                Util.writeAll(socket, "poop".getBytes(), new CompletedCallback() {
+                    @Override
+                    public void onCompleted(Exception ex) {
+
+                    }
+                });
+
+                socket.setDataCallback(new DataCallback.NullDataCallback());
+            }
+
+            @Override
+            public void onListening(AsyncServerSocket socket) {
+
+            }
+
+            @Override
+            public void onCompleted(Exception ex) {
+
+            }
+        }).getLocalPort();
+
+
+
+        AsyncServer.getDefault().connectSocket("localhost", port, new ConnectCallback() {
+            @Override
+            public void onConnectCompleted(Exception ex, AsyncSocket socket) {
+                socket.setDataCallback(new DataCallback() {
+                    @Override
+                    public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+                        throw new NullPointerException("this should crash?");
+                    }
+                });
+            }
+        });
+
+        Thread.sleep(10000);
+        fail();
+    }
+}
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
index ac18eadee..0f7c9a13c 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
@@ -18,7 +18,9 @@
 
 
 import android.content.Context;
-import android.test.AndroidTestCase;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.runner.RunWith;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -33,10 +35,14 @@
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLEngineResult;
 
+import static android.support.test.InstrumentationRegistry.getContext;
+import static org.junit.Assert.assertEquals;
+
 /**
  * Created by koush on 7/15/14.
  */
-public class ConscryptTests extends AndroidTestCase {
+@RunWith(AndroidJUnit4.class)
+public class ConscryptTests {
     boolean initialized;
     Field peerHost;
     Field peerPort;
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/FileCacheTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/FileCacheTests.java
index ef07e2710..4dfb397c8 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/FileCacheTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/FileCacheTests.java
@@ -1,21 +1,28 @@
 package com.koushikdutta.async.test;
 
-import android.test.AndroidTestCase;
+import android.support.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.util.FileCache;
 import com.koushikdutta.async.util.StreamUtility;
 
+import org.junit.runner.RunWith;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 
+import static android.support.test.InstrumentationRegistry.getContext;
+import static junit.framework.TestCase.assertFalse;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 /**
  * Created by koush on 4/13/14.
  */
-public class FileCacheTests extends AndroidTestCase {
-    @Override
+@RunWith(AndroidJUnit4.class)
+public class FileCacheTests {
     protected void setUp() throws Exception {
-        super.setUp();
         File dir = new File(getContext().getCacheDir(), "filecache");
         File[] files = dir.listFiles();
         if (files == null)
@@ -25,6 +32,8 @@ protected void setUp() throws Exception {
     }
 
     public void testSimple() throws Exception {
+        setUp();
+
         FileCache cache = new FileCache(new File(getContext().getCacheDir(), "filecache"), 100000, false);
         cache.setBlockSize(1);
 
@@ -38,6 +47,8 @@ public void testSimple() throws Exception {
     }
 
     public void testEviction() throws Exception {
+        setUp();
+
         FileCache cache = new FileCache(new File(getContext().getCacheDir(), "filecache"), 25, false);
         cache.setBlockSize(1);
 
@@ -60,6 +71,8 @@ public void testEviction() throws Exception {
     }
 
     public void testMultipleParts() throws Exception {
+        setUp();
+
         FileCache cache = new FileCache(new File(getContext().getCacheDir(), "filecache"), 100000, false);
         cache.setBlockSize(1);
         File[] temps = new File[10];
@@ -80,6 +93,8 @@ public void testMultipleParts() throws Exception {
     }
 
     public void testMultipartEviction() throws Exception {
+        setUp();
+
         FileCache cache = new FileCache(new File(getContext().getCacheDir(), "filecache"), 12, false);
         cache.setBlockSize(1);
         File[] temps = new File[10];
@@ -108,6 +123,8 @@ public void testMultipartEviction() throws Exception {
 
 
     public void testMultipartEvictionAgain() throws Exception {
+        setUp();
+
         FileCache cache = new FileCache(new File(getContext().getCacheDir(), "filecache"), 72, false);
         cache.setBlockSize(1);
         File[] temps = new File[10];
@@ -150,6 +167,8 @@ public void testMultipartEvictionAgain() throws Exception {
     }
 
     public void testReinit() throws Exception {
+        setUp();
+
         FileCache cache = new FileCache(new File(getContext().getCacheDir(), "filecache"), 10, false);
         cache.setBlockSize(1);
         File temp = cache.getTempFile();
@@ -173,6 +192,8 @@ public void testReinit() throws Exception {
     }
 
     public void testCacheOrder() throws Exception {
+        setUp();
+
         FileCache cache = new FileCache(new File(getContext().getCacheDir(), "filecache"), 10, false);
         cache.setBlockSize(1);
         File temp = cache.getTempFile();
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java
index 4642bd2f5..1011929d3 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java
@@ -1,6 +1,7 @@
 package com.koushikdutta.async.test;
 
-import android.test.AndroidTestCase;
+
+import android.support.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.FileDataEmitter;
@@ -11,14 +12,21 @@
 
 import junit.framework.TestCase;
 
+import org.junit.runner.RunWith;
+
 import java.io.File;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
+import static android.support.test.InstrumentationRegistry.getContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Created by koush on 5/22/13.
  */
-public class FileTests extends AndroidTestCase {
+@RunWith(AndroidJUnit4.class)
+public class FileTests {
     public static final long TIMEOUT = 1000L;
     public void testFileDataEmitter() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
index 8c5f02162..e8164ffd3 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
@@ -1,11 +1,10 @@
 package com.koushikdutta.async.test;
 
 import android.net.Uri;
-import android.test.AndroidTestCase;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.google.android.gms.security.ProviderInstaller;
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.AsyncServerSocket;
 import com.koushikdutta.async.ByteBufferList;
@@ -28,9 +27,10 @@
 import com.koushikdutta.async.http.server.AsyncHttpServerResponse;
 import com.koushikdutta.async.http.server.AsyncProxyServer;
 
-import junit.framework.Assert;
-
 import org.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.io.File;
 import java.util.concurrent.CancellationException;
@@ -39,9 +39,16 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import javax.net.ssl.SSLContext;
+import static android.support.test.InstrumentationRegistry.getContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-public class HttpClientTests extends AndroidTestCase {
+@RunWith(AndroidJUnit4.class)
+public class HttpClientTests {
     AsyncHttpClient client;
     AsyncServer server = new AsyncServer();
     
@@ -51,8 +58,8 @@ public HttpClientTests() {
     }
 
     @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
+    protected void finalize() throws Throwable {
+        super.finalize();
         client.getSSLSocketMiddleware().setConnectAllAddresses(false);
         client.getSocketMiddleware().setConnectAllAddresses(false);
         client.getSocketMiddleware().disableProxy();
@@ -104,6 +111,7 @@ public void onCompleted(Exception ex) {
     */
 
     private static final long TIMEOUT = 10000L;
+    @Test
     public void testHomepage() throws Exception {
         Future<String> ret = client.executeString(new AsyncHttpGet("http://google.com"), null);
         assertNotNull(ret.get(TIMEOUT, TimeUnit.MILLISECONDS));
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/MultipartTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/MultipartTests.java
index 0a4a5a246..ee31526a3 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/MultipartTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/MultipartTests.java
@@ -1,7 +1,6 @@
 package com.koushikdutta.async.test;
 
-import android.os.Environment;
-import android.test.AndroidTestCase;
+import android.support.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.ByteBufferList;
@@ -21,18 +20,21 @@
 import com.koushikdutta.async.http.server.AsyncHttpServerResponse;
 import com.koushikdutta.async.http.server.HttpServerRequestCallback;
 
-import junit.framework.TestCase;
+import org.junit.runner.RunWith;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.concurrent.TimeUnit;
 
-public class MultipartTests extends AndroidTestCase {
+import static android.support.test.InstrumentationRegistry.getContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+@RunWith(AndroidJUnit4.class)
+public class MultipartTests {
     AsyncHttpServer httpServer;
 
-    @Override
     protected void setUp() throws Exception {
-        super.setUp();
 
         httpServer = new AsyncHttpServer();
         httpServer.setErrorCallback(new CompletedCallback() {
@@ -73,40 +75,46 @@ public void onCompleted(Exception ex) {
         });
     }
 
-    @Override
     protected void tearDown() throws Exception {
-        super.tearDown();
-        
+
         httpServer.stop();
         AsyncServer.getDefault().stop();
     }
 
     public void testUpload() throws Exception {
-        File dummy = getContext().getFileStreamPath("dummy.txt");
-        final String FIELD_VAL = "bar";
-        dummy.getParentFile().mkdirs();
-        FileOutputStream fout = new FileOutputStream(dummy);
-        byte[] zeroes = new byte[100000];
-        for (int i = 0; i < 10; i++) {
-            fout.write(zeroes);
-        }
-        fout.close();
-//        StreamUtility.writeFile(dummy, DUMMY_VAL);
-        
-        AsyncHttpPost post = new AsyncHttpPost("http://localhost:5000");
-        MultipartFormDataBody body = new MultipartFormDataBody();
-        body.addStringPart("foo", FIELD_VAL);
-        body.addFilePart("my-file", dummy);
-        body.addStringPart("baz", FIELD_VAL);
-        post.setBody(body);
-
-        Future<String> ret = AsyncHttpClient.getDefaultInstance().executeString(post, new StringCallback() {
-            @Override
-            public void onCompleted(Exception e, AsyncHttpResponse source, String result) {
+        setUp();
+
+        try {
+            File dummy = getContext().getFileStreamPath("dummy.txt");
+            final String FIELD_VAL = "bar";
+            dummy.getParentFile().mkdirs();
+            FileOutputStream fout = new FileOutputStream(dummy);
+            byte[] zeroes = new byte[100000];
+            for (int i = 0; i < 10; i++) {
+                fout.write(zeroes);
             }
-        });
-        
-        String data = ret.get(10000, TimeUnit.MILLISECONDS);
-        assertEquals(data, FIELD_VAL + (zeroes.length * 10) + FIELD_VAL);
+            fout.close();
+//        StreamUtility.writeFile(dummy, DUMMY_VAL);
+
+            AsyncHttpPost post = new AsyncHttpPost("http://localhost:5000");
+            MultipartFormDataBody body = new MultipartFormDataBody();
+            body.addStringPart("foo", FIELD_VAL);
+            body.addFilePart("my-file", dummy);
+            body.addStringPart("baz", FIELD_VAL);
+            post.setBody(body);
+
+            Future<String> ret = AsyncHttpClient.getDefaultInstance().executeString(post, new StringCallback() {
+                @Override
+                public void onCompleted(Exception e, AsyncHttpResponse source, String result) {
+                }
+            });
+
+            String data = ret.get(10000, TimeUnit.MILLISECONDS);
+            assertEquals(data, FIELD_VAL + (zeroes.length * 10) + FIELD_VAL);
+        }
+        finally {
+            tearDown();
+        }
+
     }
 }
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/SSLTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/SSLTests.java
index fbdc6cf90..1255f78a1 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/SSLTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/SSLTests.java
@@ -1,6 +1,6 @@
 package com.koushikdutta.async.test;
 
-import android.test.AndroidTestCase;
+import android.support.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.http.AsyncHttpClient;
@@ -11,6 +11,7 @@
 import com.koushikdutta.async.http.server.HttpServerRequestCallback;
 
 import org.json.JSONObject;
+import org.junit.runner.RunWith;
 
 import java.security.KeyStore;
 
@@ -18,10 +19,13 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManagerFactory;
 
+import static android.support.test.InstrumentationRegistry.getContext;
+
 /**
  * Created by koush on 6/4/13.
  */
-public class SSLTests extends AndroidTestCase {
+@RunWith(AndroidJUnit4.class)
+public class SSLTests {
     public void testKeys() throws Exception {
         KeyManagerFactory kmf = KeyManagerFactory.getInstance("X509");
         KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());

From e37f1cf06df1f9730c82c508c8f2eee0019bec1e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 21 Nov 2018 00:50:24 -0800
Subject: [PATCH 279/399] clean up a bunch of legacy code. fix some http server
 stuff.

---
 .../com/koushikdutta/async/AsyncServer.java   | 186 ++++++++----------
 .../koushikdutta/async/ChannelWrapper.java    |   1 -
 .../async/http/AsyncHttpClient.java           |  12 +-
 .../com/koushikdutta/async/http/Multimap.java |   4 +
 .../async/http/server/AsyncHttpServer.java    |  40 +++-
 .../http/server/AsyncHttpServerRouter.java    |   2 +-
 .../async/util/ThrottleTimeout.java           |   7 +-
 .../async/test/CallbackTests.java             |  35 +++-
 8 files changed, 166 insertions(+), 121 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index b72b55257..762ea4d4a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -31,7 +31,6 @@
 import java.util.Comparator;
 import java.util.PriorityQueue;
 import java.util.Set;
-import java.util.WeakHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.Semaphore;
@@ -68,6 +67,7 @@ public void run() {
             }
         }
     }
+
     public static void post(Handler handler, Runnable runnable) {
         RunnableWrapper wrapper = new RunnableWrapper();
         ThreadQueue threadQueue = ThreadQueue.getOrCreateThreadQueue(handler.getLooper().getThread());
@@ -75,6 +75,7 @@ public static void post(Handler handler, Runnable runnable) {
         wrapper.handler = handler;
         wrapper.runnable = runnable;
 
+        // run it in a blocking AsyncSemaphore or a Handler, whichever gets to it first.
         threadQueue.add(wrapper);
         handler.post(wrapper);
 
@@ -115,19 +116,6 @@ public AsyncServer(String name) {
         mName = name;
     }
 
-    private void handleSocket(final AsyncNetworkSocket handler) throws ClosedChannelException {
-        final ChannelWrapper sc = handler.getChannel();
-        SelectionKey ckey = sc.register(mSelector.getSelector());
-        ckey.attach(handler);
-        handler.setup(this, ckey);
-    }
-
-    public void removeAllCallbacks(Object scheduled) {
-        synchronized (this) {
-            mQueue.remove(scheduled);
-        }
-    }
-
     private static ExecutorService synchronousWorkers = newSynchronousWorkers("AsyncServer-worker-");
     private static void wakeup(final SelectorWrapper selector) {
         synchronousWorkers.execute(new Runnable() {
@@ -144,7 +132,7 @@ public void run() {
     }
 
     int postCounter = 0;
-    public Object postDelayed(Runnable runnable, long delay) {
+    public Cancellable postDelayed(Runnable runnable, long delay) {
         Scheduled s;
         synchronized (this) {
             // Calculate when to run this queue item:
@@ -164,10 +152,10 @@ else if (mQueue.size() > 0)
                 time = Math.min(0, mQueue.peek().time - 1);
             else
                 time = 0;
-            mQueue.add(s = new Scheduled(runnable, time));
+            mQueue.add(s = new Scheduled(this, runnable, time));
             // start the server up if necessary
             if (mSelector == null)
-                run(true);
+                run();
             if (!isAffinityThread()) {
                 wakeup(mSelector);
             }
@@ -175,7 +163,7 @@ else if (mQueue.size() > 0)
         return s;
     }
 
-    public Object postImmediate(Runnable runnable) {
+    public Cancellable postImmediate(Runnable runnable) {
         if (Thread.currentThread() == getAffinity()) {
             runnable.run();
             return null;
@@ -183,11 +171,11 @@ public Object postImmediate(Runnable runnable) {
         return postDelayed(runnable, -1);
     }
 
-    public Object post(Runnable runnable) {
+    public Cancellable post(Runnable runnable) {
         return postDelayed(runnable, 0);
     }
 
-    public Object post(final CompletedCallback callback, final Exception e) {
+    public Cancellable post(final CompletedCallback callback, final Exception e) {
         return post(new Runnable() {
             @Override
             public void run() {
@@ -219,13 +207,42 @@ public void run() {
         }
     }
 
-    private static class Scheduled {
-        public Scheduled(Runnable runnable, long time) {
+    private static class Scheduled implements Cancellable, Runnable {
+        // this constructor is only called when the async execution should not be preserved
+        // ie... AsyncServer.stop.
+        public Scheduled(AsyncServer server, Runnable runnable, long time) {
+            this.server = server;
             this.runnable = runnable;
             this.time = time;
         }
+        public AsyncServer server;
         public Runnable runnable;
         public long time;
+
+        @Override
+        public void run() {
+            this.runnable.run();
+        }
+
+        @Override
+        public boolean isDone() {
+            synchronized (server) {
+                return !cancelled && !server.mQueue.contains(this);
+            }
+        }
+
+        boolean cancelled;
+        @Override
+        public boolean isCancelled() {
+            return cancelled;
+        }
+
+        @Override
+        public boolean cancel() {
+            synchronized (server) {
+                return cancelled = server.mQueue.remove(this);
+            }
+        }
     }
     PriorityQueue<Scheduled> mQueue = new PriorityQueue<Scheduled>(1, Scheduler.INSTANCE);
 
@@ -255,13 +272,10 @@ public void stop() {
             currentSelector = mSelector;
             if (currentSelector == null)
                 return;
-            synchronized (mServers) {
-                mServers.remove(mAffinity);
-            }
             semaphore = new Semaphore(0);
 
             // post a shutdown and wait
-            mQueue.add(new Scheduled(new Runnable() {
+            mQueue.add(new Scheduled(this, new Runnable() {
                 @Override
                 public void run() {
                     shutdownEverything(currentSelector);
@@ -478,6 +492,13 @@ protected void transform(InetAddress[] result) throws Exception {
         });
     }
 
+    private void handleSocket(final AsyncNetworkSocket handler) throws ClosedChannelException {
+        final ChannelWrapper sc = handler.getChannel();
+        SelectionKey ckey = sc.register(mSelector.getSelector());
+        ckey.attach(handler);
+        handler.setup(this, ckey);
+    }
+
     public AsyncDatagramSocket connectDatagram(final String host, final int port) throws IOException {
         final DatagramChannel socket = DatagramChannel.open();
         final AsyncDatagramSocket handler = new AsyncDatagramSocket();
@@ -566,90 +587,63 @@ public void run() {
         return handler;
     }
 
-    final static WeakHashMap<Thread, AsyncServer> mServers = new WeakHashMap<Thread, AsyncServer>();
-
-    private boolean addMe() {
-        synchronized (mServers) {
-            AsyncServer current = mServers.get(mAffinity);
-            if (current != null) {
-//                Log.e(LOGTAG, "****AsyncServer already running on this thread.****");
-                return false;
-            }
-            mServers.put(mAffinity, this);
-        }
-        return true;
-    }
+    final private static ThreadLocal<AsyncServer> threadServer = new ThreadLocal<>();
 
     public static AsyncServer getCurrentThreadServer() {
-        return mServers.get(Thread.currentThread());
+        return threadServer.get();
     }
 
     Thread mAffinity;
-    private void run(boolean newThread) {
+    private void run() {
         final SelectorWrapper selector;
         final PriorityQueue<Scheduled> queue;
-        boolean reentrant = false;
         synchronized (this) {
-            if (mSelector != null) {
-                Log.i(LOGTAG, "Reentrant call");
-                assert Thread.currentThread() == mAffinity;
-                // this is reentrant
-                reentrant = true;
-                selector = mSelector;
-                queue = mQueue;
-            }
-            else {
+            if (mSelector == null) {
                 try {
                     selector = mSelector = new SelectorWrapper(SelectorProvider.provider().openSelector());
                     queue = mQueue;
                 }
                 catch (IOException e) {
-                    return;
+                    throw new RuntimeException("unable to create selector?", e);
                 }
-                if (newThread) {
-                    mAffinity = new Thread(mName) {
-                        public void run() {
+
+                mAffinity = new Thread(mName) {
+                    public void run() {
+                        try {
+                            threadServer.set(AsyncServer.this);
                             AsyncServer.run(AsyncServer.this, selector, queue);
                         }
-                    };
-                }
-                else {
-                    mAffinity = Thread.currentThread();
-                }
-                if (!addMe()) {
-                    StreamUtility.closeQuietly(mSelector);
-                    mSelector = null;
-                    mAffinity = null;
-                    return;
-                }
-                if (newThread) {
-                    mAffinity.start();
-                    // kicked off the new thread, let's bail.
-                    return;
-                }
+                        finally {
+                            threadServer.remove();
+                        }
+                    }
+                };
 
-                // fall through to outside of the synchronization scope
-                // to allow the thread to run without locking.
+                mAffinity.start();
+                // kicked off the new thread, let's bail.
+                return;
             }
+
+            // this is a reentrant call
+            selector = mSelector;
+            queue = mQueue;
+
+            // fall through to outside of the synchronization scope
+            // to allow the thread to run without locking.
         }
 
-        if (reentrant) {
+        try {
+            runLoop(this, selector, queue);
+        }
+        catch (AsyncSelectorException e) {
+            Log.i(LOGTAG, "Selector closed", e);
             try {
-                runLoop(this, selector, queue);
+                // StreamUtility.closeQuiety is throwing ArrayStoreException?
+                selector.getSelector().close();
             }
-            catch (AsyncSelectorException e) {
-                Log.i(LOGTAG, "Selector closed", e);
-                try {
-                    // StreamUtility.closeQuiety is throwing ArrayStoreException?
-                    selector.getSelector().close();
-                }
-                catch (Exception ex) {
-                }
+            catch (Exception ex) {
             }
-            return;
         }
-
-        run(this, selector, queue);
     }
 
     private static void run(final AsyncServer server, final SelectorWrapper selector, final PriorityQueue<Scheduled> queue) {
@@ -683,9 +677,6 @@ private static void run(final AsyncServer server, final SelectorWrapper selector
                 break;
             }
         }
-        synchronized (mServers) {
-            mServers.remove(Thread.currentThread());
-        }
 //        Log.i(LOGTAG, "****AsyncServer has shut down.****");
     }
 
@@ -707,11 +698,7 @@ private static void shutdownKeys(SelectorWrapper selector) {
     private static void shutdownEverything(SelectorWrapper selector) {
         shutdownKeys(selector);
         // SHUT. DOWN. EVERYTHING.
-        try {
-            selector.close();
-        }
-        catch (Exception e) {
-        }
+        StreamUtility.closeQuietly(selector);
     }
 
     private static final long QUEUE_EMPTY = Long.MAX_VALUE;
@@ -740,7 +727,7 @@ private static long lockAndRunQueue(final AsyncServer server, final PriorityQueu
             if (run == null)
                 break;
 
-            run.runnable.run();
+            run.run();
         }
 
         server.postCounter = 0;
@@ -847,13 +834,8 @@ else if (key.isConnectable()) {
                             cancel.callback.onConnectCompleted(ex, null);
                         continue;
                     }
-                    try {
-                        if (cancel.setComplete(newHandler))
-                            cancel.callback.onConnectCompleted(null, newHandler);
-                    }
-                    catch (Exception e) {
-                        throw new RuntimeException(e);
-                    }
+                    if (cancel.setComplete(newHandler))
+                        cancel.callback.onConnectCompleted(null, newHandler);
                 }
                 else {
                     Log.i(LOGTAG, "wtf");
diff --git a/AndroidAsync/src/com/koushikdutta/async/ChannelWrapper.java b/AndroidAsync/src/com/koushikdutta/async/ChannelWrapper.java
index 0fd550172..418075661 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ChannelWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ChannelWrapper.java
@@ -1,7 +1,6 @@
 package com.koushikdutta.async;
 
 import java.io.IOException;
-import java.net.Socket;
 import java.nio.ByteBuffer;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.ReadableByteChannel;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 2f4366017..30da55367 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -134,7 +134,7 @@ public Future<AsyncHttpResponse> execute(String uri, final HttpConnectCallback c
     private static final String LOGTAG = "AsyncHttp";
     private class FutureAsyncHttpResponse extends SimpleFuture<AsyncHttpResponse> {
         public AsyncSocket socket;
-        public Object scheduled;
+        public Cancellable scheduled;
         public Runnable timeoutRunnable;
 
         @Override
@@ -148,7 +148,7 @@ public boolean cancel() {
             }
 
             if (scheduled != null)
-                mServer.removeAllCallbacks(scheduled);
+                scheduled.cancel();
 
             return true;
         }
@@ -156,7 +156,7 @@ public boolean cancel() {
 
     private void reportConnectedCompleted(FutureAsyncHttpResponse cancel, Exception ex, AsyncHttpResponseImpl response, AsyncHttpRequest request, final HttpConnectCallback callback) {
         assert callback != null;
-        mServer.removeAllCallbacks(cancel.scheduled);
+        cancel.scheduled.cancel();
         boolean complete;
         if (ex != null) {
             request.loge("Connection error", ex);
@@ -273,7 +273,7 @@ public void onConnectCompleted(Exception ex, AsyncSocket socket) {
 
                 // 3) on connect, cancel timeout
                 if (cancel.timeoutRunnable != null)
-                    mServer.removeAllCallbacks(cancel.scheduled);
+                    cancel.scheduled.cancel();
 
                 if (ex != null) {
                     reportConnectedCompleted(cancel, ex, null, request, callback);
@@ -328,7 +328,7 @@ protected void onRequestCompleted(Exception ex) {
                     return;
                 // 5) after request is sent, set a header timeout
                 if (cancel.timeoutRunnable != null && mHeaders == null) {
-                    mServer.removeAllCallbacks(cancel.scheduled);
+                    cancel.scheduled.cancel();
                     cancel.scheduled = mServer.postDelayed(cancel.timeoutRunnable, getTimeoutRemaining(request));
                 }
 
@@ -392,7 +392,7 @@ protected void onHeadersReceived() {
 
                 // 7) on headers, cancel timeout
                 if (cancel.timeoutRunnable != null)
-                    mServer.removeAllCallbacks(cancel.scheduled);
+                    cancel.scheduled.cancel();
 
                 // allow the middleware to massage the headers before the body is decoded
                 request.logv("Received headers:\n" + toString());
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
index 8ac83cd30..6bcb1215f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
@@ -1,6 +1,7 @@
 package com.koushikdutta.async.http;
 
 import android.net.Uri;
+import android.text.TextUtils;
 
 import com.koushikdutta.async.util.TaggedList;
 
@@ -88,6 +89,9 @@ public static Multimap parse(String value, String delimiter, String assigner, bo
         for (String part: parts) {
             String[] pair = part.split(assigner, 2);
             String key = pair[0].trim();
+            // watch for empty string or trailing delimiter
+            if (TextUtils.isEmpty(key))
+                continue;
             String v = null;
             if (pair.length > 1)
                 v = pair[1];
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 3061e9980..30324ab3d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -2,6 +2,7 @@
 
 import android.annotation.TargetApi;
 import android.os.Build;
+import android.util.Log;
 
 import com.koushikdutta.async.AsyncSSLSocket;
 import com.koushikdutta.async.AsyncSSLSocketWrapper;
@@ -13,6 +14,7 @@
 import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ListenCallback;
+import com.koushikdutta.async.callback.ValueCallback;
 import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.HttpUtil;
 import com.koushikdutta.async.http.Multimap;
@@ -53,7 +55,7 @@ protected AsyncHttpRequestBody onUnknownBody(Headers headers) {
     ListenCallback mListenCallback = new ListenCallback() {
         @Override
         public void onAccepted(final AsyncSocket socket) {
-            AsyncHttpServerRequestImpl req = new AsyncHttpServerRequestImpl() {
+            final AsyncHttpServerRequestImpl req = new AsyncHttpServerRequestImpl() {
                 HttpServerRequestCallback requestCallback;
                 String fullPath;
                 String path;
@@ -62,6 +64,24 @@ public void onAccepted(final AsyncSocket socket) {
                 AsyncHttpServerResponseImpl res;
                 boolean hasContinued;
 
+                final Runnable onFinally = new Runnable() {
+                    @Override
+                    public void run() {
+                        Log.i("HTTP", "Done");
+                    }
+                };
+
+                final ValueCallback<Exception> onException = new ValueCallback<Exception>() {
+                    @Override
+                    public void onResult(Exception value) {
+                        Log.e("HTTP", "exception", value);
+                    }
+                };
+
+                void onRequest() {
+                    AsyncHttpServer.this.onRequest(requestCallback, this, res);
+                }
+
                 @Override
                 protected AsyncHttpRequestBody onUnknownBody(Headers headers) {
                     return AsyncHttpServer.this.onUnknownBody(headers);
@@ -123,7 +143,7 @@ protected void onEnd() {
                         }
                     };
                     
-                    boolean handled = onRequest(this, res);
+                    boolean handled = AsyncHttpServer.this.onRequest(this, res);
                     if (handled)
                         return;
 
@@ -133,12 +153,8 @@ protected void onEnd() {
                         return;
                     }
 
-                    if (!getBody().readFullyOnRequest()) {
-                        onRequest(requestCallback, this, res);
-                    }
-                    else if (requestComplete) {
-                        onRequest(requestCallback, this, res);
-                    }
+                    if (!getBody().readFullyOnRequest() || requestComplete)
+                        onRequest();
                 }
 
                 @Override
@@ -157,10 +173,16 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                             mSocket.close();
                         }
                     });
+
+                    if (e != null) {
+                        mSocket.close();
+                        return;
+                    }
+
                     handleOnCompleted();
 
                     if (getBody().readFullyOnRequest()) {
-                        onRequest(requestCallback, this, res);
+                        onRequest();
                     }
                 }
                 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
index 9bb48b28a..7809f7658 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
@@ -314,7 +314,7 @@ public RouteMatch route(String method, String path) {
         }
     }
 
-    Callback callback = new Callback();
+    private Callback callback = new Callback();
 
     public HttpServerRequestCallback getCallback() {
         return callback;
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java b/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
index 14d27a354..8d6d568d6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
@@ -4,6 +4,7 @@
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.callback.ValueCallback;
+import com.koushikdutta.async.future.Cancellable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,7 +40,9 @@ public Object postDelayed(Runnable r, long delay) {
 
             @Override
             public void removeAllCallbacks(Object cancellable) {
-                server.removeAllCallbacks(cancellable);
+                if (cancellable == null)
+                    return;
+                ((Cancellable)cancellable).cancel();
             }
         };
     }
@@ -61,6 +64,8 @@ public Object postDelayed(Runnable r, long delay) {
 
             @Override
             public void removeAllCallbacks(Object cancellable) {
+                if (cancellable == null)
+                    return;
                 handler.removeCallbacks((Runnable)cancellable);
             }
         };
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/CallbackTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/CallbackTests.java
index 3534a675e..b7e3de3d1 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/CallbackTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/CallbackTests.java
@@ -12,6 +12,13 @@
 import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.ListenCallback;
+import com.koushikdutta.async.future.FutureCallback;
+import com.koushikdutta.async.http.AsyncHttpClient;
+import com.koushikdutta.async.http.AsyncHttpGet;
+import com.koushikdutta.async.http.server.AsyncHttpServer;
+import com.koushikdutta.async.http.server.AsyncHttpServerRequest;
+import com.koushikdutta.async.http.server.AsyncHttpServerResponse;
+import com.koushikdutta.async.http.server.HttpServerRequestCallback;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -57,13 +64,39 @@ public void onConnectCompleted(Exception ex, AsyncSocket socket) {
                 socket.setDataCallback(new DataCallback() {
                     @Override
                     public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+                        bb.recycle();
                         throw new NullPointerException("this should crash?");
+
+                    }
+                });
+            }
+        });
+
+        Thread.sleep(1000000);
+        fail();
+    }
+
+    @Test
+    public void testHttpServerThrow() throws Exception {
+        AsyncHttpServer server = new AsyncHttpServer();
+        int port = server.listen(0).getLocalPort();
+
+        server.get("/", new HttpServerRequestCallback() {
+            @Override
+            public void onRequest(AsyncHttpServerRequest request, AsyncHttpServerResponse response) {
+                AsyncHttpClient.getDefaultInstance().executeString(new AsyncHttpGet("https://google.com"), null)
+                .setCallback(new FutureCallback<String>() {
+                    @Override
+                    public void onCompleted(Exception e, String result) {
+                        throw new NullPointerException();
                     }
                 });
             }
         });
 
-        Thread.sleep(10000);
+        String result = AsyncHttpClient.getDefaultInstance().executeString(new AsyncHttpGet("http://localhost:" + port + "/"), null).get();
+
+        Thread.sleep(100000000);
         fail();
     }
 }

From 64bba3343306e5e11c28827378069309da3b423d Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 22 Nov 2018 00:40:22 -0800
Subject: [PATCH 280/399] magic transform pipeline

---
 .../koushikdutta/async/future/Converter.java  | 309 ++++++++++++++++++
 .../async/future/MultiTransformFuture.java    |  26 ++
 .../async/future/TransformFuture.java         |   7 +
 .../koushikdutta/async/test/ConvertTests.java |  23 ++
 4 files changed, 365 insertions(+)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/future/Converter.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/future/MultiTransformFuture.java
 create mode 100644 AndroidAsync/test/src/com/koushikdutta/async/test/ConvertTests.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
new file mode 100644
index 000000000..c5657c19c
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -0,0 +1,309 @@
+package com.koushikdutta.async.future;
+
+import com.koushikdutta.async.ByteBufferList;
+
+import org.json.JSONObject;
+
+import java.io.InvalidObjectException;
+import java.nio.ByteBuffer;
+import java.util.ArrayDeque;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+
+public class Converter<R> {
+    final public static <T> Converter<T> convert(Future<T> future, String mime) {
+        return new Converter<>(future, mime);
+    }
+
+    final public static <T> Converter<T> convert(Future<T> future) {
+        return convert(future, null);
+    }
+
+    static class MultiTransformer<T, F> extends MultiTransformFuture<T, Future<F>> {
+        TypeConverter<T, F> converter;
+        public MultiTransformer(TypeConverter<T, F> converter) {
+            this.converter = converter;
+        }
+
+        @Override
+        protected void transform(Future<F> result) {
+            // transform will only ever be called once,
+            // so there's no risk of running the converter twice.
+            result.setCallback(new FutureCallback<F>() {
+                @Override
+                public void onCompleted(Exception e, F result) {
+                    setComplete(converter.convert(result));
+                }
+            });
+        }
+    }
+
+    static abstract class EnsureHashMap<K, V> extends LinkedHashMap<K, V> {
+        synchronized V ensure(K k) {
+            if (!containsKey(k)) {
+                put(k, makeDefault());
+            }
+            return get(k);
+        }
+
+        protected abstract V makeDefault();
+    }
+
+    static class MimedType<T> {
+        MimedType(Class<T> type, String mime) {
+            this.type = type;
+            this.mime = mime;
+        }
+        Class<T> type;
+        String mime;
+
+        @Override
+        public int hashCode() {
+            return type.hashCode() ^ mime.hashCode();
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            MimedType other = (MimedType)obj;
+            return type.equals(other.type) && mime.equals(other.mime);
+        }
+
+        // check if this mimed type is the same or more specific than this mimed type
+        public MimedType<T> matches(MimedType other) {
+            // check the type
+            if (!this.type.isAssignableFrom(other.type))
+                return null;
+
+            return matches(other.mime);
+        }
+
+        public String primary() {
+            return mime.split("/")[0];
+        }
+
+        public String secondary() {
+            return mime.split("/")[1];
+        }
+
+        // check if this mimed type is convertible to another mimed type
+        public MimedType<T> matches(String mime) {
+            String[] parts = mime.split("/");
+            String[] myParts = this.mime.split("/");
+
+            // mime conversion can only become more specific.
+            if (!"*".equals(parts[0]) && !"*".equals(myParts[0]) && !parts[0].equals(myParts[0]))
+                return null;
+
+            if (!"*".equals(parts[1]) && !"*".equals(myParts[1]) && !parts[1].equals(myParts[1]))
+                return null;
+
+            String primary = !"*".equals(parts[0]) ? parts[0] : myParts[0];
+            String secondary = !"*".equals(parts[1]) ? parts[1] : myParts[1];
+
+            return new MimedType<>(type, primary + "/" + secondary);
+        }
+
+        @Override
+        public String toString() {
+            return type.getSimpleName() + " " + mime;
+        }
+    }
+
+    static class ConverterTransformers<F, T> extends LinkedHashMap<MimedType<T>, MultiTransformer<T, F>> {
+    }
+
+    static class Converters<F, T> extends EnsureHashMap<MimedType<F>, ConverterTransformers<F, T>> {
+        @Override
+        protected ConverterTransformers makeDefault() {
+            return new ConverterTransformers();
+        }
+
+        private static <F, T> void add(ConverterTransformers<F, T> set, ConverterTransformers<F, T> more) {
+            if (more == null)
+                return;
+            set.putAll(more);
+        }
+        public ConverterTransformers<F, T> getAll(MimedType<T> mimedType) {
+            ConverterTransformers<F, T> ret = new ConverterTransformers<>();
+            add(ret, get(mimedType));
+            add(ret, get(new MimedType<>(mimedType.type, mimedType.primary() + "/*")));
+            add(ret, get(new MimedType<>(mimedType.type, "*/*")));
+            return ret;
+        }
+    }
+
+    Converters<Object, Object> outputs = new Converters<>();
+
+    synchronized protected <F, T> void addTypeConverter(Class<F> from, String fromMime, Class<T> to, String toMime, TypeConverter<T, F> typeConverter) {
+        if (fromMime == null)
+            fromMime = MIME_ALL;
+        if (toMime == null)
+            toMime = MIME_ALL;
+        ((Converters<F, T>)outputs).ensure(new MimedType<>(from, fromMime)).put(new MimedType<>(to, toMime), new MultiTransformer<>(typeConverter));
+    }
+
+    private Converter() {
+        addTypeConverter(ByteBuffer.class, null, ByteBufferList.class, null, ByteBufferToByteBufferList);
+        addTypeConverter(String.class, null, byte[].class, null, StringToByteArray);
+        addTypeConverter(byte[].class, null, ByteBufferList.class, null, ByteArrayToByteBufferList);
+        addTypeConverter(byte[].class, null, ByteBuffer.class, null, ByteArrayToByteBuffer);
+        addTypeConverter(String.class, "application/json", JSONObject.class, null, StringToJSONObject);
+        addTypeConverter(JSONObject.class, null, String.class, "application/json", JSONObjectToString);
+    }
+
+    MultiFuture<R> future = new MultiFuture<>();
+    String futureMime;
+    protected Converter(Future future, String mime) {
+        this();
+        if (mime == null)
+            mime = MIME_ALL;
+        this.futureMime = mime;
+        this.future.setComplete(future);
+    }
+
+    synchronized private <T> Future<T> to(Object value, Class<T> clazz, String mime) {
+        if (clazz.isInstance(value))
+            return new SimpleFuture<>((T)value);
+
+        if (mime == null)
+            mime = MIME_ALL;
+
+        MimedType<T> target = new MimedType<>(clazz, mime);
+        ArrayDeque<MultiTransformer<Object, Object>> bestMatch = new ArrayDeque<>();
+        ArrayDeque<MultiTransformer<Object, Object>> currentPath = new ArrayDeque<>();
+        if (search(target, bestMatch, currentPath, new MimedType(value.getClass(), futureMime), new HashSet<MimedType>())) {
+            SimpleFuture<T> ret = new SimpleFuture<>();
+            MultiTransformer<Object, Object> current = bestMatch.removeLast();
+            ret.setComplete((MultiTransformer<T, Object>)current);
+            while (!bestMatch.isEmpty()) {
+                MultiTransformer<Object, Object> next = bestMatch.removeLast();
+                current.setComplete(next);
+                current = next;
+            }
+            current.setComplete(future);
+            return ret;
+        }
+
+        return new SimpleFuture<>(new InvalidObjectException("unable to find converter"));
+    }
+
+    public <T> Future<T> to(Class<T> clazz) {
+        return to(clazz, null);
+    }
+
+    private <T> boolean search(MimedType<T> target, ArrayDeque<MultiTransformer<Object, Object>> bestMatch, ArrayDeque<MultiTransformer<Object, Object>> currentPath, MimedType currentSearch, HashSet<MimedType> searched) {
+        if (target.matches(currentSearch) != null) {
+            bestMatch.clear();
+            bestMatch.addAll(currentPath);
+            return true;
+        }
+
+        // the current path must have potential to be better than the best match
+        // if best match is currently 4, the current path must be 2 to have
+        // the chance of a new search being better.
+        if (!bestMatch.isEmpty() && currentPath.size() > bestMatch.size() - 2)
+            return false;
+
+        // prevent reentrancy
+        if (searched.contains(currentSearch))
+            return false;
+        if (searched.contains(new MimedType(currentSearch.type, currentSearch.primary() + "/*")))
+            return false;
+        if (searched.contains(new MimedType(currentSearch.type, "*/*")))
+            return false;
+
+        boolean found = false;
+        searched.add(currentSearch);
+        ConverterTransformers<Object, Object> converterTransformers = outputs.getAll(currentSearch);
+        for (MimedType candidate: converterTransformers.keySet()) {
+            // this simulates the mime results of a transform
+            MimedType newSearch = candidate.matches(currentSearch.mime);
+
+            currentPath.addLast(converterTransformers.get(candidate));
+            try {
+                found |= search(target, bestMatch, currentPath, newSearch, searched);
+            }
+            finally {
+                currentPath.removeLast();
+            }
+        }
+
+        if (found) {
+            // if this resulted in a success,
+            // clear this from the currentSearch list, because we know this leads
+            // to a potential solution. maybe we can arrive here faster.
+            searched.remove(currentSearch);
+        }
+
+        return found;
+    }
+
+    private static final String MIME_ALL = "*/*";
+    public <T> Future<T> to(final Class<T> clazz, final String mime) {
+        return ((Future<R>)future).then(new TransformFuture<T, R>() {
+            @Override
+            protected void transform(R result) {
+                Future<T> converted = to(result, clazz, mime);
+                setComplete(converted);
+            }
+        });
+    }
+
+    public interface TypeConverter<T, F> {
+        Future<T> convert(F from);
+    }
+
+    private TypeConverter<byte[], String> StringToByteArray = new TypeConverter<byte[], String>() {
+        @Override
+        public SimpleFuture<byte[]> convert(String from) {
+            return new SimpleFuture<>(from.getBytes());
+        }
+    };
+
+    private TypeConverter<ByteBufferList, byte[]> ByteArrayToByteBufferList = new TypeConverter<ByteBufferList, byte[]>() {
+        @Override
+        public SimpleFuture<ByteBufferList> convert(byte[] from) {
+            return new SimpleFuture<>(new ByteBufferList(from));
+        }
+    };
+
+    private TypeConverter<ByteBuffer, byte[]> ByteArrayToByteBuffer = new TypeConverter<ByteBuffer, byte[]>() {
+        @Override
+        public SimpleFuture<ByteBuffer> convert(byte[] from) {
+            return new SimpleFuture<>(ByteBufferList.deepCopy(ByteBuffer.wrap(from)));
+        }
+    };
+
+    private TypeConverter<ByteBufferList, ByteBuffer> ByteBufferToByteBufferList = new TypeConverter<ByteBufferList, ByteBuffer>() {
+        @Override
+        public SimpleFuture<ByteBufferList> convert(ByteBuffer from) {
+            return new SimpleFuture<>(new ByteBufferList(ByteBufferList.deepCopy(from)));
+        }
+    };
+
+    private TypeConverter<JSONObject, String> StringToJSONObject = new TypeConverter<JSONObject, String>() {
+        @Override
+        public SimpleFuture<JSONObject> convert(String from) {
+            return new TransformFuture<JSONObject, String>(from) {
+                @Override
+                protected void transform(String result) throws Exception {
+                    setComplete(new JSONObject(result));
+                }
+            };
+        }
+    };
+
+    private TypeConverter<String, JSONObject> JSONObjectToString = new TypeConverter<String, JSONObject>() {
+        @Override
+        public SimpleFuture<String> convert(JSONObject from) {
+            return new TransformFuture<String, JSONObject>(from) {
+                @Override
+                protected void transform(JSONObject result) throws Exception {
+                    setComplete(result.toString());
+                }
+            };
+        }
+    };
+
+
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/MultiTransformFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/MultiTransformFuture.java
new file mode 100644
index 000000000..e82463d11
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/future/MultiTransformFuture.java
@@ -0,0 +1,26 @@
+package com.koushikdutta.async.future;
+
+public abstract class MultiTransformFuture<T, F> extends MultiFuture<T> implements FutureCallback<F> {
+    @Override
+    public void onCompleted(Exception e, F result) {
+        if (isCancelled())
+            return;
+        if (e != null) {
+            error(e);
+            return;
+        }
+
+        try {
+            transform(result);
+        }
+        catch (Exception ex) {
+            error(ex);
+        }
+    }
+
+    protected void error(Exception e) {
+        setComplete(e);
+    }
+
+    protected abstract void transform(F result) throws Exception;
+}
\ No newline at end of file
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/TransformFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/TransformFuture.java
index 4ea0f1749..f55b91eac 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/TransformFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/TransformFuture.java
@@ -1,6 +1,13 @@
 package com.koushikdutta.async.future;
 
 public abstract class TransformFuture<T, F> extends SimpleFuture<T> implements FutureCallback<F> {
+    public TransformFuture(F from) {
+        onCompleted(null, from);
+    }
+
+    public TransformFuture() {
+    }
+
     @Override
     public void onCompleted(Exception e, F result) {
         if (isCancelled())
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ConvertTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ConvertTests.java
new file mode 100644
index 000000000..8235bb5ae
--- /dev/null
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ConvertTests.java
@@ -0,0 +1,23 @@
+package com.koushikdutta.async.test;
+
+import android.support.test.runner.AndroidJUnit4;
+
+import com.koushikdutta.async.future.SimpleFuture;
+
+import org.json.JSONObject;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.nio.ByteBuffer;
+
+import static com.koushikdutta.async.future.Converter.convert;
+
+@RunWith(AndroidJUnit4.class)
+public class ConvertTests {
+    @Test
+    public void testConvert() throws Exception {
+        convert(new SimpleFuture<>(new JSONObject()))
+        .to(ByteBuffer.class)
+        .get();
+    }
+}

From 537b8bccab5733a3def58e735a2977f1c24a3fc4 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 22 Nov 2018 10:03:15 -0800
Subject: [PATCH 281/399] Implement Converter. New TransformFuture/flow built
 into all futures.

---
 AndroidAsync/build.gradle                     |  5 ++
 .../koushikdutta/async/future/Converter.java  | 85 ++++++++++++-------
 .../com/koushikdutta/async/future/Future.java | 21 ++++-
 .../async/future/SimpleFuture.java            | 19 +++++
 .../async/future/ThenCallback.java            |  5 ++
 .../async/future/TypeConverter.java           |  5 ++
 .../koushikdutta/async/test/ConvertTests.java |  5 +-
 7 files changed, 111 insertions(+), 34 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/future/ThenCallback.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/future/TypeConverter.java

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 2f729c7ae..17499789d 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -28,6 +28,11 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+
     compileSdkVersion project.hasProperty('global_compileSdkVersion') ? global_compileSdkVersion : 28
     buildToolsVersion project.hasProperty('global_buildToolsVersion') ? global_buildToolsVersion : '28.0.3'
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
index c5657c19c..41cd26b73 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -11,28 +11,44 @@
 import java.util.LinkedHashMap;
 
 public class Converter<R> {
-    final public static <T> Converter<T> convert(Future<T> future, String mime) {
+    public static <T> Converter<T> convert(Future<T> future, String mime) {
         return new Converter<>(future, mime);
     }
 
-    final public static <T> Converter<T> convert(Future<T> future) {
+    public static <T> Converter<T> convert(Future<T> future) {
         return convert(future, null);
     }
 
-    static class MultiTransformer<T, F> extends MultiTransformFuture<T, Future<F>> {
+    static class MimedData<T> {
+        public MimedData(T data, String mime) {
+            this.data = data;
+            this.mime = mime;
+        }
+        T data;
+        String mime;
+    }
+
+    static class MultiTransformer<T, F> extends MultiTransformFuture<MimedData<Future<T>>, MimedData<Future<F>>> {
         TypeConverter<T, F> converter;
-        public MultiTransformer(TypeConverter<T, F> converter) {
+        String converterMime;
+        public MultiTransformer(TypeConverter<T, F> converter, String converterMime) {
             this.converter = converter;
+            this.converterMime = converterMime;
         }
 
         @Override
-        protected void transform(Future<F> result) {
+        protected void transform(MimedData<Future<F>> result) {
             // transform will only ever be called once,
             // so there's no risk of running the converter twice.
-            result.setCallback(new FutureCallback<F>() {
+            final String mime = result.mime;
+
+            final MultiFuture<T> converted = new MultiFuture<>();
+            setComplete(new MimedData<Future<T>>(converted, new MimedType(null, mime).matches(converterMime).mime));
+
+            result.data.setCallback(new FutureCallback<F>() {
                 @Override
-                public void onCompleted(Exception e, F result) {
-                    setComplete(converter.convert(result));
+                public void onCompleted(Exception e, F data) {
+                    converted.setComplete(converter.convert(data, mime));
                 }
             });
         }
@@ -139,7 +155,7 @@ synchronized protected <F, T> void addTypeConverter(Class<F> from, String fromMi
             fromMime = MIME_ALL;
         if (toMime == null)
             toMime = MIME_ALL;
-        ((Converters<F, T>)outputs).ensure(new MimedType<>(from, fromMime)).put(new MimedType<>(to, toMime), new MultiTransformer<>(typeConverter));
+        ((Converters<F, T>)outputs).ensure(new MimedType<>(from, fromMime)).put(new MimedType<>(to, toMime), new MultiTransformer<>(typeConverter, toMime));
     }
 
     private Converter() {
@@ -169,29 +185,41 @@ synchronized private <T> Future<T> to(Object value, Class<T> clazz, String mime)
             mime = MIME_ALL;
 
         MimedType<T> target = new MimedType<>(clazz, mime);
-        ArrayDeque<MultiTransformer<Object, Object>> bestMatch = new ArrayDeque<>();
-        ArrayDeque<MultiTransformer<Object, Object>> currentPath = new ArrayDeque<>();
+        ArrayDeque<PathInfo> bestMatch = new ArrayDeque<>();
+        ArrayDeque<PathInfo> currentPath = new ArrayDeque<>();
         if (search(target, bestMatch, currentPath, new MimedType(value.getClass(), futureMime), new HashSet<MimedType>())) {
-            SimpleFuture<T> ret = new SimpleFuture<>();
-            MultiTransformer<Object, Object> current = bestMatch.removeLast();
-            ret.setComplete((MultiTransformer<T, Object>)current);
+            PathInfo current = bestMatch.removeFirst();
+            new SimpleFuture<>(new MimedData<>((Future<Object>)future, futureMime)).then(current.transformer);
+
             while (!bestMatch.isEmpty()) {
-                MultiTransformer<Object, Object> next = bestMatch.removeLast();
-                current.setComplete(next);
+                PathInfo next = bestMatch.removeFirst();
+                current.transformer.then(next.transformer);
                 current = next;
             }
-            current.setComplete(future);
+
+            TransformFuture<T, MimedData<Future<T>>> ret = new TransformFuture<T, MimedData<Future<T>>>() {
+                @Override
+                protected void transform(MimedData<Future<T>> result) throws Exception {
+                    setComplete(result.data);
+                }
+            };
+            ((MultiTransformer<T, Object>)current.transformer).then(ret);
             return ret;
         }
 
         return new SimpleFuture<>(new InvalidObjectException("unable to find converter"));
     }
 
+    static class PathInfo {
+        MultiTransformer<Object, Object> transformer;
+        String mime;
+    }
+
     public <T> Future<T> to(Class<T> clazz) {
         return to(clazz, null);
     }
 
-    private <T> boolean search(MimedType<T> target, ArrayDeque<MultiTransformer<Object, Object>> bestMatch, ArrayDeque<MultiTransformer<Object, Object>> currentPath, MimedType currentSearch, HashSet<MimedType> searched) {
+    private <T> boolean search(MimedType<T> target, ArrayDeque<PathInfo> bestMatch, ArrayDeque<PathInfo> currentPath, MimedType currentSearch, HashSet<MimedType> searched) {
         if (target.matches(currentSearch) != null) {
             bestMatch.clear();
             bestMatch.addAll(currentPath);
@@ -219,7 +247,10 @@ private <T> boolean search(MimedType<T> target, ArrayDeque<MultiTransformer<Obje
             // this simulates the mime results of a transform
             MimedType newSearch = candidate.matches(currentSearch.mime);
 
-            currentPath.addLast(converterTransformers.get(candidate));
+            PathInfo path = new PathInfo();
+            path.transformer = converterTransformers.get(candidate);
+            path.mime = newSearch.mime;
+            currentPath.addLast(path);
             try {
                 found |= search(target, bestMatch, currentPath, newSearch, searched);
             }
@@ -249,41 +280,37 @@ protected void transform(R result) {
         });
     }
 
-    public interface TypeConverter<T, F> {
-        Future<T> convert(F from);
-    }
-
     private TypeConverter<byte[], String> StringToByteArray = new TypeConverter<byte[], String>() {
         @Override
-        public SimpleFuture<byte[]> convert(String from) {
+        public SimpleFuture<byte[]> convert(String from, String fromMime) {
             return new SimpleFuture<>(from.getBytes());
         }
     };
 
     private TypeConverter<ByteBufferList, byte[]> ByteArrayToByteBufferList = new TypeConverter<ByteBufferList, byte[]>() {
         @Override
-        public SimpleFuture<ByteBufferList> convert(byte[] from) {
+        public SimpleFuture<ByteBufferList> convert(byte[] from, String fromMime) {
             return new SimpleFuture<>(new ByteBufferList(from));
         }
     };
 
     private TypeConverter<ByteBuffer, byte[]> ByteArrayToByteBuffer = new TypeConverter<ByteBuffer, byte[]>() {
         @Override
-        public SimpleFuture<ByteBuffer> convert(byte[] from) {
+        public SimpleFuture<ByteBuffer> convert(byte[] from, String fromMime) {
             return new SimpleFuture<>(ByteBufferList.deepCopy(ByteBuffer.wrap(from)));
         }
     };
 
     private TypeConverter<ByteBufferList, ByteBuffer> ByteBufferToByteBufferList = new TypeConverter<ByteBufferList, ByteBuffer>() {
         @Override
-        public SimpleFuture<ByteBufferList> convert(ByteBuffer from) {
+        public SimpleFuture<ByteBufferList> convert(ByteBuffer from, String fromMime) {
             return new SimpleFuture<>(new ByteBufferList(ByteBufferList.deepCopy(from)));
         }
     };
 
     private TypeConverter<JSONObject, String> StringToJSONObject = new TypeConverter<JSONObject, String>() {
         @Override
-        public SimpleFuture<JSONObject> convert(String from) {
+        public SimpleFuture<JSONObject> convert(String from, String fromMime) {
             return new TransformFuture<JSONObject, String>(from) {
                 @Override
                 protected void transform(String result) throws Exception {
@@ -295,7 +322,7 @@ protected void transform(String result) throws Exception {
 
     private TypeConverter<String, JSONObject> JSONObjectToString = new TypeConverter<String, JSONObject>() {
         @Override
-        public SimpleFuture<String> convert(JSONObject from) {
+        public SimpleFuture<String> convert(JSONObject from, String fromMime) {
             return new TransformFuture<String, JSONObject>(from) {
                 @Override
                 protected void transform(JSONObject result) throws Exception {
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Future.java b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
index 7fc1ccd89..94005209c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Future.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
@@ -1,13 +1,15 @@
 package com.koushikdutta.async.future;
 
 
+import android.view.ViewDebug;
+
 public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
     /**
      * Set a callback to be invoked when this Future completes.
      * @param callback
      * @return
      */
-    public Future<T> setCallback(FutureCallback<T> callback);
+    Future<T> setCallback(FutureCallback<T> callback);
 
     /**
      * Set a callback to be invoked when this Future completes.
@@ -15,17 +17,28 @@ public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
      * @param <C>
      * @return The callback
      */
-    public <C extends FutureCallback<T>> C then(C callback);
+    @ViewDebug.ExportedProperty
+    <C extends FutureCallback<T>> C then(C callback);
+
+    /**
+     * Set a callback to be invoked when this Future completes
+     * successfully.
+     * @param then
+     * @param <R>
+     * @return A future that will contain the future result of ThenCallback
+     * or the failure from this Future.
+     */
+    <R> Future<R> then(ThenCallback<R, T> then);
 
     /**
      * Get the result, if any. Returns null if still in progress.
      * @return
      */
-    public T tryGet();
+    T tryGet();
 
     /**
      * Get the exception, if any. Returns null if still in progress.
      * @return
      */
-    public Exception tryGetException();
+    Exception tryGetException();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
index da046e26e..411b20feb 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -184,6 +184,25 @@ public final <C extends FutureCallback<T>> C then(C callback) {
         return callback;
     }
 
+    @Override
+    public <R> Future<R> then(ThenCallback<R, T> then) {
+        final SimpleFuture<R> ret = new SimpleFuture<>();
+        setCallback((e, result) -> {
+            if (e != null) {
+                ret.setComplete(e);
+                return;
+            }
+            try {
+                ret.setComplete(then.then(result));
+            }
+            catch (Exception callbackException) {
+                ret.setComplete(callbackException);
+            }
+        });
+
+        return ret;
+    }
+
     @Override
     public SimpleFuture<T> setParent(Cancellable parent) {
         super.setParent(parent);
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/ThenCallback.java b/AndroidAsync/src/com/koushikdutta/async/future/ThenCallback.java
new file mode 100644
index 000000000..1ce081145
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/future/ThenCallback.java
@@ -0,0 +1,5 @@
+package com.koushikdutta.async.future;
+
+public interface ThenCallback<T, F> {
+    Future<T> then(F from) throws Exception;
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/TypeConverter.java b/AndroidAsync/src/com/koushikdutta/async/future/TypeConverter.java
new file mode 100644
index 000000000..17184fb07
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/future/TypeConverter.java
@@ -0,0 +1,5 @@
+package com.koushikdutta.async.future;
+
+public interface TypeConverter<T, F> {
+    Future<T> convert(F from, String fromMime);
+}
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ConvertTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ConvertTests.java
index 8235bb5ae..e7486a5ec 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/ConvertTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ConvertTests.java
@@ -11,13 +11,16 @@
 import java.nio.ByteBuffer;
 
 import static com.koushikdutta.async.future.Converter.convert;
+import static org.junit.Assert.assertEquals;
 
 @RunWith(AndroidJUnit4.class)
 public class ConvertTests {
     @Test
     public void testConvert() throws Exception {
-        convert(new SimpleFuture<>(new JSONObject()))
+        ByteBuffer buf = convert(new SimpleFuture<>(new JSONObject()))
         .to(ByteBuffer.class)
         .get();
+
+        assertEquals(buf.remaining(), 2);
     }
 }

From 9f723292d87bbf85e7d28f07a944939afd7c06d2 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 22 Nov 2018 12:59:36 -0800
Subject: [PATCH 282/399] refactor setCallback into: success fail(Convert)
 then(Convert)

This allows for easier chaining and success/error handling.
---
 .../com/koushikdutta/async/AsyncServer.java   |   9 +-
 .../koushikdutta/async/future/Converter.java  |  31 +-
 .../async/future/FailCallback.java            |  12 +
 .../async/future/FailFutureCallback.java      |  12 +
 .../com/koushikdutta/async/future/Future.java |  43 +-
 .../async/future/HandlerFuture.java           |   4 +-
 .../async/future/MultiFuture.java             |  18 +-
 .../async/future/SimpleFuture.java            |  56 ++-
 .../async/future/SuccessCallback.java         |   5 +
 .../async/future/ThenCallback.java            |   9 +-
 .../async/future/ThenFutureCallback.java      |  12 +
 .../async/http/AsyncHttpClient.java           |  29 +-
 .../async/http/AsyncSocketMiddleware.java     | 108 ++--
 .../async/http/socketio/Acknowledge.java      |   7 -
 .../async/http/socketio/ConnectCallback.java  |   5 -
 .../http/socketio/DisconnectCallback.java     |   8 -
 .../async/http/socketio/ErrorCallback.java    |   8 -
 .../async/http/socketio/EventCallback.java    |   7 -
 .../async/http/socketio/EventEmitter.java     |  54 --
 .../http/socketio/ExceptionCallback.java      |   8 -
 .../async/http/socketio/JSONCallback.java     |   8 -
 .../http/socketio/ReconnectCallback.java      |   5 -
 .../async/http/socketio/SocketIOClient.java   | 188 -------
 .../http/socketio/SocketIOConnection.java     | 466 ------------------
 .../http/socketio/SocketIOException.java      |  10 -
 .../async/http/socketio/SocketIORequest.java  |  73 ---
 .../async/http/socketio/StringCallback.java   |   5 -
 .../socketio/transport/SocketIOTransport.java |  40 --
 .../transport/WebSocketTransport.java         |  73 ---
 .../transport/XHRPollingTransport.java        | 145 ------
 .../async/http/spdy/SpdyMiddleware.java       |  44 +-
 .../async/parser/DocumentParser.java          |  12 +-
 .../async/parser/JSONArrayParser.java         |   9 +-
 .../async/parser/JSONObjectParser.java        |  10 +-
 .../async/parser/StringParser.java            |  14 +-
 35 files changed, 241 insertions(+), 1306 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/future/FailCallback.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/future/FailFutureCallback.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/future/SuccessCallback.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/future/ThenFutureCallback.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/Acknowledge.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/ConnectCallback.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/DisconnectCallback.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/ErrorCallback.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/EventCallback.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/EventEmitter.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/ExceptionCallback.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/JSONCallback.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/ReconnectCallback.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOClient.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOException.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIORequest.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/StringCallback.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/SocketIOTransport.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/WebSocketTransport.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/XHRPollingTransport.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 762ea4d4a..e1989cb54 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -11,6 +11,7 @@
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.FutureCallback;
 import com.koushikdutta.async.future.SimpleFuture;
+import com.koushikdutta.async.future.ThenFutureCallback;
 import com.koushikdutta.async.future.TransformFuture;
 import com.koushikdutta.async.util.StreamUtility;
 
@@ -483,13 +484,7 @@ public void run() {
     }
 
     public Future<InetAddress> getByName(String host) {
-        return getAllByName(host)
-        .then(new TransformFuture<InetAddress, InetAddress[]>() {
-            @Override
-            protected void transform(InetAddress[] result) throws Exception {
-                setComplete(result[0]);
-            }
-        });
+        return getAllByName(host).thenConvert(addresses -> addresses[0]);
     }
 
     private void handleSocket(final AsyncNetworkSocket handler) throws ClosedChannelException {
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
index 41cd26b73..6bebd1137 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -51,6 +51,8 @@ public void onCompleted(Exception e, F data) {
                     converted.setComplete(converter.convert(data, mime));
                 }
             });
+
+            result.data.then((ThenFutureCallback<T, F>) from -> converter.convert(from, mime));
         }
     }
 
@@ -179,32 +181,29 @@ protected Converter(Future future, String mime) {
 
     synchronized private <T> Future<T> to(Object value, Class<T> clazz, String mime) {
         if (clazz.isInstance(value))
-            return new SimpleFuture<>((T)value);
+            return new SimpleFuture<>((T) value);
+        return to(value.getClass(), clazz, mime);
+    }
 
+    synchronized private <T> Future<T> to(Class fromClass, Class<T> clazz, String mime) {
         if (mime == null)
             mime = MIME_ALL;
 
         MimedType<T> target = new MimedType<>(clazz, mime);
         ArrayDeque<PathInfo> bestMatch = new ArrayDeque<>();
         ArrayDeque<PathInfo> currentPath = new ArrayDeque<>();
-        if (search(target, bestMatch, currentPath, new MimedType(value.getClass(), futureMime), new HashSet<MimedType>())) {
+        if (search(target, bestMatch, currentPath, new MimedType(fromClass, futureMime), new HashSet<MimedType>())) {
             PathInfo current = bestMatch.removeFirst();
-            new SimpleFuture<>(new MimedData<>((Future<Object>)future, futureMime)).then(current.transformer);
+
+            new SimpleFuture<>(new MimedData<>((Future<Object>)future, futureMime)).setCallback(current.transformer);
 
             while (!bestMatch.isEmpty()) {
                 PathInfo next = bestMatch.removeFirst();
-                current.transformer.then(next.transformer);
+                current.transformer.setCallback(next.transformer);
                 current = next;
             }
 
-            TransformFuture<T, MimedData<Future<T>>> ret = new TransformFuture<T, MimedData<Future<T>>>() {
-                @Override
-                protected void transform(MimedData<Future<T>> result) throws Exception {
-                    setComplete(result.data);
-                }
-            };
-            ((MultiTransformer<T, Object>)current.transformer).then(ret);
-            return ret;
+            return ((MultiTransformer<T, Object>)current.transformer).then(from -> from.data);
         }
 
         return new SimpleFuture<>(new InvalidObjectException("unable to find converter"));
@@ -271,13 +270,7 @@ private <T> boolean search(MimedType<T> target, ArrayDeque<PathInfo> bestMatch,
 
     private static final String MIME_ALL = "*/*";
     public <T> Future<T> to(final Class<T> clazz, final String mime) {
-        return ((Future<R>)future).then(new TransformFuture<T, R>() {
-            @Override
-            protected void transform(R result) {
-                Future<T> converted = to(result, clazz, mime);
-                setComplete(converted);
-            }
-        });
+        return future.then(from -> to(from, clazz ,mime));
     }
 
     private TypeConverter<byte[], String> StringToByteArray = new TypeConverter<byte[], String>() {
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/FailCallback.java b/AndroidAsync/src/com/koushikdutta/async/future/FailCallback.java
new file mode 100644
index 000000000..26d45973f
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/future/FailCallback.java
@@ -0,0 +1,12 @@
+package com.koushikdutta.async.future;
+
+public interface FailCallback<T> {
+    /**
+     * Callback that is invoked when a future completes with an error.
+     * The error should be rethrown, or a new value should be returned.
+     * @param e
+     * @return
+     * @throws Exception
+     */
+    T fail(Exception e) throws Exception;
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/FailFutureCallback.java b/AndroidAsync/src/com/koushikdutta/async/future/FailFutureCallback.java
new file mode 100644
index 000000000..f9454fad2
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/future/FailFutureCallback.java
@@ -0,0 +1,12 @@
+package com.koushikdutta.async.future;
+
+public interface FailFutureCallback<T> {
+    /**
+     * Callback that is invoked when a future completes with an error.
+     * The error should be rethrown, or a new future value should be returned.
+     * @param e
+     * @return
+     * @throws Exception
+     */
+    Future<T> fail(Exception e) throws Exception;
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Future.java b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
index 94005209c..29f77c6d5 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Future.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
@@ -1,7 +1,7 @@
 package com.koushikdutta.async.future;
 
 
-import android.view.ViewDebug;
+import com.koushikdutta.async.callback.ValueCallback;
 
 public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
     /**
@@ -9,26 +9,51 @@ public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
      * @param callback
      * @return
      */
-    Future<T> setCallback(FutureCallback<T> callback);
+    void setCallback(FutureCallback<T> callback);
 
     /**
-     * Set a callback to be invoked when this Future completes.
+     * Set a callback to be invoked when this Future completes successfully.
      * @param callback
-     * @param <C>
-     * @return The callback
      */
-    @ViewDebug.ExportedProperty
-    <C extends FutureCallback<T>> C then(C callback);
+    Future<T> success(SuccessCallback<T> callback);
 
     /**
-     * Set a callback to be invoked when this Future completes
+     * Set a callback to be invoked when this Future completes successfully.
      * successfully.
      * @param then
      * @param <R>
      * @return A future that will contain the future result of ThenCallback
      * or the failure from this Future.
      */
-    <R> Future<R> then(ThenCallback<R, T> then);
+    <R> Future<R> then(ThenFutureCallback<R, T> then);
+
+    /**
+     * Set a callback to be invoked when this Future completes successfully.
+     * successfully.
+     * @param then
+     * @param <R>
+     * @return A future that will contain the result of ThenCallback
+     * or the failure from this Future.
+     */
+    <R> Future<R> thenConvert(ThenCallback<R, T> then);
+
+    /**
+     * Set a callback to be invoked when this future completes with a failure.
+     * The failure can be observered and rethrown, or handled by returning
+     * a new value of the same type.
+     * @param fail
+     * @return
+     */
+    Future<T> failConvert(FailCallback<T> fail);
+
+    /**
+     * Set a callback to be invoked when this future completes with a failure.
+     * The failure should be observered and rethrown, or handled by returning
+     * a new future of the same type.
+     * @param fail
+     * @return
+     */
+    Future<T> fail(FailFutureCallback<T> fail);
 
     /**
      * Get the result, if any. Returns null if still in progress.
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/HandlerFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/HandlerFuture.java
index d03eaf9e4..9378fceba 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/HandlerFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/HandlerFuture.java
@@ -17,7 +17,7 @@ public HandlerFuture() {
     }
 
     @Override
-    public SimpleFuture<T> setCallback(final FutureCallback<T> callback) {
+    public void setCallback(final FutureCallback<T> callback) {
         FutureCallback<T> wrapped = new FutureCallback<T>() {
             @Override
             public void onCompleted(final Exception e, final T result) {
@@ -34,6 +34,6 @@ public void run() {
                 });
             }
         };
-        return super.setCallback(wrapped);
+        super.setCallback(wrapped);
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/MultiFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/MultiFuture.java
index a960a21c7..c226d1167 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/MultiFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/MultiFuture.java
@@ -8,6 +8,21 @@
 public class MultiFuture<T> extends SimpleFuture<T> {
     ArrayList<FutureCallback<T>> callbacks;
 
+    public MultiFuture() {
+    }
+
+    public MultiFuture(T value) {
+        super(value);
+    }
+
+    public MultiFuture(Exception e) {
+        super(e);
+    }
+
+    public MultiFuture(Future<T> future) {
+        super(future);
+    }
+
     final FutureCallback<T> callback = new FutureCallback<T>() {
         @Override
         public void onCompleted(Exception e, T result) {
@@ -26,7 +41,7 @@ public void onCompleted(Exception e, T result) {
     };
 
     @Override
-    public MultiFuture<T> setCallback(FutureCallback<T> callback) {
+    public void setCallback(FutureCallback<T> callback) {
         synchronized (this) {
             if (callbacks == null)
                 callbacks = new ArrayList<FutureCallback<T>>();
@@ -45,7 +60,6 @@ public MultiFuture<T> setCallback(FutureCallback<T> callback) {
         // 1-INVOKE LIST
         // 2-INVOKE NULL
         super.setCallback(this.callback);
-        return this;
     }
 
     public void removeCallback(FutureCallback<T> callback) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
index 411b20feb..22d23a70f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -25,6 +25,10 @@ public SimpleFuture(Exception e) {
         setComplete(e);
     }
 
+    public SimpleFuture(Future<T> future) {
+        setComplete(future);
+    }
+
     @Override
     public boolean cancel(boolean mayInterruptIfRunning) {
         return cancel();
@@ -163,7 +167,7 @@ public FutureCallback<T> getCallback() {
     }
 
     @Override
-    public SimpleFuture<T> setCallback(FutureCallback<T> callback) {
+    public void setCallback(FutureCallback<T> callback) {
         // callback can only be changed or read/used inside a sync block
         synchronized (this) {
             this.callback = callback;
@@ -173,19 +177,28 @@ public SimpleFuture<T> setCallback(FutureCallback<T> callback) {
                 callback = null;
         }
         handleCallbackUnlocked(callback);
-        return this;
     }
 
     @Override
-    public final <C extends FutureCallback<T>> C then(C callback) {
-        if (callback instanceof DependentCancellable)
-            ((DependentCancellable)callback).setParent(this);
-        setCallback(callback);
-        return callback;
+    public Future<T> success(SuccessCallback<T> callback) {
+        final SimpleFuture<T> ret = new SimpleFuture<>();
+        setCallback((e, result) -> {
+            if (e != null) {
+                ret.setComplete(e);
+                return;
+            }
+            try {
+                callback.success(result);
+            }
+            catch (Exception callbackException) {
+                ret.setComplete(callbackException);
+            }
+        });
+        return ret;
     }
 
     @Override
-    public <R> Future<R> then(ThenCallback<R, T> then) {
+    public <R> Future<R> then(ThenFutureCallback<R, T> then) {
         final SimpleFuture<R> ret = new SimpleFuture<>();
         setCallback((e, result) -> {
             if (e != null) {
@@ -199,10 +212,37 @@ public <R> Future<R> then(ThenCallback<R, T> then) {
                 ret.setComplete(callbackException);
             }
         });
+        return ret;
+    }
 
+    @Override
+    public <R> Future<R> thenConvert(final ThenCallback<R, T> callback) {
+        return then(from -> new SimpleFuture<>(callback.then(from)));
+    }
+
+    @Override
+    public Future<T> fail(FailFutureCallback<T> fail) {
+        SimpleFuture<T> ret = new SimpleFuture<>();
+        setCallback((e, result) -> {
+            if (result != null) {
+                ret.setComplete(result);
+                return;
+            }
+            try {
+                fail.fail(e);
+            }
+            catch (Exception callbackException) {
+                ret.setComplete(callbackException);
+            }
+        });
         return ret;
     }
 
+    @Override
+    public Future<T> failConvert(FailCallback<T> fail) {
+        return fail(SimpleFuture::new);
+    }
+
     @Override
     public SimpleFuture<T> setParent(Cancellable parent) {
         super.setParent(parent);
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SuccessCallback.java b/AndroidAsync/src/com/koushikdutta/async/future/SuccessCallback.java
new file mode 100644
index 000000000..c3889da5c
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SuccessCallback.java
@@ -0,0 +1,5 @@
+package com.koushikdutta.async.future;
+
+public interface SuccessCallback<T> {
+    void success(T value) throws Exception;
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/ThenCallback.java b/AndroidAsync/src/com/koushikdutta/async/future/ThenCallback.java
index 1ce081145..a1f0c56ed 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/ThenCallback.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/ThenCallback.java
@@ -1,5 +1,12 @@
 package com.koushikdutta.async.future;
 
 public interface ThenCallback<T, F> {
-    Future<T> then(F from) throws Exception;
+    /**
+     * Callback that is invoked when Future.then completes,
+     * and converts a value F to value T.
+     * @param from
+     * @return
+     * @throws Exception
+     */
+    T then(F from) throws Exception;
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/ThenFutureCallback.java b/AndroidAsync/src/com/koushikdutta/async/future/ThenFutureCallback.java
new file mode 100644
index 000000000..3737cd149
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/future/ThenFutureCallback.java
@@ -0,0 +1,12 @@
+package com.koushikdutta.async.future;
+
+public interface ThenFutureCallback<T, F> {
+    /**
+     * Callback that is invoked when Future.then completes,
+     * and converts a value F to a Future<T>.
+     * @param from
+     * @return
+     * @throws Exception
+     */
+    Future<T> then(F from) throws Exception;
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 30da55367..c0a24e2aa 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -15,7 +15,6 @@
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.future.Cancellable;
 import com.koushikdutta.async.future.Future;
-import com.koushikdutta.async.future.FutureCallback;
 import com.koushikdutta.async.future.SimpleFuture;
 import com.koushikdutta.async.http.callback.HttpConnectCallback;
 import com.koushikdutta.async.http.callback.RequestCallback;
@@ -631,26 +630,18 @@ public void onCompleted(Exception ex) {
     public <T> SimpleFuture<T> execute(AsyncHttpRequest req, final AsyncParser<T> parser, final RequestCallback<T> callback) {
         final FutureAsyncHttpResponse cancel = new FutureAsyncHttpResponse();
         final SimpleFuture<T> ret = new SimpleFuture<T>();
-        execute(req, 0, cancel, new HttpConnectCallback() {
-            @Override
-            public void onConnectCompleted(Exception ex, final AsyncHttpResponse response) {
-                if (ex != null) {
-                    invoke(callback, ret, response, ex, null);
-                    return;
-                }
-                invokeConnect(callback, response);
+        execute(req, 0, cancel, (ex, response) -> {
+            if (ex != null) {
+                invoke(callback, ret, response, ex, null);
+                return;
+            }
+            invokeConnect(callback, response);
 
-                Future<T> parsed = parser.parse(response)
-                .setCallback(new FutureCallback<T>() {
-                    @Override
-                    public void onCompleted(Exception e, T result) {
-                        invoke(callback, ret, response, e, result);
-                    }
-                });
+            Future<T> parsed = parser.parse(response);
+            parsed.setCallback((e, result) -> invoke(callback, ret, response, e, result));
 
-                // reparent to the new parser future
-                ret.setParent(parsed);
-            }
+            // reparent to the new parser future
+            ret.setParent(parsed);
         });
         ret.setParent(cancel);
         return ret;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index a94d39c24..cdfa5fff0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -2,23 +2,22 @@
 
 import android.net.Uri;
 
-import com.koushikdutta.async.util.ArrayDeque;
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ConnectCallback;
-import com.koushikdutta.async.callback.ContinuationCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.future.Cancellable;
-import com.koushikdutta.async.future.Continuation;
+import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.SimpleCancellable;
-import com.koushikdutta.async.future.TransformFuture;
+import com.koushikdutta.async.future.SimpleFuture;
+import com.koushikdutta.async.util.ArrayDeque;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.util.Arrays;
 import java.util.Hashtable;
-import java.util.Locale;
 
 public class AsyncSocketMiddleware extends SimpleMiddleware {
     String scheme;
@@ -189,73 +188,48 @@ public Cancellable getSocket(final GetSocketData data) {
 
         // try to connect to everything...
         data.request.logv("Resolving domain and connecting to all available addresses");
-        return mClient.getServer().getAllByName(uri.getHost())
-        .then(new TransformFuture<AsyncSocket, InetAddress[]>() {
-            Exception lastException;
 
-            @Override
-            protected void error(Exception e) {
-                super.error(e);
-                wrapCallback(data, uri, port, false, data.connectCallback).onConnectCompleted(e, null);
-            }
+        final SimpleFuture<AsyncSocket> returnValue = new SimpleFuture<>();
 
-            @Override
-            protected void transform(final InetAddress[] result) throws Exception {
-                Continuation keepTrying = new Continuation(new CompletedCallback() {
-                    @Override
-                    public void onCompleted(Exception ex) {
-                        // if it completed, that means that the connection failed
-                        if (lastException == null)
-                            lastException = new ConnectionFailedException("Unable to connect to remote address");
-                        if (setComplete(lastException)) {
-                            wrapCallback(data, uri, port, false, data.connectCallback).onConnectCompleted(lastException, null);
-                        }
+        mClient.getServer().getAllByName(uri.getHost())
+        .then(from -> {
+            Future<AsyncSocket> current = new SimpleFuture<>(new Exception("empty ip address list"));
+            ArrayDeque<InetAddress> addresses = new ArrayDeque<>(Arrays.asList(from));
+
+            current = current.fail(e -> {
+                if (addresses.isEmpty())
+                    throw e;
+
+                InetAddress address = addresses.removeFirst();
+                SimpleFuture<AsyncSocket> ret = new SimpleFuture<>();
+
+                mClient.getServer().connectSocket(new InetSocketAddress(address, port),
+                wrapCallback(data, uri, port, false, (ex, socket) -> {
+                    // try the next address or fail altogether
+                    if (ex != null) {
+                        ret.setComplete(ex);
+                        return;
                     }
-                });
-
-                for (final InetAddress address: result) {
-                    final String inetSockAddress = String.format(Locale.ENGLISH, "%s:%s", address, port);
-                    keepTrying.add(new ContinuationCallback() {
-                        @Override
-                        public void onContinue(Continuation continuation, final CompletedCallback next) throws Exception {
-                            data.request.logv("attempting connection to " + inetSockAddress);
-                            mClient.getServer().connectSocket(new InetSocketAddress(address, port),
-                                wrapCallback(data, uri, port, false, new ConnectCallback() {
-                                @Override
-                                public void onConnectCompleted(Exception ex, AsyncSocket socket) {
-                                    if (isDone()) {
-                                        lastException = new Exception("internal error during connect to " + inetSockAddress);
-                                        next.onCompleted(null);
-                                        return;
-                                    }
-
-                                    // try the next address
-                                    if (ex != null) {
-                                        lastException = ex;
-                                        next.onCompleted(null);
-                                        return;
-                                    }
-
-                                    // if the socket is no longer needed, just hang onto it...
-                                    if (isDone() || isCancelled()) {
-                                        data.request.logd("Recycling extra socket leftover from cancelled operation");
-                                        idleSocket(socket);
-                                        recycleSocket(socket, data.request);
-                                        return;
-                                    }
-
-                                    if (setComplete(null, socket)) {
-                                        data.connectCallback.onConnectCompleted(null, socket);
-                                    }
-                                }
-                            }));
-                        }
-                    });
-                }
 
-                keepTrying.start();
-            }
+                    // attempt to successfully complete this socket, but
+                    // if the socket is no longer needed, just hang onto it...
+                    if (returnValue.isDone() || returnValue.isCancelled() || !ret.setComplete(socket)) {
+                        data.request.logd("Recycling extra socket leftover from cancelled operation");
+                        idleSocket(socket);
+                        recycleSocket(socket, data.request);
+                        return;
+                    }
+
+                    data.connectCallback.onConnectCompleted(null, socket);
+                }));
+
+                return ret;
+            });
+
+            return current;
         });
+
+        return returnValue;
     }
 
     private ConnectionInfo getOrCreateConnectionInfo(String lookup) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/Acknowledge.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/Acknowledge.java
deleted file mode 100644
index 8bf1c6448..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/Acknowledge.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.koushikdutta.async.http.socketio;
-
-import org.json.JSONArray;
-
-public interface Acknowledge {
-    void acknowledge(JSONArray arguments);
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/ConnectCallback.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/ConnectCallback.java
deleted file mode 100644
index 7ff69d768..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/ConnectCallback.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.koushikdutta.async.http.socketio;
-
-public interface ConnectCallback {
-    public void onConnectCompleted(Exception ex, SocketIOClient client);
-}
\ No newline at end of file
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/DisconnectCallback.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/DisconnectCallback.java
deleted file mode 100644
index 97ec4b62b..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/DisconnectCallback.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.koushikdutta.async.http.socketio;
-
-/**
- * Created by koush on 7/2/13.
- */
-public interface DisconnectCallback {
-    void onDisconnect(Exception e);
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/ErrorCallback.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/ErrorCallback.java
deleted file mode 100644
index 641166758..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/ErrorCallback.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.koushikdutta.async.http.socketio;
-
-/**
- * Created by koush on 7/2/13.
- */
-public interface ErrorCallback {
-    void onError(String error);
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/EventCallback.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/EventCallback.java
deleted file mode 100644
index 191a6635e..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/EventCallback.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.koushikdutta.async.http.socketio;
-
-import org.json.JSONArray;
-
-public interface EventCallback {
-    public void onEvent(JSONArray argument, Acknowledge acknowledge);
-}
\ No newline at end of file
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/EventEmitter.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/EventEmitter.java
deleted file mode 100644
index 1c1af7ca1..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/EventEmitter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.koushikdutta.async.http.socketio;
-
-import com.koushikdutta.async.util.HashList;
-
-import org.json.JSONArray;
-
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Created by koush on 7/1/13.
- */
-public class EventEmitter {
-    interface OnceCallback extends EventCallback {
-    }
-
-    HashList<EventCallback> callbacks = new HashList<EventCallback>();
-    void onEvent(String event, JSONArray arguments, Acknowledge acknowledge) {
-        List<EventCallback> list = callbacks.get(event);
-        if (list == null)
-            return;
-        Iterator<EventCallback> iter = list.iterator();
-        while (iter.hasNext()) {
-            EventCallback cb = iter.next();
-            cb.onEvent(arguments, acknowledge);
-            if (cb instanceof OnceCallback)
-                iter.remove();
-        }
-    }
-
-    public void addListener(String event, EventCallback callback) {
-        on(event, callback);
-    }
-
-    public void once(final String event, final EventCallback callback) {
-        on(event, new OnceCallback() {
-            @Override
-            public void onEvent(JSONArray arguments, Acknowledge acknowledge) {
-                callback.onEvent(arguments, acknowledge);
-            }
-        });
-    }
-
-    public void on(String event, EventCallback callback) {
-        callbacks.add(event, callback);
-    }
-
-    public void removeListener(String event, EventCallback callback) {
-        List<EventCallback> list = callbacks.get(event);
-        if (list == null)
-            return;
-        list.remove(callback);
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/ExceptionCallback.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/ExceptionCallback.java
deleted file mode 100644
index 14025a9aa..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/ExceptionCallback.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.koushikdutta.async.http.socketio;
-
-/**
- * Created by koush on 8/1/13.
- */
-public interface ExceptionCallback {
-    public void onException(Exception e);
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/JSONCallback.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/JSONCallback.java
deleted file mode 100644
index 52d8aff27..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/JSONCallback.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.koushikdutta.async.http.socketio;
-
-import org.json.JSONObject;
-
-public interface JSONCallback {
-    public void onJSON(JSONObject json, Acknowledge acknowledge);
-}
-    
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/ReconnectCallback.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/ReconnectCallback.java
deleted file mode 100644
index bd427f41f..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/ReconnectCallback.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.koushikdutta.async.http.socketio;
-
-public interface ReconnectCallback {
-    public void onReconnect();
-}
\ No newline at end of file
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOClient.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOClient.java
deleted file mode 100644
index af469b6d1..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOClient.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package com.koushikdutta.async.http.socketio;
-
-import android.text.TextUtils;
-
-import com.koushikdutta.async.future.Future;
-import com.koushikdutta.async.future.SimpleFuture;
-import com.koushikdutta.async.http.AsyncHttpClient;
-import com.koushikdutta.async.http.socketio.transport.SocketIOTransport;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-@Deprecated
-public class SocketIOClient extends EventEmitter {
-    boolean connected;
-    boolean disconnected;
-
-    private void emitRaw(int type, String message, Acknowledge acknowledge) {
-        connection.emitRaw(type, this, message, acknowledge);
-    }
-
-    public void emit(String name, JSONArray args) {
-        emit(name, args, null);
-    }
-
-    public void emit(final String message) {
-        emit(message, (Acknowledge)null);
-    }
-
-    public void emit(final JSONObject jsonMessage) {
-        emit(jsonMessage, null);
-    }
-
-    public void emit(String name, JSONArray args, Acknowledge acknowledge) {
-        final JSONObject event = new JSONObject();
-        try {
-            event.put("name", name);
-            event.put("args", args);
-            emitRaw(5, event.toString(), acknowledge);
-        }
-        catch (Exception e) {
-        }
-    }
-
-    public void emit(final String message, Acknowledge acknowledge) {
-        emitRaw(3, message, acknowledge);
-    }
-
-    public void emit(final JSONObject jsonMessage, Acknowledge acknowledge) {
-        emitRaw(4, jsonMessage.toString(), acknowledge);
-    }
-
-    public void emitEvent(final String name) {
-        emitEvent(name, null);
-    }
-
-    public void emitEvent(final String name, Acknowledge acknowledge) {
-        final JSONObject event = new JSONObject();
-        try {
-            event.put("name", name);
-            emitRaw(5, event.toString(), acknowledge);
-        } catch (Exception e) {
-
-        }
-    }
-
-    public static Future<SocketIOClient> connect(final AsyncHttpClient client, String uri, final ConnectCallback callback) {
-        return connect(client, new SocketIORequest(uri), callback);
-    }
-
-    ConnectCallback connectCallback;
-    public static Future<SocketIOClient> connect(final AsyncHttpClient client, final SocketIORequest request, final ConnectCallback callback) {
-        final SimpleFuture<SocketIOClient> ret = new SimpleFuture<SocketIOClient>();
-
-        final SocketIOConnection connection = new SocketIOConnection(client, request);
-
-        final ConnectCallback wrappedCallback = new ConnectCallback() {
-            @Override
-            public void onConnectCompleted(Exception ex, SocketIOClient client) {
-                if (ex != null || TextUtils.isEmpty(request.getEndpoint())) {
-                    if (callback != null)
-                        callback.onConnectCompleted(ex, client);
-                    ret.setComplete(ex, client);
-                    return;
-                }
-
-                // remove the root client since that's not actually being used.
-                connection.clients.remove(client);
-
-                // connect to the endpoint we want
-                client.of(request.getEndpoint(), new ConnectCallback() {
-                    @Override
-                    public void onConnectCompleted(Exception ex, SocketIOClient client) {
-                        if (callback != null)
-                            callback.onConnectCompleted(ex, client);
-                        ret.setComplete(ex, client);
-                    }
-                });
-            }
-        };
-
-        connection.clients.add(new SocketIOClient(connection, "", wrappedCallback));
-        connection.reconnect(ret);
-
-        return ret;
-    }
-
-    ExceptionCallback exceptionCallback;
-    public void setExceptionCallback(ExceptionCallback exceptionCallback) {
-        this.exceptionCallback = exceptionCallback;
-    }
-
-    public ExceptionCallback getExceptionCallback() {
-        return exceptionCallback;
-    }
-
-    ErrorCallback errorCallback;
-    public ErrorCallback getErrorCallback() {
-        return errorCallback;
-    }
-    public void setErrorCallback(ErrorCallback callback) {
-        errorCallback = callback;
-    }
-
-    DisconnectCallback disconnectCallback;
-    public DisconnectCallback getDisconnectCallback() {
-        return disconnectCallback;
-    }
-    public void setDisconnectCallback(DisconnectCallback callback) {
-        disconnectCallback = callback;
-    }
-
-    ReconnectCallback reconnectCallback;
-    public ReconnectCallback getReconnectCallback() {
-        return reconnectCallback;
-    }
-    public void setReconnectCallback(ReconnectCallback callback) {
-        reconnectCallback = callback;
-    }
-
-    JSONCallback jsonCallback;
-    public JSONCallback getJSONCallback() {
-        return jsonCallback;
-    }
-    public void setJSONCallback(JSONCallback callback) {
-        jsonCallback = callback;
-    }
-
-    StringCallback stringCallback;
-    public StringCallback getStringCallback() {
-        return stringCallback;
-    }
-    public void setStringCallback(StringCallback callback) {
-        stringCallback = callback;
-    }
-
-    SocketIOConnection connection;
-    String endpoint;
-    private SocketIOClient(SocketIOConnection connection, String endpoint, ConnectCallback callback) {
-        this.endpoint = endpoint;
-        this.connection = connection;
-        this.connectCallback = callback;
-    }
-
-    public boolean isConnected() {
-        return connected && !disconnected && connection.isConnected();
-    }
-
-    public void disconnect() {
-        connection.disconnect(this);
-        DisconnectCallback disconnectCallback = this.disconnectCallback;
-        if (disconnectCallback != null) {
-        	disconnectCallback.onDisconnect(null);
-        }
-    }
-
-    public void of(String endpoint, ConnectCallback connectCallback) {
-        connection.connect(new SocketIOClient(connection, endpoint, connectCallback));
-    }
-
-    public void reconnect() {
-        connection.reconnect(null);
-    }
-
-    public SocketIOTransport getTransport() {
-        return connection.transport;
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
deleted file mode 100644
index a48d24b43..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
+++ /dev/null
@@ -1,466 +0,0 @@
-package com.koushikdutta.async.http.socketio;
-
-import android.net.Uri;
-import android.text.TextUtils;
-
-import com.koushikdutta.async.callback.CompletedCallback;
-import com.koushikdutta.async.future.Cancellable;
-import com.koushikdutta.async.future.DependentCancellable;
-import com.koushikdutta.async.future.FutureCallback;
-import com.koushikdutta.async.future.SimpleFuture;
-import com.koushikdutta.async.future.TransformFuture;
-import com.koushikdutta.async.http.AsyncHttpClient;
-import com.koushikdutta.async.http.WebSocket;
-import com.koushikdutta.async.http.socketio.transport.SocketIOTransport;
-import com.koushikdutta.async.http.socketio.transport.WebSocketTransport;
-import com.koushikdutta.async.http.socketio.transport.XHRPollingTransport;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Locale;
-
-/**
- * Created by koush on 7/1/13.
- */
-class SocketIOConnection {
-    AsyncHttpClient httpClient;
-    int heartbeat;
-    long reconnectDelay;
-    ArrayList<SocketIOClient> clients = new ArrayList<SocketIOClient>();
-
-    SocketIOTransport transport;
-    SocketIORequest request;
-
-    public SocketIOConnection(AsyncHttpClient httpClient, SocketIORequest request) {
-        this.httpClient = httpClient;
-        this.request = request;
-        this.reconnectDelay = this.request.config.reconnectDelay;
-    }
-
-    public boolean isConnected() {
-        return transport != null && transport.isConnected();
-    }
-
-    Hashtable<String, Acknowledge> acknowledges = new Hashtable<String, Acknowledge>();
-    int ackCount;
-    public void emitRaw(int type, SocketIOClient client, String message, Acknowledge acknowledge) {
-        String ack = "";
-        if (acknowledge != null) {
-            String id = "" + ackCount++;
-            ack =  id + "+";
-            acknowledges.put(id, acknowledge);
-        }
-        transport.send(String.format(Locale.ENGLISH, "%d:%s:%s:%s", type, ack, client.endpoint, message));
-    }
-
-    public void connect(SocketIOClient client) {
-        if (!clients.contains(client))
-            clients.add(client);
-        transport.send(String.format(Locale.ENGLISH, "1::%s", client.endpoint));
-    }
-
-    public void disconnect(SocketIOClient client) {
-        clients.remove(client);
-
-        // see if we can leave this endpoint completely
-        boolean needsEndpointDisconnect = true;
-        for (SocketIOClient other: clients) {
-            // if this is the default endpoint (which disconnects everything),
-            // or another client is using this endpoint,
-            // we can't disconnect
-            if (TextUtils.equals(other.endpoint, client.endpoint) || TextUtils.isEmpty(client.endpoint)) {
-                needsEndpointDisconnect = false;
-                break;
-            }
-        }
-
-        final SocketIOTransport ts = transport;
-
-        if (needsEndpointDisconnect && ts != null)
-            ts.send(String.format(Locale.ENGLISH, "0::%s", client.endpoint));
-
-        // and see if we can disconnect the socket completely
-        if (clients.size() > 0 || ts == null)
-            return;
-
-        ts.setStringCallback(null);
-        ts.setClosedCallback(null);
-        ts.disconnect();
-        transport = null;
-    }
-
-    Cancellable connecting;
-    void reconnect(final DependentCancellable child) {
-        if (isConnected()) {
-            return;
-        }
-
-        // if a connection is in progress, just wait.
-        if (connecting != null && !connecting.isDone() && !connecting.isCancelled()) {
-            if (child != null)
-                child.setParent(connecting);
-            return;
-        }
-
-        request.logi("Reconnecting socket.io");
-
-        connecting = httpClient.executeString(request, null)
-        .then(new TransformFuture<SocketIOTransport, String>() {
-            @Override
-            protected void transform(String result) throws Exception {
-                String[] parts = result.split(":");
-                final String sessionId = parts[0];
-                if (!"".equals(parts[1]))
-                    heartbeat = Integer.parseInt(parts[1]) / 2 * 1000;
-                else
-                    heartbeat = 0;
-
-                String transportsLine = parts[3];
-                String[] transports = transportsLine.split(",");
-                HashSet<String> set = new HashSet<String>(Arrays.asList(transports));
-                final SimpleFuture<SocketIOTransport> transport = new SimpleFuture<SocketIOTransport>();
-
-                if (set.contains("websocket")) {
-                    final String sessionUrl = Uri.parse(request.getUri().toString()).buildUpon()
-                            .appendPath("websocket").appendPath(sessionId)
-                            .build().toString();
-
-                    httpClient.websocket(sessionUrl, null, null)
-                    .setCallback(new FutureCallback<WebSocket>() {
-                        @Override
-                        public void onCompleted(Exception e, WebSocket result) {
-                            if (e != null) {
-                                transport.setComplete(e);
-                                return;
-                            }
-                            transport.setComplete(new WebSocketTransport(result, sessionId));
-                        }
-                    });
-                } else if (set.contains("xhr-polling")) {
-                    final String sessionUrl = Uri.parse(request.getUri().toString()).buildUpon()
-                            .appendPath("xhr-polling").appendPath(sessionId)
-                            .build().toString();
-                    XHRPollingTransport xhrPolling = new XHRPollingTransport(httpClient, sessionUrl, sessionId);
-                    transport.setComplete(xhrPolling);
-                } else {
-                    throw new SocketIOException("transport not supported");
-                }
-
-                setComplete(transport);
-            }
-        })
-        .setCallback(new FutureCallback<SocketIOTransport>() {
-            @Override
-            public void onCompleted(Exception e, SocketIOTransport result) {
-                if (e != null) {
-                    reportDisconnect(e);
-                    return;
-                }
-
-                reconnectDelay = request.config.reconnectDelay;
-                SocketIOConnection.this.transport = result;
-                attach();
-            }
-        });
-
-        if (child != null)
-            child.setParent(connecting);
-    }
-
-    void setupHeartbeat() {
-        Runnable heartbeatRunner = new Runnable() {
-            @Override
-            public void run() {
-                final SocketIOTransport ts = transport;
-
-                if (heartbeat <= 0 || ts == null || !ts.isConnected())
-                    return;
-
-                ts.send("2:::");
-                ts.getServer().postDelayed(this, heartbeat);
-            }
-        };
-
-        heartbeatRunner.run();
-    }
-
-    private interface SelectCallback {
-        void onSelect(SocketIOClient client);
-    }
-
-    private void select(String endpoint, SelectCallback callback) {
-        for (SocketIOClient client: clients) {
-            if (endpoint == null || TextUtils.equals(client.endpoint, endpoint)) {
-                callback.onSelect(client);
-            }
-        }
-    }
-
-    private void delayReconnect() {
-        if (transport != null || clients.size() == 0)
-            return;
-
-        // see if any client has disconnected,
-        // and that we need a reconnect
-        boolean disconnected = false;
-        for (SocketIOClient client: clients) {
-            if (client.disconnected) {
-                disconnected = true;
-                break;
-            }
-        }
-
-        if (!disconnected)
-            return;
-
-        httpClient.getServer().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                reconnect(null);
-            }
-        }, nextReconnectDelay(reconnectDelay));
-
-        reconnectDelay = reconnectDelay * 2;
-        if (request.config.reconnectDelayMax > 0L) {
-            reconnectDelay = Math.min(reconnectDelay, request.config.reconnectDelayMax);
-        }
-    }
-
-    private long nextReconnectDelay(long targetDelay) {
-        if (targetDelay < 2L || targetDelay > (Long.MAX_VALUE >> 1) ||
-            !request.config.randomizeReconnectDelay)
-        {
-            return targetDelay;
-        }
-        return (targetDelay >> 1) + (long) (targetDelay * Math.random());
-    }
-
-    private void reportDisconnect(final Exception ex) {
-        if (ex != null) {
-            request.loge("socket.io disconnected", ex);
-        }
-        else {
-            request.logi("socket.io disconnected");
-        }
-        select(null, new SelectCallback() {
-            @Override
-            public void onSelect(SocketIOClient client) {
-                if (client.connected) {
-                    client.disconnected = true;
-                    DisconnectCallback closed = client.getDisconnectCallback();
-                    if (closed != null)
-                        closed.onDisconnect(ex);
-                }
-                else {
-                    // client has never connected, this is a initial connect failure
-                    ConnectCallback callback = client.connectCallback;
-                    if (callback != null)
-                        callback.onConnectCompleted(ex, client);
-                }
-            }
-        });
-
-        delayReconnect();
-    }
-
-    private void reportConnect(String endpoint) {
-        select(endpoint, new SelectCallback() {
-            @Override
-            public void onSelect(SocketIOClient client) {
-                if (client.isConnected())
-                    return;
-                if (!client.connected) {
-                    // normal connect
-                    client.connected = true;
-                    ConnectCallback callback = client.connectCallback;
-                    if (callback != null)
-                        callback.onConnectCompleted(null, client);
-                }
-                else if (client.disconnected) {
-                    // reconnect
-                    client.disconnected = false;
-                    ReconnectCallback callback = client.reconnectCallback;
-                    if (callback != null)
-                        callback.onReconnect();
-                }
-                else {
-                    // double connect?
-//                    assert false;
-                }
-            }
-        });
-    }
-
-    private void reportJson(String endpoint, final JSONObject jsonMessage, final Acknowledge acknowledge) {
-        select(endpoint, new SelectCallback() {
-            @Override
-            public void onSelect(SocketIOClient client) {
-                JSONCallback callback = client.jsonCallback;
-                if (callback != null)
-                    callback.onJSON(jsonMessage, acknowledge);
-            }
-        });
-    }
-
-    private void reportString(String endpoint, final String string, final Acknowledge acknowledge) {
-        select(endpoint, new SelectCallback() {
-            @Override
-            public void onSelect(SocketIOClient client) {
-                StringCallback callback = client.stringCallback;
-                if (callback != null)
-                    callback.onString(string, acknowledge);
-            }
-        });
-    }
-
-    private void reportEvent(String endpoint, final String event, final JSONArray arguments, final Acknowledge acknowledge) {
-        select(endpoint, new SelectCallback() {
-            @Override
-            public void onSelect(SocketIOClient client) {
-                client.onEvent(event, arguments, acknowledge);
-            }
-        });
-    }
-
-    private void reportError(String endpoint, final String error) {
-        select(endpoint, new SelectCallback() {
-            @Override
-            public void onSelect(SocketIOClient client) {
-                ErrorCallback callback = client.errorCallback;
-                if (callback != null)
-                    callback.onError(error);
-            }
-        });
-    }
-
-    private Acknowledge acknowledge(final String _messageId, final String endpoint) {
-        if (TextUtils.isEmpty(_messageId))
-            return null;
-
-        final String messageId = _messageId.replaceAll("\\+$", "");
-
-        return new Acknowledge() {
-            @Override
-            public void acknowledge(JSONArray arguments) {
-                String data = "";
-                if (arguments != null)
-                    data += "+" + arguments.toString();
-                SocketIOTransport transport = SocketIOConnection.this.transport;
-                if (transport == null) {
-                    final Exception e = new SocketIOException("not connected to server");
-                    select(endpoint, new SelectCallback() {
-                        @Override
-                        public void onSelect(SocketIOClient client) {
-                            ExceptionCallback callback = client.exceptionCallback;
-                            if (callback != null)
-                                callback.onException(e);
-                        }
-                    });
-                    return;
-                }
-                transport.send(String.format(Locale.ENGLISH, "6:::%s%s", messageId, data));
-            }
-        };
-    }
-
-    private void attach() {
-        if (transport.heartbeats())
-            setupHeartbeat();
-
-        transport.setClosedCallback(new CompletedCallback() {
-            @Override
-            public void onCompleted(final Exception ex) {
-                transport = null;
-                reportDisconnect(ex);
-            }
-        });
-
-        transport.setStringCallback(new SocketIOTransport.StringCallback() {
-            @Override
-            public void onStringAvailable(String message) {
-                try {
-//                    Log.d(TAG, "Message: " + message);
-                    String[] parts = message.split(":", 4);
-                    int code = Integer.parseInt(parts[0]);
-                    switch (code) {
-                        case 0:
-                            // disconnect
-                            transport.disconnect();
-                            reportDisconnect(null);
-                            break;
-                        case 1:
-                            // connect
-                            reportConnect(parts[2]);
-                            break;
-                        case 2:
-                            // heartbeat
-                            transport.send("2::");
-                            break;
-                        case 3: {
-                            // message
-                            reportString(parts[2], parts[3], acknowledge(parts[1], parts[2]));
-                            break;
-                        }
-                        case 4: {
-                            //json message
-                            final String dataString = parts[3];
-                            final JSONObject jsonMessage = new JSONObject(dataString);
-                            reportJson(parts[2], jsonMessage, acknowledge(parts[1], parts[2]));
-                            break;
-                        }
-                        case 5: {
-                            final String dataString = parts[3];
-                            final JSONObject data = new JSONObject(dataString);
-                            final String event = data.getString("name");
-                            final JSONArray args = data.optJSONArray("args");
-                            reportEvent(parts[2], event, args, acknowledge(parts[1], parts[2]));
-                            break;
-                        }
-                        case 6:
-                            // ACK
-                            final String[] ackParts = parts[3].split("\\+", 2);
-                            Acknowledge ack = acknowledges.remove(ackParts[0]);
-                            if (ack == null)
-                                return;
-                            JSONArray arguments = null;
-                            if (ackParts.length == 2)
-                                arguments = new JSONArray(ackParts[1]);
-                            ack.acknowledge(arguments);
-                            break;
-                        case 7:
-                            // error
-                            reportError(parts[2], parts[3]);
-                            break;
-                        case 8:
-                            // noop
-                            break;
-                        default:
-                            throw new SocketIOException("unknown code");
-                    }
-                }
-                catch (Exception ex) {
-                    transport.setClosedCallback(null);
-                    transport.disconnect();
-                    transport = null;
-                    reportDisconnect(ex);
-                }
-            }
-        });
-
-        // now reconnect all the sockets that may have been previously connected
-        select(null, new SelectCallback() {
-            @Override
-            public void onSelect(SocketIOClient client) {
-                if (TextUtils.isEmpty(client.endpoint))
-                    return;
-
-                connect(client);
-            }
-        });
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOException.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOException.java
deleted file mode 100644
index 4c3550b69..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOException.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.koushikdutta.async.http.socketio;
-
-/**
- * Created by koush on 8/1/13.
- */
-public class SocketIOException extends Exception {
-    public SocketIOException(String error) {
-        super(error);
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIORequest.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIORequest.java
deleted file mode 100644
index c5bc873cb..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIORequest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.koushikdutta.async.http.socketio;
-
-import android.net.Uri;
-
-import com.koushikdutta.async.http.AsyncHttpPost;
-
-public class SocketIORequest extends AsyncHttpPost {
-    public SocketIORequest(String uri) {
-        this(uri, "");
-    }
-
-    Config config;
-    public Config getConfig() {
-        return config;
-    }
-
-    String endpoint;
-    public String getEndpoint() {
-        return endpoint;
-    }
-
-    String query;
-    public String getQuery() {
-        return query;
-    }
-
-    public SocketIORequest(String uri, String endpoint) {
-        this(uri, endpoint, null);
-    }
-
-    public SocketIORequest(String uri, String endpoint, String query) {
-        this(uri, endpoint, query, null);
-    }
-
-    public SocketIORequest(String uri, String endpoint, String query, Config config) {
-        super(Uri.parse(uri + (query == null ? "" : "?" + query)).buildUpon().encodedPath("/socket.io/1/").build().toString());
-        this.config = (config != null) ? config : new Config();
-        this.endpoint = endpoint;
-        this.query = query;
-    }
-
-    public static class Config {
-        boolean randomizeReconnectDelay = false;
-        public void setRandomizeReconnectDelay(boolean randomizeReconnectDelay) {
-            this.randomizeReconnectDelay = randomizeReconnectDelay;
-        }
-        public boolean isRandomizeReconnectDelay() {
-            return randomizeReconnectDelay;
-        }
-
-        long reconnectDelay = 1000L;
-        public void setReconnectDelay(long reconnectDelay) {
-            if (reconnectDelay < 0L) {
-                throw new IllegalArgumentException("reconnectDelay must be >= 0");
-            }
-            this.reconnectDelay = reconnectDelay;
-        }
-        public long getReconnectDelay() {
-            return reconnectDelay;
-        }
-
-        long reconnectDelayMax = 0L;
-        public void setReconnectDelayMax(long reconnectDelayMax) {
-            if (reconnectDelay < 0L) {
-                throw new IllegalArgumentException("reconnectDelayMax must be >= 0");
-            }
-            this.reconnectDelayMax = reconnectDelayMax;
-        }
-        public long getReconnectDelayMax() {
-            return reconnectDelayMax;
-        }
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/StringCallback.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/StringCallback.java
deleted file mode 100644
index 7062b0ff3..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/StringCallback.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.koushikdutta.async.http.socketio;
-
-public interface StringCallback {
-    public void onString(String string, Acknowledge acknowledge);
-}
\ No newline at end of file
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/SocketIOTransport.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/SocketIOTransport.java
deleted file mode 100644
index 66219d78b..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/SocketIOTransport.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.koushikdutta.async.http.socketio.transport;
-
-import com.koushikdutta.async.AsyncServer;
-import com.koushikdutta.async.callback.CompletedCallback;
-
-/**
- * A socket.io transport.
- *
- * Please, refer to the documentation in https://github.com/LearnBoost/socket.io-spec
- */
-public interface SocketIOTransport {
-    static public interface StringCallback {
-        public void onStringAvailable(String s);
-    }
-
-    /**
-     * Send message to the server
-     * @param string
-     */
-    public void send(String string);
-
-    /**
-     * Close connection
-     */
-    public void disconnect();
-
-    public void setStringCallback(StringCallback callback);
-    public void setClosedCallback(CompletedCallback handler);
-
-    public AsyncServer getServer();
-    public boolean isConnected();
-
-    /**
-     * Indicates whether heartbeats are enabled for this transport
-     * @return
-     */
-    public boolean heartbeats();
-    
-    public String getSessionId();
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/WebSocketTransport.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/WebSocketTransport.java
deleted file mode 100644
index 3be07e757..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/WebSocketTransport.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.koushikdutta.async.http.socketio.transport;
-
-import com.koushikdutta.async.AsyncServer;
-import com.koushikdutta.async.callback.CompletedCallback;
-import com.koushikdutta.async.callback.DataCallback;
-import com.koushikdutta.async.http.WebSocket;
-
-public class WebSocketTransport implements SocketIOTransport {
-    private WebSocket webSocket;
-    private StringCallback stringCallback;
-	private String sessionId;
-
-    public WebSocketTransport(WebSocket webSocket, String sessionId) {
-        this.webSocket = webSocket;
-        this.sessionId = sessionId;
-        this.webSocket.setDataCallback(new DataCallback.NullDataCallback());
-    }
-
-    @Override
-    public boolean isConnected() {
-        return this.webSocket.isOpen();
-    }
-
-    @Override
-    public void setClosedCallback(CompletedCallback handler) {
-        this.webSocket.setClosedCallback(handler);
-    }
-
-    @Override
-    public void disconnect() {
-        this.webSocket.close();
-    }
-
-    @Override
-    public AsyncServer getServer() {
-        return this.webSocket.getServer();
-    }
-
-    @Override
-    public void send(String message) {
-        this.webSocket.send(message);
-    }
-
-    @Override
-    public void setStringCallback(final StringCallback callback) {
-        if (this.stringCallback == callback)
-            return;
-
-        if (callback == null) {
-            this.webSocket.setStringCallback(null);
-        } else {
-            this.webSocket.setStringCallback(new WebSocket.StringCallback() {
-                @Override
-                public void onStringAvailable(String s) {
-                    callback.onStringAvailable(s);
-                }
-            });
-        }
-
-        this.stringCallback = callback;
-    }
-
-    @Override
-    public boolean heartbeats() {
-        return true;
-    }
-
-	@Override
-	public String getSessionId() {
-		return this.sessionId;
-	}
-}
-
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/XHRPollingTransport.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/XHRPollingTransport.java
deleted file mode 100644
index dc6aca5ca..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/XHRPollingTransport.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.koushikdutta.async.http.socketio.transport;
-
-import android.net.Uri;
-import android.net.Uri.Builder;
-
-import com.koushikdutta.async.AsyncServer;
-import com.koushikdutta.async.callback.CompletedCallback;
-import com.koushikdutta.async.http.AsyncHttpClient;
-import com.koushikdutta.async.http.AsyncHttpGet;
-import com.koushikdutta.async.http.AsyncHttpPost;
-import com.koushikdutta.async.http.AsyncHttpRequest;
-import com.koushikdutta.async.http.AsyncHttpResponse;
-import com.koushikdutta.async.http.body.StringBody;
-
-public class XHRPollingTransport implements SocketIOTransport {
-    private AsyncHttpClient client;
-    private Uri sessionUrl;
-    private StringCallback stringCallback;
-    private CompletedCallback closedCallback;
-    private boolean connected;
-	private String sessionId;
-
-    private static final String SEPARATOR = "\ufffd";
-
-    public XHRPollingTransport(AsyncHttpClient client, String sessionUrl, String sessionId) {
-        this.client = client;
-        this.sessionUrl = Uri.parse(sessionUrl);
-        this.sessionId = sessionId;
-        
-        doLongPolling();
-        connected = true;
-    }
-
-    @Override
-    public boolean isConnected() {
-        return connected;
-    }
-
-    @Override
-    public void setClosedCallback(CompletedCallback handler) {
-        closedCallback = handler;
-    }
-
-    @Override
-    public void disconnect() {
-        connected = false;
-        close(null);
-    }
-
-    private void close(Exception ex) {
-        if (closedCallback != null)
-            closedCallback.onCompleted(ex);
-    }
-
-    @Override
-    public AsyncServer getServer() {
-        return client.getServer();
-    }
-
-    @Override
-    public void send(String message) {
-        if (message.startsWith("5")) {
-            postMessage(message);
-            return;
-        }
-
-        AsyncHttpRequest request = new AsyncHttpPost(computedRequestUrl());
-        request.setBody(new StringBody(message));
-
-        client.executeString(request, new AsyncHttpClient.StringCallback() {
-            @Override
-            public void onCompleted(Exception e, AsyncHttpResponse source, String result) {
-                if (e != null) {
-                    close(e);
-                    return;
-                }
-
-                sendResult(result);
-            }
-        });
-    }
-
-    private void postMessage(String message) {
-        if (!message.startsWith("5"))
-            return;
-
-        AsyncHttpRequest request = new AsyncHttpPost(computedRequestUrl());
-        request.setBody(new StringBody(message));
-        client.executeString(request, null);
-    }
-
-    private void doLongPolling() {
-        this.client.executeString(new AsyncHttpGet(computedRequestUrl()), new AsyncHttpClient.StringCallback() {
-            @Override
-            public void onCompleted(Exception e, AsyncHttpResponse source, String result) {
-                if (e != null) {
-                    close(e);
-                    return;
-                }
-
-                sendResult(result);
-                doLongPolling();
-            }
-        });
-    }
-
-    private void sendResult(String result) {
-        if (stringCallback == null)
-            return;
-
-        if (!result.contains(SEPARATOR)) {
-            stringCallback.onStringAvailable(result);
-            return;
-        }
-
-        String [] results = result.split(SEPARATOR);
-        for (int i = 1; i < results.length; i = i + 2) {
-            stringCallback.onStringAvailable(results[i+1]);
-        }
-    }
-
-    /**
-     * Return an url with a time-based parameter to avoid caching issues
-     */
-    private String computedRequestUrl() {
-        String currentTime = String.valueOf(System.currentTimeMillis());
-        return sessionUrl.buildUpon().appendQueryParameter("t", currentTime)
-                .build().toString();
-    }
-
-    @Override
-    public void setStringCallback(StringCallback callback) {
-        stringCallback = callback;
-    }
-
-    @Override
-    public boolean heartbeats() {
-        return false;
-    }
-
-	@Override
-	public String getSessionId() {
-		return this.sessionId;
-	}
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
index 1a95f9279..26dec047d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
@@ -13,7 +13,6 @@
 import com.koushikdutta.async.future.FutureCallback;
 import com.koushikdutta.async.future.MultiFuture;
 import com.koushikdutta.async.future.SimpleCancellable;
-import com.koushikdutta.async.future.TransformFuture;
 import com.koushikdutta.async.http.AsyncHttpClient;
 import com.koushikdutta.async.http.AsyncHttpRequest;
 import com.koushikdutta.async.http.AsyncSSLEngineConfigurator;
@@ -31,7 +30,6 @@
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Hashtable;
-import java.util.List;
 import java.util.Locale;
 
 import javax.net.ssl.SSLContext;
@@ -407,32 +405,26 @@ public boolean exchangeHeaders(final OnExchangeHeaderData data) {
 
         final AsyncSpdyConnection.SpdySocket spdySocket = (AsyncSpdyConnection.SpdySocket)data.socket;
         spdySocket.headers()
-        .then(new TransformFuture<Headers, List<Header>>() {
-            @Override
-            protected void transform(List<Header> result) throws Exception {
-                Headers headers = new Headers();
-                for (Header header: result) {
-                    String key = header.name.utf8();
-                    String value = header.value.utf8();
-                    headers.add(key, value);
-                }
-                String status = headers.remove(Header.RESPONSE_STATUS.utf8());
-                String[] statusParts = status.split(" ", 2);
-                data.response.code(Integer.parseInt(statusParts[0]));
-                if (statusParts.length == 2)
-                    data.response.message(statusParts[1]);
-                data.response.protocol(headers.remove(Header.VERSION.utf8()));
-                data.response.headers(headers);
-                setComplete(headers);
+        .thenConvert(from -> {
+            Headers headers = new Headers();
+            for (Header header: from) {
+                String key = header.name.utf8();
+                String value = header.value.utf8();
+                headers.add(key, value);
             }
+            String status = headers.remove(Header.RESPONSE_STATUS.utf8());
+            String[] statusParts = status.split(" ", 2);
+            data.response.code(Integer.parseInt(statusParts[0]));
+            if (statusParts.length == 2)
+                data.response.message(statusParts[1]);
+            data.response.protocol(headers.remove(Header.VERSION.utf8()));
+            data.response.headers(headers);
+            return headers;
         })
-        .setCallback(new FutureCallback<Headers>() {
-            @Override
-            public void onCompleted(Exception e, Headers result) {
-                data.receiveHeadersCallback.onCompleted(e);
-                DataEmitter emitter = HttpUtil.getBodyDecoder(spdySocket, spdySocket.getConnection().protocol, result, false);
-                data.response.emitter(emitter);
-            }
+        .setCallback((e, result) -> {
+            data.receiveHeadersCallback.onCompleted(e);
+            DataEmitter emitter = HttpUtil.getBodyDecoder(spdySocket, spdySocket.getConnection().protocol, result, false);
+            data.response.emitter(emitter);
         });
         return true;
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
index 06bfaf098..8dd0cc959 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
@@ -1,11 +1,9 @@
 package com.koushikdutta.async.parser;
 
-import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.future.Future;
-import com.koushikdutta.async.future.TransformFuture;
 import com.koushikdutta.async.http.body.DocumentBody;
 import com.koushikdutta.async.stream.ByteBufferListInputStream;
 
@@ -13,7 +11,6 @@
 
 import java.lang.reflect.Type;
 
-import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 /**
@@ -23,14 +20,7 @@ public class DocumentParser implements AsyncParser<Document> {
     @Override
     public Future<Document> parse(DataEmitter emitter) {
         return new ByteBufferListParser().parse(emitter)
-        .then(new TransformFuture<Document, ByteBufferList>() {
-            @Override
-            protected void transform(ByteBufferList result) throws Exception {
-                DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-                DocumentBuilder db = dbf.newDocumentBuilder();
-                setComplete(db.parse(new ByteBufferListInputStream(result)));
-            }
-        });
+        .thenConvert(from -> DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ByteBufferListInputStream(from)));
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
index 21bed7e69..b4b9c16f3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
@@ -4,10 +4,8 @@
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.future.Future;
-import com.koushikdutta.async.future.TransformFuture;
 
 import org.json.JSONArray;
-import org.json.JSONObject;
 
 import java.lang.reflect.Type;
 
@@ -18,12 +16,7 @@ public class JSONArrayParser implements AsyncParser<JSONArray> {
     @Override
     public Future<JSONArray> parse(DataEmitter emitter) {
         return new StringParser().parse(emitter)
-        .then(new TransformFuture<JSONArray, String>() {
-            @Override
-            protected void transform(String result) throws Exception {
-                setComplete(new JSONArray(result));
-            }
-        });
+        .thenConvert(JSONArray::new);
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
index 4e567cae8..1d9db9b42 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
@@ -4,7 +4,7 @@
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.future.Future;
-import com.koushikdutta.async.future.TransformFuture;
+
 import org.json.JSONObject;
 
 import java.lang.reflect.Type;
@@ -15,13 +15,7 @@
 public class JSONObjectParser implements AsyncParser<JSONObject> {
     @Override
     public Future<JSONObject> parse(DataEmitter emitter) {
-        return new StringParser().parse(emitter)
-        .then(new TransformFuture<JSONObject, String>() {
-            @Override
-            protected void transform(String result) throws Exception {
-                setComplete(new JSONObject(result));
-            }
-        });
+        return new StringParser().parse(emitter).thenConvert(JSONObject::new);
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
index 38ef0be1b..cb6f623d3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
@@ -5,7 +5,6 @@
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.future.Future;
-import com.koushikdutta.async.future.TransformFuture;
 
 import java.lang.reflect.Type;
 import java.nio.charset.Charset;
@@ -27,14 +26,11 @@ public StringParser(Charset charset) {
     public Future<String> parse(DataEmitter emitter) {
         final String charset = emitter.charset();
         return new ByteBufferListParser().parse(emitter)
-        .then(new TransformFuture<String, ByteBufferList>() {
-            @Override
-            protected void transform(ByteBufferList result) throws Exception {
-                Charset charsetToUse = forcedCharset;
-                if (charsetToUse == null && charset != null)
-                    charsetToUse = Charset.forName(charset);
-                setComplete(result.readString(charsetToUse));
-            }
+        .thenConvert(from -> {
+            Charset charsetToUse = forcedCharset;
+            if (charsetToUse == null && charset != null)
+                charsetToUse = Charset.forName(charset);
+            return from.readString(charsetToUse);
         });
     }
 

From 236ef4ccedba91f74d81db1a4335aa446d2ce83b Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 22 Nov 2018 13:03:38 -0800
Subject: [PATCH 283/399] imports

---
 AndroidAsync/src/com/koushikdutta/async/future/Future.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Future.java b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
index 29f77c6d5..78d56fe3d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Future.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
@@ -1,8 +1,6 @@
 package com.koushikdutta.async.future;
 
 
-import com.koushikdutta.async.callback.ValueCallback;
-
 public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
     /**
      * Set a callback to be invoked when this Future completes.

From 3cc8d9cda641d9fb88474f1cadf77ba41d8c7dbc Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 22 Nov 2018 13:09:34 -0800
Subject: [PATCH 284/399] java 8 lambdas

---
 .../com/koushikdutta/async/AsyncServer.java   |  2 -
 .../async/future/ConvertFuture.java           | 13 -----
 .../koushikdutta/async/future/Converter.java  | 54 +++----------------
 3 files changed, 6 insertions(+), 63 deletions(-)
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/future/ConvertFuture.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index e1989cb54..328430ca6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -11,8 +11,6 @@
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.FutureCallback;
 import com.koushikdutta.async.future.SimpleFuture;
-import com.koushikdutta.async.future.ThenFutureCallback;
-import com.koushikdutta.async.future.TransformFuture;
 import com.koushikdutta.async.util.StreamUtility;
 
 import java.io.IOException;
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/ConvertFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/ConvertFuture.java
deleted file mode 100644
index b07ac4333..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/future/ConvertFuture.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.koushikdutta.async.future;
-
-/**
- * Created by koush on 6/21/14.
- */
-public abstract class ConvertFuture<T, F> extends TransformFuture<T, F> {
-    @Override
-    protected final void transform(F result) throws Exception {
-        setComplete(convert(result));
-    }
-
-    protected abstract Future<T> convert(F result) throws Exception;
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
index 6bebd1137..b4107aa88 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -273,57 +273,15 @@ public <T> Future<T> to(final Class<T> clazz, final String mime) {
         return future.then(from -> to(from, clazz ,mime));
     }
 
-    private TypeConverter<byte[], String> StringToByteArray = new TypeConverter<byte[], String>() {
-        @Override
-        public SimpleFuture<byte[]> convert(String from, String fromMime) {
-            return new SimpleFuture<>(from.getBytes());
-        }
-    };
-
-    private TypeConverter<ByteBufferList, byte[]> ByteArrayToByteBufferList = new TypeConverter<ByteBufferList, byte[]>() {
-        @Override
-        public SimpleFuture<ByteBufferList> convert(byte[] from, String fromMime) {
-            return new SimpleFuture<>(new ByteBufferList(from));
-        }
-    };
+    private TypeConverter<byte[], String> StringToByteArray = (from, fromMime) -> new SimpleFuture<>(from.getBytes());
 
-    private TypeConverter<ByteBuffer, byte[]> ByteArrayToByteBuffer = new TypeConverter<ByteBuffer, byte[]>() {
-        @Override
-        public SimpleFuture<ByteBuffer> convert(byte[] from, String fromMime) {
-            return new SimpleFuture<>(ByteBufferList.deepCopy(ByteBuffer.wrap(from)));
-        }
-    };
-
-    private TypeConverter<ByteBufferList, ByteBuffer> ByteBufferToByteBufferList = new TypeConverter<ByteBufferList, ByteBuffer>() {
-        @Override
-        public SimpleFuture<ByteBufferList> convert(ByteBuffer from, String fromMime) {
-            return new SimpleFuture<>(new ByteBufferList(ByteBufferList.deepCopy(from)));
-        }
-    };
+    private TypeConverter<ByteBufferList, byte[]> ByteArrayToByteBufferList = (from, fromMime) -> new SimpleFuture<>(new ByteBufferList(from));
 
-    private TypeConverter<JSONObject, String> StringToJSONObject = new TypeConverter<JSONObject, String>() {
-        @Override
-        public SimpleFuture<JSONObject> convert(String from, String fromMime) {
-            return new TransformFuture<JSONObject, String>(from) {
-                @Override
-                protected void transform(String result) throws Exception {
-                    setComplete(new JSONObject(result));
-                }
-            };
-        }
-    };
+    private TypeConverter<ByteBuffer, byte[]> ByteArrayToByteBuffer = (from, fromMime) -> new SimpleFuture<>(ByteBufferList.deepCopy(ByteBuffer.wrap(from)));
 
-    private TypeConverter<String, JSONObject> JSONObjectToString = new TypeConverter<String, JSONObject>() {
-        @Override
-        public SimpleFuture<String> convert(JSONObject from, String fromMime) {
-            return new TransformFuture<String, JSONObject>(from) {
-                @Override
-                protected void transform(JSONObject result) throws Exception {
-                    setComplete(result.toString());
-                }
-            };
-        }
-    };
+    private TypeConverter<ByteBufferList, ByteBuffer> ByteBufferToByteBufferList = (from, fromMime) -> new SimpleFuture<>(new ByteBufferList(ByteBufferList.deepCopy(from)));
 
+    private TypeConverter<JSONObject, String> StringToJSONObject = (from, fromMime) -> new SimpleFuture<>(from).thenConvert(JSONObject::new);
 
+    private TypeConverter<String, JSONObject> JSONObjectToString = (from, fromMime) -> new SimpleFuture<>(from).thenConvert(JSONObject::toString);
 }

From 6205be8a64295ee16e5de94ebe95740dcbef9875 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 22 Nov 2018 20:23:51 -0800
Subject: [PATCH 285/399] more simplifications around the stremaing converters

---
 .../koushikdutta/async/future/Converter.java  | 117 +++++++++++++-----
 .../async/future/SimpleFuture.java            |   6 +-
 .../async/future/TypeConverter.java           |   2 +-
 3 files changed, 87 insertions(+), 38 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
index b4107aa88..33ceac120 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -37,22 +37,27 @@ public MultiTransformer(TypeConverter<T, F> converter, String converterMime) {
         }
 
         @Override
-        protected void transform(MimedData<Future<F>> result) {
-            // transform will only ever be called once,
+        protected void transform(MimedData<Future<F>> converting) {
+            // transform will only ever be called once, and is called immediately,
+            // the transform is on the future itself, and not a pending value.
             // so there's no risk of running the converter twice.
-            final String mime = result.mime;
+            final String mime = converting.mime;
 
+            // this future will receive the eventual actual value.
             final MultiFuture<T> converted = new MultiFuture<>();
-            setComplete(new MimedData<Future<T>>(converted, new MimedType(null, mime).matches(converterMime).mime));
 
-            result.data.setCallback(new FutureCallback<F>() {
-                @Override
-                public void onCompleted(Exception e, F data) {
-                    converted.setComplete(converter.convert(data, mime));
-                }
+            // this marks the conversion as "complete". the conversion will start
+            // as soon as the value is ready.
+            setComplete(new MimedData<>(converted, new MimedType(null, mime).matches(converterMime).mime));
+
+            // wait on the incoming value and convert it
+            converting.data.thenConvert(data -> converter.convert(data, mime)).
+            setCallback((e, result1) -> {
+                if (e != null)
+                    converted.setComplete(e);
+                else
+                    converted.setComplete(result1);
             });
-
-            result.data.then((ThenFutureCallback<T, F>) from -> converter.convert(from, mime));
         }
     }
 
@@ -150,29 +155,15 @@ public ConverterTransformers<F, T> getAll(MimedType<T> mimedType) {
         }
     }
 
-    Converters<Object, Object> outputs = new Converters<>();
-
-    synchronized protected <F, T> void addTypeConverter(Class<F> from, String fromMime, Class<T> to, String toMime, TypeConverter<T, F> typeConverter) {
-        if (fromMime == null)
-            fromMime = MIME_ALL;
-        if (toMime == null)
-            toMime = MIME_ALL;
-        ((Converters<F, T>)outputs).ensure(new MimedType<>(from, fromMime)).put(new MimedType<>(to, toMime), new MultiTransformer<>(typeConverter, toMime));
-    }
+    Converters<Object, Object> outputs;
 
-    private Converter() {
-        addTypeConverter(ByteBuffer.class, null, ByteBufferList.class, null, ByteBufferToByteBufferList);
-        addTypeConverter(String.class, null, byte[].class, null, StringToByteArray);
-        addTypeConverter(byte[].class, null, ByteBufferList.class, null, ByteArrayToByteBufferList);
-        addTypeConverter(byte[].class, null, ByteBuffer.class, null, ByteArrayToByteBuffer);
-        addTypeConverter(String.class, "application/json", JSONObject.class, null, StringToJSONObject);
-        addTypeConverter(JSONObject.class, null, String.class, "application/json", JSONObjectToString);
+    protected ConverterMap getConverters() {
+        return Converters;
     }
 
     MultiFuture<R> future = new MultiFuture<>();
     String futureMime;
     protected Converter(Future future, String mime) {
-        this();
         if (mime == null)
             mime = MIME_ALL;
         this.futureMime = mime;
@@ -189,6 +180,14 @@ synchronized private <T> Future<T> to(Class fromClass, Class<T> clazz, String mi
         if (mime == null)
             mime = MIME_ALL;
 
+        if (outputs == null) {
+            outputs = new Converters<>();
+            ConverterMap converters = getConverters();
+            for (ConverterEntry entry: converters.map.keySet()) {
+                outputs.ensure(entry.from).put(entry.to, new MultiTransformer<>(converters.map.get(entry), entry.to.mime));
+            }
+        }
+
         MimedType<T> target = new MimedType<>(clazz, mime);
         ArrayDeque<PathInfo> bestMatch = new ArrayDeque<>();
         ArrayDeque<PathInfo> currentPath = new ArrayDeque<>();
@@ -273,15 +272,65 @@ public <T> Future<T> to(final Class<T> clazz, final String mime) {
         return future.then(from -> to(from, clazz ,mime));
     }
 
-    private TypeConverter<byte[], String> StringToByteArray = (from, fromMime) -> new SimpleFuture<>(from.getBytes());
+    static class ConverterEntry<F, T> {
+        ConverterEntry(Class<F> from, String fromMime, Class<T> to, String toMime) {
+            this.from = new MimedType<>(from, fromMime);
+            this.to = new MimedType<>(to, toMime);
+        }
+        MimedType<F> from;
+        MimedType<T> to;
+
+        @Override
+        public int hashCode() {
+            return from.hashCode() ^ to.hashCode();
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            ConverterEntry other = (ConverterEntry)obj;
+            return from.equals(other.from) && to.equals(other.to);
+        }
+    }
+
+    public static class ConverterMap {
+        private LinkedHashMap<ConverterEntry, TypeConverter> map = new LinkedHashMap<>();
+        public ConverterMap() {
+        }
+
+        public ConverterMap(ConverterMap other) {
+            map.putAll(other.map);
+        }
+
+        public synchronized <F, T> void addConverter(Class<F> from, String fromMime, Class<T> to, String toMime, TypeConverter<T, F> typeConverter) {
+            if (fromMime == null)
+                fromMime = MIME_ALL;
+            if (toMime == null)
+                toMime = MIME_ALL;
+
+            map.put(new ConverterEntry<>(from, fromMime, to, toMime), typeConverter);
+        }
+    }
+
+    public static ConverterMap Converters = new ConverterMap();
 
-    private TypeConverter<ByteBufferList, byte[]> ByteArrayToByteBufferList = (from, fromMime) -> new SimpleFuture<>(new ByteBufferList(from));
+    static {
+        final TypeConverter<byte[], String> StringToByteArray = (from, fromMime) -> new SimpleFuture<>(from.getBytes());
 
-    private TypeConverter<ByteBuffer, byte[]> ByteArrayToByteBuffer = (from, fromMime) -> new SimpleFuture<>(ByteBufferList.deepCopy(ByteBuffer.wrap(from)));
+        final TypeConverter<ByteBufferList, byte[]> ByteArrayToByteBufferList = (from, fromMime) -> new SimpleFuture<>(new ByteBufferList(from));
 
-    private TypeConverter<ByteBufferList, ByteBuffer> ByteBufferToByteBufferList = (from, fromMime) -> new SimpleFuture<>(new ByteBufferList(ByteBufferList.deepCopy(from)));
+        final TypeConverter<ByteBuffer, byte[]> ByteArrayToByteBuffer = (from, fromMime) -> new SimpleFuture<>(ByteBufferList.deepCopy(ByteBuffer.wrap(from)));
 
-    private TypeConverter<JSONObject, String> StringToJSONObject = (from, fromMime) -> new SimpleFuture<>(from).thenConvert(JSONObject::new);
+        final TypeConverter<ByteBufferList, ByteBuffer> ByteBufferToByteBufferList = (from, fromMime) -> new SimpleFuture<>(new ByteBufferList(ByteBufferList.deepCopy(from)));
 
-    private TypeConverter<String, JSONObject> JSONObjectToString = (from, fromMime) -> new SimpleFuture<>(from).thenConvert(JSONObject::toString);
+        final TypeConverter<JSONObject, String> StringToJSONObject = (from, fromMime) -> new SimpleFuture<>(from).thenConvert(JSONObject::new);
+
+        final TypeConverter<String, JSONObject> JSONObjectToString = (from, fromMime) -> new SimpleFuture<>(from).thenConvert(JSONObject::toString);
+
+        Converters.addConverter(ByteBuffer.class, null, ByteBufferList.class, null, ByteBufferToByteBufferList);
+        Converters.addConverter(String.class, null, byte[].class, null, StringToByteArray);
+        Converters.addConverter(byte[].class, null, ByteBufferList.class, null, ByteArrayToByteBufferList);
+        Converters.addConverter(byte[].class, null, ByteBuffer.class, null, ByteArrayToByteBuffer);
+        Converters.addConverter(String.class, "application/json", JSONObject.class, null, StringToJSONObject);
+        Converters.addConverter(JSONObject.class, null, String.class, "application/json", JSONObjectToString);
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
index 22d23a70f..f380b6c99 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -8,9 +8,9 @@
 import java.util.concurrent.TimeoutException;
 
 public class SimpleFuture<T> extends SimpleCancellable implements DependentFuture<T> {
-    AsyncSemaphore waiter;
-    Exception exception;
-    T result;
+    private AsyncSemaphore waiter;
+    private Exception exception;
+    private T result;
     boolean silent;
     FutureCallback<T> callback;
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/TypeConverter.java b/AndroidAsync/src/com/koushikdutta/async/future/TypeConverter.java
index 17184fb07..76a6bb5c6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/TypeConverter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/TypeConverter.java
@@ -1,5 +1,5 @@
 package com.koushikdutta.async.future;
 
 public interface TypeConverter<T, F> {
-    Future<T> convert(F from, String fromMime);
+    Future<T> convert(F from, String fromMime) throws Exception;
 }

From 644ec55b5694352b9922e831961ae0df5cc44330 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 23 Nov 2018 00:01:58 -0800
Subject: [PATCH 286/399] fix mime bugs

---
 .../com/koushikdutta/async/future/Converter.java  | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
index 33ceac120..f754aca42 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -48,7 +48,7 @@ protected void transform(MimedData<Future<F>> converting) {
 
             // this marks the conversion as "complete". the conversion will start
             // as soon as the value is ready.
-            setComplete(new MimedData<>(converted, new MimedType(null, mime).matches(converterMime).mime));
+            setComplete(new MimedData<>(converted, mimeReplace(mime, converterMime)));
 
             // wait on the incoming value and convert it
             converting.data.thenConvert(data -> converter.convert(data, mime)).
@@ -213,6 +213,16 @@ static class PathInfo {
         String mime;
     }
 
+    static String mimeReplace(String mime1, String mime2) {
+        String[] parts = mime2.split("/");
+        String[] myParts = mime1.split("/");
+
+        String primary = !"*".equals(parts[0]) ? parts[0] : myParts[0];
+        String secondary = !"*".equals(parts[1]) ? parts[1] : myParts[1];
+
+        return primary + "/" + secondary;
+    }
+
     public <T> Future<T> to(Class<T> clazz) {
         return to(clazz, null);
     }
@@ -243,7 +253,8 @@ private <T> boolean search(MimedType<T> target, ArrayDeque<PathInfo> bestMatch,
         ConverterTransformers<Object, Object> converterTransformers = outputs.getAll(currentSearch);
         for (MimedType candidate: converterTransformers.keySet()) {
             // this simulates the mime results of a transform
-            MimedType newSearch = candidate.matches(currentSearch.mime);
+//            MimedType newSearch = candidate.matches(currentSearch.mime);
+            MimedType newSearch = new MimedType(candidate.type, mimeReplace(currentSearch.mime, candidate.mime));
 
             PathInfo path = new PathInfo();
             path.transformer = converterTransformers.get(candidate);

From c4e2d1484aece4546e496ad3169651765182a171 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 23 Nov 2018 17:01:58 -0800
Subject: [PATCH 287/399] more mime converter fixes and improvements

---
 .../koushikdutta/async/future/Converter.java  | 72 +++++++++++--------
 1 file changed, 42 insertions(+), 30 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
index f754aca42..e6481ebee 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -31,9 +31,11 @@ public MimedData(T data, String mime) {
     static class MultiTransformer<T, F> extends MultiTransformFuture<MimedData<Future<T>>, MimedData<Future<F>>> {
         TypeConverter<T, F> converter;
         String converterMime;
-        public MultiTransformer(TypeConverter<T, F> converter, String converterMime) {
+        int distance;
+        public MultiTransformer(TypeConverter<T, F> converter, String converterMime, int distance) {
             this.converter = converter;
             this.converterMime = converterMime;
+            this.distance = distance;
         }
 
         @Override
@@ -92,12 +94,12 @@ public boolean equals(Object obj) {
         }
 
         // check if this mimed type is the same or more specific than this mimed type
-        public MimedType<T> matches(MimedType other) {
-            // check the type
+        public boolean isTypeOf(MimedType other) {
+            // check the type, this type must be less specific than the other type
             if (!this.type.isAssignableFrom(other.type))
-                return null;
+                return false;
 
-            return matches(other.mime);
+            return isTypeOf(other.mime);
         }
 
         public String primary() {
@@ -109,21 +111,18 @@ public String secondary() {
         }
 
         // check if this mimed type is convertible to another mimed type
-        public MimedType<T> matches(String mime) {
-            String[] parts = mime.split("/");
+        public boolean isTypeOf(String mime) {
+            String[] otherParts = mime.split("/");
             String[] myParts = this.mime.split("/");
 
-            // mime conversion can only become more specific.
-            if (!"*".equals(parts[0]) && !"*".equals(myParts[0]) && !parts[0].equals(myParts[0]))
-                return null;
+            // ensure the other type is the same OR this type is fine with a wildcard
+            if (!"*".equals(myParts[0]) && !otherParts[0].equals(myParts[0]))
+                return false;
 
-            if (!"*".equals(parts[1]) && !"*".equals(myParts[1]) && !parts[1].equals(myParts[1]))
-                return null;
+            if (!"*".equals(myParts[1]) && !otherParts[1].equals(myParts[1]))
+                return false;
 
-            String primary = !"*".equals(parts[0]) ? parts[0] : myParts[0];
-            String secondary = !"*".equals(parts[1]) ? parts[1] : myParts[1];
-
-            return new MimedType<>(type, primary + "/" + secondary);
+            return true;
         }
 
         @Override
@@ -158,7 +157,7 @@ public ConverterTransformers<F, T> getAll(MimedType<T> mimedType) {
     Converters<Object, Object> outputs;
 
     protected ConverterMap getConverters() {
-        return Converters;
+        return new ConverterMap(Converters);
     }
 
     MultiFuture<R> future = new MultiFuture<>();
@@ -184,7 +183,7 @@ synchronized private <T> Future<T> to(Class fromClass, Class<T> clazz, String mi
             outputs = new Converters<>();
             ConverterMap converters = getConverters();
             for (ConverterEntry entry: converters.map.keySet()) {
-                outputs.ensure(entry.from).put(entry.to, new MultiTransformer<>(converters.map.get(entry), entry.to.mime));
+                outputs.ensure(entry.from).put(entry.to, new MultiTransformer<>(converters.map.get(entry), entry.to.mime, entry.distance));
             }
         }
 
@@ -211,6 +210,15 @@ synchronized private <T> Future<T> to(Class fromClass, Class<T> clazz, String mi
     static class PathInfo {
         MultiTransformer<Object, Object> transformer;
         String mime;
+        MimedType candidate;
+
+        static int distance(ArrayDeque<PathInfo> path) {
+            int distance = 0;
+            for (PathInfo entry: path) {
+                distance += entry.transformer.distance;
+            }
+            return distance;
+        }
     }
 
     static String mimeReplace(String mime1, String mime2) {
@@ -228,25 +236,23 @@ public <T> Future<T> to(Class<T> clazz) {
     }
 
     private <T> boolean search(MimedType<T> target, ArrayDeque<PathInfo> bestMatch, ArrayDeque<PathInfo> currentPath, MimedType currentSearch, HashSet<MimedType> searched) {
-        if (target.matches(currentSearch) != null) {
+        if (target.isTypeOf(currentSearch)) {
             bestMatch.clear();
             bestMatch.addAll(currentPath);
             return true;
         }
 
         // the current path must have potential to be better than the best match
-        // if best match is currently 4, the current path must be 2 to have
-        // the chance of a new search being better.
-        if (!bestMatch.isEmpty() && currentPath.size() > bestMatch.size() - 2)
+        if (!bestMatch.isEmpty() && PathInfo.distance(currentPath) >= PathInfo.distance(bestMatch))
             return false;
 
         // prevent reentrancy
         if (searched.contains(currentSearch))
             return false;
-        if (searched.contains(new MimedType(currentSearch.type, currentSearch.primary() + "/*")))
-            return false;
-        if (searched.contains(new MimedType(currentSearch.type, "*/*")))
-            return false;
+//        if (searched.contains(new MimedType(currentSearch.type, currentSearch.primary() + "/*")))
+//            return false;
+//        if (searched.contains(new MimedType(currentSearch.type, "*/*")))
+//            return false;
 
         boolean found = false;
         searched.add(currentSearch);
@@ -259,6 +265,7 @@ private <T> boolean search(MimedType<T> target, ArrayDeque<PathInfo> bestMatch,
             PathInfo path = new PathInfo();
             path.transformer = converterTransformers.get(candidate);
             path.mime = newSearch.mime;
+            path.candidate = candidate;
             currentPath.addLast(path);
             try {
                 found |= search(target, bestMatch, currentPath, newSearch, searched);
@@ -284,12 +291,14 @@ public <T> Future<T> to(final Class<T> clazz, final String mime) {
     }
 
     static class ConverterEntry<F, T> {
-        ConverterEntry(Class<F> from, String fromMime, Class<T> to, String toMime) {
+        ConverterEntry(Class<F> from, String fromMime, Class<T> to, String toMime, int distance) {
             this.from = new MimedType<>(from, fromMime);
             this.to = new MimedType<>(to, toMime);
+            this.distance = distance;
         }
         MimedType<F> from;
         MimedType<T> to;
+        int distance;
 
         @Override
         public int hashCode() {
@@ -304,7 +313,7 @@ public boolean equals(Object obj) {
     }
 
     public static class ConverterMap {
-        private LinkedHashMap<ConverterEntry, TypeConverter> map = new LinkedHashMap<>();
+        public LinkedHashMap<ConverterEntry, TypeConverter> map = new LinkedHashMap<>();
         public ConverterMap() {
         }
 
@@ -313,16 +322,19 @@ public ConverterMap(ConverterMap other) {
         }
 
         public synchronized <F, T> void addConverter(Class<F> from, String fromMime, Class<T> to, String toMime, TypeConverter<T, F> typeConverter) {
+            addConverter(from, fromMime, to, toMime, 1, typeConverter);
+        }
+        public synchronized <F, T> void addConverter(Class<F> from, String fromMime, Class<T> to, String toMime, int distance, TypeConverter<T, F> typeConverter) {
             if (fromMime == null)
                 fromMime = MIME_ALL;
             if (toMime == null)
                 toMime = MIME_ALL;
 
-            map.put(new ConverterEntry<>(from, fromMime, to, toMime), typeConverter);
+            map.put(new ConverterEntry<>(from, fromMime, to, toMime, distance), typeConverter);
         }
     }
 
-    public static ConverterMap Converters = new ConverterMap();
+    private static ConverterMap Converters = new ConverterMap();
 
     static {
         final TypeConverter<byte[], String> StringToByteArray = (from, fromMime) -> new SimpleFuture<>(from.getBytes());

From afdd2ab1142253ff81fc75ae0c3b2a0ff9788647 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 23 Nov 2018 23:44:00 -0800
Subject: [PATCH 288/399] setCallback no longer returns self. chaining futures
 now set up a call site so the stack does not become enormous.

---
 .../koushikdutta/async/future/Converter.java  |   6 +-
 .../com/koushikdutta/async/future/Future.java |  14 +-
 .../async/future/SimpleFuture.java            | 183 ++++++++++----
 .../koushikdutta/async/test/FileTests.java    |   3 +-
 .../koushikdutta/async/test/FutureTests.java  |  41 ++++
 .../async/test/HttpClientTests.java           |   4 +-
 .../async/test/SocketIOTests.java             | 231 ------------------
 7 files changed, 188 insertions(+), 294 deletions(-)
 delete mode 100644 AndroidAsync/test/src/com/koushikdutta/async/test/SocketIOTests.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
index e6481ebee..3678fe664 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -225,6 +225,7 @@ static String mimeReplace(String mime1, String mime2) {
         String[] parts = mime2.split("/");
         String[] myParts = mime1.split("/");
 
+        // a wildcard mime converter adopts the mime of the converted type
         String primary = !"*".equals(parts[0]) ? parts[0] : myParts[0];
         String secondary = !"*".equals(parts[1]) ? parts[1] : myParts[1];
 
@@ -249,17 +250,12 @@ private <T> boolean search(MimedType<T> target, ArrayDeque<PathInfo> bestMatch,
         // prevent reentrancy
         if (searched.contains(currentSearch))
             return false;
-//        if (searched.contains(new MimedType(currentSearch.type, currentSearch.primary() + "/*")))
-//            return false;
-//        if (searched.contains(new MimedType(currentSearch.type, "*/*")))
-//            return false;
 
         boolean found = false;
         searched.add(currentSearch);
         ConverterTransformers<Object, Object> converterTransformers = outputs.getAll(currentSearch);
         for (MimedType candidate: converterTransformers.keySet()) {
             // this simulates the mime results of a transform
-//            MimedType newSearch = candidate.matches(currentSearch.mime);
             MimedType newSearch = new MimedType(candidate.type, mimeReplace(currentSearch.mime, candidate.mime));
 
             PathInfo path = new PathInfo();
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Future.java b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
index 78d56fe3d..18edc8da7 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Future.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
@@ -12,33 +12,33 @@ public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
     /**
      * Set a callback to be invoked when this Future completes successfully.
      * @param callback
+     * @return A future that will resolve once the success callback completes,
+     * which may contain any errors thrown by the success callback.
      */
     Future<T> success(SuccessCallback<T> callback);
 
     /**
      * Set a callback to be invoked when this Future completes successfully.
-     * successfully.
      * @param then
      * @param <R>
-     * @return A future that will contain the future result of ThenCallback
-     * or the failure from this Future.
+     * @return A future containing all exceptions that happened prior or during
+     * the callback, or the successful result.
      */
     <R> Future<R> then(ThenFutureCallback<R, T> then);
 
     /**
      * Set a callback to be invoked when this Future completes successfully.
-     * successfully.
      * @param then
      * @param <R>
-     * @return A future that will contain the result of ThenCallback
-     * or the failure from this Future.
+     * @return A future containing all exceptions that happened prior or during
+     * the callback, or the successful result.
      */
     <R> Future<R> thenConvert(ThenCallback<R, T> then);
 
     /**
      * Set a callback to be invoked when this future completes with a failure.
      * The failure can be observered and rethrown, or handled by returning
-     * a new value of the same type.
+     * a new fallback value of the same type.
      * @param fail
      * @return
      */
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
index f380b6c99..b7f2e37a8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -13,6 +13,11 @@ public class SimpleFuture<T> extends SimpleCancellable implements DependentFutur
     private T result;
     boolean silent;
     FutureCallback<T> callback;
+    FutureCallbackInternal internalCallback;
+
+    private interface FutureCallbackInternal<T> {
+        void onCompleted(Exception e, T result, FutureCallsite next);
+    }
 
     public SimpleFuture() {
     }
@@ -39,13 +44,15 @@ private boolean cancelInternal(boolean silent) {
             return false;
         // still need to release any pending waiters
         FutureCallback<T> callback;
+        FutureCallbackInternal<T> internalCallback;
         synchronized (this) {
             exception = new CancellationException();
             releaseWaiterLocked();
             callback = handleCompleteLocked();
+            internalCallback = handleInternalCompleteLocked();
             this.silent = silent;
         }
-        handleCallbackUnlocked(callback);
+        handleCallbackUnlocked(null, callback, internalCallback);
         return true;
     }
 
@@ -106,9 +113,63 @@ private FutureCallback<T> handleCompleteLocked() {
         return callback;
     }
 
-    private void handleCallbackUnlocked(FutureCallback<T> callback) {
-        if (callback != null && !silent)
+    private FutureCallbackInternal<T> handleInternalCompleteLocked() {
+        // don't execute the callback inside the sync block... possible hangup
+        // read the callback value, and then call it outside the block.
+        // can't simply call this.callback.onCompleted directly outside the block,
+        // because that may result in a race condition where the callback changes once leaving
+        // the block.
+        FutureCallbackInternal<T> callback = this.internalCallback;
+        // null out members to allow garbage collection
+        this.callback = null;
+        return callback;
+    }
+
+    static class FutureCallsite {
+        Exception e;
+        Object result;
+        FutureCallbackInternal callback;
+
+        void loop() {
+            while (callback != null) {
+                // these values always start non null.
+                FutureCallbackInternal callback = this.callback;
+                Exception e = this.e;
+                Object result = this.result;
+
+                // null them out for reentrancy
+                this.callback = null;
+                this.e = null;
+                this.result = null;
+
+                callback.onCompleted(e, result, this);
+            }
+        }
+    }
+
+    private void handleCallbackUnlocked(FutureCallsite callsite, FutureCallback<T> callback, FutureCallbackInternal<T> internalCallback) {
+        if (silent)
+            return;
+        if (callback != null) {
             callback.onCompleted(exception, result);
+            return;
+        }
+
+        if (internalCallback == null)
+            return;
+
+        boolean needsLoop = false;
+        if (callsite == null) {
+            needsLoop = true;
+            callsite = new FutureCallsite();
+        }
+
+        callsite.callback = internalCallback;
+        callsite.e = exception;
+        callsite.result = result;
+
+        if (needsLoop)
+            callsite.loop();
     }
 
     void releaseWaiterLocked() {
@@ -125,15 +186,20 @@ AsyncSemaphore ensureWaiterLocked() {
     }
 
     public boolean setComplete(Exception e) {
-        return setComplete(e, null);
+        return setComplete(e, null, null);
     }
 
     public boolean setComplete(T value) {
-        return setComplete(null, value);
+        return setComplete(null, value, null);
     }
 
     public boolean setComplete(Exception e, T value) {
+        return setComplete(e, value, null);
+    }
+
+    private boolean setComplete(Exception e, T value, FutureCallsite callsite) {
         FutureCallback<T> callback;
+        FutureCallbackInternal internalCallback;
         synchronized (this) {
             if (!super.setComplete())
                 return false;
@@ -141,58 +207,72 @@ public boolean setComplete(Exception e, T value) {
             exception = e;
             releaseWaiterLocked();
             callback = handleCompleteLocked();
+            internalCallback = handleInternalCompleteLocked();
         }
-        handleCallbackUnlocked(callback);
+        handleCallbackUnlocked(callsite, callback, internalCallback);
         return true;
     }
 
-    public FutureCallback<T> getCompletionCallback() {
-        return new FutureCallback<T>() {
-            @Override
-            public void onCompleted(Exception e, T result) {
-                setComplete(e, result);
-            }
-        };
+    private void setCallbackInternal(FutureCallsite callsite, FutureCallback<T> callback, FutureCallbackInternal<T> internalCallback) {
+        // callback can only be changed or read/used inside a sync block
+        synchronized (this) {
+            // done or cancelled,
+            this.callback = callback;
+            this.internalCallback = internalCallback;
+            if (!isDone() && !isCancelled())
+                return;
+
+            callback = handleCompleteLocked();
+            internalCallback = handleInternalCompleteLocked();
+        }
+        handleCallbackUnlocked(callsite, callback, internalCallback);
+    }
+
+    @Override
+    public void setCallback(FutureCallback<T> callback) {
+        setCallbackInternal(null, callback, null);
     }
 
-    public SimpleFuture<T> setComplete(Future<T> future) {
-        future.setCallback(getCompletionCallback());
+    private void setComplete(Future<T> future, FutureCallsite callsite) {
+        if (future instanceof SimpleFuture)
+            ((SimpleFuture<T>)future).setCallbackInternal(callsite, null, this::setComplete);
+        else
+            future.setCallback(this::setComplete);
+        setParent(future);
+    }
+
+    public void setComplete(Future<T> future) {
+        if (future instanceof SimpleFuture)
+            ((SimpleFuture<T>)future).setCallbackInternal(null, null, this::setComplete);
+        else
+            future.setCallback(this::setComplete);
         setParent(future);
-        return this;
     }
 
-    // TEST USE ONLY!
+    /**
+     * THIS METHOD IS FOR TEST USE ONLY
+     * @return
+     */
+    @Deprecated
     public FutureCallback<T> getCallback() {
         return callback;
     }
 
-    @Override
-    public void setCallback(FutureCallback<T> callback) {
-        // callback can only be changed or read/used inside a sync block
-        synchronized (this) {
-            this.callback = callback;
-            if (isDone() || isCancelled())
-                callback = handleCompleteLocked();
-            else
-                callback = null;
-        }
-        handleCallbackUnlocked(callback);
-    }
 
     @Override
     public Future<T> success(SuccessCallback<T> callback) {
         final SimpleFuture<T> ret = new SimpleFuture<>();
-        setCallback((e, result) -> {
-            if (e != null) {
-                ret.setComplete(e);
-                return;
-            }
-            try {
-                callback.success(result);
-            }
-            catch (Exception callbackException) {
-                ret.setComplete(callbackException);
+        setCallbackInternal(null, null, (e, result, next) -> {
+            if (e == null) {
+                try {
+                    callback.success(result);
+                }
+                catch (Exception callbackException) {
+                    e = callbackException;
+                    result = null;
+                }
             }
+            ret.setComplete(e, result, next);
         });
         return ret;
     }
@@ -200,17 +280,21 @@ public Future<T> success(SuccessCallback<T> callback) {
     @Override
     public <R> Future<R> then(ThenFutureCallback<R, T> then) {
         final SimpleFuture<R> ret = new SimpleFuture<>();
-        setCallback((e, result) -> {
+        setCallbackInternal(null, null, (e, result, next) -> {
             if (e != null) {
-                ret.setComplete(e);
+                ret.setComplete(e, null, next);
                 return;
             }
+            Future<R> out;
             try {
-                ret.setComplete(then.then(result));
+                out = then.then(result);
             }
             catch (Exception callbackException) {
-                ret.setComplete(callbackException);
+                ret.setComplete(callbackException, null, next);
+                return;
             }
+            ret.setComplete(out, next);
+
         });
         return ret;
     }
@@ -223,17 +307,20 @@ public <R> Future<R> thenConvert(final ThenCallback<R, T> callback) {
     @Override
     public Future<T> fail(FailFutureCallback<T> fail) {
         SimpleFuture<T> ret = new SimpleFuture<>();
-        setCallback((e, result) -> {
-            if (result != null) {
-                ret.setComplete(result);
+        setCallbackInternal(null, null, (e, result, next) -> {
+            if (e == null) {
+                ret.setComplete(e, result, next);
                 return;
             }
+            Future<T> out;
             try {
-                fail.fail(e);
+                out = fail.fail(e);
             }
             catch (Exception callbackException) {
-                ret.setComplete(callbackException);
+                ret.setComplete(callbackException, null, next);
+                return;
             }
+            ret.setComplete(out, next);
         });
         return ret;
     }
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java
index 1011929d3..609a4d3b1 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java
@@ -34,7 +34,8 @@ public void testFileDataEmitter() throws Exception {
         StreamUtility.writeFile(f, "hello world");
         FileDataEmitter fdm = new FileDataEmitter(AsyncServer.getDefault(), f);
         final Md5 md5 = Md5.createInstance();
-        Future<String> stringBody = new StringParser().parse(fdm)
+        Future<String> stringBody = new StringParser().parse(fdm);
+        stringBody
         .setCallback(new FutureCallback<String>() {
             @Override
             public void onCompleted(Exception e, String result) {
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java
index c453db9ed..30375ee7e 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java
@@ -2,6 +2,7 @@
 
 import android.os.Handler;
 import android.os.Looper;
+import android.support.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.callback.CompletedCallback;
@@ -9,9 +10,13 @@
 import com.koushikdutta.async.future.Continuation;
 import com.koushikdutta.async.future.FutureCallback;
 import com.koushikdutta.async.future.SimpleFuture;
+import com.koushikdutta.async.future.ThenCallback;
 
 import junit.framework.TestCase;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.ArrayList;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
@@ -19,7 +24,41 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+@RunWith(AndroidJUnit4.class)
 public class FutureTests extends TestCase {
+    @Test
+    public void testChain() throws Exception {
+        SimpleFuture<Integer> foo = new SimpleFuture<>();
+
+        foo
+        .thenConvert(new ThenCallback<Integer, Integer>() {
+            @Override
+            public Integer then(Integer from) {
+                return null;
+            }
+        })
+        .thenConvert(new ThenCallback<Integer, Integer>() {
+            @Override
+            public Integer then(Integer from) {
+                return null;
+            }
+        })
+        .thenConvert(new ThenCallback<Integer, Integer>() {
+            @Override
+            public Integer then(Integer from) {
+                return null;
+            }
+        })
+        .thenConvert(new ThenCallback<Integer, Integer>() {
+            @Override
+            public Integer then(Integer from) {
+                return null;
+            }
+        });
+
+        foo.setComplete(3);
+    }
+
     private static class IntegerFuture extends SimpleFuture<Integer> {
         private IntegerFuture() {
         }
@@ -43,6 +82,8 @@ public void run() {
         }
     }
 
+
+
     public void testFutureCallback() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
         final IntegerFuture future = IntegerFuture.create(20, 1000);
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
index e8164ffd3..a1071a260 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
@@ -276,8 +276,8 @@ public void onCompleted(Exception e, AsyncHttpResponse source, File result) {
             public void onProgress(AsyncHttpResponse response, long downloaded, long total) {
                 semaphore.release();
             }
-        })
-        .setCallback(new FutureCallback<File>() {
+        });
+        fileFuture.setCallback(new FutureCallback<File>() {
             @Override
             public void onCompleted(Exception e, File result) {
                 assertTrue(e instanceof CancellationException);
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/SocketIOTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/SocketIOTests.java
deleted file mode 100644
index 4c8ec6613..000000000
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/SocketIOTests.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package com.koushikdutta.async.test;
-
-import android.util.Log;
-
-import com.koushikdutta.async.AsyncServer;
-import com.koushikdutta.async.future.SimpleFuture;
-import com.koushikdutta.async.http.AsyncHttpClient;
-import com.koushikdutta.async.http.socketio.Acknowledge;
-import com.koushikdutta.async.http.socketio.ConnectCallback;
-import com.koushikdutta.async.http.socketio.DisconnectCallback;
-import com.koushikdutta.async.http.socketio.EventCallback;
-import com.koushikdutta.async.http.socketio.JSONCallback;
-import com.koushikdutta.async.http.socketio.ReconnectCallback;
-import com.koushikdutta.async.http.socketio.SocketIOClient;
-import com.koushikdutta.async.http.socketio.SocketIORequest;
-import com.koushikdutta.async.http.socketio.StringCallback;
-
-import junit.framework.TestCase;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.concurrent.TimeUnit;
-
-public class SocketIOTests extends TestCase {
-    public static final long TIMEOUT = 10000L;
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        AsyncServer.getDefault().stop();
-    }
-
-    class TriggerFuture extends SimpleFuture<Boolean> {
-        public void trigger(boolean val) {
-            setComplete(val);
-        }
-    }
-
-    public void testAcknowledge() throws Exception {
-        final TriggerFuture trigger = new TriggerFuture();
-        SocketIOClient client = SocketIOClient.connect(AsyncHttpClient.getDefaultInstance(), "http://koush.clockworkmod.com:8080/", null).get();
-
-        client.emit("hello", new Acknowledge() {
-            @Override
-            public void acknowledge(JSONArray arguments) {
-                trigger.trigger("hello".equals(arguments.optString(0)));
-            }
-        });
-
-        assertTrue(trigger.get(TIMEOUT, TimeUnit.MILLISECONDS));
-    }
-
-
-    public void testSendAcknowledge() throws Exception {
-        final TriggerFuture trigger = new TriggerFuture();
-        SocketIOClient client = SocketIOClient.connect(AsyncHttpClient.getDefaultInstance(), "http://koush.clockworkmod.com:8080/", null).get();
-
-        client.setStringCallback(new StringCallback() {
-            boolean isEcho = true;
-            @Override
-            public void onString(String string, Acknowledge acknowledge) {
-                if (!isEcho) {
-                    trigger.trigger("hello".equals(string));
-                    return;
-                }
-                assertNotNull(acknowledge);
-                isEcho = false;
-                acknowledge.acknowledge(new JSONArray().put(string));
-            }
-        });
-
-        client.emit("hello");
-
-        assertTrue(trigger.get(TIMEOUT, TimeUnit.MILLISECONDS));
-    }
-
-    public void testEndpoint() throws Exception {
-        final TriggerFuture trigger = new TriggerFuture();
-        SocketIOClient.connect(AsyncHttpClient.getDefaultInstance(), new SocketIORequest("http://koush.clockworkmod.com:8080/", "/chat"), new ConnectCallback() {
-            @Override
-            public void onConnectCompleted(Exception ex, SocketIOClient client) {
-                assertNull(ex);
-                client.setStringCallback(new StringCallback() {
-                    @Override
-                    public void onString(String string, Acknowledge acknowledge) {
-                        trigger.trigger("hello".equals(string));
-                    }
-                });
-                client.emit("hello");
-            }
-        });
-        assertTrue(trigger.get(TIMEOUT, TimeUnit.MILLISECONDS));
-    }
-
-    public void testEchoServer() throws Exception {
-        final TriggerFuture trigger1 = new TriggerFuture();
-        final TriggerFuture trigger2 = new TriggerFuture();
-        final TriggerFuture trigger3 = new TriggerFuture();
-
-        SocketIORequest req = new SocketIORequest("http://koush.clockworkmod.com:8080");
-        req.setLogging("Socket.IO", Log.VERBOSE);
-        SocketIOClient.connect(AsyncHttpClient.getDefaultInstance(), req, new ConnectCallback() {
-            @Override
-            public void onConnectCompleted(Exception ex, SocketIOClient client) {
-                assertNull(ex);
-                client.setStringCallback(new StringCallback() {
-                    @Override
-                    public void onString(String string, Acknowledge acknowledge) {
-                        trigger1.trigger("hello".equals(string));
-                    }
-                });
-                client.on("pong", new EventCallback() {
-                    @Override
-                    public void onEvent(JSONArray arguments, Acknowledge acknowledge) {
-                        trigger2.trigger(arguments.length() == 3);
-                    }
-                });
-                client.setJSONCallback(new JSONCallback() {
-                    @Override
-                    public void onJSON(JSONObject json, Acknowledge acknowledge) {
-                        trigger3.trigger("world".equals(json.optString("hello")));
-                    }
-                });
-                try {
-                    client.emit("hello");
-                    client.emit(new JSONObject("{\"hello\":\"world\"}"));
-                    client.emit("ping", new JSONArray("[2,3,4]"));
-                }
-                catch (JSONException e) {
-                }
-            }
-        });
-
-        assertTrue(trigger1.get(TIMEOUT, TimeUnit.MILLISECONDS));
-        assertTrue(trigger2.get(TIMEOUT, TimeUnit.MILLISECONDS));
-        assertTrue(trigger3.get(TIMEOUT, TimeUnit.MILLISECONDS));
-    }
-
-    public void testReconnect() throws Exception {
-        final TriggerFuture disconnectTrigger = new TriggerFuture();
-        final TriggerFuture reconnectTrigger = new TriggerFuture();
-        final TriggerFuture endpointReconnectTrigger = new TriggerFuture();
-        final TriggerFuture echoTrigger = new TriggerFuture();
-
-        SocketIORequest req = new SocketIORequest("http://koush.clockworkmod.com:8080");
-        req.setLogging("socket.io", Log.VERBOSE);
-        SocketIOClient.connect(AsyncHttpClient.getDefaultInstance(), req, new ConnectCallback() {
-            @Override
-            public void onConnectCompleted(Exception ex, final SocketIOClient client) {
-                assertNull(ex);
-
-                client.of("/chat", new ConnectCallback() {
-                    @Override
-                    public void onConnectCompleted(Exception ex, final SocketIOClient client) {
-                        client.setReconnectCallback(new ReconnectCallback() {
-                            @Override
-                            public void onReconnect() {
-                                client.emit("hello");
-                                endpointReconnectTrigger.trigger(true);
-                            }
-                        });
-
-                        client.setStringCallback(new StringCallback() {
-                            @Override
-                            public void onString(String string, Acknowledge acknowledge) {
-                                echoTrigger.trigger("hello".equals(string));
-                            }
-                        });
-
-                        AsyncServer.getDefault().postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                // this will trigger a reconnect
-                                client.getTransport().disconnect();
-                            }
-                        }, 200);
-                    }
-                });
-
-                client.setDisconnectCallback(new DisconnectCallback() {
-                    @Override
-                    public void onDisconnect(Exception e) {
-                        disconnectTrigger.trigger(true);
-                    }
-                });
-
-                client.setReconnectCallback(new ReconnectCallback() {
-                    @Override
-                    public void onReconnect() {
-                        reconnectTrigger.trigger(true);
-                    }
-                });
-            }
-        });
-
-        assertTrue(disconnectTrigger.get(TIMEOUT, TimeUnit.MILLISECONDS));
-        assertTrue(reconnectTrigger.get(TIMEOUT, TimeUnit.MILLISECONDS));
-        assertTrue(endpointReconnectTrigger.get(TIMEOUT, TimeUnit.MILLISECONDS));
-        assertTrue(echoTrigger.get(TIMEOUT, TimeUnit.MILLISECONDS));
-    }
-
-    public void testEventAck() throws Exception {
-        final TriggerFuture trigger = new TriggerFuture();
-        SocketIOClient client = SocketIOClient.connect(AsyncHttpClient.getDefaultInstance(), "http://koush.clockworkmod.com:8080/", null).get();
-
-        final JSONArray args = new JSONArray();
-        args.put("echo");
-
-        client.on("scoop", new EventCallback() {
-            @Override
-            public void onEvent(JSONArray argument, Acknowledge acknowledge) {
-                acknowledge.acknowledge(args);
-
-            }
-        });
-
-        client.on("ack", new EventCallback() {
-            @Override
-            public void onEvent(JSONArray argument, Acknowledge acknowledge) {
-
-                trigger.trigger(args.optString(0, null).equals("echo"));
-            }
-        });
-
-        client.emit("poop", args);
-
-        assertTrue(trigger.get(TIMEOUT, TimeUnit.MILLISECONDS));
-    }
-}

From 54cfeced75ff870060350a60214367a7724147db Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 24 Nov 2018 09:57:52 -0800
Subject: [PATCH 289/399] more future fixes, converter fixes

---
 .../com/koushikdutta/async/future/Converter.java   |  9 ++++++---
 .../koushikdutta/async/future/FailCallback.java    |  5 ++---
 .../async/future/FailConvertCallback.java          | 12 ++++++++++++
 ...utureCallback.java => FailRecoverCallback.java} |  2 +-
 .../src/com/koushikdutta/async/future/Future.java  |  6 ++++--
 .../koushikdutta/async/future/SimpleFuture.java    | 14 +++++++++++---
 .../async/http/AsyncSocketMiddleware.java          |  2 +-
 7 files changed, 37 insertions(+), 13 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/future/FailConvertCallback.java
 rename AndroidAsync/src/com/koushikdutta/async/future/{FailFutureCallback.java => FailRecoverCallback.java} (88%)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
index 3678fe664..2a712dcd9 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -147,9 +147,12 @@ private static <F, T> void add(ConverterTransformers<F, T> set, ConverterTransfo
         }
         public ConverterTransformers<F, T> getAll(MimedType<T> mimedType) {
             ConverterTransformers<F, T> ret = new ConverterTransformers<>();
-            add(ret, get(mimedType));
-            add(ret, get(new MimedType<>(mimedType.type, mimedType.primary() + "/*")));
-            add(ret, get(new MimedType<>(mimedType.type, "*/*")));
+
+            for (MimedType candidate: keySet()) {
+                if (candidate.isTypeOf(mimedType))
+                    add(ret, get(candidate));
+            }
+
             return ret;
         }
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/FailCallback.java b/AndroidAsync/src/com/koushikdutta/async/future/FailCallback.java
index 26d45973f..52cca0528 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/FailCallback.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/FailCallback.java
@@ -1,12 +1,11 @@
 package com.koushikdutta.async.future;
 
-public interface FailCallback<T> {
+public interface FailCallback {
     /**
      * Callback that is invoked when a future completes with an error.
      * The error should be rethrown, or a new value should be returned.
      * @param e
-     * @return
      * @throws Exception
      */
-    T fail(Exception e) throws Exception;
+    void fail(Exception e) throws Exception;
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/FailConvertCallback.java b/AndroidAsync/src/com/koushikdutta/async/future/FailConvertCallback.java
new file mode 100644
index 000000000..87660f24d
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/future/FailConvertCallback.java
@@ -0,0 +1,12 @@
+package com.koushikdutta.async.future;
+
+public interface FailConvertCallback<T> {
+    /**
+     * Callback that is invoked when a future completes with an error.
+     * The error should be rethrown, or a new value should be returned.
+     * @param e
+     * @return
+     * @throws Exception
+     */
+    T fail(Exception e) throws Exception;
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/FailFutureCallback.java b/AndroidAsync/src/com/koushikdutta/async/future/FailRecoverCallback.java
similarity index 88%
rename from AndroidAsync/src/com/koushikdutta/async/future/FailFutureCallback.java
rename to AndroidAsync/src/com/koushikdutta/async/future/FailRecoverCallback.java
index f9454fad2..f76e1520b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/FailFutureCallback.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/FailRecoverCallback.java
@@ -1,6 +1,6 @@
 package com.koushikdutta.async.future;
 
-public interface FailFutureCallback<T> {
+public interface FailRecoverCallback<T> {
     /**
      * Callback that is invoked when a future completes with an error.
      * The error should be rethrown, or a new future value should be returned.
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Future.java b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
index 18edc8da7..62065fc42 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Future.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
@@ -35,6 +35,8 @@ public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
      */
     <R> Future<R> thenConvert(ThenCallback<R, T> then);
 
+    Future<T> fail(FailCallback fail);
+
     /**
      * Set a callback to be invoked when this future completes with a failure.
      * The failure can be observered and rethrown, or handled by returning
@@ -42,7 +44,7 @@ public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
      * @param fail
      * @return
      */
-    Future<T> failConvert(FailCallback<T> fail);
+    Future<T> failConvert(FailConvertCallback<T> fail);
 
     /**
      * Set a callback to be invoked when this future completes with a failure.
@@ -51,7 +53,7 @@ public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
      * @param fail
      * @return
      */
-    Future<T> fail(FailFutureCallback<T> fail);
+    Future<T> failRecover(FailRecoverCallback<T> fail);
 
     /**
      * Get the result, if any. Returns null if still in progress.
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
index b7f2e37a8..30cd5ca97 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -305,7 +305,15 @@ public <R> Future<R> thenConvert(final ThenCallback<R, T> callback) {
     }
 
     @Override
-    public Future<T> fail(FailFutureCallback<T> fail) {
+    public Future<T> fail(FailCallback fail) {
+        return failRecover(e -> {
+            fail.fail(e);
+            return this;
+        });
+    }
+
+    @Override
+    public Future<T> failRecover(FailRecoverCallback<T> fail) {
         SimpleFuture<T> ret = new SimpleFuture<>();
         setCallbackInternal(null, null, (e, result, next) -> {
             if (e == null) {
@@ -326,8 +334,8 @@ public Future<T> fail(FailFutureCallback<T> fail) {
     }
 
     @Override
-    public Future<T> failConvert(FailCallback<T> fail) {
-        return fail(SimpleFuture::new);
+    public Future<T> failConvert(FailConvertCallback<T> fail) {
+        return failRecover(e -> new SimpleFuture<>(fail.fail(e)));
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index cdfa5fff0..c74ae72e0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -196,7 +196,7 @@ public Cancellable getSocket(final GetSocketData data) {
             Future<AsyncSocket> current = new SimpleFuture<>(new Exception("empty ip address list"));
             ArrayDeque<InetAddress> addresses = new ArrayDeque<>(Arrays.asList(from));
 
-            current = current.fail(e -> {
+            current = current.failRecover(e -> {
                 if (addresses.isEmpty())
                     throw e;
 

From 96062a177850960b7abcc48a4983f69196d3e09b Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 24 Nov 2018 22:21:00 -0800
Subject: [PATCH 290/399] form multipart enhancements

---
 .../com/koushikdutta/async/http/HttpUtil.java |  2 +-
 .../http/body/MultipartFormDataBody.java      | 65 +++++++++++--------
 .../http/server/AsyncHttpServerRequest.java   |  1 +
 .../http/server/AsyncHttpServerRouter.java    |  5 ++
 4 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
index b7178ee6c..260ddec28 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
@@ -33,7 +33,7 @@ public static AsyncHttpRequestBody getBody(DataEmitter emitter, CompletedCallbac
                     return new StringBody();
                 }
                 if (MultipartFormDataBody.CONTENT_TYPE.equals(ct)) {
-                    return new MultipartFormDataBody(values);
+                    return new MultipartFormDataBody(contentType);
                 }
             }
         }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
index 34ea06db9..000cb58f5 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
@@ -1,5 +1,7 @@
 package com.koushikdutta.async.http.body;
 
+import android.text.TextUtils;
+
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.DataSink;
@@ -16,13 +18,14 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
 
 public class MultipartFormDataBody extends BoundaryEmitter implements AsyncHttpRequestBody<Multimap> {
     LineEmitter liner;
     Headers formData;
-    ByteBufferList last;
-    String lastName;
+    ByteBufferList lastData;
+    Part lastPart;
 
     public interface MultipartCallback {
         public void onPart(Part part);
@@ -35,16 +38,22 @@ public void parse(DataEmitter emitter, final CompletedCallback completed) {
     }
 
     void handleLast() {
-        if (last == null)
+        if (lastData == null)
             return;
         
         if (formData == null)
             formData = new Headers();
-        
-        formData.add(lastName, last.peekString());
-        
-        lastName = null;
-        last = null;
+
+        String value = lastData.peekString();
+        String name = TextUtils.isEmpty(lastPart.getName()) ? "unnamed" : lastPart.getName();
+        StringPart part = new StringPart(name, value);
+        part.mHeaders = lastPart.mHeaders;
+        addPart(part);
+
+        formData.add(name, value);
+
+        lastPart = null;
+        lastData = null;
     }
     
     public String getField(String name) {
@@ -58,7 +67,7 @@ protected void onBoundaryEnd() {
         super.onBoundaryEnd();
         handleLast();
     }
-    
+
     @Override
     protected void onBoundaryStart() {
         final Headers headers = new Headers();
@@ -78,17 +87,17 @@ public void onStringAvailable(String s) {
                     if (mCallback != null)
                         mCallback.onPart(part);
                     if (getDataCallback() == null) {
-                        if (part.isFile()) {
-                            setDataCallback(new NullDataCallback());
-                            return;
-                        }
+//                        if (part.isFile()) {
+//                            setDataCallback(new NullDataCallback());
+//                            return;
+//                        }
 
-                        lastName = part.getName();
-                        last = new ByteBufferList();
+                        lastPart = part;
+                        lastData = new ByteBufferList();
                         setDataCallback(new DataCallback() {
                             @Override
                             public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-                                bb.get(last);
+                                bb.get(lastData);
                             }
                         });
                     }
@@ -100,17 +109,13 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
 
     public static final String CONTENT_TYPE = "multipart/form-data";
     String contentType = CONTENT_TYPE;
-    public MultipartFormDataBody(String[] values) {
-        for (String value: values) {
-            String[] splits = value.split("=");
-            if (splits.length != 2)
-                continue;
-            if (!"boundary".equals(splits[0]))
-                continue;
-            setBoundary(splits[1]);
-            return;
-        }
-        report(new Exception ("No boundary found for multipart/form-data"));
+    public MultipartFormDataBody(String contentType) {
+        Multimap map = Multimap.parseSemicolonDelimited(contentType);
+        String boundary = map.getString("boundary");
+        if (boundary == null)
+            report(new Exception ("No boundary found for multipart/form-data"));
+        else
+            setBoundary(boundary);
     }
 
     MultipartCallback mCallback;
@@ -217,6 +222,12 @@ public void setContentType(String contentType) {
         this.contentType = contentType;
     }
 
+    public List<Part> getParts() {
+        if (mParts == null)
+            return null;
+        return new ArrayList<>(mParts);
+    }
+
     public void addFilePart(String name, File file) {
         addPart(new FilePart(name, file));
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
index 153181d6d..cbb27977c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
@@ -12,6 +12,7 @@
 public interface AsyncHttpServerRequest extends DataEmitter {
     Headers getHeaders();
     Matcher getMatcher();
+    void setMatcher(Matcher matcher);
     <T extends AsyncHttpRequestBody> T getBody();
     AsyncSocket getSocket();
     String getPath();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
index 7809f7658..d127df3d8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
@@ -293,6 +293,11 @@ abstract class AsyncHttpServerRequestImpl extends com.koushikdutta.async.http.se
         public Matcher getMatcher() {
             return matcher;
         }
+
+        @Override
+        public void setMatcher(Matcher matcher) {
+            this.matcher = matcher;
+        }
     }
 
     class Callback implements HttpServerRequestCallback, RouteMatcher {

From 8800eaf2c8ca224a4d7f45794e816483267d0771 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 24 Nov 2018 22:51:54 -0800
Subject: [PATCH 291/399] multipart

---
 .../src/com/koushikdutta/async/http/body/StringPart.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/StringPart.java b/AndroidAsync/src/com/koushikdutta/async/http/body/StringPart.java
index 8005fc549..7c9dedaae 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/StringPart.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/StringPart.java
@@ -16,4 +16,7 @@ protected InputStream getInputStream() throws IOException {
         return new ByteArrayInputStream(value.getBytes());
     }
 
+    public String getValue() {
+        return value;
+    }
 }

From 53d1a85529f3c1128fc1e8e2359fdc83b2f5a82e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 25 Nov 2018 17:31:08 -0800
Subject: [PATCH 292/399] future utils

---
 .../koushikdutta/async/future/Futures.java    | 34 +++++++++++++++-
 .../async/future/SimpleFuture.java            | 39 +++++++++++++------
 2 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Futures.java b/AndroidAsync/src/com/koushikdutta/async/future/Futures.java
index 71fe061c7..82e3a5f83 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Futures.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Futures.java
@@ -1,6 +1,8 @@
 package com.koushikdutta.async.future;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
 
 public class Futures {
     public static <T> Future<ArrayList<T>> waitAll(final Future<T>... futures) {
@@ -9,6 +11,7 @@ public static <T> Future<ArrayList<T>> waitAll(final Future<T>... futures) {
 
         FutureCallback<T> cb = new FutureCallback<T>() {
             int count = 0;
+
             @Override
             public void onCompleted(Exception e, T result) {
                 results.add(result);
@@ -24,4 +27,33 @@ public void onCompleted(Exception e, T result) {
 
         return ret;
     }
-}
+
+
+    private static <T, F> void loopUntil(final Iterator<F> values, ThenFutureCallback<T, F> callback, SimpleFuture<T> ret, Exception lastException) {
+        while (values.hasNext()) {
+            try {
+                callback.then(values.next())
+                        .success(ret::setComplete)
+                        .fail(e -> loopUntil(values, callback, ret, e));
+                return;
+            } catch (Exception e) {
+                lastException = e;
+            }
+        }
+
+        if (lastException == null)
+            ret.setComplete(new Exception("empty list"));
+        else
+            ret.setComplete(lastException);
+    }
+
+    public static <T, F> Future<T> loopUntil(final Iterable<F> values, ThenFutureCallback<T, F> callback) {
+        SimpleFuture<T> ret = new SimpleFuture<>();
+        loopUntil(values.iterator(), callback, ret, null);
+        return ret;
+    }
+
+    public static <T, F> Future<T> loopUntil(final F[] values, ThenFutureCallback<T, F> callback) {
+        return loopUntil(Arrays.asList(values), callback);
+    }
+}
\ No newline at end of file
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
index 30cd5ca97..9a8715fdd 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -233,20 +233,30 @@ public void setCallback(FutureCallback<T> callback) {
         setCallbackInternal(null, callback, null);
     }
 
-    private void setComplete(Future<T> future, FutureCallsite callsite) {
-        if (future instanceof SimpleFuture)
-            ((SimpleFuture<T>)future).setCallbackInternal(callsite, null, this::setComplete);
-        else
-            future.setCallback(this::setComplete);
+    private Future<T> setComplete(Future<T> future, FutureCallsite callsite) {
         setParent(future);
+
+        SimpleFuture<T> ret = new SimpleFuture<>();
+        if (future instanceof SimpleFuture) {
+            ((SimpleFuture<T>)future).setCallbackInternal(callsite, null,
+                    (e, result, next) ->
+                            ret.setComplete(SimpleFuture.this.setComplete(e, result, next) ? null : new CancellationException(), result, next));
+        }
+        else {
+            future.setCallback((e, result) -> ret.setComplete(SimpleFuture.this.setComplete(e, result, null) ? null : new CancellationException()));
+        }
+        return ret;
     }
 
-    public void setComplete(Future<T> future) {
-        if (future instanceof SimpleFuture)
-            ((SimpleFuture<T>)future).setCallbackInternal(null, null, this::setComplete);
-        else
-            future.setCallback(this::setComplete);
-        setParent(future);
+    /**
+     * Complete a future with another future. Returns a future that reports whether the completion
+     * was successful. If the future was not completed due to cancellation, the callback
+     * will be called with a CancellationException, and the original future result, if one was provided.
+     * @param future
+     * @return
+     */
+    public Future<T> setComplete(Future<T> future) {
+        return setComplete(future, null);
     }
 
     /**
@@ -262,6 +272,7 @@ public FutureCallback<T> getCallback() {
     @Override
     public Future<T> success(SuccessCallback<T> callback) {
         final SimpleFuture<T> ret = new SimpleFuture<>();
+        ret.setParent(this);
         setCallbackInternal(null, null, (e, result, next) -> {
             if (e == null) {
                 try {
@@ -269,7 +280,9 @@ public Future<T> success(SuccessCallback<T> callback) {
                 }
                 catch (Exception callbackException) {
                     e = callbackException;
-                    result = null;
+                    // note that the result is not nulled out. this is useful for managed resources, like sockets.
+                    // for example: a successful socket connection was made, but the request can be cancelled.
+                    // so, returning an error along with a socket object allows for failure cleanup.
                 }
             }
             ret.setComplete(e, result, next);
@@ -280,6 +293,7 @@ public Future<T> success(SuccessCallback<T> callback) {
     @Override
     public <R> Future<R> then(ThenFutureCallback<R, T> then) {
         final SimpleFuture<R> ret = new SimpleFuture<>();
+        ret.setParent(this);
         setCallbackInternal(null, null, (e, result, next) -> {
             if (e != null) {
                 ret.setComplete(e, null, next);
@@ -315,6 +329,7 @@ public Future<T> fail(FailCallback fail) {
     @Override
     public Future<T> failRecover(FailRecoverCallback<T> fail) {
         SimpleFuture<T> ret = new SimpleFuture<>();
+        ret.setParent(this);
         setCallbackInternal(null, null, (e, result, next) -> {
             if (e == null) {
                 ret.setComplete(e, result, next);

From 1530b4ba73af73f8240b724f47c788230fbdb702 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 25 Nov 2018 17:36:57 -0800
Subject: [PATCH 293/399] simplify code around checking all possible addresses

---
 .../async/http/AsyncSocketMiddleware.java     | 69 +++++++++----------
 .../koushikdutta/async/test/FutureTests.java  | 24 +++++--
 .../async/test/HttpClientTests.java           |  8 +--
 3 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index c74ae72e0..3461b23c7 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -9,15 +9,17 @@
 import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.future.Cancellable;
+import com.koushikdutta.async.future.FailCallback;
 import com.koushikdutta.async.future.Future;
+import com.koushikdutta.async.future.FutureCallback;
+import com.koushikdutta.async.future.Futures;
 import com.koushikdutta.async.future.SimpleCancellable;
 import com.koushikdutta.async.future.SimpleFuture;
 import com.koushikdutta.async.util.ArrayDeque;
 
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import java.util.Arrays;
 import java.util.Hashtable;
+import java.util.Locale;
 
 public class AsyncSocketMiddleware extends SimpleMiddleware {
     String scheme;
@@ -189,47 +191,40 @@ public Cancellable getSocket(final GetSocketData data) {
         // try to connect to everything...
         data.request.logv("Resolving domain and connecting to all available addresses");
 
-        final SimpleFuture<AsyncSocket> returnValue = new SimpleFuture<>();
+        final SimpleFuture<AsyncSocket> checkedReturnValue = new SimpleFuture<>();
 
-        mClient.getServer().getAllByName(uri.getHost())
-        .then(from -> {
-            Future<AsyncSocket> current = new SimpleFuture<>(new Exception("empty ip address list"));
-            ArrayDeque<InetAddress> addresses = new ArrayDeque<>(Arrays.asList(from));
+        Future<AsyncSocket> socket = mClient.getServer().getAllByName(uri.getHost())
+        .then(addresses -> Futures.loopUntil(addresses, address -> {
+            SimpleFuture<AsyncSocket> loopResult = new SimpleFuture<>();
 
-            current = current.failRecover(e -> {
-                if (addresses.isEmpty())
-                    throw e;
+            final String inetSockAddress = String.format(Locale.ENGLISH, "%s:%s", address, port);
+            data.request.logv("attempting connection to " + inetSockAddress);
 
-                InetAddress address = addresses.removeFirst();
-                SimpleFuture<AsyncSocket> ret = new SimpleFuture<>();
+            mClient.getServer().connectSocket(new InetSocketAddress(address, port), loopResult::setComplete);
+            return loopResult;
+        }))
+        // handle failures here (wrap the callback)
+        .fail(e -> wrapCallback(data, uri, port, false, data.connectCallback).onConnectCompleted(e, null));
 
-                mClient.getServer().connectSocket(new InetSocketAddress(address, port),
-                wrapCallback(data, uri, port, false, (ex, socket) -> {
-                    // try the next address or fail altogether
-                    if (ex != null) {
-                        ret.setComplete(ex);
-                        return;
-                    }
-
-                    // attempt to successfully complete this socket, but
-                    // if the socket is no longer needed, just hang onto it...
-                    if (returnValue.isDone() || returnValue.isCancelled() || !ret.setComplete(socket)) {
-                        data.request.logd("Recycling extra socket leftover from cancelled operation");
-                        idleSocket(socket);
-                        recycleSocket(socket, data.request);
-                        return;
-                    }
-
-                    data.connectCallback.onConnectCompleted(null, socket);
-                }));
-
-                return ret;
-            });
-
-            return current;
+        checkedReturnValue.setComplete(socket)
+        .setCallback((e, successfulSocket) -> {
+            if (successfulSocket == null)
+                return;
+            // SimpleFuture.setComplete(Future) returns a future as to whether
+            // the completion was successful, or the future has been cancelled,
+            // thus the completion failed.
+            // The exception value will only ever be a CancellationException.
+            if (e == null) {
+                // handle successes here (wrap the callback)
+                wrapCallback(data, uri, port, false, data.connectCallback).onConnectCompleted(null, successfulSocket);
+                return;
+            }
+            data.request.logd("Recycling extra socket leftover from cancelled operation");
+            idleSocket(successfulSocket);
+            recycleSocket(successfulSocket, data.request);
         });
 
-        return returnValue;
+        return checkedReturnValue;
     }
 
     private ConnectionInfo getOrCreateConnectionInfo(String lookup) {
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java
index 30375ee7e..739ada90d 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java
@@ -84,6 +84,7 @@ public void run() {
 
 
 
+    @Test
     public void testFutureCallback() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
         final IntegerFuture future = IntegerFuture.create(20, 1000);
@@ -99,6 +100,7 @@ public void onCompleted(Exception e, Integer result) {
         assertTrue(semaphore.tryAcquire(3000, TimeUnit.MILLISECONDS));
     }
 
+    @Test
     public void testFutureFinishedCallback() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
         final IntegerFuture future = IntegerFuture.create(20, 1);
@@ -115,6 +117,7 @@ public void onCompleted(Exception e, Integer result) {
         assertTrue(semaphore.tryAcquire(3000, TimeUnit.MILLISECONDS));
     }
 
+    @Test
     public void testFutureCancel() throws Exception {
         // test a future being cancelled while waiting
         final IntegerFuture future = IntegerFuture.create(20, 2000);
@@ -145,13 +148,15 @@ public void run() {
             assertTrue(e.getCause() instanceof CancellationException);
         }
     }
-    
+
+    @Test
     public void testIntegerFuture() throws Exception {
         IntegerFuture i = IntegerFuture.create(10, 500L);
         assertEquals((int)i.get(), 10);
     }
     
     int someValue;
+    @Test
     public void testContinuation() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
         someValue = 0;
@@ -204,7 +209,8 @@ public void run() {
         assertTrue(semaphore.tryAcquire(3000, TimeUnit.MILLISECONDS));
         assertEquals(someValue, 3);
     }
-    
+
+    @Test
     public void testFutureChain() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
         final Continuation c = new Continuation(new CompletedCallback() {
@@ -231,7 +237,8 @@ public void run() {
         assertEquals((int)i1.get(), 2);
         assertEquals((int)i2.get(), 3);
     }
-    
+
+    @Test
     public void testContinuationFail() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
         final Continuation c = new Continuation(new CompletedCallback() {
@@ -257,7 +264,8 @@ public void run() {
         
         assertTrue(semaphore.tryAcquire(3000, TimeUnit.MILLISECONDS));
     }
-    
+
+    @Test
     public void testContinuationCancel() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
         final Continuation c = new Continuation(new CompletedCallback() {
@@ -300,8 +308,9 @@ public void run() {
         
         assertTrue(semaphore.tryAcquire(3000, TimeUnit.MILLISECONDS));
     }
-    
-    
+
+
+    @Test
     public void testChildContinuationCancel() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
         final Continuation c = new Continuation(new CompletedCallback() {
@@ -390,6 +399,7 @@ public void run() {
         }
     }
 
+    @Test
     public void testReentrancy() throws Exception {
         // verify reentrancy will work
         
@@ -440,6 +450,7 @@ public void run() {
         assertEquals((int)trigger.get(5000, TimeUnit.MILLISECONDS), 2020);
     }
 
+    @Test
     public void testPostCancelCallback() throws Exception {
         SimpleFuture<String> future = new SimpleFuture<String>();
         final Semaphore semaphore = new Semaphore(0);
@@ -455,6 +466,7 @@ public void onCompleted(Exception e, String result) {
         assertNull(future.getCallback());
     }
 
+    @Test
     public void testPreCancelCallback() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
         SimpleFuture<String> future = new SimpleFuture<String>();
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
index a1071a260..b0d4c272c 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
@@ -49,13 +49,8 @@
 
 @RunWith(AndroidJUnit4.class)
 public class HttpClientTests {
-    AsyncHttpClient client;
     AsyncServer server = new AsyncServer();
-    
-    public HttpClientTests() {
-        super();
-        client = new AsyncHttpClient(server);
-    }
+    AsyncHttpClient client  = new AsyncHttpClient(server);
 
     @Override
     protected void finalize() throws Throwable {
@@ -117,6 +112,7 @@ public void testHomepage() throws Exception {
         assertNotNull(ret.get(TIMEOUT, TimeUnit.MILLISECONDS));
     }
 
+    @Test
     public void testClockworkMod() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
         final Md5 md5 = Md5.createInstance();

From 80f7be9b55aa6666f216ae744205dc2f510904b8 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 27 Nov 2018 11:43:52 -0800
Subject: [PATCH 294/399] toString implementations

---
 .../src/com/koushikdutta/async/http/body/FilePart.java    | 5 +++++
 .../async/http/body/MultipartFormDataBody.java            | 8 ++++++++
 .../src/com/koushikdutta/async/http/body/StringPart.java  | 5 +++++
 3 files changed, 18 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java b/AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java
index cc850e864..48d5ade20 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/FilePart.java
@@ -27,4 +27,9 @@ public FilePart(String name, final File file) {
     protected InputStream getInputStream() throws IOException {
         return new FileInputStream(file);
     }
+
+    @Override
+    public String toString() {
+        return getName();
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
index 000cb58f5..0481e1331 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
@@ -247,4 +247,12 @@ public void addPart(Part part) {
     public Multimap get() {
         return new Multimap(formData.getMultiMap());
     }
+
+    @Override
+    public String toString() {
+        for (Part part: getParts()) {
+            return part.toString();
+        }
+        return "multipart content is empty";
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/StringPart.java b/AndroidAsync/src/com/koushikdutta/async/http/body/StringPart.java
index 7c9dedaae..99a28e086 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/StringPart.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/StringPart.java
@@ -19,4 +19,9 @@ protected InputStream getInputStream() throws IOException {
     public String getValue() {
         return value;
     }
+
+    @Override
+    public String toString() {
+        return value;
+    }
 }

From f66e6cc726f8acba11d513189597cb86e13c3089 Mon Sep 17 00:00:00 2001
From: Marc Robbins <marccrobbins@gmail.com>
Date: Tue, 27 Nov 2018 15:19:25 -0500
Subject: [PATCH 295/399] parse contentlength as long instead of int

---
 AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
index 260ddec28..8fd34dca8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
@@ -132,12 +132,12 @@ public static boolean isKeepAlive(String protocol, Headers headers) {
         return "keep-alive".equalsIgnoreCase(connection);
     }
 
-    public static int contentLength(Headers headers) {
+    public static long contentLength(Headers headers) {
         String cl = headers.get("Content-Length");
         if (cl == null)
             return -1;
         try {
-            return Integer.parseInt(cl);
+            return Long.parseLong(cl);
         }
         catch (NumberFormatException e) {
             return -1;

From d77ae9e4d00c2c44669878fe54d1cea227980922 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 28 Nov 2018 21:56:04 -0800
Subject: [PATCH 296/399] better multipart detection

---
 AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java    | 4 +++-
 .../koushikdutta/async/http/body/MultipartFormDataBody.java   | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
index 260ddec28..52a083d74 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
@@ -1,5 +1,7 @@
 package com.koushikdutta.async.http;
 
+import android.text.TextUtils;
+
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.FilteredDataEmitter;
@@ -32,7 +34,7 @@ public static AsyncHttpRequestBody getBody(DataEmitter emitter, CompletedCallbac
                 if (StringBody.CONTENT_TYPE.equals(ct)) {
                     return new StringBody();
                 }
-                if (MultipartFormDataBody.CONTENT_TYPE.equals(ct)) {
+                if (ct != null && ct.startsWith(MultipartFormDataBody.PRIMARY_TYPE)) {
                     return new MultipartFormDataBody(contentType);
                 }
             }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
index 0481e1331..52deafe25 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
@@ -107,7 +107,8 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
         setDataCallback(liner);
     }
 
-    public static final String CONTENT_TYPE = "multipart/form-data";
+    public static final String PRIMARY_TYPE = "multipart/";
+    public static final String CONTENT_TYPE = PRIMARY_TYPE + "form-data";
     String contentType = CONTENT_TYPE;
     public MultipartFormDataBody(String contentType) {
         Multimap map = Multimap.parseSemicolonDelimited(contentType);

From dee6e531c76e7ed9c3d640d7ce7a636b01502b46 Mon Sep 17 00:00:00 2001
From: Swordsman-Inaction <ipzlkmy@gmail.com>
Date: Thu, 29 Nov 2018 21:54:16 +0800
Subject: [PATCH 297/399] Fix send stream issue that head is not written if
 content is empty

---
 .../async/http/server/AsyncHttpServerResponseImpl.java      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index 691619a60..fe09b081f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -300,6 +300,12 @@ public void sendStream(final InputStream inputStream, long totalLength) {
                 onEnd();
                 return;
             }
+            if (mContentLength == 0) {
+                writeHead();
+                StreamUtility.closeQuietly(inputStream);
+                onEnd();
+                return;
+            }
             getServer().post(new Runnable() {
                 @Override
                 public void run() {

From 4b2066256da5c5c6cb34e6e0c5eb08344ea06d4a Mon Sep 17 00:00:00 2001
From: Swordsman-Inaction <ipzlkmy@gmail.com>
Date: Thu, 29 Nov 2018 22:19:15 +0800
Subject: [PATCH 298/399] Add delete method

---
 .../koushikdutta/async/http/AsyncHttpDelete.java  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpDelete.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpDelete.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpDelete.java
new file mode 100644
index 000000000..a361d1be0
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpDelete.java
@@ -0,0 +1,15 @@
+package com.koushikdutta.async.http;
+
+import android.net.Uri;
+
+public class AsyncHttpDelete extends AsyncHttpRequest {
+    public static final String METHOD = "DELETE";
+
+    public AsyncHttpDelete(String uri) {
+        this(Uri.parse(uri));
+    }
+
+    public AsyncHttpDelete(Uri uri) {
+        super(uri, METHOD);
+    }
+}

From bdba013dc015e78f2197dba82a3e335247ccb367 Mon Sep 17 00:00:00 2001
From: Swordsman-Inaction <ipzlkmy@gmail.com>
Date: Thu, 29 Nov 2018 23:12:50 +0800
Subject: [PATCH 299/399] Add send json array method

---
 .../async/http/server/AsyncHttpServerResponse.java          | 2 ++
 .../async/http/server/AsyncHttpServerResponseImpl.java      | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
index 61d7b8d7d..e3a8eff8d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
@@ -6,6 +6,7 @@
 import com.koushikdutta.async.http.AsyncHttpResponse;
 import com.koushikdutta.async.http.Headers;
 
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.io.File;
@@ -17,6 +18,7 @@ public interface AsyncHttpServerResponse extends DataSink, CompletedCallback {
     void send(String contentType, String string);
     void send(String string);
     void send(JSONObject json);
+    void send(JSONArray jsonArray);
     void sendFile(File file);
     void sendStream(InputStream inputStream, long totalLength);
     AsyncHttpServerResponse code(int code);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index 691619a60..571cb9889 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -18,6 +18,7 @@
 import com.koushikdutta.async.http.filter.ChunkedOutputFilter;
 import com.koushikdutta.async.util.StreamUtility;
 
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.io.BufferedInputStream;
@@ -254,6 +255,11 @@ public void send(JSONObject json) {
         send("application/json; charset=utf-8", json.toString());
     }
 
+    @Override
+    public void send(JSONArray jsonArray) {
+        send("application/json; charset=utf-8", jsonArray.toString());
+    }
+
     @Override
     public void sendStream(final InputStream inputStream, long totalLength) {
         long start = 0;

From 057cd5686096eb1779038de3db17123fbf6c4e40 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 5 Dec 2018 16:56:08 -0800
Subject: [PATCH 300/399] documentation

---
 .../src/com/koushikdutta/async/future/FailCallback.java     | 2 +-
 AndroidAsync/src/com/koushikdutta/async/future/Future.java  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/FailCallback.java b/AndroidAsync/src/com/koushikdutta/async/future/FailCallback.java
index 52cca0528..8089f1dae 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/FailCallback.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/FailCallback.java
@@ -3,7 +3,7 @@
 public interface FailCallback {
     /**
      * Callback that is invoked when a future completes with an error.
-     * The error should be rethrown, or a new value should be returned.
+     * The error should be rethrown to pass it along.
      * @param e
      * @throws Exception
      */
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Future.java b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
index 62065fc42..639e9b0dd 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Future.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
@@ -35,6 +35,12 @@ public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
      */
     <R> Future<R> thenConvert(ThenCallback<R, T> then);
 
+    /**
+     * Set a callback to be invoked when this future completes with a failure.
+     * The failure can be observered and rethrown, otherwise it is considered handled.
+     * @param fail
+     * @return
+     */
     Future<T> fail(FailCallback fail);
 
     /**

From 9a8027a286caaed8e4c08bf11c78d92d12309b99 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 8 Dec 2018 14:11:02 -0800
Subject: [PATCH 301/399] http server: asset serving improvements

---
 .../src/com/koushikdutta/async/Util.java        |  2 +-
 .../http/server/AsyncHttpServerRouter.java      | 17 ++++++++++-------
 .../com/koushikdutta/async/util/Allocator.java  |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/Util.java b/AndroidAsync/src/com/koushikdutta/async/Util.java
index 5e6ef5760..b250140c4 100644
--- a/AndroidAsync/src/com/koushikdutta/async/Util.java
+++ b/AndroidAsync/src/com/koushikdutta/async/Util.java
@@ -80,7 +80,7 @@ private void cleanup() {
                 StreamUtility.closeQuietly(is);
             }
             ByteBufferList pending = new ByteBufferList();
-            Allocator allocator = new Allocator();
+            Allocator allocator = new Allocator().setMinAlloc((int)Math.min(2 << 19, max));
 
             @Override
             public void onWriteable() {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
index d127df3d8..42b793f12 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
@@ -111,7 +111,10 @@ public Asset(int available, InputStream inputStream, String path) {
     }
 
     public static Asset getAssetStream(final Context context, String asset) {
-        AssetManager am = context.getAssets();
+        return getAssetStream(context.getAssets(), asset);
+    }
+
+    public static Asset getAssetStream(AssetManager am, String asset) {
         try {
             InputStream is = am.open(asset);
             return new Asset(is.available(), is, asset);
@@ -162,12 +165,12 @@ public static String tryGetContentType(String path) {
     }
 
     public void directory(Context context, String regex, final String assetPath) {
-        final Context _context = context.getApplicationContext();
+        AssetManager am = context.getAssets();
         addAction(AsyncHttpGet.METHOD, regex, new HttpServerRequestCallback() {
             @Override
             public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
                 String path = request.getMatcher().replaceAll("");
-                Asset pair = getAssetStream(_context, assetPath + path);
+                Asset pair = getAssetStream(am, assetPath + path);
                 if (pair == null || pair.inputStream == null) {
                     response.code(404);
                     response.end();
@@ -177,7 +180,7 @@ public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerRespo
                 response.getHeaders().set("Content-Length", String.valueOf(pair.available));
                 response.code(200);
                 response.getHeaders().add("Content-Type", getContentType(pair.path));
-                Util.pump(is, response, new CompletedCallback() {
+                Util.pump(is, pair.available, response, new CompletedCallback() {
                     @Override
                     public void onCompleted(Exception ex) {
                         response.end();
@@ -190,7 +193,7 @@ public void onCompleted(Exception ex) {
             @Override
             public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
                 String path = request.getMatcher().replaceAll("");
-                Asset pair = getAssetStream(_context, assetPath + path);
+                Asset pair = getAssetStream(am, assetPath + path);
                 if (pair == null || pair.inputStream == null) {
                     response.code(404);
                     response.end();
@@ -257,14 +260,14 @@ public int compare(File lhs, File rhs) {
                 try {
                     FileInputStream is = new FileInputStream(file);
                     response.code(200);
-                    Util.pump(is, response, new CompletedCallback() {
+                    Util.pump(is, is.available(), response, new CompletedCallback() {
                         @Override
                         public void onCompleted(Exception ex) {
                             response.end();
                         }
                     });
                 }
-                catch (FileNotFoundException ex) {
+                catch (IOException ex) {
                     response.code(404);
                     response.end();
                 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java b/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java
index c25c1a1d7..c81e4551a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/Allocator.java
@@ -45,7 +45,7 @@ public int getMinAlloc() {
     }
 
     public Allocator setMinAlloc(int minAlloc ) {
-        this.minAlloc = minAlloc;
+        this.minAlloc = Math.max(0, minAlloc);
         return this;
     }
 }

From 2bf464fe8e7e376b16bca3247e94c450c2df8ebb Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 12 Dec 2018 16:01:34 -0800
Subject: [PATCH 302/399] remove defunct map usage from Converters

---
 .../koushikdutta/async/future/Converter.java  | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
index 2a712dcd9..c2311ed10 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -7,6 +7,7 @@
 import java.io.InvalidObjectException;
 import java.nio.ByteBuffer;
 import java.util.ArrayDeque;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 
@@ -159,8 +160,8 @@ public ConverterTransformers<F, T> getAll(MimedType<T> mimedType) {
 
     Converters<Object, Object> outputs;
 
-    protected ConverterMap getConverters() {
-        return new ConverterMap(Converters);
+    protected ConverterEntries getConverters() {
+        return new ConverterEntries(Converters);
     }
 
     MultiFuture<R> future = new MultiFuture<>();
@@ -184,9 +185,9 @@ synchronized private <T> Future<T> to(Class fromClass, Class<T> clazz, String mi
 
         if (outputs == null) {
             outputs = new Converters<>();
-            ConverterMap converters = getConverters();
-            for (ConverterEntry entry: converters.map.keySet()) {
-                outputs.ensure(entry.from).put(entry.to, new MultiTransformer<>(converters.map.get(entry), entry.to.mime, entry.distance));
+            ConverterEntries converters = getConverters();
+            for (ConverterEntry entry: converters.list) {
+                outputs.ensure(entry.from).put(entry.to, new MultiTransformer<>(entry.typeConverter, entry.to.mime, entry.distance));
             }
         }
 
@@ -290,14 +291,16 @@ public <T> Future<T> to(final Class<T> clazz, final String mime) {
     }
 
     static class ConverterEntry<F, T> {
-        ConverterEntry(Class<F> from, String fromMime, Class<T> to, String toMime, int distance) {
+        ConverterEntry(Class<F> from, String fromMime, Class<T> to, String toMime, int distance, TypeConverter<T, F> typeConverter) {
             this.from = new MimedType<>(from, fromMime);
             this.to = new MimedType<>(to, toMime);
             this.distance = distance;
+            this.typeConverter = typeConverter;
         }
         MimedType<F> from;
         MimedType<T> to;
         int distance;
+        TypeConverter<T, F> typeConverter;
 
         @Override
         public int hashCode() {
@@ -311,13 +314,13 @@ public boolean equals(Object obj) {
         }
     }
 
-    public static class ConverterMap {
-        public LinkedHashMap<ConverterEntry, TypeConverter> map = new LinkedHashMap<>();
-        public ConverterMap() {
+    public static class ConverterEntries {
+        public ArrayList<ConverterEntry> list = new ArrayList<>();
+        public ConverterEntries() {
         }
 
-        public ConverterMap(ConverterMap other) {
-            map.putAll(other.map);
+        public ConverterEntries(ConverterEntries other) {
+            list.addAll(other.list);
         }
 
         public synchronized <F, T> void addConverter(Class<F> from, String fromMime, Class<T> to, String toMime, TypeConverter<T, F> typeConverter) {
@@ -329,11 +332,11 @@ public synchronized <F, T> void addConverter(Class<F> from, String fromMime, Cla
             if (toMime == null)
                 toMime = MIME_ALL;
 
-            map.put(new ConverterEntry<>(from, fromMime, to, toMime, distance), typeConverter);
+            list.add(new ConverterEntry<>(from, fromMime, to, toMime, distance, typeConverter));
         }
     }
 
-    private static ConverterMap Converters = new ConverterMap();
+    private static ConverterEntries Converters = new ConverterEntries();
 
     static {
         final TypeConverter<byte[], String> StringToByteArray = (from, fromMime) -> new SimpleFuture<>(from.getBytes());

From cc88b7c22b96b3bbb9ed147cd75b1a27e27dcc0a Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 12 Dec 2018 16:28:56 -0800
Subject: [PATCH 303/399] add method to remove a converter

---
 .../src/com/koushikdutta/async/future/Converter.java      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
index c2311ed10..fd37cd323 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -334,6 +334,14 @@ public synchronized <F, T> void addConverter(Class<F> from, String fromMime, Cla
 
             list.add(new ConverterEntry<>(from, fromMime, to, toMime, distance, typeConverter));
         }
+
+        public synchronized boolean removeConverter(TypeConverter typeConverter) {
+            for (ConverterEntry entry: list) {
+                if (entry.typeConverter == typeConverter)
+                    return list.remove(entry);
+            }
+            return false;
+        }
     }
 
     private static ConverterEntries Converters = new ConverterEntries();

From 280b56d32f2e986e5f417aff6e184febdcee1b15 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 14 Dec 2018 01:44:35 -0800
Subject: [PATCH 304/399] fix bug where exceptions get swallowed by
 UrlEncodedFormBody

---
 .../com/koushikdutta/async/http/body/UrlEncodedFormBody.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
index 8df5472d3..ac7363b63 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
@@ -80,11 +80,12 @@ public void onCompleted(Exception ex) {
                 }
                 try {
                     mParameters = Multimap.parseUrlEncoded(data.readString());
-                    completed.onCompleted(null);
                 }
                 catch (Exception e) {
                     completed.onCompleted(e);
+                    return;
                 }
+                completed.onCompleted(null);
             }
         });
     }

From a673f29b12f19aed480e150ee1ec4ceb1feb1c6f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 15 Dec 2018 11:59:23 -0800
Subject: [PATCH 305/399] cleanup

---
 .../koushikdutta/async/http/body/UrlEncodedFormBody.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
index ac7363b63..c237b38b1 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
@@ -74,11 +74,9 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
         emitter.setEndCallback(new CompletedCallback() {
             @Override
             public void onCompleted(Exception ex) {
-                if (ex != null) {
-                    completed.onCompleted(ex);
-                    return;
-                }
                 try {
+                    if (ex != null)
+                        throw ex;
                     mParameters = Multimap.parseUrlEncoded(data.readString());
                 }
                 catch (Exception e) {

From ab6aea8cd7356bb6dff4e85a59886689805e0ae6 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 19 Dec 2018 20:50:52 -0800
Subject: [PATCH 306/399] lambda

---
 .../src/com/koushikdutta/async/AsyncServer.java  | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 328430ca6..c5037343c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -175,12 +175,7 @@ public Cancellable post(Runnable runnable) {
     }
 
     public Cancellable post(final CompletedCallback callback, final Exception e) {
-        return post(new Runnable() {
-            @Override
-            public void run() {
-                callback.onCompleted(e);
-            }
-        });
+        return post(() -> callback.onCompleted(e));
     }
 
     public void run(final Runnable runnable) {
@@ -191,12 +186,9 @@ public void run(final Runnable runnable) {
         }
 
         final Semaphore semaphore = new Semaphore(0);
-        post(new Runnable() {
-            @Override
-            public void run() {
-                runnable.run();
-                semaphore.release();
-            }
+        post(() -> {
+            runnable.run();
+            semaphore.release();
         });
         try {
             semaphore.acquire();

From 29e12f662bb19c5a0c32cd3c9db4d5232a97dcdb Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 20 Dec 2018 17:15:39 -0800
Subject: [PATCH 307/399] watch for http server on request fatal crashes? not
 sure if this is good. it is logged though.

fix return value on cancellation double completion.
convenience methods exposed on socket connection.
---
 .../src/com/koushikdutta/async/AsyncServer.java      | 11 +++++++++--
 .../async/callback/SocketCreateCallback.java         |  7 +++++++
 .../koushikdutta/async/future/SimpleCancellable.java |  3 +--
 .../async/http/server/AsyncHttpServer.java           | 12 ++++++++++--
 4 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/callback/SocketCreateCallback.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index c5037343c..6bb3123fb 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -7,6 +7,7 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.callback.ListenCallback;
+import com.koushikdutta.async.callback.SocketCreateCallback;
 import com.koushikdutta.async.future.Cancellable;
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.FutureCallback;
@@ -363,7 +364,11 @@ protected void cancelCleanup() {
         ConnectCallback callback;
     }
 
-    private ConnectFuture connectResolvedInetSocketAddress(final InetSocketAddress address, final ConnectCallback callback) {
+    public Cancellable connectResolvedInetSocketAddress(final InetSocketAddress address, final ConnectCallback callback) {
+        return connectResolvedInetSocketAddress(address, callback, null);
+    }
+
+    public ConnectFuture connectResolvedInetSocketAddress(final InetSocketAddress address, final ConnectCallback callback, final SocketCreateCallback createCallback) {
         final ConnectFuture cancel = new ConnectFuture();
         assert !address.isUnresolved();
 
@@ -381,6 +386,8 @@ public void run() {
                     socket.configureBlocking(false);
                     ckey = socket.register(mSelector.getSelector(), SelectionKey.OP_CONNECT);
                     ckey.attach(cancel);
+                    if (createCallback != null)
+                        createCallback.onSocketCreated(socket.socket().getLocalPort());
                     socket.connect(address);
                 }
                 catch (Throwable e) {
@@ -413,7 +420,7 @@ public void onCompleted(Exception e, InetAddress result) {
                     return;
                 }
 
-                ret.setComplete(connectResolvedInetSocketAddress(new InetSocketAddress(result, remote.getPort()), callback));
+                ret.setComplete((ConnectFuture)connectResolvedInetSocketAddress(new InetSocketAddress(result, remote.getPort()), callback));
             }
         });
         return ret;
diff --git a/AndroidAsync/src/com/koushikdutta/async/callback/SocketCreateCallback.java b/AndroidAsync/src/com/koushikdutta/async/callback/SocketCreateCallback.java
new file mode 100644
index 000000000..7009c7baa
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/callback/SocketCreateCallback.java
@@ -0,0 +1,7 @@
+package com.koushikdutta.async.callback;
+
+import com.koushikdutta.async.AsyncNetworkSocket;
+
+public interface SocketCreateCallback {
+    void onSocketCreated(int localPort);
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleCancellable.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleCancellable.java
index b080d4cf8..4c2408bbb 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleCancellable.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleCancellable.java
@@ -22,8 +22,7 @@ public boolean setComplete() {
                 return false;
             if (complete) {
                 // don't allow a Cancellable to complete twice...
-                assert false;
-                return true;
+                return false;
             }
             complete = true;
             parent = null;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 30324ab3d..166b21b8a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -44,8 +44,16 @@ protected boolean onRequest(AsyncHttpServerRequest request, AsyncHttpServerRespo
     }
 
     protected void onRequest(HttpServerRequestCallback callback, AsyncHttpServerRequest request, AsyncHttpServerResponse response) {
-        if (callback != null)
-            callback.onRequest(request, response);
+        if (callback != null) {
+            try {
+                callback.onRequest(request, response);
+            }
+            catch (Exception e) {
+                Log.e("AsyncHttpServer", "request callback raised uncaught exception. Catching versus crashing process", e);
+                response.code(500);
+                response.end();
+            }
+        }
     }
 
     protected AsyncHttpRequestBody onUnknownBody(Headers headers) {

From 943ed7ac4c60be3b21e89139781f59783341a975 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 26 Dec 2018 17:09:33 -0800
Subject: [PATCH 308/399] mark some methods final

---
 .../src/com/koushikdutta/async/future/Converter.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
index fd37cd323..0fcb748dc 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -173,13 +173,13 @@ protected Converter(Future future, String mime) {
         this.future.setComplete(future);
     }
 
-    synchronized private <T> Future<T> to(Object value, Class<T> clazz, String mime) {
+    synchronized private final <T> Future<T> to(Object value, Class<T> clazz, String mime) {
         if (clazz.isInstance(value))
             return new SimpleFuture<>((T) value);
         return to(value.getClass(), clazz, mime);
     }
 
-    synchronized private <T> Future<T> to(Class fromClass, Class<T> clazz, String mime) {
+    synchronized private final <T> Future<T> to(Class fromClass, Class<T> clazz, String mime) {
         if (mime == null)
             mime = MIME_ALL;
 
@@ -236,7 +236,7 @@ static String mimeReplace(String mime1, String mime2) {
         return primary + "/" + secondary;
     }
 
-    public <T> Future<T> to(Class<T> clazz) {
+    public final <T> Future<T> to(Class<T> clazz) {
         return to(clazz, null);
     }
 
@@ -286,7 +286,7 @@ private <T> boolean search(MimedType<T> target, ArrayDeque<PathInfo> bestMatch,
     }
 
     private static final String MIME_ALL = "*/*";
-    public <T> Future<T> to(final Class<T> clazz, final String mime) {
+    public <T> Future<T> to(Class<T> clazz, String mime) {
         return future.then(from -> to(from, clazz ,mime));
     }
 
@@ -344,7 +344,7 @@ public synchronized boolean removeConverter(TypeConverter typeConverter) {
         }
     }
 
-    private static ConverterEntries Converters = new ConverterEntries();
+    public static ConverterEntries Converters = new ConverterEntries();
 
     static {
         final TypeConverter<byte[], String> StringToByteArray = (from, fromMime) -> new SimpleFuture<>(from.getBytes());

From 1cc68f24d4f7e5d0da3338a3aa9c60747f6ea974 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 26 Dec 2018 17:09:51 -0800
Subject: [PATCH 309/399] mark some methods final

---
 AndroidAsync/src/com/koushikdutta/async/future/Converter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
index 0fcb748dc..970fa1c85 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -344,7 +344,7 @@ public synchronized boolean removeConverter(TypeConverter typeConverter) {
         }
     }
 
-    public static ConverterEntries Converters = new ConverterEntries();
+    public final static ConverterEntries Converters = new ConverterEntries();
 
     static {
         final TypeConverter<byte[], String> StringToByteArray = (from, fromMime) -> new SimpleFuture<>(from.getBytes());

From f34169f02d227a86eed8c576ad98fe32d7259805 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 27 Dec 2018 00:20:47 -0800
Subject: [PATCH 310/399] fix potential websocket blocking

---
 .../src/com/koushikdutta/async/http/WebSocketImpl.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
index ab1404d87..c6dd4c179 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
@@ -226,27 +226,27 @@ public CompletedCallback getEndCallback() {
 
     @Override
     public void send(byte[] bytes) {
-        mSink.write(new ByteBufferList((mParser.frame(bytes))));
+        getServer().post(() -> mSink.write(new ByteBufferList((mParser.frame(bytes)))));
     }
     
     @Override
     public void send(byte[] bytes, int offset, int len) {
-    	mSink.write(new ByteBufferList(mParser.frame(bytes, offset, len)));
+        getServer().post(() -> mSink.write(new ByteBufferList(mParser.frame(bytes, offset, len))));
     }
 
     @Override
     public void send(String string) {
-        mSink.write(new ByteBufferList((mParser.frame(string))));
+        getServer().post(() -> mSink.write(new ByteBufferList((mParser.frame(string)))));
     }
 
     @Override
     public void ping(String string) {
-        mSink.write(new ByteBufferList(ByteBuffer.wrap(mParser.pingFrame(string))));
+        getServer().post(() -> mSink.write(new ByteBufferList(ByteBuffer.wrap(mParser.pingFrame(string)))));
     }
 
     @Override
     public void pong(String string) {
-        mSink.write(new ByteBufferList(ByteBuffer.wrap(mParser.pongFrame(string))));
+        getServer().post(() -> mSink.write(new ByteBufferList(ByteBuffer.wrap(mParser.pongFrame(string)))));
     }
 
     private StringCallback mStringCallback;

From c2e4a96d03cdd411dc8bfaf94274a74c81da3268 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 28 Dec 2018 23:57:08 -0800
Subject: [PATCH 311/399] dont unnecessarily throw on content-length checks

---
 .../src/com/koushikdutta/async/http/HttpUtil.java        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
index 9e287bdf5..d9e9a3552 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
@@ -62,12 +62,13 @@ public void run() {
     }
     
     public static DataEmitter getBodyDecoder(DataEmitter emitter, Protocol protocol, Headers headers, boolean server) {
-        long _contentLength;
+        long _contentLength = -1;
         try {
-            _contentLength = Long.parseLong(headers.get("Content-Length"));
+            String header = headers.get("Content-Length");
+            if (header != null)
+                _contentLength = Long.parseLong(header);
         }
-        catch (Exception ex) {
-            _contentLength = -1;
+        catch (NumberFormatException ex) {
         }
         final long contentLength = _contentLength;
         if (-1 != contentLength) {

From 66353b36537f07f5eeb2fb82cceff3ec8f9adbcf Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 2 Jan 2019 17:09:01 -0800
Subject: [PATCH 312/399] empty vs null

---
 .../src/com/koushikdutta/async/future/Converter.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
index 970fa1c85..48423063c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -1,5 +1,7 @@
 package com.koushikdutta.async.future;
 
+import android.text.TextUtils;
+
 import com.koushikdutta.async.ByteBufferList;
 
 import org.json.JSONObject;
@@ -167,7 +169,7 @@ protected ConverterEntries getConverters() {
     MultiFuture<R> future = new MultiFuture<>();
     String futureMime;
     protected Converter(Future future, String mime) {
-        if (mime == null)
+        if (TextUtils.isEmpty(mime))
             mime = MIME_ALL;
         this.futureMime = mime;
         this.future.setComplete(future);
@@ -180,7 +182,7 @@ synchronized private final <T> Future<T> to(Object value, Class<T> clazz, String
     }
 
     synchronized private final <T> Future<T> to(Class fromClass, Class<T> clazz, String mime) {
-        if (mime == null)
+        if (TextUtils.isEmpty(mime))
             mime = MIME_ALL;
 
         if (outputs == null) {
@@ -327,9 +329,9 @@ public synchronized <F, T> void addConverter(Class<F> from, String fromMime, Cla
             addConverter(from, fromMime, to, toMime, 1, typeConverter);
         }
         public synchronized <F, T> void addConverter(Class<F> from, String fromMime, Class<T> to, String toMime, int distance, TypeConverter<T, F> typeConverter) {
-            if (fromMime == null)
+            if (TextUtils.isEmpty(fromMime))
                 fromMime = MIME_ALL;
-            if (toMime == null)
+            if (TextUtils.isEmpty(toMime))
                 toMime = MIME_ALL;
 
             list.add(new ConverterEntry<>(from, fromMime, to, toMime, distance, typeConverter));

From 4bdd0388fe935cc43af099e896580d150d71ae84 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 11 Jan 2019 12:14:01 -0800
Subject: [PATCH 313/399] ChunkedInputFilter should eat all data on error.

---
 .../async/http/filter/ChunkedInputFilter.java         | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedInputFilter.java b/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedInputFilter.java
index f049a066e..75edbf95a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedInputFilter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedInputFilter.java
@@ -10,18 +10,20 @@ public class ChunkedInputFilter extends FilteredDataEmitter {
     private int mChunkLengthRemaining = 0;
     private State mState = State.CHUNK_LEN;
     
-    private static enum State {
+    private enum State {
         CHUNK_LEN,
         CHUNK_LEN_CR,
         CHUNK_LEN_CRLF,
         CHUNK,
         CHUNK_CR,
         CHUNK_CRLF,
-        COMPLETE
+        COMPLETE,
+        ERROR,
     }
     
     private boolean checkByte(char b, char value) {
         if (b != value) {
+            mState = State.ERROR;
             report(new ChunkedDataException(value + " was expected, got " + (char)b));
             return false;
         }
@@ -46,6 +48,11 @@ protected void report(Exception e) {
     ByteBufferList pending = new ByteBufferList();
     @Override
     public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
+        if (mState == State.ERROR) {
+            bb.recycle();
+            return;
+        }
+
         try {
             while (bb.remaining() > 0) {
                 switch (mState) {

From 6e54133644e54da8fe7791043a3c33d921bae00e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 15 Jan 2019 20:23:51 -0800
Subject: [PATCH 314/399] fix stream bug in ByteBufferListInputStream. get
 returns a value 0-255. various extra remote functions for async sockets.

---
 .../async/AsyncNetworkSocket.java             | 10 ++++-
 .../com/koushikdutta/async/AsyncServer.java   | 42 +++++++++++++++++++
 .../koushikdutta/async/ChannelWrapper.java    |  2 +
 .../async/DatagramChannelWrapper.java         |  8 +++-
 .../async/ServerSocketChannelWrapper.java     |  6 +++
 .../async/SocketChannelWrapper.java           |  6 +++
 .../async/callback/ValueFunction.java         |  5 +++
 .../stream/ByteBufferListInputStream.java     |  2 +-
 8 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/callback/ValueFunction.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
index 6a6d0cee3..e13860aae 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
@@ -8,7 +8,9 @@
 import com.koushikdutta.async.util.Allocator;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.Socket;
 import java.nio.ByteBuffer;
 import java.nio.channels.CancelledKeyException;
 import java.nio.channels.DatagramChannel;
@@ -189,7 +191,7 @@ public void close() {
         reportClose(null);
     }
 
-    public void closeInternal() {
+    private void closeInternal() {
         mKey.cancel();
         try {
             mChannel.close();
@@ -336,7 +338,11 @@ public AsyncServer getServer() {
     public InetSocketAddress getRemoteAddress() {
         return socketAddress;
     }
-    
+
+    public InetAddress getLocalAddress() {
+        return mChannel.getLocalAddress();
+    }
+
     public int getLocalPort() {
         return mChannel.getLocalPort();
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 6bb3123fb..d0f8e9455 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -8,6 +8,7 @@
 import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.callback.ListenCallback;
 import com.koushikdutta.async.callback.SocketCreateCallback;
+import com.koushikdutta.async.callback.ValueFunction;
 import com.koushikdutta.async.future.Cancellable;
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.FutureCallback;
@@ -519,6 +520,47 @@ public AsyncDatagramSocket openDatagram() {
         return openDatagram(null, 0, false);
     }
 
+    public Cancellable createDatagram(String address, int port, boolean reuseAddress, FutureCallback<AsyncDatagramSocket> callback) {
+        return createDatagram(() -> InetAddress.getByName(address), port, reuseAddress, callback);
+    }
+
+    public Cancellable createDatagram(InetAddress address, int port, boolean reuseAddress, FutureCallback<AsyncDatagramSocket> callback) {
+        return createDatagram(() -> address, port, reuseAddress, callback);
+    }
+
+    private Cancellable createDatagram(ValueFunction<InetAddress> inetAddressValueFunction, final int port, final boolean reuseAddress, FutureCallback<AsyncDatagramSocket> callback) {
+        SimpleFuture<AsyncDatagramSocket> ret = new SimpleFuture<>();
+        ret.setCallback(callback);
+        post(() -> {
+            DatagramChannel socket = null;
+            try {
+                socket = DatagramChannel.open();
+
+                final AsyncDatagramSocket handler = new AsyncDatagramSocket();
+                handler.attach(socket);
+
+                InetSocketAddress address;
+                if (inetAddressValueFunction == null)
+                    address = new InetSocketAddress(port);
+                else
+                    address = new InetSocketAddress(inetAddressValueFunction.getValue(), port);
+
+                if (reuseAddress)
+                    socket.socket().setReuseAddress(reuseAddress);
+                socket.socket().bind(address);
+                handleSocket(handler);
+                if (!ret.setComplete(handler))
+                    socket.close();
+            }
+            catch (Exception e) {
+                StreamUtility.closeQuietly(socket);
+                ret.setComplete(e);
+            }
+        });
+
+        return ret;
+    }
+
     public AsyncDatagramSocket openDatagram(final InetAddress host, final int port, final boolean reuseAddress) {
         final AsyncDatagramSocket handler = new AsyncDatagramSocket();
         // ugh.. this should really be post to make it nonblocking...
diff --git a/AndroidAsync/src/com/koushikdutta/async/ChannelWrapper.java b/AndroidAsync/src/com/koushikdutta/async/ChannelWrapper.java
index 418075661..76fe0d42e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ChannelWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ChannelWrapper.java
@@ -1,6 +1,7 @@
 package com.koushikdutta.async;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.ReadableByteChannel;
@@ -46,5 +47,6 @@ public void close() throws IOException {
     }
     
     public abstract int getLocalPort();
+    public abstract InetAddress getLocalAddress();
     public abstract Object getSocket();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/DatagramChannelWrapper.java b/AndroidAsync/src/com/koushikdutta/async/DatagramChannelWrapper.java
index 9d3c84c46..000070be0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/DatagramChannelWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/DatagramChannelWrapper.java
@@ -1,6 +1,7 @@
 package com.koushikdutta.async;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.ClosedChannelException;
@@ -10,7 +11,12 @@
 
 class DatagramChannelWrapper extends ChannelWrapper {
     DatagramChannel mChannel;
-    
+
+    @Override
+    public InetAddress getLocalAddress() {
+        return mChannel.socket().getLocalAddress();
+    }
+
     @Override
     public int getLocalPort() {
         return mChannel.socket().getLocalPort();
diff --git a/AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java b/AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java
index d13bd71a4..ac1e7c66b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java
@@ -1,6 +1,7 @@
 package com.koushikdutta.async;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.SelectionKey;
@@ -18,6 +19,11 @@ public void shutdownOutput() {
     public void shutdownInput() {
     }
 
+    @Override
+    public InetAddress getLocalAddress() {
+        return mChannel.socket().getInetAddress();
+    }
+
     @Override
     public int getLocalPort() {
         return mChannel.socket().getLocalPort();
diff --git a/AndroidAsync/src/com/koushikdutta/async/SocketChannelWrapper.java b/AndroidAsync/src/com/koushikdutta/async/SocketChannelWrapper.java
index 73b1195cc..f8d7dbcc1 100644
--- a/AndroidAsync/src/com/koushikdutta/async/SocketChannelWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/SocketChannelWrapper.java
@@ -1,6 +1,7 @@
 package com.koushikdutta.async;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.SelectionKey;
@@ -10,6 +11,11 @@
 class SocketChannelWrapper extends ChannelWrapper {
     SocketChannel mChannel;
 
+    @Override
+    public InetAddress getLocalAddress() {
+        return mChannel.socket().getLocalAddress();
+    }
+
     @Override
     public int getLocalPort() {
         return mChannel.socket().getLocalPort();
diff --git a/AndroidAsync/src/com/koushikdutta/async/callback/ValueFunction.java b/AndroidAsync/src/com/koushikdutta/async/callback/ValueFunction.java
new file mode 100644
index 000000000..0797f6612
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/callback/ValueFunction.java
@@ -0,0 +1,5 @@
+package com.koushikdutta.async.callback;
+
+public interface ValueFunction<T> {
+    T getValue() throws Exception;
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/stream/ByteBufferListInputStream.java b/AndroidAsync/src/com/koushikdutta/async/stream/ByteBufferListInputStream.java
index 102e03814..e243d9655 100644
--- a/AndroidAsync/src/com/koushikdutta/async/stream/ByteBufferListInputStream.java
+++ b/AndroidAsync/src/com/koushikdutta/async/stream/ByteBufferListInputStream.java
@@ -18,7 +18,7 @@ public ByteBufferListInputStream(ByteBufferList bb) {
     public int read() throws IOException {
         if (bb.remaining() <= 0)
             return -1;
-        return bb.get();
+        return (int)bb.get() & 0x000000ff;
     }
 
     @Override

From f088820c215c55582a5a7485051470de3c469148 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 16 Jan 2019 10:29:57 -0800
Subject: [PATCH 315/399] cancel and setparent ought to return a boolean result

---
 .../koushikdutta/async/future/DependentCancellable.java  | 2 +-
 .../com/koushikdutta/async/future/SimpleCancellable.java | 9 +++++----
 .../src/com/koushikdutta/async/future/SimpleFuture.java  | 5 ++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/DependentCancellable.java b/AndroidAsync/src/com/koushikdutta/async/future/DependentCancellable.java
index f3842d0b2..5df55f858 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/DependentCancellable.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/DependentCancellable.java
@@ -1,5 +1,5 @@
 package com.koushikdutta.async.future;
 
 public interface DependentCancellable extends Cancellable {
-    public DependentCancellable setParent(Cancellable parent);
+    boolean setParent(Cancellable parent);
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleCancellable.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleCancellable.java
index 4c2408bbb..f05a40162 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleCancellable.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleCancellable.java
@@ -55,12 +55,13 @@ public boolean cancel() {
 
     private Cancellable parent;
     @Override
-    public SimpleCancellable setParent(Cancellable parent) {
+    public boolean setParent(Cancellable parent) {
         synchronized (this) {
-            if (!isDone())
-                this.parent = parent;
+            if (isDone())
+                return false;
+            this.parent = parent;
+            return true;
         }
-        return this;
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
index 9a8715fdd..437a2fcb7 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -354,9 +354,8 @@ public Future<T> failConvert(FailConvertCallback<T> fail) {
     }
 
     @Override
-    public SimpleFuture<T> setParent(Cancellable parent) {
-        super.setParent(parent);
-        return this;
+    public boolean setParent(Cancellable parent) {
+        return super.setParent(parent);
     }
 
     /**

From 6e9d4291f2182ca6e91cf7a494b3eda676a63039 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 23 Jan 2019 22:08:25 -0800
Subject: [PATCH 316/399] hooks in http server

---
 .../async/http/server/AsyncHttpServer.java    | 14 ++++--
 .../http/server/AsyncHttpServerResponse.java  |  5 ++
 .../server/AsyncHttpServerResponseImpl.java   | 48 +++++++++++++------
 3 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 166b21b8a..fa24436a2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -18,7 +18,6 @@
 import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.HttpUtil;
 import com.koushikdutta.async.http.Multimap;
-import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.WebSocket;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 
@@ -56,14 +55,23 @@ protected void onRequest(HttpServerRequestCallback callback, AsyncHttpServerRequ
         }
     }
 
+    protected boolean isKeepAlive(AsyncHttpServerRequest request, AsyncHttpServerResponse response) {
+        return HttpUtil.isKeepAlive(response.getHttpVersion(), request.getHeaders());
+    }
+
     protected AsyncHttpRequestBody onUnknownBody(Headers headers) {
         return new UnknownRequestBody(headers.get("Content-Type"));
     }
 
+    protected boolean isSwitchingProtocols(AsyncHttpServerResponse res) {
+        return res.code() == 101;
+    }
+
     ListenCallback mListenCallback = new ListenCallback() {
         @Override
         public void onAccepted(final AsyncSocket socket) {
             final AsyncHttpServerRequestImpl req = new AsyncHttpServerRequestImpl() {
+                AsyncHttpServerRequestImpl self = this;
                 HttpServerRequestCallback requestCallback;
                 String fullPath;
                 String path;
@@ -168,7 +176,7 @@ protected void onEnd() {
                 @Override
                 public void onCompleted(Exception e) {
                     // if the protocol was switched off http, ignore this request/response.
-                    if (res.code() == 101)
+                    if (isSwitchingProtocols(res))
                         return;
                     requestComplete = true;
                     super.onCompleted(e);
@@ -196,7 +204,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                 
                 private void handleOnCompleted() {
                     if (requestComplete && responseComplete) {
-                        if (HttpUtil.isKeepAlive(Protocol.HTTP_1_1, getHeaders())) {
+                        if (isKeepAlive(self, res)) {
                             onAccepted(socket);
                         }
                         else {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
index e3a8eff8d..0d0875fa7 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
@@ -1,6 +1,7 @@
 package com.koushikdutta.async.http.server;
 
 import com.koushikdutta.async.AsyncSocket;
+import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.http.AsyncHttpResponse;
@@ -15,6 +16,7 @@
 public interface AsyncHttpServerResponse extends DataSink, CompletedCallback {
     void end();
     void send(String contentType, byte[] bytes);
+    void send(String contentType, ByteBufferList bb);
     void send(String contentType, String string);
     void send(String string);
     void send(JSONObject json);
@@ -28,6 +30,8 @@ public interface AsyncHttpServerResponse extends DataSink, CompletedCallback {
     void setContentType(String contentType);
     void redirect(String location);
     AsyncHttpServerRequest getRequest();
+    String getHttpVersion();
+    void setHttpVersion(String httpVersion);
 
     // NOT FINAL
     void proxy(AsyncHttpResponse response);
@@ -37,4 +41,5 @@ public interface AsyncHttpServerResponse extends DataSink, CompletedCallback {
      */
     void onCompleted(Exception ex);
     AsyncSocket getSocket();
+    void setSocket(AsyncSocket socket);
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index 58df73676..5dd69a84c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -42,6 +42,11 @@ public AsyncSocket getSocket() {
         return mSocket;
     }
 
+    @Override
+    public void setSocket(AsyncSocket socket) {
+        mSocket = socket;
+    }
+
     AsyncSocket mSocket;
     AsyncHttpServerRequestImpl mRequest;
     AsyncHttpServerResponseImpl(AsyncSocket socket, AsyncHttpServerRequestImpl req) {
@@ -103,7 +108,7 @@ void initFirstWrite() {
             isChunked = false;
         }
 
-        String statusLine = String.format(Locale.ENGLISH, "HTTP/1.1 %s %s", code, AsyncHttpServer.getResponseCodeDescription(code));
+        String statusLine = String.format(Locale.ENGLISH, "%s %s %s", httpVersion, code, AsyncHttpServer.getResponseCodeDescription(code));
         String rh = mRawHeaders.toPrefixString(statusLine);
 
         Util.writeAll(mSocket, rh.getBytes(), new CompletedCallback() {
@@ -205,21 +210,23 @@ public void setContentType(String contentType) {
 
     @Override
     public void send(final String contentType, final byte[] bytes) {
-        assert mContentLength < 0;
-        getServer().post(new Runnable() {
-            @Override
-            public void run() {
-                mContentLength = bytes.length;
-                mRawHeaders.set("Content-Length", Integer.toString(bytes.length));
+        send(contentType, new ByteBufferList(bytes));
+    }
+
+    @Override
+    public void send(String contentType, ByteBufferList bb) {
+        getServer().post(() -> {
+            mContentLength = bb.remaining();
+            mRawHeaders.set("Content-Length", Long.toString(mContentLength));
+            if (contentType != null)
                 mRawHeaders.set("Content-Type", contentType);
 
-                Util.writeAll(AsyncHttpServerResponseImpl.this, bytes, new CompletedCallback() {
-                    @Override
-                    public void onCompleted(Exception ex) {
-                        onEnd();
-                    }
-                });
-            }
+            Util.writeAll(AsyncHttpServerResponseImpl.this, bb, new CompletedCallback() {
+                @Override
+                public void onCompleted(Exception ex) {
+                    onEnd();
+                }
+            });
         });
     }
 
@@ -383,6 +390,17 @@ public void redirect(String location) {
         end();
     }
 
+    String httpVersion = "HTTP/1.1";
+    @Override
+    public String getHttpVersion() {
+        return httpVersion;
+    }
+
+    @Override
+    public void setHttpVersion(String httpVersion) {
+        this.httpVersion = httpVersion;
+    }
+
     @Override
     public void onCompleted(Exception ex) {
         end();
@@ -420,7 +438,7 @@ public AsyncServer getServer() {
     public String toString() {
         if (mRawHeaders == null)
             return super.toString();
-        String statusLine = String.format(Locale.ENGLISH, "HTTP/1.1 %s %s", code, AsyncHttpServer.getResponseCodeDescription(code));
+        String statusLine = String.format(Locale.ENGLISH, "%s %s %s", httpVersion, code, AsyncHttpServer.getResponseCodeDescription(code));
         return mRawHeaders.toPrefixString(statusLine);
     }
 }

From a621353d6d9826a235d8488c9543214bf3b959ec Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 30 Jan 2019 21:11:40 -0800
Subject: [PATCH 317/399] convenience method for connecting ssl sockets and
 ignoring the trust chain

---
 .../async/AsyncSSLSocketWrapper.java          | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index cdbe5da7f..effe8ba48 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -7,9 +7,12 @@
 import android.util.Pair;
 
 import com.koushikdutta.async.callback.CompletedCallback;
+import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.ListenCallback;
 import com.koushikdutta.async.callback.WritableCallback;
+import com.koushikdutta.async.future.Cancellable;
+import com.koushikdutta.async.future.SimpleCancellable;
 import com.koushikdutta.async.http.SSLEngineSNIConfigurator;
 import com.koushikdutta.async.util.Allocator;
 import com.koushikdutta.async.util.StreamUtility;
@@ -61,6 +64,7 @@
 import javax.net.ssl.SSLEngineResult.HandshakeStatus;
 import javax.net.ssl.SSLEngineResult.Status;
 import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
@@ -73,6 +77,9 @@ public interface HandshakeCallback {
     }
 
     static SSLContext defaultSSLContext;
+    static SSLContext trustAllSSLContext;
+    static TrustManager[] trustAllManagers;
+    static HostnameVerifier trustAllVerifier;
 
     AsyncSocket mSocket;
     BufferedDataSink mSink;
@@ -127,6 +134,27 @@ public void checkServerTrusted(java.security.cert.X509Certificate[] certs, Strin
                 ex2.printStackTrace();
             }
         }
+
+
+        try {
+            trustAllSSLContext = SSLContext.getInstance("TLS");
+            trustAllManagers = new TrustManager[] { new X509TrustManager() {
+                public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+                    return new X509Certificate[0];
+                }
+
+                public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) {
+                }
+
+                public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) {
+                }
+            } };
+            trustAllSSLContext.init(null, trustAllManagers, null);
+            trustAllVerifier = (hostname, session) -> true;
+        }
+        catch (Exception ex2) {
+            ex2.printStackTrace();
+        }
     }
 
     public static SSLContext getDefaultSSLContext() {
@@ -157,6 +185,40 @@ public void onCompleted(Exception ex) {
         }
     }
 
+    public static Cancellable connectSocket(AsyncServer server, String host, int port, ConnectCallback callback) {
+        return connectSocket(server, host, port, false, callback);
+    }
+    public static Cancellable connectSocket(AsyncServer server, String host, int port, boolean trustAllCerts, ConnectCallback callback) {
+        SimpleCancellable cancellable = new SimpleCancellable();
+        Cancellable connect = server.connectSocket(host, port, (ex, netSocket) -> {
+            if (ex != null) {
+                if (cancellable.setComplete())
+                    callback.onConnectCompleted(ex, null);
+                return;
+            }
+
+            handshake(netSocket, host, port,
+                    (trustAllCerts ? trustAllSSLContext : defaultSSLContext).createSSLEngine(host, port),
+                    trustAllCerts ? trustAllManagers : null,
+                    trustAllCerts ? trustAllVerifier : null,
+                    true, (e, socket) -> {
+                if (!cancellable.setComplete()) {
+                    if (socket != null)
+                        socket.close();
+                    return;
+                }
+
+                if (e != null)
+                    callback.onConnectCompleted(e, null);
+                else
+                    callback.onConnectCompleted(null, socket);
+            });
+        });
+
+        cancellable.setParent(connect);
+        return cancellable;
+    }
+
     boolean mEnded;
     Exception mEndException;
     final ByteBufferList pending = new ByteBufferList();

From 689d1889ad6d9d8ce2a65e222ce5de074d61593b Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 31 Jan 2019 10:00:05 -0800
Subject: [PATCH 318/399] Future.fail needs to clear the exception.

---
 AndroidAsync/src/com/koushikdutta/async/future/Future.java  | 1 +
 .../src/com/koushikdutta/async/future/SimpleFuture.java     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Future.java b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
index 639e9b0dd..57e7c19a7 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Future.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
@@ -38,6 +38,7 @@ public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
     /**
      * Set a callback to be invoked when this future completes with a failure.
      * The failure can be observered and rethrown, otherwise it is considered handled.
+     * The exception will be nulled for subsequent callbacks in the chain.
      * @param fail
      * @return
      */
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
index 437a2fcb7..fd28de404 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -12,8 +12,8 @@ public class SimpleFuture<T> extends SimpleCancellable implements DependentFutur
     private Exception exception;
     private T result;
     boolean silent;
-    FutureCallback<T> callback;
-    FutureCallbackInternal internalCallback;
+    private FutureCallback<T> callback;
+    private FutureCallbackInternal internalCallback;
 
     private interface FutureCallbackInternal<T> {
         void onCompleted(Exception e, T result, FutureCallsite next);
@@ -322,7 +322,7 @@ public <R> Future<R> thenConvert(final ThenCallback<R, T> callback) {
     public Future<T> fail(FailCallback fail) {
         return failRecover(e -> {
             fail.fail(e);
-            return this;
+            return new SimpleFuture<>((T)null);
         });
     }
 

From 9aac3abf8bbfadf2194f162159dc19b65bef8cf9 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 4 Feb 2019 14:53:08 -0800
Subject: [PATCH 319/399] Futures.all

---
 .../koushikdutta/async/future/Futures.java    | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Futures.java b/AndroidAsync/src/com/koushikdutta/async/future/Futures.java
index 82e3a5f83..fa4119579 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Futures.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Futures.java
@@ -2,12 +2,19 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 
 public class Futures {
-    public static <T> Future<ArrayList<T>> waitAll(final Future<T>... futures) {
+    public static <T> Future<List<T>> waitAll(final List<Future<T>> futures) {
         final ArrayList<T> results = new ArrayList<>();
-        final SimpleFuture<ArrayList<T>> ret = new SimpleFuture<>();
+        final SimpleFuture<List<T>> ret = new SimpleFuture<>();
+
+        if (futures.isEmpty()) {
+            ret.setComplete(results);
+            return ret;
+        }
 
         FutureCallback<T> cb = new FutureCallback<T>() {
             int count = 0;
@@ -16,18 +23,22 @@ public static <T> Future<ArrayList<T>> waitAll(final Future<T>... futures) {
             public void onCompleted(Exception e, T result) {
                 results.add(result);
                 count++;
-                if (count < futures.length)
-                    futures[count].setCallback(this);
+                if (count < futures.size())
+                    futures.get(count).setCallback(this);
                 else
                     ret.setComplete(results);
             }
         };
 
-        futures[0].setCallback(cb);
+        futures.get(0).setCallback(cb);
 
         return ret;
     }
 
+    public static <T> Future<List<T>> waitAll(final Future<T>... futures) {
+        return waitAll(Arrays.asList(futures));
+    }
+
 
     private static <T, F> void loopUntil(final Iterator<F> values, ThenFutureCallback<T, F> callback, SimpleFuture<T> ret, Exception lastException) {
         while (values.hasNext()) {

From 016316781f009b31e76cebe402a2c61a6bbce39b Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 5 Feb 2019 10:39:54 -0800
Subject: [PATCH 320/399] AsyncHttpServer: add etag/if-none-match cache support
 for android assets.

---
 .../async/http/server/AsyncHttpServer.java    |   1 +
 .../http/server/AsyncHttpServerRouter.java    | 140 +++++++++++++-----
 2 files changed, 102 insertions(+), 39 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index fa24436a2..f952286db 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -301,6 +301,7 @@ public CompletedCallback getErrorCallback() {
         mCodes.put(101, "Switching Protocols");
         mCodes.put(301, "Moved Permanently");
         mCodes.put(302, "Found");
+        mCodes.put(304, "Not Modified");
         mCodes.put(404, "Not Found");
     }
     
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
index 42b793f12..7f09f5bb0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
@@ -3,27 +3,29 @@
 import android.content.Context;
 import android.content.res.AssetManager;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.http.AsyncHttpGet;
 import com.koushikdutta.async.http.AsyncHttpHead;
 import com.koushikdutta.async.http.AsyncHttpPost;
-import com.koushikdutta.async.http.WebSocket;
 import com.koushikdutta.async.http.WebSocketImpl;
 import com.koushikdutta.async.util.StreamUtility;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Hashtable;
+import java.util.jar.Manifest;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 public class AsyncHttpServerRouter implements RouteMatcher {
 
@@ -164,49 +166,109 @@ public static String tryGetContentType(String path) {
         return null;
     }
 
+    static String NotFound = "";
+    static Hashtable<String, String> ETags = new Hashtable<>();
+    static Manifest AppManifest;
+    static Exception ManifestFailure;
+    static synchronized void ensureManifest(Context context) {
+        try {
+            if (AppManifest != null || ManifestFailure != null)
+                return;
+
+            ZipFile zip = new ZipFile(context.getPackageResourcePath());
+            ZipEntry entry = zip.getEntry("META-INF/MANIFEST.MF");
+            AppManifest = new Manifest(zip.getInputStream(entry));
+        }
+        catch (Exception e) {
+            ManifestFailure = e;
+        }
+    }
+
+    static boolean isClientCached(Context context, AsyncHttpServerRequest request, AsyncHttpServerResponse response, String assetFileName) {
+        ensureManifest(context);
+        if (AppManifest == null)
+            return false;
+
+
+        try {
+            String etag;
+            if (!ETags.containsKey(assetFileName)) {
+                String digest = AppManifest.getEntries().get("assets/" + assetFileName).getValue("SHA-256-Digest");
+
+                if (TextUtils.isEmpty(digest))
+                    etag = NotFound;
+                else
+                    etag = String.format("\"%s\"", digest);
+
+                ETags.put(assetFileName, etag);
+            }
+            else {
+                etag = ETags.get(assetFileName);
+            }
+
+            if (etag == NotFound)
+                return false;
+
+            response.getHeaders().set("ETag", etag);
+
+            String ifNoneMatch = request.getHeaders().get("If-None-Match");
+
+            return TextUtils.equals(ifNoneMatch, etag);
+        }
+        catch (Exception e) {
+            Log.w(AsyncHttpServerRouter.class.getSimpleName(), "Error getting ETag for apk asset", e);
+            ETags.put(assetFileName, NotFound);
+            return false;
+        }
+    }
+
     public void directory(Context context, String regex, final String assetPath) {
         AssetManager am = context.getAssets();
-        addAction(AsyncHttpGet.METHOD, regex, new HttpServerRequestCallback() {
-            @Override
-            public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
-                String path = request.getMatcher().replaceAll("");
-                Asset pair = getAssetStream(am, assetPath + path);
-                if (pair == null || pair.inputStream == null) {
-                    response.code(404);
-                    response.end();
-                    return;
-                }
-                final InputStream is = pair.inputStream;
-                response.getHeaders().set("Content-Length", String.valueOf(pair.available));
-                response.code(200);
-                response.getHeaders().add("Content-Type", getContentType(pair.path));
-                Util.pump(is, pair.available, response, new CompletedCallback() {
-                    @Override
-                    public void onCompleted(Exception ex) {
-                        response.end();
-                        StreamUtility.closeQuietly(is);
-                    }
-                });
+        addAction(AsyncHttpGet.METHOD, regex, (request, response) -> {
+            String path = request.getMatcher().replaceAll("");
+            Asset pair = getAssetStream(am, assetPath + path);
+            if (pair == null || pair.inputStream == null) {
+                response.code(404);
+                response.end();
+                return;
             }
-        });
-        addAction(AsyncHttpHead.METHOD, regex, new HttpServerRequestCallback() {
-            @Override
-            public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
-                String path = request.getMatcher().replaceAll("");
-                Asset pair = getAssetStream(am, assetPath + path);
-                if (pair == null || pair.inputStream == null) {
-                    response.code(404);
-                    response.end();
-                    return;
-                }
-                final InputStream is = pair.inputStream;
-                StreamUtility.closeQuietly(is);
-                response.getHeaders().set("Content-Length", String.valueOf(pair.available));
-                response.code(200);
-                response.getHeaders().add("Content-Type", getContentType(pair.path));
+            final InputStream is = pair.inputStream;
+            response.getHeaders().set("Content-Length", String.valueOf(pair.available));
+            response.getHeaders().add("Content-Type", getContentType(pair.path));
+
+            if (isClientCached(context, request, response, pair.path)) {
+                response.code(304);
                 response.writeHead();
                 response.end();
+                return;
+            }
+
+            response.code(200);
+            Util.pump(is, pair.available, response, ex -> {
+                response.end();
+                StreamUtility.closeQuietly(is);
+            });
+        });
+        addAction(AsyncHttpHead.METHOD, regex, (request, response) -> {
+            String path = request.getMatcher().replaceAll("");
+            Asset pair = getAssetStream(am, assetPath + path);
+            if (pair == null || pair.inputStream == null) {
+                response.code(404);
+                response.end();
+                return;
             }
+            final InputStream is = pair.inputStream;
+            StreamUtility.closeQuietly(is);
+            response.getHeaders().set("Content-Length", String.valueOf(pair.available));
+            response.getHeaders().add("Content-Type", getContentType(pair.path));
+
+            if (isClientCached(context, request, response, pair.path))
+                response.code(304);
+            else
+                response.code(200);
+
+            response.writeHead();
+            response.end();
         });
     }
 

From d94a75d2c02977c545353d1efea847a48e2dfa91 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 5 Feb 2019 12:02:45 -0800
Subject: [PATCH 321/399] AsyncHttpServer: clean up unused 304 streams. do not
 send anything but the 304 on cache hit.

---
 .../http/server/AsyncHttpServerRouter.java    | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
index 7f09f5bb0..cf92a75d8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
@@ -232,21 +232,22 @@ public void directory(Context context, String regex, final String assetPath) {
                 response.end();
                 return;
             }
-            final InputStream is = pair.inputStream;
-            response.getHeaders().set("Content-Length", String.valueOf(pair.available));
-            response.getHeaders().add("Content-Type", getContentType(pair.path));
 
             if (isClientCached(context, request, response, pair.path)) {
+                StreamUtility.closeQuietly(pair.inputStream);
                 response.code(304);
                 response.writeHead();
                 response.end();
                 return;
             }
 
+            response.getHeaders().set("Content-Length", String.valueOf(pair.available));
+            response.getHeaders().add("Content-Type", getContentType(pair.path));
+
             response.code(200);
-            Util.pump(is, pair.available, response, ex -> {
+            Util.pump(pair.inputStream, pair.available, response, ex -> {
                 response.end();
-                StreamUtility.closeQuietly(is);
+                StreamUtility.closeQuietly(pair.inputStream);
             });
         });
         addAction(AsyncHttpHead.METHOD, regex, (request, response) -> {
@@ -257,15 +258,17 @@ public void directory(Context context, String regex, final String assetPath) {
                 response.end();
                 return;
             }
-            final InputStream is = pair.inputStream;
-            StreamUtility.closeQuietly(is);
-            response.getHeaders().set("Content-Length", String.valueOf(pair.available));
-            response.getHeaders().add("Content-Type", getContentType(pair.path));
+            StreamUtility.closeQuietly(pair.inputStream);
 
-            if (isClientCached(context, request, response, pair.path))
+            if (isClientCached(context, request, response, pair.path)) {
                 response.code(304);
+            }
             else
+            {
+                response.getHeaders().set("Content-Length", String.valueOf(pair.available));
+                response.getHeaders().add("Content-Type", getContentType(pair.path));
                 response.code(200);
+            }
 
             response.writeHead();
             response.end();

From 3b5667080f4d20c021578a1f22aa8115d23cfd51 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 5 Feb 2019 12:36:04 -0800
Subject: [PATCH 322/399] seems i do need the content length

---
 .../async/http/server/AsyncHttpServerRouter.java   | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
index cf92a75d8..6625c957a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
@@ -232,6 +232,8 @@ public void directory(Context context, String regex, final String assetPath) {
                 response.end();
                 return;
             }
+            response.getHeaders().set("Content-Length", String.valueOf(pair.available));
+            response.getHeaders().add("Content-Type", getContentType(pair.path));
 
             if (isClientCached(context, request, response, pair.path)) {
                 StreamUtility.closeQuietly(pair.inputStream);
@@ -241,9 +243,6 @@ public void directory(Context context, String regex, final String assetPath) {
                 return;
             }
 
-            response.getHeaders().set("Content-Length", String.valueOf(pair.available));
-            response.getHeaders().add("Content-Type", getContentType(pair.path));
-
             response.code(200);
             Util.pump(pair.inputStream, pair.available, response, ex -> {
                 response.end();
@@ -259,16 +258,13 @@ public void directory(Context context, String regex, final String assetPath) {
                 return;
             }
             StreamUtility.closeQuietly(pair.inputStream);
+            response.getHeaders().set("Content-Length", String.valueOf(pair.available));
+            response.getHeaders().add("Content-Type", getContentType(pair.path));
 
-            if (isClientCached(context, request, response, pair.path)) {
+            if (isClientCached(context, request, response, pair.path))
                 response.code(304);
-            }
             else
-            {
-                response.getHeaders().set("Content-Length", String.valueOf(pair.available));
-                response.getHeaders().add("Content-Type", getContentType(pair.path));
                 response.code(200);
-            }
 
             response.writeHead();
             response.end();

From f822551151d747b0cf7b370f4a3d5e6cdecc422f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 5 Feb 2019 12:45:00 -0800
Subject: [PATCH 323/399] Revert "seems i do need the content length"

This reverts commit 3b5667080f4d20c021578a1f22aa8115d23cfd51.
---
 .../async/http/server/AsyncHttpServerRouter.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
index 6625c957a..cf92a75d8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
@@ -232,8 +232,6 @@ public void directory(Context context, String regex, final String assetPath) {
                 response.end();
                 return;
             }
-            response.getHeaders().set("Content-Length", String.valueOf(pair.available));
-            response.getHeaders().add("Content-Type", getContentType(pair.path));
 
             if (isClientCached(context, request, response, pair.path)) {
                 StreamUtility.closeQuietly(pair.inputStream);
@@ -243,6 +241,9 @@ public void directory(Context context, String regex, final String assetPath) {
                 return;
             }
 
+            response.getHeaders().set("Content-Length", String.valueOf(pair.available));
+            response.getHeaders().add("Content-Type", getContentType(pair.path));
+
             response.code(200);
             Util.pump(pair.inputStream, pair.available, response, ex -> {
                 response.end();
@@ -258,13 +259,16 @@ public void directory(Context context, String regex, final String assetPath) {
                 return;
             }
             StreamUtility.closeQuietly(pair.inputStream);
-            response.getHeaders().set("Content-Length", String.valueOf(pair.available));
-            response.getHeaders().add("Content-Type", getContentType(pair.path));
 
-            if (isClientCached(context, request, response, pair.path))
+            if (isClientCached(context, request, response, pair.path)) {
                 response.code(304);
+            }
             else
+            {
+                response.getHeaders().set("Content-Length", String.valueOf(pair.available));
+                response.getHeaders().add("Content-Type", getContentType(pair.path));
                 response.code(200);
+            }
 
             response.writeHead();
             response.end();

From 86016e28b7369fe825e2aa0ee54e0048bfe060b9 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 5 Feb 2019 12:53:40 -0800
Subject: [PATCH 324/399] do not call writeHeader before end, because it
 implies a body. this was causing Chrome to crap out (on a seemingly valid
 response).

---
 .../koushikdutta/async/http/server/AsyncHttpServerRouter.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
index cf92a75d8..075160f35 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
@@ -236,7 +236,6 @@ public void directory(Context context, String regex, final String assetPath) {
             if (isClientCached(context, request, response, pair.path)) {
                 StreamUtility.closeQuietly(pair.inputStream);
                 response.code(304);
-                response.writeHead();
                 response.end();
                 return;
             }
@@ -270,7 +269,6 @@ public void directory(Context context, String regex, final String assetPath) {
                 response.code(200);
             }
 
-            response.writeHead();
             response.end();
         });
     }

From 0268d7fbf4ad1f67bfec2e40e96695a640981c77 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 6 Feb 2019 09:22:18 -0800
Subject: [PATCH 325/399] AsyncHttpServer: fix up 304 caching to work on any
 package. remove unnecessary map cache. manifest serves that purpose.

---
 .../http/server/AsyncHttpServerRouter.java    | 58 ++++++++-----------
 1 file changed, 25 insertions(+), 33 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
index 075160f35..8e2e4b52a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
@@ -7,6 +7,8 @@
 
 import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
+import com.koushikdutta.async.future.Future;
+import com.koushikdutta.async.future.SimpleFuture;
 import com.koushikdutta.async.http.AsyncHttpGet;
 import com.koushikdutta.async.http.AsyncHttpHead;
 import com.koushikdutta.async.http.AsyncHttpPost;
@@ -166,58 +168,48 @@ public static String tryGetContentType(String path) {
         return null;
     }
 
-    static String NotFound = "";
-    static Hashtable<String, String> ETags = new Hashtable<>();
-    static Manifest AppManifest;
-    static Exception ManifestFailure;
-    static synchronized void ensureManifest(Context context) {
-        try {
-            if (AppManifest != null || ManifestFailure != null)
-                return;
+    static Hashtable<String, Future<Manifest>> AppManifests = new Hashtable<>();
+    static synchronized Manifest ensureManifest(Context context) {
+        Future<Manifest> future = AppManifests.get(context.getPackageName());
+        if (future != null)
+            return future.tryGet();
 
-            ZipFile zip = new ZipFile(context.getPackageResourcePath());
+        ZipFile zip = null;
+        SimpleFuture<Manifest> result = new SimpleFuture<>();
+        try {
+            zip = new ZipFile(context.getPackageResourcePath());
             ZipEntry entry = zip.getEntry("META-INF/MANIFEST.MF");
-            AppManifest = new Manifest(zip.getInputStream(entry));
+            Manifest manifest = new Manifest(zip.getInputStream(entry));
+            result.setComplete(manifest);
+            return manifest;
         }
         catch (Exception e) {
-            ManifestFailure = e;
+            result.setComplete(e);
+            return null;
+        }
+        finally {
+            StreamUtility.closeQuietly(zip);
+            AppManifests.put(context.getPackageName(), result);
         }
     }
 
     static boolean isClientCached(Context context, AsyncHttpServerRequest request, AsyncHttpServerResponse response, String assetFileName) {
-        ensureManifest(context);
-        if (AppManifest == null)
+        Manifest manifest = ensureManifest(context);
+        if (manifest == null)
             return false;
 
-
         try {
-            String etag;
-            if (!ETags.containsKey(assetFileName)) {
-                String digest = AppManifest.getEntries().get("assets/" + assetFileName).getValue("SHA-256-Digest");
-
-                if (TextUtils.isEmpty(digest))
-                    etag = NotFound;
-                else
-                    etag = String.format("\"%s\"", digest);
-
-                ETags.put(assetFileName, etag);
-            }
-            else {
-                etag = ETags.get(assetFileName);
-            }
-
-            if (etag == NotFound)
+            String digest = manifest.getEntries().get("assets/" + assetFileName).getValue("SHA-256-Digest");
+            if (TextUtils.isEmpty(digest))
                 return false;
 
+            String etag = String.format("\"%s\"", digest);
             response.getHeaders().set("ETag", etag);
-
             String ifNoneMatch = request.getHeaders().get("If-None-Match");
-
             return TextUtils.equals(ifNoneMatch, etag);
         }
         catch (Exception e) {
             Log.w(AsyncHttpServerRouter.class.getSimpleName(), "Error getting ETag for apk asset", e);
-            ETags.put(assetFileName, NotFound);
             return false;
         }
     }

From eae9a190f30809a0f4ba2e5fa0adcf571d83890b Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 15 Feb 2019 09:17:48 -0800
Subject: [PATCH 326/399] http server tweaks and features

---
 .../src/com/koushikdutta/async/http/Headers.java       |  7 +++++++
 .../src/com/koushikdutta/async/http/Multimap.java      | 10 ++++++++++
 .../async/http/server/AsyncHttpServer.java             |  5 +++++
 .../async/http/server/AsyncHttpServerRequest.java      |  1 +
 .../async/http/server/AsyncHttpServerResponse.java     |  2 ++
 .../async/http/server/AsyncHttpServerResponseImpl.java |  6 ++++++
 6 files changed, 31 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
index a3055484b..b9ff9fd99 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Headers.java
@@ -87,6 +87,13 @@ public Headers addAll(Map<String, List<String>> m) {
         return this;
     }
 
+    public Headers addAllMap(Map<String, String> m) {
+        for (String key: m.keySet()) {
+            add(key, m.get(key));
+        }
+        return this;
+    }
+
     public Headers addAll(Headers headers) {
         // safe to addall since this is another Headers object
         map.putAll(headers.map);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
index 6bcb1215f..1f2503265 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
@@ -7,9 +7,11 @@
 
 import java.net.URLDecoder;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by koush on 5/27/13.
@@ -147,4 +149,12 @@ public Iterator<NameValuePair> iterator() {
         }
         return ret.iterator();
     }
+
+    public Map<String, String> toSingleMap() {
+        HashMap<String, String> ret = new HashMap<>();
+        for (String key: keySet()) {
+            ret.put(key, getString(key));
+        }
+        return ret;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index f952286db..7cf4a6000 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -225,6 +225,11 @@ public Multimap getQuery() {
                         return new Multimap();
                     return Multimap.parseQuery(parts[1]);
                 }
+
+                @Override
+                public String getUrl() {
+                    return fullPath;
+                }
             };
             req.setSocket(socket);
             socket.resume();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
index cbb27977c..947e4215d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
@@ -18,6 +18,7 @@ public interface AsyncHttpServerRequest extends DataEmitter {
     String getPath();
     Multimap getQuery();
     String getMethod();
+    String getUrl();
 
     String get(String name);
     Map<String, Object> getState();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
index 0d0875fa7..2f3aed691 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
@@ -12,11 +12,13 @@
 
 import java.io.File;
 import java.io.InputStream;
+import java.nio.ByteBuffer;
 
 public interface AsyncHttpServerResponse extends DataSink, CompletedCallback {
     void end();
     void send(String contentType, byte[] bytes);
     void send(String contentType, ByteBufferList bb);
+    void send(String contentType, ByteBuffer bb);
     void send(String contentType, String string);
     void send(String string);
     void send(JSONObject json);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index 5dd69a84c..f29d0532e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -27,6 +27,7 @@
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
 import java.util.Locale;
 
 public class AsyncHttpServerResponseImpl implements AsyncHttpServerResponse {
@@ -213,6 +214,11 @@ public void send(final String contentType, final byte[] bytes) {
         send(contentType, new ByteBufferList(bytes));
     }
 
+    @Override
+    public void send(String contentType, ByteBuffer bb) {
+        send(contentType, new ByteBufferList(bb));
+    }
+
     @Override
     public void send(String contentType, ByteBufferList bb) {
         getServer().post(() -> {

From a2611b270199866603c0545844b95eb1d7f59697 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 16 Feb 2019 12:25:20 -0800
Subject: [PATCH 327/399] string converter

---
 AndroidAsync/src/com/koushikdutta/async/future/Converter.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
index 48423063c..6943ad03d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -361,11 +361,14 @@ public synchronized boolean removeConverter(TypeConverter typeConverter) {
 
         final TypeConverter<String, JSONObject> JSONObjectToString = (from, fromMime) -> new SimpleFuture<>(from).thenConvert(JSONObject::toString);
 
+        final TypeConverter<String, byte[]> ByteArrayToString = (from, fromMime) -> new SimpleFuture<>(new String(from));
+
         Converters.addConverter(ByteBuffer.class, null, ByteBufferList.class, null, ByteBufferToByteBufferList);
         Converters.addConverter(String.class, null, byte[].class, null, StringToByteArray);
         Converters.addConverter(byte[].class, null, ByteBufferList.class, null, ByteArrayToByteBufferList);
         Converters.addConverter(byte[].class, null, ByteBuffer.class, null, ByteArrayToByteBuffer);
         Converters.addConverter(String.class, "application/json", JSONObject.class, null, StringToJSONObject);
         Converters.addConverter(JSONObject.class, null, String.class, "application/json", JSONObjectToString);
+        Converters.addConverter(byte[].class, "text/plain", String.class, "text/plain", ByteArrayToString);
     }
 }

From ce5f67579547c882719f5d1502860de5296810e4 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 18 Feb 2019 14:44:42 -0800
Subject: [PATCH 328/399] add a bit of a hacky hook for body parsing. need to
 bust out the router totally at some point.

---
 .../server/AsyncHttpRequestBodyProvider.java  |  8 +++++
 .../async/http/server/AsyncHttpServer.java    | 31 ++++++++++++-------
 .../server/AsyncHttpServerRequestImpl.java    | 15 ++++++---
 .../http/server/AsyncHttpServerRouter.java    | 19 +++++++++---
 4 files changed, 54 insertions(+), 19 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpRequestBodyProvider.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpRequestBodyProvider.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpRequestBodyProvider.java
new file mode 100644
index 000000000..6bafea4bc
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpRequestBodyProvider.java
@@ -0,0 +1,8 @@
+package com.koushikdutta.async.http.server;
+
+import com.koushikdutta.async.http.Headers;
+import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
+
+public interface AsyncHttpRequestBodyProvider {
+    AsyncHttpRequestBody getBody(Headers headers);
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 7cf4a6000..f0bd30b78 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -98,6 +98,25 @@ void onRequest() {
                     AsyncHttpServer.this.onRequest(requestCallback, this, res);
                 }
 
+                @Override
+                protected AsyncHttpRequestBody onBody(Headers headers) {
+                    String statusLine = getStatusLine();
+                    String[] parts = statusLine.split(" ");
+                    fullPath = parts[1];
+                    path = URLDecoder.decode(fullPath.split("\\?")[0]);
+                    method = parts[0];
+                    RouteMatch route = route(method, path);
+                    if (route == null)
+                        return null;
+
+                    matcher = route.matcher;
+                    requestCallback = route.callback;
+
+                    if (route.bodyCallback == null)
+                        return null;
+                    return route.bodyCallback.getBody(headers);
+                }
+
                 @Override
                 protected AsyncHttpRequestBody onUnknownBody(Headers headers) {
                     return AsyncHttpServer.this.onUnknownBody(headers);
@@ -128,16 +147,6 @@ public void onCompleted(Exception ex) {
                     }
 //                    System.out.println(headers.toHeaderString());
                     
-                    String statusLine = getStatusLine();
-                    String[] parts = statusLine.split(" ");
-                    fullPath = parts[1];
-                    path = URLDecoder.decode(fullPath.split("\\?")[0]);
-                    method = parts[0];
-                    RouteMatch route = route(method, path);
-                    if (route != null) {
-                        matcher = route.matcher;
-                        requestCallback = route.callback;
-                    }
                     res = new AsyncHttpServerResponseImpl(socket, this) {
                         @Override
                         protected void report(Exception e) {
@@ -158,7 +167,7 @@ protected void onEnd() {
                             handleOnCompleted();
                         }
                     };
-                    
+
                     boolean handled = AsyncHttpServer.this.onRequest(this, res);
                     if (handled)
                         return;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
index 4a56428ab..0185f1d08 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
@@ -55,6 +55,10 @@ protected void onNotHttp() {
     protected AsyncHttpRequestBody onUnknownBody(Headers headers) {
         return null;
     }
+    protected AsyncHttpRequestBody onBody(Headers headers) {
+        return null;
+    }
+
     
     StringCallback mHeaderCallback = new StringCallback() {
         @Override
@@ -74,11 +78,14 @@ public void onStringAvailable(String s) {
             }
 
             DataEmitter emitter = HttpUtil.getBodyDecoder(mSocket, Protocol.HTTP_1_1, mRawHeaders, true);
-            mBody = HttpUtil.getBody(emitter, mReporter, mRawHeaders);
+            mBody = onBody(mRawHeaders);
             if (mBody == null) {
-                mBody = onUnknownBody(mRawHeaders);
-                if (mBody == null)
-                    mBody = new UnknownRequestBody(mRawHeaders.get("Content-Type"));
+                mBody = HttpUtil.getBody(emitter, mReporter, mRawHeaders);
+                if (mBody == null) {
+                    mBody = onUnknownBody(mRawHeaders);
+                    if (mBody == null)
+                        mBody = new UnknownRequestBody(mRawHeaders.get("Content-Type"));
+                }
             }
             mBody.parse(emitter, mReporter);
             onHeadersReceived();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
index 8e2e4b52a..91a566b10 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
@@ -9,10 +9,13 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.SimpleFuture;
+import com.koushikdutta.async.future.ThenCallback;
 import com.koushikdutta.async.http.AsyncHttpGet;
 import com.koushikdutta.async.http.AsyncHttpHead;
 import com.koushikdutta.async.http.AsyncHttpPost;
+import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.WebSocketImpl;
+import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 import com.koushikdutta.async.util.StreamUtility;
 
 import java.io.File;
@@ -35,6 +38,7 @@ private static class RouteInfo {
         String method;
         Pattern regex;
         HttpServerRequestCallback callback;
+        AsyncHttpRequestBodyProvider bodyCallback;
     }
 
     final ArrayList<RouteInfo> routes = new ArrayList<>();
@@ -49,16 +53,22 @@ public void removeAction(String action, String regex) {
         }
     }
 
-    public void addAction(String action, String regex, HttpServerRequestCallback callback) {
+    public void addAction(String action, String regex, HttpServerRequestCallback callback, AsyncHttpRequestBodyProvider bodyCallback) {
         RouteInfo p = new RouteInfo();
         p.regex = Pattern.compile("^" + regex);
         p.callback = callback;
         p.method = action;
+        p.bodyCallback = bodyCallback;
 
         synchronized (routes) {
             routes.add(p);
         }
     }
+
+    public void addAction(String action, String regex, HttpServerRequestCallback callback) {
+        addAction(action, regex, callback, null);
+    }
+
     public void websocket(String regex, final AsyncHttpServer.WebSocketRequestCallback callback) {
         websocket(regex, null, callback);
     }
@@ -335,13 +345,14 @@ public static class RouteMatch {
         public final String path;
         public final Matcher matcher;
         public final HttpServerRequestCallback callback;
+        public final AsyncHttpRequestBodyProvider bodyCallback;
 
-
-        private RouteMatch(String method, String path, Matcher matcher, HttpServerRequestCallback callback) {
+        private RouteMatch(String method, String path, Matcher matcher, HttpServerRequestCallback callback, AsyncHttpRequestBodyProvider bodyCallback) {
             this.method = method;
             this.path = path;
             this.matcher = matcher;
             this.callback = callback;
+            this.bodyCallback = bodyCallback;
         }
     }
 
@@ -396,7 +407,7 @@ public RouteMatch route(String method, String path) {
                         String subPath = m.group(1);
                         return ((RouteMatcher)p.callback).route(method, subPath);
                     }
-                    return new RouteMatch(method, path, m, p.callback);
+                    return new RouteMatch(method, path, m, p.callback, p.bodyCallback);
                 }
             }
         }

From fb7695c3db2f96b8ebc08ed13c69f4bb9f051b9f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 23 Feb 2019 12:51:30 -0800
Subject: [PATCH 329/399] prevent double handled on requests with slow bodies

---
 .../com/koushikdutta/async/http/server/AsyncHttpServer.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index f0bd30b78..a39242ea0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -79,6 +79,7 @@ public void onAccepted(final AsyncSocket socket) {
                 boolean requestComplete;
                 AsyncHttpServerResponseImpl res;
                 boolean hasContinued;
+                boolean handled;
 
                 final Runnable onFinally = new Runnable() {
                     @Override
@@ -168,7 +169,7 @@ protected void onEnd() {
                         }
                     };
 
-                    boolean handled = AsyncHttpServer.this.onRequest(this, res);
+                    handled = AsyncHttpServer.this.onRequest(this, res);
                     if (handled)
                         return;
 
@@ -206,7 +207,7 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
 
                     handleOnCompleted();
 
-                    if (getBody().readFullyOnRequest()) {
+                    if (getBody().readFullyOnRequest() && !handled) {
                         onRequest();
                     }
                 }

From 2a8bc780bdae2993a5d3cec6cef4576955c0a863 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 25 Feb 2019 20:50:35 -0800
Subject: [PATCH 330/399] websocket: support manual upgrades add
 ByteBufferListBody for web servers

---
 .../http/body/ByteBufferListRequestBody.java  | 53 +++++++++++++++++
 .../async/http/server/AsyncHttpServer.java    |  2 +
 .../http/server/AsyncHttpServerRouter.java    | 57 ++++++++++---------
 3 files changed, 86 insertions(+), 26 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/http/body/ByteBufferListRequestBody.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/ByteBufferListRequestBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/ByteBufferListRequestBody.java
new file mode 100644
index 000000000..07c3edc1d
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/ByteBufferListRequestBody.java
@@ -0,0 +1,53 @@
+package com.koushikdutta.async.http.body;
+
+import com.koushikdutta.async.ByteBufferList;
+import com.koushikdutta.async.DataEmitter;
+import com.koushikdutta.async.DataSink;
+import com.koushikdutta.async.Util;
+import com.koushikdutta.async.callback.CompletedCallback;
+import com.koushikdutta.async.http.AsyncHttpRequest;
+import com.koushikdutta.async.parser.ByteBufferListParser;
+
+public class ByteBufferListRequestBody implements AsyncHttpRequestBody<ByteBufferList> {
+    public ByteBufferListRequestBody() {
+    }
+
+    ByteBufferList bb;
+    public ByteBufferListRequestBody(ByteBufferList bb) {
+        this.bb = bb;
+    }
+    @Override
+    public void write(AsyncHttpRequest request, DataSink sink, CompletedCallback completed) {
+        Util.writeAll(sink, bb, completed);
+    }
+
+    @Override
+    public void parse(DataEmitter emitter, CompletedCallback completed) {
+        new ByteBufferListParser().parse(emitter).setCallback((e, result) -> {
+            bb = result;
+            completed.onCompleted(e);
+        });
+    }
+
+    public static String CONTENT_TYPE = "application/binary";
+
+    @Override
+    public String getContentType() {
+        return CONTENT_TYPE;
+    }
+
+    @Override
+    public boolean readFullyOnRequest() {
+        return true;
+    }
+
+    @Override
+    public int length() {
+        return bb.remaining();
+    }
+
+    @Override
+    public ByteBufferList get() {
+        return bb;
+    }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index a39242ea0..2b88bf206 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -317,7 +317,9 @@ public CompletedCallback getErrorCallback() {
         mCodes.put(301, "Moved Permanently");
         mCodes.put(302, "Found");
         mCodes.put(304, "Not Modified");
+        mCodes.put(400, "Bad Request");
         mCodes.put(404, "Not Found");
+        mCodes.put(500, "Internal Server Error");
     }
     
     public static String getResponseCodeDescription(int code) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
index 91a566b10..7bb03ba1e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
@@ -14,6 +14,7 @@
 import com.koushikdutta.async.http.AsyncHttpHead;
 import com.koushikdutta.async.http.AsyncHttpPost;
 import com.koushikdutta.async.http.Headers;
+import com.koushikdutta.async.http.WebSocket;
 import com.koushikdutta.async.http.WebSocketImpl;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 import com.koushikdutta.async.util.StreamUtility;
@@ -73,34 +74,38 @@ public void websocket(String regex, final AsyncHttpServer.WebSocketRequestCallba
         websocket(regex, null, callback);
     }
 
-    public void websocket(String regex, final String protocol, final AsyncHttpServer.WebSocketRequestCallback callback) {
-        get(regex, new HttpServerRequestCallback() {
-            @Override
-            public void onRequest(final AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
-                boolean hasUpgrade = false;
-                String connection = request.getHeaders().get("Connection");
-                if (connection != null) {
-                    String[] connections = connection.split(",");
-                    for (String c: connections) {
-                        if ("Upgrade".equalsIgnoreCase(c.trim())) {
-                            hasUpgrade = true;
-                            break;
-                        }
-                    }
+    protected WebSocket checkWebSocketUpgrade(final String protocol, AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
+        boolean hasUpgrade = false;
+        String connection = request.getHeaders().get("Connection");
+        if (connection != null) {
+            String[] connections = connection.split(",");
+            for (String c: connections) {
+                if ("Upgrade".equalsIgnoreCase(c.trim())) {
+                    hasUpgrade = true;
+                    break;
                 }
-                if (!"websocket".equalsIgnoreCase(request.getHeaders().get("Upgrade")) || !hasUpgrade) {
-                    response.code(404);
-                    response.end();
-                    return;
-                }
-                String peerProtocol = request.getHeaders().get("Sec-WebSocket-Protocol");
-                if (!TextUtils.equals(protocol, peerProtocol)) {
-                    response.code(404);
-                    response.end();
-                    return;
-                }
-                callback.onConnected(new WebSocketImpl(request, response), request);
             }
+        }
+        if (!"websocket".equalsIgnoreCase(request.getHeaders().get("Upgrade")) || !hasUpgrade) {
+            return null;
+        }
+        String peerProtocol = request.getHeaders().get("Sec-WebSocket-Protocol");
+        if (!TextUtils.equals(protocol, peerProtocol)) {
+            return null;
+        }
+        return new WebSocketImpl(request, response);
+    }
+
+    public void websocket(String regex, final String protocol, final AsyncHttpServer.WebSocketRequestCallback callback) {
+        get(regex, (request, response) -> {
+            WebSocket webSocket = checkWebSocketUpgrade(protocol, request, response);
+            if (webSocket == null) {
+                response.code(404);
+                response.end();
+                return;
+            }
+
+            callback.onConnected(webSocket, request);
         });
     }
 

From a0354a2fc4a7611c07df49593ddd210c3b8ec8a5 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 1 Mar 2019 22:40:08 -0800
Subject: [PATCH 331/399] update libs

---
 AndroidAsync/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 17499789d..5a2a3b3d1 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -46,7 +46,7 @@ android {
         androidTestImplementation 'com.android.support.test:runner:1.0.2'
         androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
         // for when i wanna test this against gms conscrypt
-        androidTestImplementation 'com.google.android.gms:play-services-base:10.+'
+        androidTestImplementation 'com.google.android.gms:play-services-base:16.1.0'
     }
 }
 

From 667ab86a3d640f5ea0a6f9cbc7a389d9a1f9f839 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 2 Mar 2019 12:46:20 -0800
Subject: [PATCH 332/399] Future: add a done callback. Need to deprecate
 setCallback.

---
 .../async/future/DoneCallback.java            |  5 +++++
 .../com/koushikdutta/async/future/Future.java | 12 +++++++++++
 .../async/future/SimpleFuture.java            | 20 +++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/future/DoneCallback.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/DoneCallback.java b/AndroidAsync/src/com/koushikdutta/async/future/DoneCallback.java
new file mode 100644
index 000000000..ded465382
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/future/DoneCallback.java
@@ -0,0 +1,5 @@
+package com.koushikdutta.async.future;
+
+public interface DoneCallback<T> {
+    void done(Exception e, T result) throws Exception;
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Future.java b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
index 57e7c19a7..5df5afec4 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Future.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
@@ -1,6 +1,8 @@
 package com.koushikdutta.async.future;
 
 
+import com.koushikdutta.async.callback.CompletedCallback;
+
 public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
     /**
      * Set a callback to be invoked when this Future completes.
@@ -9,6 +11,16 @@ public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
      */
     void setCallback(FutureCallback<T> callback);
 
+    /**
+     * Set a callback to be invoked when the Future completes
+     * with an error or a result.
+     * The existing error or result will be passed down the chain, or a new error
+     * may be thrown.
+     * @param done
+     * @return
+     */
+    Future<T> done(DoneCallback<T> done);
+
     /**
      * Set a callback to be invoked when this Future completes successfully.
      * @param callback
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
index fd28de404..c2fe81b85 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -268,6 +268,26 @@ public FutureCallback<T> getCallback() {
         return callback;
     }
 
+    @Override
+    public Future<T> done(DoneCallback<T> done) {
+        final SimpleFuture<T> ret = new SimpleFuture<>();
+        ret.setParent(this);
+        setCallbackInternal(null, null, (e, result, next) -> {
+            if (e == null) {
+                try {
+                    done.done(e, result);
+                }
+                catch (Exception callbackException) {
+                    e = callbackException;
+                    // note that the result is not nulled out. this is useful for managed resources, like sockets.
+                    // for example: a successful socket connection was made, but the request can be cancelled.
+                    // so, returning an error along with a socket object allows for failure cleanup.
+                }
+            }
+            ret.setComplete(e, result, next);
+        });
+        return ret;
+    }
 
     @Override
     public Future<T> success(SuccessCallback<T> callback) {

From f8250cb33986cc169e1284d5cdd7c6ee2b6376fd Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 5 Mar 2019 11:19:14 -0800
Subject: [PATCH 333/399] add a throttle mode

---
 .../async/util/ThrottleTimeout.java           | 58 +++++++++++++++----
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java b/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
index 8d6d568d6..2b6e43c72 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
@@ -17,6 +17,20 @@ public class ThrottleTimeout<T> {
     ValueCallback<List<T>> callback;
     long delay;
     ArrayList<T> values = new ArrayList<>();
+    ThrottleMode throttleMode = ThrottleMode.Collect;
+
+    public enum ThrottleMode {
+        /**
+         * The timeout will keep resetting until it expires, at which point all
+         * the collected values will be invoked on the callback.
+         */
+        Collect,
+        /**
+         * The callback will be invoked immediately with the first, but future values will be
+         * metered until it expires.
+         */
+        Meter,
+    }
 
     private interface Handlerish {
         void post(Runnable r);
@@ -71,23 +85,43 @@ public void removeAllCallbacks(Object cancellable) {
         };
     }
 
+    private void runCallback() {
+        cancellable = null;
+        ArrayList<T> v = new ArrayList<>(values);
+        values.clear();
+        callback.onResult(v);
+    }
+
     Object cancellable;
     public synchronized void postThrottled(final T value) {
-        handlerish.post(new Runnable() {
-            @Override
-            public void run() {
-                values.add(value);
+        handlerish.post(() -> {
+            values.add(value);
 
+            if (throttleMode == ThrottleMode.Collect) {
+                // cancel the existing, schedule a new one, and wait.
                 handlerish.removeAllCallbacks(cancellable);
-                cancellable = handlerish.postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        ArrayList<T> v = new ArrayList<T>(values);
-                        values.clear();
-                        callback.onResult(v);
-                    }
-                }, delay);
+                cancellable = handlerish.postDelayed(this::runCallback, delay);
+            }
+            else {
+                // nothing is pending, so this can be fired off immediately
+                if (cancellable == null) {
+                    runCallback();
+                }
+                else {
+                    handlerish.removeAllCallbacks(cancellable);
+                }
+
+                // meter future invocations
+                cancellable = handlerish.postDelayed(this::runCallback, delay);
             }
         });
     }
+
+    public void setThrottleMode(ThrottleMode throttleMode) {
+        this.throttleMode = throttleMode;
+    }
+
+    public void setDelay(long delay) {
+        this.delay = delay;
+    }
 }

From f41cb4953bd4b755dadb340449b8abfdd0247d5f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 5 Mar 2019 13:57:25 -0800
Subject: [PATCH 334/399] add an idletimeout

---
 .../koushikdutta/async/util/IdleTimeout.java  | 26 +++++++
 .../async/util/ThrottleTimeout.java           | 55 +--------------
 .../koushikdutta/async/util/TimeoutBase.java  | 70 +++++++++++++++++++
 3 files changed, 99 insertions(+), 52 deletions(-)
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/util/IdleTimeout.java
 create mode 100644 AndroidAsync/src/com/koushikdutta/async/util/TimeoutBase.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/util/IdleTimeout.java b/AndroidAsync/src/com/koushikdutta/async/util/IdleTimeout.java
new file mode 100644
index 000000000..cca67806b
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/util/IdleTimeout.java
@@ -0,0 +1,26 @@
+package com.koushikdutta.async.util;
+
+import android.os.Handler;
+
+import com.koushikdutta.async.AsyncServer;
+
+public class IdleTimeout extends TimeoutBase {
+    Runnable callback;
+
+    public IdleTimeout(AsyncServer server, long delay, Runnable callback) {
+        super(server, delay);
+        this.callback = callback;
+
+    }
+
+    public IdleTimeout(Handler handler, long delay, Runnable callback) {
+        super(handler, delay);
+        this.callback = callback;
+    }
+
+    Object cancellable;
+    public void reset() {
+        handlerish.removeAllCallbacks(cancellable);
+        handlerish.postDelayed(callback, delay);
+    }
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java b/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
index 2b6e43c72..18ced6624 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
@@ -4,7 +4,6 @@
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.callback.ValueCallback;
-import com.koushikdutta.async.future.Cancellable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,10 +11,8 @@
 /**
  * Created by koush on 7/19/16.
  */
-public class ThrottleTimeout<T> {
-    Handlerish handlerish;
+public class ThrottleTimeout<T> extends TimeoutBase {
     ValueCallback<List<T>> callback;
-    long delay;
     ArrayList<T> values = new ArrayList<>();
     ThrottleMode throttleMode = ThrottleMode.Collect;
 
@@ -32,57 +29,15 @@ public enum ThrottleMode {
         Meter,
     }
 
-    private interface Handlerish {
-        void post(Runnable r);
-        Object postDelayed(Runnable r, long delay);
-        void removeAllCallbacks(Object cancellable);
-    }
 
     public ThrottleTimeout(final AsyncServer server, long delay, ValueCallback<List<T>> callback) {
-        this.delay = delay;
+        super(server, delay);
         this.callback = callback;
-        this.handlerish = new Handlerish() {
-            @Override
-            public void post(Runnable r) {
-                server.post(r);
-            }
-
-            @Override
-            public Object postDelayed(Runnable r, long delay) {
-                return server.postDelayed(r, delay);
-            }
-
-            @Override
-            public void removeAllCallbacks(Object cancellable) {
-                if (cancellable == null)
-                    return;
-                ((Cancellable)cancellable).cancel();
-            }
-        };
     }
 
     public ThrottleTimeout(final Handler handler, long delay, ValueCallback<List<T>> callback) {
-        this.delay = delay;
+        super(handler, delay);
         this.callback = callback;
-        this.handlerish = new Handlerish() {
-            @Override
-            public void post(Runnable r) {
-                handler.post(r);
-            }
-
-            @Override
-            public Object postDelayed(Runnable r, long delay) {
-                handler.postDelayed(r, delay);
-                return r;
-            }
-
-            @Override
-            public void removeAllCallbacks(Object cancellable) {
-                if (cancellable == null)
-                    return;
-                handler.removeCallbacks((Runnable)cancellable);
-            }
-        };
     }
 
     private void runCallback() {
@@ -120,8 +75,4 @@ public synchronized void postThrottled(final T value) {
     public void setThrottleMode(ThrottleMode throttleMode) {
         this.throttleMode = throttleMode;
     }
-
-    public void setDelay(long delay) {
-        this.delay = delay;
-    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/TimeoutBase.java b/AndroidAsync/src/com/koushikdutta/async/util/TimeoutBase.java
new file mode 100644
index 000000000..c80dcb5f0
--- /dev/null
+++ b/AndroidAsync/src/com/koushikdutta/async/util/TimeoutBase.java
@@ -0,0 +1,70 @@
+package com.koushikdutta.async.util;
+
+import android.os.Handler;
+
+import com.koushikdutta.async.AsyncServer;
+import com.koushikdutta.async.future.Cancellable;
+
+public class TimeoutBase {
+    protected Handlerish handlerish;
+    protected long delay;
+
+    interface Handlerish {
+        void post(Runnable r);
+        Object postDelayed(Runnable r, long delay);
+        void removeAllCallbacks(Object cancellable);
+    }
+
+    protected void onCallback() {
+
+    }
+
+    public TimeoutBase(final AsyncServer server, long delay) {
+        this.delay = delay;
+        this.handlerish = new Handlerish() {
+            @Override
+            public void post(Runnable r) {
+                server.post(r);
+            }
+
+            @Override
+            public Object postDelayed(Runnable r, long delay) {
+                return server.postDelayed(r, delay);
+            }
+
+            @Override
+            public void removeAllCallbacks(Object cancellable) {
+                if (cancellable == null)
+                    return;
+                ((Cancellable)cancellable).cancel();
+            }
+        };
+    }
+
+    public TimeoutBase(final Handler handler, long delay) {
+        this.delay = delay;
+        this.handlerish = new Handlerish() {
+            @Override
+            public void post(Runnable r) {
+                handler.post(r);
+            }
+
+            @Override
+            public Object postDelayed(Runnable r, long delay) {
+                handler.postDelayed(r, delay);
+                return r;
+            }
+
+            @Override
+            public void removeAllCallbacks(Object cancellable) {
+                if (cancellable == null)
+                    return;
+                handler.removeCallbacks((Runnable)cancellable);
+            }
+        };
+    }
+
+    public void setDelay(long delay) {
+        this.delay = delay;
+    }
+}

From 302e4cbc95245b3e5e98f3f2c787c55e2738b5a5 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 5 Mar 2019 15:41:39 -0800
Subject: [PATCH 335/399] bug fixes

---
 .../koushikdutta/async/util/IdleTimeout.java    | 17 +++++++++++++----
 .../async/util/ThrottleTimeout.java             | 13 +++++++------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/util/IdleTimeout.java b/AndroidAsync/src/com/koushikdutta/async/util/IdleTimeout.java
index cca67806b..2fe2da1e8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/IdleTimeout.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/IdleTimeout.java
@@ -7,20 +7,29 @@
 public class IdleTimeout extends TimeoutBase {
     Runnable callback;
 
-    public IdleTimeout(AsyncServer server, long delay, Runnable callback) {
+    public IdleTimeout(AsyncServer server, long delay) {
         super(server, delay);
-        this.callback = callback;
 
     }
 
-    public IdleTimeout(Handler handler, long delay, Runnable callback) {
+    public IdleTimeout(Handler handler, long delay) {
         super(handler, delay);
+    }
+
+    public void setTimeout(Runnable callback) {
         this.callback = callback;
     }
 
     Object cancellable;
     public void reset() {
         handlerish.removeAllCallbacks(cancellable);
-        handlerish.postDelayed(callback, delay);
+        cancellable = handlerish.postDelayed(callback, delay);
+    }
+
+    public void cancel() {
+        // must post this, so that when it runs it removes everything in the queue,
+        // preventing any rescheduling.
+        // posting gaurantees there is not a reschedule in progress.
+        handlerish.post(() -> handlerish.removeAllCallbacks(cancellable));
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java b/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
index 18ced6624..c0066bb50 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/ThrottleTimeout.java
@@ -40,6 +40,10 @@ public ThrottleTimeout(final Handler handler, long delay, ValueCallback<List<T>>
         this.callback = callback;
     }
 
+    public void setCallback(ValueCallback<List<T>> callback) {
+        this.callback = callback;
+    }
+
     private void runCallback() {
         cancellable = null;
         ArrayList<T> v = new ArrayList<>(values);
@@ -61,13 +65,10 @@ public synchronized void postThrottled(final T value) {
                 // nothing is pending, so this can be fired off immediately
                 if (cancellable == null) {
                     runCallback();
-                }
-                else {
-                    handlerish.removeAllCallbacks(cancellable);
-                }
 
-                // meter future invocations
-                cancellable = handlerish.postDelayed(this::runCallback, delay);
+                    // meter future invocations
+                    cancellable = handlerish.postDelayed(this::runCallback, delay);
+                }
             }
         });
     }

From e5b7cf626bc53da73cbf62090ecaf8ddccf44e7f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 10 Mar 2019 15:43:15 -0700
Subject: [PATCH 336/399] systemclock in async server... fix potential bug
 around time changes. AsyncHttpResponesImpl should not implement DataSink.

---
 .../com/koushikdutta/async/AsyncServer.java   | 40 ++++++++++++++----
 .../async/future/SimpleCancellable.java       |  6 +++
 .../async/http/AsyncHttpResponseImpl.java     | 41 +------------------
 3 files changed, 39 insertions(+), 48 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index d0f8e9455..41861b135 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -2,6 +2,7 @@
 
 import android.os.Build;
 import android.os.Handler;
+import android.os.SystemClock;
 import android.util.Log;
 
 import com.koushikdutta.async.callback.CompletedCallback;
@@ -12,6 +13,7 @@
 import com.koushikdutta.async.future.Cancellable;
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.FutureCallback;
+import com.koushikdutta.async.future.SimpleCancellable;
 import com.koushikdutta.async.future.SimpleFuture;
 import com.koushikdutta.async.util.StreamUtility;
 
@@ -132,10 +134,21 @@ public void run() {
         });
     }
 
+    boolean killed;
+    public void kill() {
+        synchronized (this) {
+            killed = true;
+        }
+        stop(false);
+    }
+
     int postCounter = 0;
     public Cancellable postDelayed(Runnable runnable, long delay) {
         Scheduled s;
         synchronized (this) {
+            if (killed)
+                return SimpleCancellable.CANCELLED;
+
             // Calculate when to run this queue item:
             // If there is a delay (non-zero), add it to the current time
             // When delay is zero, ensure that this follows all other
@@ -146,7 +159,7 @@ public Cancellable postDelayed(Runnable runnable, long delay) {
             // behind all other immediately run queue items.
             long time;
             if (delay > 0)
-                time = System.currentTimeMillis() + delay;
+                time = SystemClock.elapsedRealtime() + delay;
             else if (delay == 0)
                 time = postCounter++;
             else if (mQueue.size() > 0)
@@ -187,11 +200,16 @@ public void run(final Runnable runnable) {
             return;
         }
 
-        final Semaphore semaphore = new Semaphore(0);
-        post(() -> {
-            runnable.run();
-            semaphore.release();
-        });
+        final Semaphore semaphore;
+        synchronized (this) {
+            if (killed)
+                return;
+            semaphore = new Semaphore(0);
+            post(() -> {
+                runnable.run();
+                semaphore.release();
+            });
+        }
         try {
             semaphore.acquire();
         }
@@ -256,6 +274,10 @@ public int compare(Scheduled s1, Scheduled s2) {
 
 
     public void stop() {
+        stop(true);
+    }
+
+    public void stop(boolean wait) {
 //        Log.i(LOGTAG, "****AsyncServer is shutting down.****");
         final SelectorWrapper currentSelector;
         final Semaphore semaphore;
@@ -280,12 +302,12 @@ public void run() {
             // force any existing connections to die
             shutdownKeys(currentSelector);
 
-            mQueue = new PriorityQueue<Scheduled>(1, Scheduler.INSTANCE);
+            mQueue = new PriorityQueue<>(1, Scheduler.INSTANCE);
             mSelector = null;
             mAffinity = null;
         }
         try {
-            if (!isAffinityThread)
+            if (!isAffinityThread && wait)
                 semaphore.acquire();
         }
         catch (Exception e) {
@@ -744,7 +766,7 @@ private static long lockAndRunQueue(final AsyncServer server, final PriorityQueu
             Scheduled run = null;
 
             synchronized (server) {
-                long now = System.currentTimeMillis();
+                long now = SystemClock.elapsedRealtime();
 
                 if (queue.size() > 0) {
                     Scheduled s = queue.remove();
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleCancellable.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleCancellable.java
index f05a40162..225378617 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleCancellable.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleCancellable.java
@@ -77,6 +77,12 @@ public boolean isCancelled() {
         }
     };
 
+    public static final Cancellable CANCELLED = new SimpleCancellable() {
+        {
+            cancel();
+        }
+    };
+
     public Cancellable reset() {
         cancel();
         complete = false;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index 2164a1dca..3ec57e7c8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -12,7 +12,7 @@
 
 import java.nio.charset.Charset;
 
-abstract class AsyncHttpResponseImpl extends FilteredDataEmitter implements AsyncSocket, AsyncHttpResponse, AsyncHttpClientMiddleware.ResponseHead {
+abstract class AsyncHttpResponseImpl extends FilteredDataEmitter implements DataEmitter, AsyncHttpResponse, AsyncHttpClientMiddleware.ResponseHead {
     public AsyncSocket socket() {
         return mSocket;
     }
@@ -33,7 +33,7 @@ void setSocket(AsyncSocket exchange) {
     protected void onHeadersSent() {
         AsyncHttpRequestBody requestBody = mRequest.getBody();
         if (requestBody != null) {
-            requestBody.write(mRequest, AsyncHttpResponseImpl.this, new CompletedCallback() {
+            requestBody.write(mRequest, mSink, new CompletedCallback() {
                 @Override
                 public void onCompleted(Exception ex) {
                     onRequestCompleted(ex);
@@ -192,43 +192,6 @@ public AsyncHttpClientMiddleware.ResponseHead sink(DataSink sink) {
         return this;
     }
 
-    @Override
-    public void write(ByteBufferList bb) {
-        assertContent();
-        mSink.write(bb);
-    }
-
-    @Override
-    public void end() {
-        throw new AssertionError("end called?");
-    }
-
-    @Override
-    public void setWriteableCallback(WritableCallback handler) {
-        mSink.setWriteableCallback(handler);
-    }
-
-    @Override
-    public WritableCallback getWriteableCallback() {
-        return mSink.getWriteableCallback();
-    }
-
-
-    @Override
-    public boolean isOpen() {
-        return mSink.isOpen();
-    }
-
-    @Override
-    public void setClosedCallback(CompletedCallback handler) {
-        mSink.setClosedCallback(handler);
-    }
-
-    @Override
-    public CompletedCallback getClosedCallback() {
-        return mSink.getClosedCallback();
-    }
-    
     @Override
     public AsyncServer getServer() {
         return mSocket.getServer();

From c96024ad76c7595601a926c2df0fedf01f00f52a Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 13 Mar 2019 13:23:18 -0700
Subject: [PATCH 337/399] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3dc79f5a3..322c97d45 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ AndroidAsync is a low level network protocol library. If you are looking for an
 http request library, check out [Ion](https://github.com/koush/ion) (it is built on top of AndroidAsync). The typical Android
 app developer would probably be more interested in Ion.
 
-But if you're looking for a raw Socket, HTTP client/server, WebSocket, and Socket.IO library for Android, AndroidAsync
+But if you're looking for a raw Socket, HTTP(s) client/server, and WebSocket library for Android, AndroidAsync
 is it.
 
 #### Features

From d2d847fa912e5d0190ea1d075f9d4a35fd17c924 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 17 Mar 2019 19:39:39 -0700
Subject: [PATCH 338/399] testing a possible regression

---
 .../com/koushikdutta/async/http/HttpUtil.java    | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
index d9e9a3552..bf7437008 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
@@ -1,7 +1,5 @@
 package com.koushikdutta.async.http;
 
-import android.text.TextUtils;
-
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.FilteredDataEmitter;
@@ -93,14 +91,12 @@ else if ("chunked".equalsIgnoreCase(headers.get("Transfer-Encoding"))) {
             chunker.setDataEmitter(emitter);
             emitter = chunker;
         }
-        else {
-            if ((server || protocol == Protocol.HTTP_1_1) && !"close".equalsIgnoreCase(headers.get("Connection"))) {
-                // if this is the server, and the client has not indicated a request body, the client is done
-                EndEmitter ender = EndEmitter.create(emitter.getServer(), null);
-                ender.setDataEmitter(emitter);
-                emitter = ender;
-                return emitter;
-            }
+        else if (server) {
+            // if this is the server, and the client has not indicated a request body, the client is done
+            EndEmitter ender = EndEmitter.create(emitter.getServer(), null);
+            ender.setDataEmitter(emitter);
+            emitter = ender;
+            return emitter;
         }
 
         if ("gzip".equals(headers.get("Content-Encoding"))) {

From e602bd7b50888eabc163aa6a2f8a32b4a7aa0ef2 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 17 Mar 2019 22:44:02 -0700
Subject: [PATCH 339/399] explciitly watch for empty response body based on
 response codes.

---
 .../async/http/HttpTransportMiddleware.java   |  7 +++++
 .../koushikdutta/async/test/CacheTests.java   | 29 +++++++++++++++++++
 .../async/test/WebSocketTests.java            |  5 +++-
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
index 9b17ccdca..151d711f8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpTransportMiddleware.java
@@ -114,6 +114,9 @@ else if (!TextUtils.isEmpty(s)) {
                         if (!data.request.hasBody()) {
                             emitter = HttpUtil.EndEmitter.create(socket.getServer(), null);
                         }
+                        else if (responseIsEmpty(data.response.code())) {
+                            emitter = HttpUtil.EndEmitter.create(socket.getServer(), null);
+                        }
                         else {
                             emitter = HttpUtil.getBodyDecoder(socket, Protocol.get(protocol), mRawHeaders, false);
                         }
@@ -132,6 +135,10 @@ else if (!TextUtils.isEmpty(s)) {
         return true;
     }
 
+    static boolean responseIsEmpty(int code) {
+        return (code >= 100 && code <= 199) || code == 204 || code == 304;
+    }
+
     @Override
     public void onRequestSent(OnRequestSentData data) {
         Protocol p = Protocol.get(data.protocol);
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
index e13af08e2..b62735d7e 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
@@ -1,5 +1,7 @@
 package com.koushikdutta.async.test;
 
+import android.content.res.AssetManager;
+import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.AsyncServer;
@@ -10,6 +12,7 @@
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.http.AsyncHttpClient;
 import com.koushikdutta.async.http.AsyncHttpGet;
+import com.koushikdutta.async.http.AsyncHttpResponse;
 import com.koushikdutta.async.http.HttpDate;
 import com.koushikdutta.async.http.cache.ResponseCacheMiddleware;
 import com.koushikdutta.async.http.server.AsyncHttpServer;
@@ -17,6 +20,7 @@
 import com.koushikdutta.async.http.server.AsyncHttpServerResponse;
 import com.koushikdutta.async.http.server.HttpServerRequestCallback;
 
+import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.io.File;
@@ -68,6 +72,31 @@ public void onRequest(AsyncHttpServerRequest request, AsyncHttpServerResponse re
         }
     }
 
+    final static String dataNameAndHash = "6691924d7d24237d3b3679310157d640";
+    @Test
+    public void test304() throws Exception {
+        try {
+            AsyncHttpServer httpServer = new AsyncHttpServer();
+            AsyncServerSocket socket = httpServer.listen(AsyncServer.getDefault(), 0);
+            int port = socket.getLocalPort();
+
+            AssetManager am = InstrumentationRegistry.getTargetContext().getAssets();
+            httpServer.directory(InstrumentationRegistry.getTargetContext(), "/.*?", "");
+
+            AsyncHttpClient client = new AsyncHttpClient(AsyncServer.getDefault());
+            ByteBufferList bb = client.executeByteBufferList(new AsyncHttpGet("http://localhost:" + port + "/" + dataNameAndHash), new AsyncHttpClient.DownloadCallback() {
+                @Override
+                public void onCompleted(Exception e, AsyncHttpResponse source, ByteBufferList result) {
+                    System.out.println(source.headers());
+                }
+            })
+                    .get();
+        }
+        finally {
+            AsyncServer.getDefault().stop();
+        }
+    }
+
     private static final long TIMEOUT = 1000L;
     public void testFilteredDataEmitter() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
index 55d9a3e07..b7d722c83 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
@@ -13,6 +13,8 @@
 
 import junit.framework.TestCase;
 
+import org.junit.Test;
+
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
@@ -46,7 +48,8 @@ public void onStringAvailable(String s) {
         });
     }
     
-    private static final long TIMEOUT = 10000L; 
+    private static final long TIMEOUT = 60000L;
+    @Test
     public void testWebSocket() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
 

From 8b619ac0edbd56bfc5105f5416072c95279225b0 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 22 Mar 2019 21:01:03 -0700
Subject: [PATCH 340/399] fixup idempotency

---
 .../koushikdutta/async/future/Converter.java  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
index 6943ad03d..f415b0910 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -349,23 +349,25 @@ public synchronized boolean removeConverter(TypeConverter typeConverter) {
     public final static ConverterEntries Converters = new ConverterEntries();
 
     static {
-        final TypeConverter<byte[], String> StringToByteArray = (from, fromMime) -> new SimpleFuture<>(from.getBytes());
-
-        final TypeConverter<ByteBufferList, byte[]> ByteArrayToByteBufferList = (from, fromMime) -> new SimpleFuture<>(new ByteBufferList(from));
-
-        final TypeConverter<ByteBuffer, byte[]> ByteArrayToByteBuffer = (from, fromMime) -> new SimpleFuture<>(ByteBufferList.deepCopy(ByteBuffer.wrap(from)));
-
-        final TypeConverter<ByteBufferList, ByteBuffer> ByteBufferToByteBufferList = (from, fromMime) -> new SimpleFuture<>(new ByteBufferList(ByteBufferList.deepCopy(from)));
+        // ensure byte buffer operations are idempotent. do deep copies.
+        final TypeConverter<ByteBufferList, byte[]> ByteArrayToByteBufferList = (from, fromMime) ->
+                new SimpleFuture<>(new ByteBufferList(ByteBufferList.deepCopy(ByteBuffer.wrap(from))));
+        final TypeConverter<String, ByteBufferList> ByteBufferListToByteArray = (from, fromMime) ->
+                new SimpleFuture<>(from.peekString());
+        final TypeConverter<ByteBuffer, byte[]> ByteArrayToByteBuffer = (from, fromMime) ->
+                new SimpleFuture<>(ByteBufferList.deepCopy(ByteBuffer.wrap(from)));
+        final TypeConverter<ByteBufferList, ByteBuffer> ByteBufferToByteBufferList = (from, fromMime) ->
+                new SimpleFuture<>(new ByteBufferList(ByteBufferList.deepCopy(from)));
 
+        final TypeConverter<byte[], String> StringToByteArray = (from, fromMime) -> new SimpleFuture<>(from.getBytes());
         final TypeConverter<JSONObject, String> StringToJSONObject = (from, fromMime) -> new SimpleFuture<>(from).thenConvert(JSONObject::new);
-
         final TypeConverter<String, JSONObject> JSONObjectToString = (from, fromMime) -> new SimpleFuture<>(from).thenConvert(JSONObject::toString);
-
         final TypeConverter<String, byte[]> ByteArrayToString = (from, fromMime) -> new SimpleFuture<>(new String(from));
 
         Converters.addConverter(ByteBuffer.class, null, ByteBufferList.class, null, ByteBufferToByteBufferList);
         Converters.addConverter(String.class, null, byte[].class, null, StringToByteArray);
         Converters.addConverter(byte[].class, null, ByteBufferList.class, null, ByteArrayToByteBufferList);
+        Converters.addConverter(ByteBufferList.class, null, String.class, null, ByteBufferListToByteArray);
         Converters.addConverter(byte[].class, null, ByteBuffer.class, null, ByteArrayToByteBuffer);
         Converters.addConverter(String.class, "application/json", JSONObject.class, null, StringToJSONObject);
         Converters.addConverter(JSONObject.class, null, String.class, "application/json", JSONObjectToString);

From 6d0eef178540847c09a2989b6ec01b7cd548bc18 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 27 Mar 2019 20:07:26 -0700
Subject: [PATCH 341/399] log cleanup

---
 .../async/AsyncSSLSocketWrapper.java          | 137 +++++++++---------
 .../com/koushikdutta/async/AsyncServer.java   |   4 +-
 .../http/server/AsyncHttpServerResponse.java  |   3 +
 .../server/AsyncHttpServerResponseImpl.java   |   7 +
 4 files changed, 79 insertions(+), 72 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index effe8ba48..d4d5e9501 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -698,19 +698,16 @@ public static Pair<KeyPair, Certificate> selfSignCertificate(final Context conte
 
     public static AsyncSSLServerSocket listenSecure(final Context context, final AsyncServer server, final String subjectName, final InetAddress host, final int port, final ListenCallback handler) {
         final ObjectHolder<AsyncSSLServerSocket> holder = new ObjectHolder<>();
-        server.run(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    Pair<KeyPair, Certificate> keyCert = selfSignCertificate(context, subjectName);
-                    KeyPair pair = keyCert.first;
-                    Certificate cert = keyCert.second;
+        server.run(() -> {
+            try {
+                Pair<KeyPair, Certificate> keyCert = selfSignCertificate(context, subjectName);
+                KeyPair pair = keyCert.first;
+                Certificate cert = keyCert.second;
 
-                    holder.held = listenSecure(server, pair.getPrivate(), cert, host, port, handler);
-                }
-                catch (Exception e) {
-                    handler.onCompleted(e);
-                }
+                holder.held = listenSecure(server, pair.getPrivate(), cert, host, port, handler);
+            }
+            catch (Exception e) {
+                handler.onCompleted(e);
             }
         });
         return holder.held;
@@ -727,20 +724,17 @@ private static class ObjectHolder<T> {
 
     public static AsyncSSLServerSocket listenSecure(final AsyncServer server, final byte[] keyDer, final byte[] certDer, final InetAddress host, final int port, final ListenCallback handler) {
         final ObjectHolder<AsyncSSLServerSocket> holder = new ObjectHolder<>();
-        server.run(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    PKCS8EncodedKeySpec key = new PKCS8EncodedKeySpec(keyDer);
-                    Certificate cert = CertificateFactory.getInstance("X.509").generateCertificate(new ByteArrayInputStream(certDer));
+        server.run(() -> {
+            try {
+                PKCS8EncodedKeySpec key = new PKCS8EncodedKeySpec(keyDer);
+                Certificate cert = CertificateFactory.getInstance("X.509").generateCertificate(new ByteArrayInputStream(certDer));
 
-                    PrivateKey pk = KeyFactory.getInstance("RSA").generatePrivate(key);
+                PrivateKey pk = KeyFactory.getInstance("RSA").generatePrivate(key);
 
-                    holder.held = listenSecure(server, pk, cert, host, port, handler);
-                }
-                catch (Exception e) {
-                    handler.onCompleted(e);
-                }
+                holder.held = listenSecure(server, pk, cert, host, port, handler);
+            }
+            catch (Exception e) {
+                handler.onCompleted(e);
             }
         });
         return holder.held;
@@ -748,50 +742,47 @@ public void run() {
 
     public static AsyncSSLServerSocket listenSecure(final AsyncServer server, final PrivateKey pk, final Certificate cert, final InetAddress host, final int port, final ListenCallback handler) {
         final ObjectHolder<AsyncSSLServerSocket> holder = new ObjectHolder<>();
-        server.run(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
-                    ks.load(null);
+        server.run(() -> {
+            try {
+                KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
+                ks.load(null);
 
-                    ks.setKeyEntry("key", pk, null, new Certificate[] { cert });
+                ks.setKeyEntry("key", pk, null, new Certificate[] { cert });
 
-                    KeyManagerFactory kmf = KeyManagerFactory.getInstance("X509");
-                    kmf.init(ks, "".toCharArray());
+                KeyManagerFactory kmf = KeyManagerFactory.getInstance("X509");
+                kmf.init(ks, "".toCharArray());
 
-                    TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-                    tmf.init(ks);
+                TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+                tmf.init(ks);
 
-                    SSLContext sslContext = SSLContext.getInstance("TLS");
-                    sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+                SSLContext sslContext = SSLContext.getInstance("TLS");
+                sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
 
-                    final AsyncServerSocket socket = listenSecure(server, sslContext, host, port, handler);
-                    holder.held = new AsyncSSLServerSocket() {
-                        @Override
-                        public PrivateKey getPrivateKey() {
-                            return pk;
-                        }
+                final AsyncServerSocket socket = listenSecure(server, sslContext, host, port, handler);
+                holder.held = new AsyncSSLServerSocket() {
+                    @Override
+                    public PrivateKey getPrivateKey() {
+                        return pk;
+                    }
 
-                        @Override
-                        public Certificate getCertificate() {
-                            return cert;
-                        }
+                    @Override
+                    public Certificate getCertificate() {
+                        return cert;
+                    }
 
-                        @Override
-                        public void stop() {
-                            socket.stop();
-                        }
+                    @Override
+                    public void stop() {
+                        socket.stop();
+                    }
 
-                        @Override
-                        public int getLocalPort() {
-                            return socket.getLocalPort();
-                        }
-                    };
-                }
-                catch (Exception e) {
-                    handler.onCompleted(e);
-                }
+                    @Override
+                    public int getLocalPort() {
+                        return socket.getLocalPort();
+                    }
+                };
+            }
+            catch (Exception e) {
+                handler.onCompleted(e);
             }
         });
         return holder.held;
@@ -802,10 +793,12 @@ public static AsyncServerSocket listenSecure(AsyncServer server, final SSLContex
             @Override
             public SSLEngine createEngine(SSLContext sslContext, String peerHost, int peerPort) {
                 SSLEngine engine = super.createEngine(sslContext, peerHost, peerPort);
-                String[] ciphers = engine.getEnabledCipherSuites();
+//                String[] ciphers = engine.getEnabledCipherSuites();
 //                for (String cipher: ciphers) {
 //                    Log.i(LOGTAG, cipher);
 //                }
+
+                // todo: what's this for? some vestigal vysor code i think. required by audio mirroring?
                 engine.setEnabledCipherSuites(new String[] { "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384" });
                 return engine;
             }
@@ -814,16 +807,19 @@ public SSLEngine createEngine(SSLContext sslContext, String peerHost, int peerPo
             @Override
             public void onAccepted(final AsyncSocket socket) {
                 AsyncSSLSocketWrapper.handshake(socket, null, port, conf.createEngine(sslContext, null, port), null, null, false,
-                        new AsyncSSLSocketWrapper.HandshakeCallback() {
-                            @Override
-                            public void onHandshakeCompleted(Exception e, AsyncSSLSocket sslSocket) {
-                                if (e != null) {
-                                    Log.e(LOGTAG, "Error while handshaking", e);
-                                    socket.close();
-                                    return;
-                                }
-                                handler.onAccepted(sslSocket);
+                        (e, sslSocket) -> {
+                            if (e != null) {
+                                // chrome seems to do some sort of SSL probe and cancels handshakes. not sure why.
+                                // i suspect it is to pick an optimal strong cipher.
+                                // seeing a lot of the following in the log (but no actual connection errors)
+                                // javax.net.ssl.SSLHandshakeException: error:10000416:SSL routines:OPENSSL_internal:SSLV3_ALERT_CERTIFICATE_UNKNOWN
+                                // seen on Shield TV running API 26
+                                // todo fix: conscrypt ssl context?
+//                                Log.e(LOGTAG, "Error while handshaking", e);
+                                socket.close();
+                                return;
                             }
+                            handler.onAccepted(sslSocket);
                         });
             }
 
@@ -838,5 +834,4 @@ public void onCompleted(Exception ex) {
             }
         });
     }
-
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 41861b135..250ff1661 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -25,6 +25,7 @@
 import java.net.SocketAddress;
 import java.nio.channels.CancelledKeyException;
 import java.nio.channels.ClosedChannelException;
+import java.nio.channels.ClosedSelectorException;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.ServerSocketChannel;
@@ -716,7 +717,8 @@ private static void run(final AsyncServer server, final SelectorWrapper selector
                 runLoop(server, selector, queue);
             }
             catch (AsyncSelectorException e) {
-                Log.i(LOGTAG, "Selector exception, shutting down", e);
+                if (!(e.getCause() instanceof ClosedSelectorException))
+                    Log.i(LOGTAG, "Selector exception, shutting down", e);
                 StreamUtility.closeQuietly(selector);
             }
             // see if we keep looping, this must be in a synchronized block since the queue is accessed.
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
index 2f3aed691..c46db7459 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java
@@ -6,6 +6,8 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.http.AsyncHttpResponse;
 import com.koushikdutta.async.http.Headers;
+import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
+import com.koushikdutta.async.parser.AsyncParser;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -25,6 +27,7 @@ public interface AsyncHttpServerResponse extends DataSink, CompletedCallback {
     void send(JSONArray jsonArray);
     void sendFile(File file);
     void sendStream(InputStream inputStream, long totalLength);
+    <T> void sendBody(AsyncParser<T> body, T value);
     AsyncHttpServerResponse code(int code);
     int code();
     Headers getHeaders();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index f29d0532e..0a78291fd 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -16,6 +16,7 @@
 import com.koushikdutta.async.http.HttpUtil;
 import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.filter.ChunkedOutputFilter;
+import com.koushikdutta.async.parser.AsyncParser;
 import com.koushikdutta.async.util.StreamUtility;
 
 import org.json.JSONArray;
@@ -214,6 +215,12 @@ public void send(final String contentType, final byte[] bytes) {
         send(contentType, new ByteBufferList(bytes));
     }
 
+    @Override
+    public <T> void sendBody(AsyncParser<T> body, T value) {
+        mRawHeaders.set("Content-Type", body.getMime());
+        body.write(this, value, ex -> onEnd());
+    }
+
     @Override
     public void send(String contentType, ByteBuffer bb) {
         send(contentType, new ByteBufferList(bb));

From ce79f72d13807756d67165de6bb9fddf7ed1dffb Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 29 Mar 2019 14:44:58 -0700
Subject: [PATCH 342/399] log cleanup

---
 .../src/com/koushikdutta/async/AsyncSSLSocketWrapper.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index d4d5e9501..367a592a5 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -322,7 +322,7 @@ else if (res.getStatus() == Status.BUFFER_UNDERFLOW) {
                 AsyncSSLSocketWrapper.this.onDataAvailable();
             }
             catch (SSLException ex) {
-                ex.printStackTrace();
+//                ex.printStackTrace();
                 report(ex);
             }
             finally {
@@ -717,7 +717,6 @@ public static AsyncSSLServerSocket listenSecure(AsyncServer server, String keyDe
         return listenSecure(server, Base64.decode(keyDer, Base64.DEFAULT), Base64.decode(certDer, Base64.DEFAULT), host, port, handler);
     }
 
-
     private static class ObjectHolder<T> {
         T held;
     }

From c48870c5894fd58fa661a46a1b6cd57157b16f7f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 30 Mar 2019 14:06:00 -0700
Subject: [PATCH 343/399] Mainthread chaining convenience method for futures.

---
 .../src/com/koushikdutta/async/future/Future.java  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Future.java b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
index 5df5afec4..c6bf24f80 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Future.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
@@ -1,7 +1,8 @@
 package com.koushikdutta.async.future;
 
 
-import com.koushikdutta.async.callback.CompletedCallback;
+import android.os.Handler;
+import android.os.Looper;
 
 public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
     /**
@@ -85,4 +86,15 @@ public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
      * @return
      */
     Exception tryGetException();
+
+    Handler mainHandler = new Handler(Looper.getMainLooper());
+    /**
+     * Get the result on the main thread.
+     * @return
+     */
+    default Future<T> mainThread() {
+        SimpleFuture<T> ret = new SimpleFuture<>();
+        mainHandler.post(() -> ret.setComplete(Future.this));
+        return ret;
+    }
 }

From fe046714a95a01fe8be3566be998ca2f345d5808 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 31 Mar 2019 12:08:39 -0700
Subject: [PATCH 344/399] getAllByteArray logic was totally wrong. and turns
 out it is not that useful anyways. DirectByteBuffers can return arrays.
 arrayOffset needs to be zero, and capacity may be less than the length of the
 array. Will likely just deprecate this method.

---
 .../src/com/koushikdutta/async/ByteBufferList.java    | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index f96dd8444..d657a0998 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -61,19 +61,8 @@ public byte[] getBytes(int length) {
     }
 
     public byte[] getAllByteArray() {
-        // fast path to return the contents of the first and only byte buffer,
-        // if that's what we're looking for. avoids allocation.
-        if (mBuffers.size() == 1) {
-            ByteBuffer peek = mBuffers.peek();
-            if (peek.capacity() == remaining() && peek.isDirect()) {
-                remaining = 0;
-                return mBuffers.remove().array();
-            }
-        }
-
         byte[] ret = new byte[remaining()];
         get(ret);
-
         return ret;
     }
 

From 64ea345366143c341eb932014127ac27b9d67aff Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 26 May 2019 18:02:16 -0700
Subject: [PATCH 345/399] converter fixes

---
 .../com/koushikdutta/async/future/Converter.java | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
index f415b0910..03fd7280e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Converter.java
@@ -289,7 +289,7 @@ private <T> boolean search(MimedType<T> target, ArrayDeque<PathInfo> bestMatch,
 
     private static final String MIME_ALL = "*/*";
     public <T> Future<T> to(Class<T> clazz, String mime) {
-        return future.then(from -> to(from, clazz ,mime));
+        return future.then(from -> to(from, clazz, mime));
     }
 
     static class ConverterEntry<F, T> {
@@ -352,7 +352,11 @@ public synchronized boolean removeConverter(TypeConverter typeConverter) {
         // ensure byte buffer operations are idempotent. do deep copies.
         final TypeConverter<ByteBufferList, byte[]> ByteArrayToByteBufferList = (from, fromMime) ->
                 new SimpleFuture<>(new ByteBufferList(ByteBufferList.deepCopy(ByteBuffer.wrap(from))));
-        final TypeConverter<String, ByteBufferList> ByteBufferListToByteArray = (from, fromMime) ->
+        final TypeConverter<byte[], ByteBufferList> ByteBufferListToByteArray = (from, fromMime) ->
+                new SimpleFuture<>(from.getAllByteArray());
+        final TypeConverter<ByteBuffer, ByteBufferList> ByteBufferListToByteBuffer = (from, fromMime) ->
+                new SimpleFuture<>(from.getAll());
+        final TypeConverter<String, ByteBufferList> ByteBufferListToString = (from, fromMime) ->
                 new SimpleFuture<>(from.peekString());
         final TypeConverter<ByteBuffer, byte[]> ByteArrayToByteBuffer = (from, fromMime) ->
                 new SimpleFuture<>(ByteBufferList.deepCopy(ByteBuffer.wrap(from)));
@@ -365,12 +369,14 @@ public synchronized boolean removeConverter(TypeConverter typeConverter) {
         final TypeConverter<String, byte[]> ByteArrayToString = (from, fromMime) -> new SimpleFuture<>(new String(from));
 
         Converters.addConverter(ByteBuffer.class, null, ByteBufferList.class, null, ByteBufferToByteBufferList);
-        Converters.addConverter(String.class, null, byte[].class, null, StringToByteArray);
+        Converters.addConverter(String.class, null, byte[].class, "text/plain", StringToByteArray);
         Converters.addConverter(byte[].class, null, ByteBufferList.class, null, ByteArrayToByteBufferList);
-        Converters.addConverter(ByteBufferList.class, null, String.class, null, ByteBufferListToByteArray);
+        Converters.addConverter(ByteBufferList.class, null, byte[].class, null, ByteBufferListToByteArray);
+        Converters.addConverter(ByteBufferList.class, null, ByteBuffer.class, null, ByteBufferListToByteBuffer);
+        Converters.addConverter(ByteBufferList.class, "text/plain", String.class, null, ByteBufferListToString);
         Converters.addConverter(byte[].class, null, ByteBuffer.class, null, ByteArrayToByteBuffer);
         Converters.addConverter(String.class, "application/json", JSONObject.class, null, StringToJSONObject);
         Converters.addConverter(JSONObject.class, null, String.class, "application/json", JSONObjectToString);
-        Converters.addConverter(byte[].class, "text/plain", String.class, "text/plain", ByteArrayToString);
+        Converters.addConverter(byte[].class, "text/plain", String.class, null, ByteArrayToString);
     }
 }

From 68ec6f83c8a09662011a21108abc4e91d55cc962 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 9 Jun 2019 21:28:06 -0700
Subject: [PATCH 346/399] deepCopy null ByteBuffer returns null.

---
 AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index d657a0998..956ea1415 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -535,6 +535,8 @@ public static void obtainArray(ByteBuffer[] arr, int size) {
     }
 
     public static ByteBuffer deepCopy(ByteBuffer copyOf) {
+        if (copyOf == null)
+            return null;
         return (ByteBuffer)obtain(copyOf.remaining()).put(copyOf.duplicate()).flip();
     }
 

From 682f15989165d899b490d32c7f50d77b7944595a Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 11 Jun 2019 09:37:16 -0700
Subject: [PATCH 347/399] Fixup protocol switching behavior happening after
 request received versus after response sent.

---
 .../async/http/server/AsyncHttpServer.java    | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 2b88bf206..de6ad6df2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -42,6 +42,10 @@ protected boolean onRequest(AsyncHttpServerRequest request, AsyncHttpServerRespo
         return false;
     }
 
+    protected void onResponseCompleted(AsyncHttpServerRequest request, AsyncHttpServerResponse response) {
+
+    }
+
     protected void onRequest(HttpServerRequestCallback callback, AsyncHttpServerRequest request, AsyncHttpServerResponse response) {
         if (callback != null) {
             try {
@@ -161,9 +165,12 @@ protected void report(Exception e) {
 
                         @Override
                         protected void onEnd() {
+                            responseComplete = true;
                             super.onEnd();
                             mSocket.setEndCallback(null);
-                            responseComplete = true;
+
+                            onResponseCompleted(getRequest(), res);
+
                             // reuse the socket for a subsequent request.
                             handleOnCompleted();
                         }
@@ -185,9 +192,6 @@ protected void onEnd() {
 
                 @Override
                 public void onCompleted(Exception e) {
-                    // if the protocol was switched off http, ignore this request/response.
-                    if (isSwitchingProtocols(res))
-                        return;
                     requestComplete = true;
                     super.onCompleted(e);
                     // no http pipelining, gc trashing if the socket dies
@@ -213,7 +217,12 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                 }
                 
                 private void handleOnCompleted() {
-                    if (requestComplete && responseComplete) {
+                    // response may complete before request. the request may have a body, and
+                    // the response may be sent before it is fully sent.
+
+                    // if the protocol was switched off http, abandon the socket,
+                    // otherwise attempt to recycle it.
+                    if (requestComplete && responseComplete && !isSwitchingProtocols(res)) {
                         if (isKeepAlive(self, res)) {
                             onAccepted(socket);
                         }

From a25d2be0a0f813750746b4a2e8ccb7c98295a85d Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 16 Jun 2019 20:31:04 -0700
Subject: [PATCH 348/399] multiple websocket protocol support

---
 .../async/http/AsyncHttpClient.java           | 57 +++++++++++--------
 .../koushikdutta/async/http/WebSocket.java    | 38 ++++++-------
 .../async/http/WebSocketImpl.java             | 18 ++++--
 3 files changed, 65 insertions(+), 48 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index c0a24e2aa..0618c6bdf 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -647,36 +647,37 @@ public <T> SimpleFuture<T> execute(AsyncHttpRequest req, final AsyncParser<T> pa
         return ret;
     }
 
-    public static interface WebSocketConnectCallback {
-        public void onCompleted(Exception ex, WebSocket webSocket);
+    public interface WebSocketConnectCallback {
+        void onCompleted(Exception ex, WebSocket webSocket);
     }
 
     public Future<WebSocket> websocket(final AsyncHttpRequest req, String protocol, final WebSocketConnectCallback callback) {
-        WebSocketImpl.addWebSocketUpgradeHeaders(req, protocol);
-        final SimpleFuture<WebSocket> ret = new SimpleFuture<WebSocket>();
-        Cancellable connect = execute(req, new HttpConnectCallback() {
-            @Override
-            public void onConnectCompleted(Exception ex, AsyncHttpResponse response) {
-                if (ex != null) {
-                    if (ret.setComplete(ex)) {
-                        if (callback != null)
-                            callback.onCompleted(ex, null);
-                    }
-                    return;
-                }
-                WebSocket ws = WebSocketImpl.finishHandshake(req.getHeaders(), response);
-                if (ws == null) {
-                    ex = new WebSocketHandshakeException("Unable to complete websocket handshake");
-                    if (!ret.setComplete(ex))
-                        return;
-                }
-                else {
-                    if (!ret.setComplete(ws))
-                        return;
+        return websocket(req, protocol != null ? new String[] { protocol } : null, callback);
+    }
+
+    public Future<WebSocket> websocket(final AsyncHttpRequest req, String[] protocols, final WebSocketConnectCallback callback) {
+        WebSocketImpl.addWebSocketUpgradeHeaders(req, protocols);
+        final SimpleFuture<WebSocket> ret = new SimpleFuture<>();
+        Cancellable connect = execute(req, (ex, response) -> {
+            if (ex != null) {
+                if (ret.setComplete(ex)) {
+                    if (callback != null)
+                        callback.onCompleted(ex, null);
                 }
-                if (callback != null)
-                    callback.onCompleted(ex, ws);
+                return;
+            }
+            WebSocket ws = WebSocketImpl.finishHandshake(req.getHeaders(), response);
+            if (ws == null) {
+                ex = new WebSocketHandshakeException("Unable to complete websocket handshake");
+                if (!ret.setComplete(ex))
+                    return;
+            }
+            else {
+                if (!ret.setComplete(ws))
+                    return;
             }
+            if (callback != null)
+                callback.onCompleted(ex, ws);
         });
 
         ret.setParent(connect);
@@ -689,6 +690,12 @@ public Future<WebSocket> websocket(String uri, String protocol, final WebSocketC
         return websocket(get, protocol, callback);
     }
 
+    public Future<WebSocket> websocket(String uri, String[] protocols, final WebSocketConnectCallback callback) {
+//        assert callback != null;
+        final AsyncHttpGet get = new AsyncHttpGet(uri.replace("ws://", "http://").replace("wss://", "https://"));
+        return websocket(get, protocols, callback);
+    }
+
     public AsyncServer getServer() {
         return mServer;
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java
index 672a9a5e0..a1efd69f2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java
@@ -2,33 +2,33 @@
 
 import com.koushikdutta.async.AsyncSocket;
 
-
 public interface WebSocket extends AsyncSocket {
-    static public interface StringCallback {
-        public void onStringAvailable(String s);
+    interface StringCallback {
+        void onStringAvailable(String s);
     }
-    static public interface PingCallback {
-        public void onPingReceived(String s);
+    interface PingCallback {
+        void onPingReceived(String s);
     }
-    static public interface PongCallback {
-        public void onPongReceived(String s);
+    interface PongCallback {
+        void onPongReceived(String s);
     }
 
-    public void send(byte[] bytes);
-    public void send(String string);
-    public void send(byte [] bytes, int offset, int len);
-    public void ping(String message);
-    public void pong(String message);
+    void send(byte[] bytes);
+    void send(String string);
+    void send(byte [] bytes, int offset, int len);
+    void ping(String message);
+    void pong(String message);
     
-    public void setStringCallback(StringCallback callback);
-    public StringCallback getStringCallback();
+    void setStringCallback(StringCallback callback);
+    StringCallback getStringCallback();
 
-    public void setPingCallback(PingCallback callback);
+    void setPingCallback(PingCallback callback);
     
-    public void setPongCallback(PongCallback callback);
-    public PongCallback getPongCallback();
+    void setPongCallback(PongCallback callback);
+    PongCallback getPongCallback();
 
-    public boolean isBuffering();
+    boolean isBuffering();
+    String getProtocol();
     
-    public AsyncSocket getSocket();
+    AsyncSocket getSocket();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
index c6dd4c179..644303a0e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
@@ -140,8 +140,14 @@ public WebSocketImpl(AsyncHttpServerRequest request, AsyncHttpServerResponse res
         
         setupParser(false, false);
     }
-    
-    public static void addWebSocketUpgradeHeaders(AsyncHttpRequest req, String protocol) {
+
+    String protocol;
+    @Override
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public static void addWebSocketUpgradeHeaders(AsyncHttpRequest req, String... protocols) {
         Headers headers = req.getHeaders();
         final String key = Base64.encodeToString(toByteArray(UUID.randomUUID()),Base64.NO_WRAP);
         headers.set("Sec-WebSocket-Version", "13");
@@ -149,8 +155,11 @@ public static void addWebSocketUpgradeHeaders(AsyncHttpRequest req, String proto
         headers.set("Sec-WebSocket-Extensions", "x-webkit-deflate-frame");
         headers.set("Connection", "Upgrade");
         headers.set("Upgrade", "websocket");
-        if (protocol != null)
-            headers.set("Sec-WebSocket-Protocol", protocol);
+        if (protocols != null) {
+            for (String protocol: protocols) {
+                headers.add("Sec-WebSocket-Protocol", protocol);
+            }
+        }
         headers.set("Pragma", "no-cache");
         headers.set("Cache-Control", "no-cache");
         if (TextUtils.isEmpty(req.getHeaders().get("User-Agent")))
@@ -192,6 +201,7 @@ public static WebSocket finishHandshake(Headers requestHeaders, AsyncHttpRespons
         }
 
         WebSocketImpl ret = new WebSocketImpl(response.detachSocket());
+        ret.protocol = response.headers().get("Sec-WebSocket-Protocol");
         ret.setupParser(true, deflate);
         return ret;
     }

From b46f39e84b4d47f55045d6430c4764e9d2f1f0ac Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 19 Jun 2019 18:41:44 -0700
Subject: [PATCH 349/399] do not crash on bad http

---
 .../async/http/server/AsyncHttpServerRequestImpl.java         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
index 0185f1d08..929daef03 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
@@ -13,6 +13,7 @@
 import com.koushikdutta.async.http.Protocol;
 import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -67,7 +68,8 @@ public void onStringAvailable(String s) {
                 statusLine = s;
                 if (!statusLine.contains("HTTP/")) {
                     onNotHttp();
-                    mSocket.setDataCallback(null);
+                    mSocket.setDataCallback(new NullDataCallback());
+                    report(new IOException("data/header received was not not http"));
                 }
 
                 return;

From be035664ade4c2d94323c4bf574a63eb7b6164ab Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 25 Jun 2019 21:54:45 -0700
Subject: [PATCH 350/399] content type

---
 .../async/http/server/AsyncHttpServerRouter.java     | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
index 7bb03ba1e..cff7d4da8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
@@ -9,14 +9,11 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.SimpleFuture;
-import com.koushikdutta.async.future.ThenCallback;
 import com.koushikdutta.async.http.AsyncHttpGet;
 import com.koushikdutta.async.http.AsyncHttpHead;
 import com.koushikdutta.async.http.AsyncHttpPost;
-import com.koushikdutta.async.http.Headers;
 import com.koushikdutta.async.http.WebSocket;
 import com.koushikdutta.async.http.WebSocketImpl;
-import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 import com.koushikdutta.async.util.StreamUtility;
 
 import java.io.File;
@@ -74,7 +71,7 @@ public void websocket(String regex, final AsyncHttpServer.WebSocketRequestCallba
         websocket(regex, null, callback);
     }
 
-    protected WebSocket checkWebSocketUpgrade(final String protocol, AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
+    static public WebSocket checkWebSocketUpgrade(final String protocol, AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
         boolean hasUpgrade = false;
         String connection = request.getHeaders().get("Connection");
         if (connection != null) {
@@ -158,18 +155,17 @@ public static Asset getAssetStream(AssetManager am, String asset) {
         mContentTypes.put("json", "application/json");
         mContentTypes.put("png", "image/png");
         mContentTypes.put("jpg", "image/jpeg");
+        mContentTypes.put("jpeg", "image/jpeg");
         mContentTypes.put("html", "text/html");
         mContentTypes.put("css", "text/css");
         mContentTypes.put("mp4", "video/mp4");
         mContentTypes.put("mov", "video/quicktime");
         mContentTypes.put("wmv", "video/x-ms-wmv");
+        mContentTypes.put("txt", "text/plain");
     }
 
     public static String getContentType(String path) {
-        String type = tryGetContentType(path);
-        if (type != null)
-            return type;
-        return "text/plain";
+        return tryGetContentType(path);
     }
 
     public static String tryGetContentType(String path) {

From 1eab1c4958271a2787ea118a394032ccda688cea Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 1 Jul 2019 17:20:02 -0700
Subject: [PATCH 351/399] androidx

---
 .../test/src/com/koushikdutta/async/test/BodyTests.java     | 2 +-
 .../test/src/com/koushikdutta/async/test/CacheTests.java    | 6 +++---
 .../test/src/com/koushikdutta/async/test/CallbackTests.java | 2 +-
 .../src/com/koushikdutta/async/test/ConscryptTests.java     | 4 ++--
 .../test/src/com/koushikdutta/async/test/ConvertTests.java  | 2 +-
 .../src/com/koushikdutta/async/test/FileCacheTests.java     | 4 ++--
 .../test/src/com/koushikdutta/async/test/FileTests.java     | 6 ++----
 .../test/src/com/koushikdutta/async/test/FutureTests.java   | 2 +-
 .../src/com/koushikdutta/async/test/HttpClientTests.java    | 4 ++--
 .../src/com/koushikdutta/async/test/MultipartTests.java     | 4 ++--
 .../test/src/com/koushikdutta/async/test/SSLTests.java      | 4 ++--
 11 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/BodyTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/BodyTests.java
index 5902e369b..112a96f91 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/BodyTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/BodyTests.java
@@ -1,6 +1,6 @@
 package com.koushikdutta.async.test;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.http.Multimap;
 import com.koushikdutta.async.http.body.UrlEncodedFormBody;
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
index b62735d7e..7d4272c40 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/CacheTests.java
@@ -1,8 +1,8 @@
 package com.koushikdutta.async.test;
 
 import android.content.res.AssetManager;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.AsyncServerSocket;
@@ -29,7 +29,7 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import static android.support.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getContext;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/CallbackTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/CallbackTests.java
index b7e3de3d1..f632ce7cd 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/CallbackTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/CallbackTests.java
@@ -1,6 +1,6 @@
 package com.koushikdutta.async.test;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.AsyncServerSocket;
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
index 0f7c9a13c..5487e16a2 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ConscryptTests.java
@@ -18,7 +18,7 @@
 
 
 import android.content.Context;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.runner.RunWith;
 
@@ -35,7 +35,7 @@
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLEngineResult;
 
-import static android.support.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getContext;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ConvertTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ConvertTests.java
index e7486a5ec..57f343b97 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/ConvertTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ConvertTests.java
@@ -1,6 +1,6 @@
 package com.koushikdutta.async.test;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.future.SimpleFuture;
 
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/FileCacheTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/FileCacheTests.java
index 4dfb397c8..d4a1644c8 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/FileCacheTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/FileCacheTests.java
@@ -1,6 +1,6 @@
 package com.koushikdutta.async.test;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.util.FileCache;
 import com.koushikdutta.async.util.StreamUtility;
@@ -11,7 +11,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 
-import static android.support.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getContext;
 import static junit.framework.TestCase.assertFalse;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java
index 609a4d3b1..6a05592bc 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/FileTests.java
@@ -1,7 +1,7 @@
 package com.koushikdutta.async.test;
 
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.FileDataEmitter;
@@ -10,15 +10,13 @@
 import com.koushikdutta.async.parser.StringParser;
 import com.koushikdutta.async.util.StreamUtility;
 
-import junit.framework.TestCase;
-
 import org.junit.runner.RunWith;
 
 import java.io.File;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import static android.support.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getContext;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java
index 739ada90d..966972325 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java
@@ -2,7 +2,7 @@
 
 import android.os.Handler;
 import android.os.Looper;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.callback.CompletedCallback;
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
index b0d4c272c..664e6a5ac 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/HttpClientTests.java
@@ -1,7 +1,7 @@
 package com.koushikdutta.async.test;
 
 import android.net.Uri;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -39,7 +39,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static android.support.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getContext;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/MultipartTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/MultipartTests.java
index ee31526a3..e29a256fa 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/MultipartTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/MultipartTests.java
@@ -1,6 +1,6 @@
 package com.koushikdutta.async.test;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.ByteBufferList;
@@ -26,7 +26,7 @@
 import java.io.FileOutputStream;
 import java.util.concurrent.TimeUnit;
 
-import static android.support.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getContext;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/SSLTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/SSLTests.java
index 1255f78a1..ec5fb93a6 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/SSLTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/SSLTests.java
@@ -1,6 +1,6 @@
 package com.koushikdutta.async.test;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.http.AsyncHttpClient;
@@ -19,7 +19,7 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManagerFactory;
 
-import static android.support.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getContext;
 
 /**
  * Created by koush on 6/4/13.

From f0eaa72c604a0c56a73975f65800471e16d7e673 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 1 Jul 2019 17:20:20 -0700
Subject: [PATCH 352/399] prevent locking in buffered data sink

---
 .../koushikdutta/async/BufferedDataSink.java  | 67 ++++++++-----------
 1 file changed, 27 insertions(+), 40 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
index d7b16f53e..c14d0b1f7 100644
--- a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
@@ -3,8 +3,6 @@
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.WritableCallback;
 
-import java.nio.ByteBuffer;
-
 public class BufferedDataSink implements DataSink {
     DataSink mDataSink;
     public BufferedDataSink(DataSink datasink) {
@@ -14,7 +12,7 @@ public BufferedDataSink(DataSink datasink) {
     public boolean isBuffering() {
         return mPendingWrites.hasRemaining() || forceBuffering;
     }
-    
+
     public DataSink getDataSink() {
         return mDataSink;
     }
@@ -28,12 +26,7 @@ public void forceBuffering(boolean forceBuffering) {
 
     public void setDataSink(DataSink datasink) {
         mDataSink = datasink;
-        mDataSink.setWriteableCallback(new WritableCallback() {
-            @Override
-            public void onWriteable() {
-                writePending();
-            }
-        });
+        mDataSink.setWriteableCallback(this::writePending);
     }
 
     private void writePending() {
@@ -41,45 +34,42 @@ private void writePending() {
             return;
 
 //        Log.i("NIO", "Writing to buffer...");
-        if (mPendingWrites.hasRemaining()) {
+        boolean empty;
+        synchronized (mPendingWrites) {
             mDataSink.write(mPendingWrites);
-            if (mPendingWrites.remaining() == 0) {
-                if (endPending)
-                    mDataSink.end();
-            }
+            empty = mPendingWrites.isEmpty();
+        }
+        if (empty) {
+            if (endPending)
+                mDataSink.end();
         }
-        if (!mPendingWrites.hasRemaining() && mWritable != null)
+        if (empty && mWritable != null)
             mWritable.onWriteable();
     }
     
-    ByteBufferList mPendingWrites = new ByteBufferList();
+    final ByteBufferList mPendingWrites = new ByteBufferList();
 
     @Override
     public void write(ByteBufferList bb) {
         write(bb, false);
     }
-    
+
     protected void write(final ByteBufferList bb, final boolean ignoreBuffer) {
         if (getServer().getAffinity() != Thread.currentThread()) {
-            getServer().run(new Runnable() {
-                @Override
-                public void run() {
-                    write(bb, ignoreBuffer);
-                }
-            });
+            synchronized (mPendingWrites) {
+                if (mPendingWrites.remaining() >= mMaxBuffer && !ignoreBuffer)
+                    return;
+                bb.get(mPendingWrites);
+            }
+            getServer().post(this::writePending);
             return;
         }
 
         if (!isBuffering())
             mDataSink.write(bb);
 
-        if (bb.remaining() > 0) {
-            int toRead = Math.min(bb.remaining(), mMaxBuffer);
-            if (ignoreBuffer)
-                toRead = bb.remaining();
-            if (toRead > 0) {
-                bb.get(mPendingWrites, toRead);
-            }
+        synchronized (mPendingWrites) {
+            bb.get(mPendingWrites);
         }
     }
 
@@ -102,7 +92,7 @@ public int remaining() {
     public int getMaxBuffer() {
         return mMaxBuffer;
     }
-    
+
     public void setMaxBuffer(int maxBuffer) {
         assert maxBuffer >= 0;
         mMaxBuffer = maxBuffer;
@@ -117,18 +107,15 @@ public boolean isOpen() {
     @Override
     public void end() {
         if (getServer().getAffinity() != Thread.currentThread()) {
-            getServer().run(new Runnable() {
-                @Override
-                public void run() {
-                    end();
-                }
-            });
+            getServer().post(this::end);
             return;
         }
 
-        if (mPendingWrites.hasRemaining()) {
-            endPending = true;
-            return;
+        synchronized (mPendingWrites) {
+            if (mPendingWrites.hasRemaining()) {
+                endPending = true;
+                return;
+            }
         }
         mDataSink.end();
     }

From cc428afd4c1e07abc002756156ee2dadb0a748b5 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 1 Jul 2019 17:20:46 -0700
Subject: [PATCH 353/399] refactor out redirect handling.

---
 AndroidAsync/build.gradle                     |  4 +-
 .../async/http/AsyncHttpClient.java           | 25 ++++++-
 .../async/http/AsyncHttpClientMiddleware.java | 68 +++++++++++--------
 .../async/http/AsyncSocketMiddleware.java     |  6 +-
 .../async/http/SimpleMiddleware.java          | 11 ++-
 .../http/cache/ResponseCacheMiddleware.java   |  4 +-
 6 files changed, 76 insertions(+), 42 deletions(-)

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 5a2a3b3d1..513425626 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -25,7 +25,7 @@ android {
         targetSdkVersion 28
         minSdkVersion 14
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     compileOptions {
@@ -46,7 +46,7 @@ android {
         androidTestImplementation 'com.android.support.test:runner:1.0.2'
         androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
         // for when i wanna test this against gms conscrypt
-        androidTestImplementation 'com.google.android.gms:play-services-base:16.1.0'
+        androidTestImplementation 'com.google.android.gms:play-services-base:17.0.0'
     }
 }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 0618c6bdf..3845fd369 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -211,7 +211,7 @@ private void executeAffinity(final AsyncHttpRequest request, final int redirectC
             return;
         }
         final Uri uri = request.getUri();
-        final AsyncHttpClientMiddleware.OnResponseCompleteDataOnRequestSentData data = new AsyncHttpClientMiddleware.OnResponseCompleteDataOnRequestSentData();
+        final AsyncHttpClientMiddleware.OnResponseCompleteData data = new AsyncHttpClientMiddleware.OnResponseCompleteData();
         request.executionTime = System.currentTimeMillis();
         data.request = request;
 
@@ -310,7 +310,7 @@ public void onConnectCompleted(Exception ex, AsyncSocket socket) {
 
     private void executeSocket(final AsyncHttpRequest request, final int redirectCount,
                                final FutureAsyncHttpResponse cancel, final HttpConnectCallback callback,
-                               final AsyncHttpClientMiddleware.OnResponseCompleteDataOnRequestSentData data) {
+                               final AsyncHttpClientMiddleware.OnResponseCompleteData data) {
         // 4) wait for request to be sent fully
         // and
         // 6) wait for headers
@@ -345,6 +345,25 @@ public void setDataEmitter(DataEmitter emitter) {
 
                 super.setDataEmitter(data.bodyEmitter);
 
+                for (AsyncHttpClientMiddleware middleware: mMiddleware) {
+                    AsyncHttpRequest newReq = middleware.onResponseReady(data);
+                    if (newReq != null) {
+                        newReq.executionTime = request.executionTime;
+                        newReq.logLevel = request.logLevel;
+                        newReq.LOGTAG = request.LOGTAG;
+                        newReq.proxyHost = request.proxyHost;
+                        newReq.proxyPort = request.proxyPort;
+                        setupAndroidProxy(newReq);
+
+                        request.logi("Response intercepted by middleware");
+                        newReq.logi("Request initiated by middleware intercept by middleware");
+                        // post to allow reuse of socket.
+                        mServer.post(() -> execute(newReq, redirectCount, cancel, callback));
+                        setDataCallback(new NullDataCallback());
+                        return;
+                    }
+                }
+
                 Headers headers = mHeaders;
                 int responseCode = code();
                 if ((responseCode == HttpURLConnection.HTTP_MOVED_PERM || responseCode == HttpURLConnection.HTTP_MOVED_TEMP || responseCode == 307) && request.getFollowRedirect()) {
@@ -372,7 +391,7 @@ public void setDataEmitter(DataEmitter emitter) {
                     copyHeader(request, newReq, "Range");
                     request.logi("Redirecting");
                     newReq.logi("Redirected");
-                    execute(newReq, redirectCount + 1, cancel, callback);
+                    mServer.post(() -> execute(newReq, redirectCount + 1, cancel, callback));
 
                     setDataCallback(new NullDataCallback());
                     return;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
index 48be20947..a940cf5b3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClientMiddleware.java
@@ -13,51 +13,54 @@
  * inspect, manipulate, and handle http requests.
  */
 public interface AsyncHttpClientMiddleware {
-    public interface ResponseHead  {
-        public AsyncSocket socket();
-        public String protocol();
-        public String message();
-        public int code();
-        public ResponseHead protocol(String protocol);
-        public ResponseHead message(String message);
-        public ResponseHead code(int code);
-        public Headers headers();
-        public ResponseHead headers(Headers headers);
-        public DataSink sink();
-        public ResponseHead sink(DataSink sink);
-        public DataEmitter emitter();
-        public ResponseHead emitter(DataEmitter emitter);
+    interface ResponseHead  {
+        AsyncSocket socket();
+        String protocol();
+        String message();
+        int code();
+        ResponseHead protocol(String protocol);
+        ResponseHead message(String message);
+        ResponseHead code(int code);
+        Headers headers();
+        ResponseHead headers(Headers headers);
+        DataSink sink();
+        ResponseHead sink(DataSink sink);
+        DataEmitter emitter();
+        ResponseHead emitter(DataEmitter emitter);
     }
 
-    public static class OnRequestData {
+    class OnRequestData {
         public UntypedHashtable state = new UntypedHashtable();
         public AsyncHttpRequest request;
     }
 
-    public static class GetSocketData extends OnRequestData {
+    class GetSocketData extends OnRequestData {
         public ConnectCallback connectCallback;
         public Cancellable socketCancellable;
         public String protocol;
     }
 
-    public static class OnExchangeHeaderData extends GetSocketData {
+    class OnExchangeHeaderData extends GetSocketData {
         public AsyncSocket socket;
         public ResponseHead response;
         public CompletedCallback sendHeadersCallback;
         public CompletedCallback receiveHeadersCallback;
     }
 
-    public static class OnRequestSentData extends OnExchangeHeaderData {
+    class OnRequestSentData extends OnExchangeHeaderData {
     }
 
-    public static class OnHeadersReceivedDataOnRequestSentData extends OnRequestSentData {
+    class OnHeadersReceivedData extends OnRequestSentData {
     }
 
-    public static class OnBodyDataOnRequestSentData extends OnHeadersReceivedDataOnRequestSentData {
+    class OnBodyDecoderData extends OnHeadersReceivedData {
         public DataEmitter bodyEmitter;
     }
 
-    public static class OnResponseCompleteDataOnRequestSentData extends OnBodyDataOnRequestSentData {
+    class OnResponseReadyData extends OnBodyDecoderData {
+    }
+
+    class OnResponseCompleteData extends OnResponseReadyData {
         public Exception exception;
     }
 
@@ -65,14 +68,14 @@ public static class OnResponseCompleteDataOnRequestSentData extends OnBodyDataOn
      * Called immediately upon request execution
      * @param data
      */
-    public void onRequest(OnRequestData data);
+    void onRequest(OnRequestData data);
 
     /**
      * Called to retrieve the socket that will fulfill this request
      * @param data
      * @return
      */
-    public Cancellable getSocket(GetSocketData data);
+    Cancellable getSocket(GetSocketData data);
 
     /**
      * Called before when the headers are sent and received via the socket.
@@ -80,31 +83,40 @@ public static class OnResponseCompleteDataOnRequestSentData extends OnBodyDataOn
      * @param data
      * @return
      */
-    public boolean exchangeHeaders(OnExchangeHeaderData data);
+    boolean exchangeHeaders(OnExchangeHeaderData data);
 
     /**
      * Called once the headers and any optional request body has
      * been sent
      * @param data
      */
-    public void onRequestSent(OnRequestSentData data);
+    void onRequestSent(OnRequestSentData data);
 
     /**
      * Called once the headers have been received via the socket
      * @param data
      */
-    public void onHeadersReceived(OnHeadersReceivedDataOnRequestSentData data);
+    void onHeadersReceived(OnHeadersReceivedData data);
 
     /**
      * Called before the body is decoded
      * @param data
      */
-    public void onBodyDecoder(OnBodyDataOnRequestSentData data);
+    void onBodyDecoder(OnBodyDecoderData data);
+
+    /**
+     * Called before the response is returned to the client. Return a new AsyncHttpRequest
+     * to end the current request and start a new one. Can be used to implement redirect strategies
+     * or multileg authentication, such as digest.
+     * @param data
+     * @return
+     */
+    AsyncHttpRequest onResponseReady(OnResponseReadyData data);
 
     /**
      * Called once the request is complete and response has been received,
      * or if an error occurred
      * @param data
      */
-    public void onResponseComplete(OnResponseCompleteDataOnRequestSentData data);
+    void onResponseComplete(OnResponseCompleteData data);
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index 3461b23c7..81fe1e4a6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -9,9 +9,7 @@
 import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.future.Cancellable;
-import com.koushikdutta.async.future.FailCallback;
 import com.koushikdutta.async.future.Future;
-import com.koushikdutta.async.future.FutureCallback;
 import com.koushikdutta.async.future.Futures;
 import com.koushikdutta.async.future.SimpleCancellable;
 import com.koushikdutta.async.future.SimpleFuture;
@@ -322,12 +320,12 @@ private void nextConnection(AsyncHttpRequest request) {
         }
     }
 
-    protected boolean isKeepAlive(OnResponseCompleteDataOnRequestSentData data) {
+    protected boolean isKeepAlive(OnResponseCompleteData data) {
         return HttpUtil.isKeepAlive(data.response.protocol(), data.response.headers()) && HttpUtil.isKeepAlive(Protocol.HTTP_1_1, data.request.getHeaders());
     }
 
     @Override
-    public void onResponseComplete(final OnResponseCompleteDataOnRequestSentData data) {
+    public void onResponseComplete(final OnResponseCompleteData data) {
         if (data.state.get("socket-owner") != this)
             return;
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java
index 8b2998ae8..575064c99 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/SimpleMiddleware.java
@@ -22,14 +22,19 @@ public void onRequestSent(OnRequestSentData data) {
     }
 
     @Override
-    public void onHeadersReceived(OnHeadersReceivedDataOnRequestSentData data) {
+    public void onHeadersReceived(OnHeadersReceivedData data) {
     }
 
     @Override
-    public void onBodyDecoder(OnBodyDataOnRequestSentData data) {
+    public void onBodyDecoder(OnBodyDecoderData data) {
     }
 
     @Override
-    public void onResponseComplete(OnResponseCompleteDataOnRequestSentData data) {
+    public AsyncHttpRequest onResponseReady(OnResponseReadyData data) {
+        return null;
+    }
+
+    @Override
+    public void onResponseComplete(OnResponseCompleteData data) {
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index 22f4c9533..80c8908f3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -222,7 +222,7 @@ public int getCacheStoreCount() {
     // step 2) if this is a conditional cache request, serve it from the cache if necessary
     // otherwise, see if it is cacheable
     @Override
-    public void onBodyDecoder(OnBodyDataOnRequestSentData data) {
+    public void onBodyDecoder(OnBodyDecoderData data) {
         CachedSocket cached = com.koushikdutta.async.Util.getWrappedSocket(data.socket, CachedSocket.class);
         if (cached != null) {
             data.response.headers().set(SERVED_FROM, CACHE);
@@ -301,7 +301,7 @@ public void onBodyDecoder(OnBodyDataOnRequestSentData data) {
 
     // step 3: close up shop
     @Override
-    public void onResponseComplete(OnResponseCompleteDataOnRequestSentData data) {
+    public void onResponseComplete(OnResponseCompleteData data) {
         CacheData cacheData = data.state.get("cache-data");
         if (cacheData != null && cacheData.snapshot != null)
             StreamUtility.closeQuietly(cacheData.snapshot);

From d0175e0a55d0e1ade65f5b4b7ec94c492fed7874 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 4 Jul 2019 15:12:21 -0700
Subject: [PATCH 354/399] clean up buffered data sink.

---
 .../koushikdutta/async/BufferedDataSink.java  | 20 ++++++++++++++-----
 .../koushikdutta/async/FilteredDataSink.java  | 13 +++++-------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
index c14d0b1f7..7c510bd61 100644
--- a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
@@ -13,6 +13,12 @@ public boolean isBuffering() {
         return mPendingWrites.hasRemaining() || forceBuffering;
     }
 
+    public boolean isWritable() {
+        synchronized (mPendingWrites) {
+            return mPendingWrites.remaining() < mMaxBuffer;
+        }
+    }
+
     public DataSink getDataSink() {
         return mDataSink;
     }
@@ -49,22 +55,26 @@ private void writePending() {
     
     final ByteBufferList mPendingWrites = new ByteBufferList();
 
-    @Override
-    public void write(ByteBufferList bb) {
-        write(bb, false);
+    // before the data is queued, let inheritors know. allows for filters, without
+    // issues with having to filter before writing which may fail in the buffer.
+    protected void onDataAccepted(ByteBufferList bb) {
     }
 
-    protected void write(final ByteBufferList bb, final boolean ignoreBuffer) {
+    @Override
+    public void write(final ByteBufferList bb) {
         if (getServer().getAffinity() != Thread.currentThread()) {
             synchronized (mPendingWrites) {
-                if (mPendingWrites.remaining() >= mMaxBuffer && !ignoreBuffer)
+                if (mPendingWrites.remaining() >= mMaxBuffer)
                     return;
+                onDataAccepted(bb);
                 bb.get(mPendingWrites);
             }
             getServer().post(this::writePending);
             return;
         }
 
+        onDataAccepted(bb);
+
         if (!isBuffering())
             mDataSink.write(bb);
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/FilteredDataSink.java b/AndroidAsync/src/com/koushikdutta/async/FilteredDataSink.java
index 8aa1806c2..0307cdc07 100644
--- a/AndroidAsync/src/com/koushikdutta/async/FilteredDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/FilteredDataSink.java
@@ -11,15 +11,12 @@ public ByteBufferList filter(ByteBufferList bb) {
     }
 
     @Override
-    public final void write(ByteBufferList bb) {
-        // don't filter and write if currently buffering, unless we know
-        // that the buffer can fit the entirety of the filtered result
-        if (isBuffering() && getMaxBuffer() != Integer.MAX_VALUE)
-            return;
+    protected void onDataAccepted(ByteBufferList bb) {
         ByteBufferList filtered = filter(bb);
-        assert bb == null || filtered == bb || bb.isEmpty();
-        super.write(filtered, true);
-        if (bb != null)
+        // filtering may return the same byte buffer, so watch for that.
+        if (filtered != bb) {
             bb.recycle();
+            filtered.get(bb);
+        }
     }
 }

From 336b0813709242375b7a53cf83c583b140220567 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 4 Jul 2019 18:47:41 -0700
Subject: [PATCH 355/399] modernize to lambdas fix bug in sendbody where
 chunked output never ended.

---
 .../server/AsyncHttpServerResponseImpl.java   | 103 +++++++-----------
 1 file changed, 41 insertions(+), 62 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index 0a78291fd..95a80fe30 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -113,40 +113,34 @@ void initFirstWrite() {
         String statusLine = String.format(Locale.ENGLISH, "%s %s %s", httpVersion, code, AsyncHttpServer.getResponseCodeDescription(code));
         String rh = mRawHeaders.toPrefixString(statusLine);
 
-        Util.writeAll(mSocket, rh.getBytes(), new CompletedCallback() {
-            @Override
-            public void onCompleted(Exception ex) {
-                if (ex != null) {
-                    report(ex);
-                    return;
-                }
-                if (isChunked) {
-                    ChunkedOutputFilter chunked = new ChunkedOutputFilter(mSocket);
-                    chunked.setMaxBuffer(0);
-                    mSink = chunked;
-                }
-                else {
-                    mSink = mSocket;
-                }
-
-                mSink.setClosedCallback(closedCallback);
-                closedCallback = null;
-                mSink.setWriteableCallback(writable);
-                writable = null;
-                if (ended) {
-                    // the response ended while headers were written
-                    end();
-                    return;
-                }
-                getServer().post(new Runnable() {
-                    @Override
-                    public void run() {
-                        WritableCallback wb = getWriteableCallback();
-                        if (wb != null)
-                            wb.onWriteable();
-                    }
-                });
+        Util.writeAll(mSocket, rh.getBytes(), ex -> {
+            if (ex != null) {
+                report(ex);
+                return;
+            }
+            if (isChunked) {
+                ChunkedOutputFilter chunked = new ChunkedOutputFilter(mSocket);
+                chunked.setMaxBuffer(0);
+                mSink = chunked;
+            }
+            else {
+                mSink = mSocket;
+            }
+
+            mSink.setClosedCallback(closedCallback);
+            closedCallback = null;
+            mSink.setWriteableCallback(writable);
+            writable = null;
+            if (ended) {
+                // the response ended while headers were written
+                end();
+                return;
             }
+            getServer().post(() -> {
+                WritableCallback wb = getWriteableCallback();
+                if (wb != null)
+                    wb.onWriteable();
+            });
         });
     }
 
@@ -183,9 +177,8 @@ public void end() {
             mRawHeaders.remove("Transfer-Encoding");
         }
         if (mSink instanceof ChunkedOutputFilter) {
-            ((ChunkedOutputFilter)mSink).setMaxBuffer(Integer.MAX_VALUE);
-            mSink.write(new ByteBufferList());
-            onEnd();
+            // this filter won't close the socket underneath.
+            mSink.end();
         }
         else if (!headWritten) {
             if (!mRequest.getMethod().equalsIgnoreCase(AsyncHttpHead.METHOD))
@@ -218,7 +211,7 @@ public void send(final String contentType, final byte[] bytes) {
     @Override
     public <T> void sendBody(AsyncParser<T> body, T value) {
         mRawHeaders.set("Content-Type", body.getMime());
-        body.write(this, value, ex -> onEnd());
+        body.write(this, value, ex -> end());
     }
 
     @Override
@@ -234,12 +227,7 @@ public void send(String contentType, ByteBufferList bb) {
             if (contentType != null)
                 mRawHeaders.set("Content-Type", contentType);
 
-            Util.writeAll(AsyncHttpServerResponseImpl.this, bb, new CompletedCallback() {
-                @Override
-                public void onCompleted(Exception ex) {
-                    onEnd();
-                }
-            });
+            Util.writeAll(AsyncHttpServerResponseImpl.this, bb, ex -> onEnd());
         });
     }
 
@@ -332,18 +320,12 @@ public void sendStream(final InputStream inputStream, long totalLength) {
                 onEnd();
                 return;
             }
-            getServer().post(new Runnable() {
-                @Override
-                public void run() {
-                    Util.pump(inputStream, mContentLength, AsyncHttpServerResponseImpl.this, new CompletedCallback() {
-                        @Override
-                        public void onCompleted(Exception ex) {
-                            StreamUtility.closeQuietly(inputStream);
-                            onEnd();
-                        }
-                    });
-                }
-            });
+            getServer().post(() ->
+                    Util.pump(inputStream, mContentLength, AsyncHttpServerResponseImpl.this,
+                            ex -> {
+                                StreamUtility.closeQuietly(inputStream);
+                                onEnd();
+                            }));
         }
         catch (Exception e) {
             code(500);
@@ -374,13 +356,10 @@ public void proxy(final AsyncHttpResponse remoteResponse) {
         getHeaders().addAll(remoteResponse.headers());
         // TODO: remove?
         remoteResponse.headers().set("Connection", "close");
-        Util.pump(remoteResponse, this, new CompletedCallback() {
-            @Override
-            public void onCompleted(Exception ex) {
-                remoteResponse.setEndCallback(new NullCompletedCallback());
-                remoteResponse.setDataCallback(new DataCallback.NullDataCallback());
-                end();
-            }
+        Util.pump(remoteResponse, this, ex -> {
+            remoteResponse.setEndCallback(new NullCompletedCallback());
+            remoteResponse.setDataCallback(new DataCallback.NullDataCallback());
+            end();
         });
     }
 

From 116eadf27bfaa8e5057f03c032d70c710c04494f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 13 Jul 2019 19:05:56 -0700
Subject: [PATCH 356/399] cleanup futures, fix callback clobbering in
 multifuture.

---
 .../async/future/MultiFuture.java             | 44 ++++++-------
 .../async/future/SimpleFuture.java            | 63 ++++++-------------
 .../koushikdutta/async/test/FutureTests.java  | 17 +++++
 .../async/test/WebSocketTests.java            |  2 +-
 4 files changed, 56 insertions(+), 70 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/MultiFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/MultiFuture.java
index c226d1167..486bc885e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/MultiFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/MultiFuture.java
@@ -6,7 +6,7 @@
  * Created by koush on 2/25/14.
  */
 public class MultiFuture<T> extends SimpleFuture<T> {
-    ArrayList<FutureCallback<T>> callbacks;
+    private ArrayList<FutureCallbackInternal<T>> internalCallbacks;
 
     public MultiFuture() {
     }
@@ -23,29 +23,28 @@ public MultiFuture(Future<T> future) {
         super(future);
     }
 
-    final FutureCallback<T> callback = new FutureCallback<T>() {
-        @Override
-        public void onCompleted(Exception e, T result) {
-            ArrayList<FutureCallback<T>> callbacks;
-            synchronized (MultiFuture.this) {
-                callbacks = MultiFuture.this.callbacks;
-                MultiFuture.this.callbacks = null;
-            }
+    private final FutureCallbackInternal<T> internalCallback = (e, result, callsite) -> {
+        ArrayList<FutureCallbackInternal<T>> callbacks;
+        synchronized (MultiFuture.this) {
+            callbacks = MultiFuture.this.internalCallbacks;
+            MultiFuture.this.internalCallbacks = null;
+        }
 
-            if (callbacks == null)
-                return;
-            for (FutureCallback<T> cb: callbacks) {
-                cb.onCompleted(e, result);
-            }
+        if (callbacks == null)
+            return;
+        for (FutureCallbackInternal<T> cb : callbacks) {
+            cb.onCompleted(e, result, callsite);
         }
     };
 
     @Override
-    public void setCallback(FutureCallback<T> callback) {
+    protected void setCallbackInternal(FutureCallsite callsite, FutureCallbackInternal<T> internalCallback) {
         synchronized (this) {
-            if (callbacks == null)
-                callbacks = new ArrayList<FutureCallback<T>>();
-            callbacks.add(callback);
+            if (internalCallback != null) {
+                if (internalCallbacks == null)
+                    internalCallbacks = new ArrayList<>();
+                internalCallbacks.add(internalCallback);
+            }
         }
         // so, there is a race condition where this internal callback could get
         // executed twice, if two callbacks are added at the same time.
@@ -59,14 +58,7 @@ public void setCallback(FutureCallback<T> callback) {
         // 2-ADD
         // 1-INVOKE LIST
         // 2-INVOKE NULL
-        super.setCallback(this.callback);
-    }
 
-    public void removeCallback(FutureCallback<T> callback) {
-        synchronized (this) {
-            if (callbacks == null)
-                return;
-            callbacks.remove(callback);
-        }
+        super.setCallbackInternal(callsite, this.internalCallback);
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
index c2fe81b85..45e05abf8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -11,11 +11,10 @@ public class SimpleFuture<T> extends SimpleCancellable implements DependentFutur
     private AsyncSemaphore waiter;
     private Exception exception;
     private T result;
-    boolean silent;
-    private FutureCallback<T> callback;
-    private FutureCallbackInternal internalCallback;
+    private boolean silent;
+    private FutureCallbackInternal<T> internalCallback;
 
-    private interface FutureCallbackInternal<T> {
+    protected interface FutureCallbackInternal<T> {
         void onCompleted(Exception e, T result, FutureCallsite next);
     }
 
@@ -43,16 +42,14 @@ private boolean cancelInternal(boolean silent) {
         if (!super.cancel())
             return false;
         // still need to release any pending waiters
-        FutureCallback<T> callback;
         FutureCallbackInternal<T> internalCallback;
         synchronized (this) {
             exception = new CancellationException();
             releaseWaiterLocked();
-            callback = handleCompleteLocked();
             internalCallback = handleInternalCompleteLocked();
             this.silent = silent;
         }
-        handleCallbackUnlocked(null, callback, internalCallback);
+        handleCallbackUnlocked(null, internalCallback);
         return true;
     }
 
@@ -101,18 +98,6 @@ public boolean setComplete() {
         return setComplete((T)null);
     }
 
-    private FutureCallback<T> handleCompleteLocked() {
-        // don't execute the callback inside the sync block... possible hangup
-        // read the callback value, and then call it outside the block.
-        // can't simply call this.callback.onCompleted directly outside the block,
-        // because that may result in a race condition where the callback changes once leaving
-        // the block.
-        FutureCallback<T> callback = this.callback;
-        // null out members to allow garbage collection
-        this.callback = null;
-        return callback;
-    }
-
     private FutureCallbackInternal<T> handleInternalCompleteLocked() {
         // don't execute the callback inside the sync block... possible hangup
         // read the callback value, and then call it outside the block.
@@ -121,7 +106,7 @@ private FutureCallbackInternal<T> handleInternalCompleteLocked() {
         // the block.
         FutureCallbackInternal<T> callback = this.internalCallback;
         // null out members to allow garbage collection
-        this.callback = null;
+        this.internalCallback = null;
         return callback;
     }
 
@@ -147,13 +132,9 @@ void loop() {
         }
     }
 
-    private void handleCallbackUnlocked(FutureCallsite callsite, FutureCallback<T> callback, FutureCallbackInternal<T> internalCallback) {
+    private void handleCallbackUnlocked(FutureCallsite callsite, FutureCallbackInternal<T> internalCallback) {
         if (silent)
             return;
-        if (callback != null) {
-            callback.onCompleted(exception, result);
-            return;
-        }
 
         if (internalCallback == null)
             return;
@@ -198,39 +179,34 @@ public boolean setComplete(Exception e, T value) {
     }
 
     private boolean setComplete(Exception e, T value, FutureCallsite callsite) {
-        FutureCallback<T> callback;
-        FutureCallbackInternal internalCallback;
+        FutureCallbackInternal<T> internalCallback;
         synchronized (this) {
             if (!super.setComplete())
                 return false;
             result = value;
             exception = e;
             releaseWaiterLocked();
-            callback = handleCompleteLocked();
             internalCallback = handleInternalCompleteLocked();
         }
-        handleCallbackUnlocked(callsite, callback, internalCallback);
+        handleCallbackUnlocked(callsite, internalCallback);
         return true;
     }
 
-    private void setCallbackInternal(FutureCallsite callsite, FutureCallback<T> callback, FutureCallbackInternal<T> internalCallback) {
+    void setCallbackInternal(FutureCallsite callsite, FutureCallbackInternal<T> internalCallback) {
         // callback can only be changed or read/used inside a sync block
         synchronized (this) {
-            // done or cancelled,
-            this.callback = callback;
             this.internalCallback = internalCallback;
             if (!isDone() && !isCancelled())
                 return;
 
-            callback = handleCompleteLocked();
             internalCallback = handleInternalCompleteLocked();
         }
-        handleCallbackUnlocked(callsite, callback, internalCallback);
+        handleCallbackUnlocked(callsite, internalCallback);
     }
 
     @Override
     public void setCallback(FutureCallback<T> callback) {
-        setCallbackInternal(null, callback, null);
+        setCallbackInternal(null, (e, result, next) -> callback.onCompleted(e, result));
     }
 
     private Future<T> setComplete(Future<T> future, FutureCallsite callsite) {
@@ -238,7 +214,7 @@ private Future<T> setComplete(Future<T> future, FutureCallsite callsite) {
 
         SimpleFuture<T> ret = new SimpleFuture<>();
         if (future instanceof SimpleFuture) {
-            ((SimpleFuture<T>)future).setCallbackInternal(callsite, null,
+            ((SimpleFuture<T>)future).setCallbackInternal(callsite,
                     (e, result, next) ->
                             ret.setComplete(SimpleFuture.this.setComplete(e, result, next) ? null : new CancellationException(), result, next));
         }
@@ -259,20 +235,21 @@ public Future<T> setComplete(Future<T> future) {
         return setComplete(future, null);
     }
 
+
     /**
      * THIS METHOD IS FOR TEST USE ONLY
      * @return
      */
     @Deprecated
-    public FutureCallback<T> getCallback() {
-        return callback;
+    public Object getCallback() {
+        return internalCallback;
     }
 
     @Override
     public Future<T> done(DoneCallback<T> done) {
         final SimpleFuture<T> ret = new SimpleFuture<>();
         ret.setParent(this);
-        setCallbackInternal(null, null, (e, result, next) -> {
+        setCallbackInternal(null, (e, result, next) -> {
             if (e == null) {
                 try {
                     done.done(e, result);
@@ -293,7 +270,7 @@ public Future<T> done(DoneCallback<T> done) {
     public Future<T> success(SuccessCallback<T> callback) {
         final SimpleFuture<T> ret = new SimpleFuture<>();
         ret.setParent(this);
-        setCallbackInternal(null, null, (e, result, next) -> {
+        setCallbackInternal(null, (e, result, next) -> {
             if (e == null) {
                 try {
                     callback.success(result);
@@ -314,7 +291,7 @@ public Future<T> success(SuccessCallback<T> callback) {
     public <R> Future<R> then(ThenFutureCallback<R, T> then) {
         final SimpleFuture<R> ret = new SimpleFuture<>();
         ret.setParent(this);
-        setCallbackInternal(null, null, (e, result, next) -> {
+        setCallbackInternal(null, (e, result, next) -> {
             if (e != null) {
                 ret.setComplete(e, null, next);
                 return;
@@ -350,7 +327,7 @@ public Future<T> fail(FailCallback fail) {
     public Future<T> failRecover(FailRecoverCallback<T> fail) {
         SimpleFuture<T> ret = new SimpleFuture<>();
         ret.setParent(this);
-        setCallbackInternal(null, null, (e, result, next) -> {
+        setCallbackInternal(null, (e, result, next) -> {
             if (e == null) {
                 ret.setComplete(e, result, next);
                 return;
@@ -388,7 +365,7 @@ public SimpleFuture<T> reset() {
         result = null;
         exception = null;
         waiter = null;
-        callback = null;
+        internalCallback = null;
         silent = false;
 
         return this;
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java
index 966972325..f73715bd4 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/FutureTests.java
@@ -9,7 +9,9 @@
 import com.koushikdutta.async.callback.ContinuationCallback;
 import com.koushikdutta.async.future.Continuation;
 import com.koushikdutta.async.future.FutureCallback;
+import com.koushikdutta.async.future.MultiFuture;
 import com.koushikdutta.async.future.SimpleFuture;
+import com.koushikdutta.async.future.SuccessCallback;
 import com.koushikdutta.async.future.ThenCallback;
 
 import junit.framework.TestCase;
@@ -59,6 +61,16 @@ public Integer then(Integer from) {
         foo.setComplete(3);
     }
 
+    int sum = 0;
+    @Test
+    public void multifutureTest() throws Exception {
+        MultiFuture<Integer> foo = new MultiFuture<>();
+        foo.success(value -> sum += value + 10);
+        foo.success(value -> sum += value + 20);
+        foo.setComplete(1);
+        assertEquals(sum, 32);
+    }
+
     private static class IntegerFuture extends SimpleFuture<Integer> {
         private IntegerFuture() {
         }
@@ -401,6 +413,11 @@ public void run() {
 
     @Test
     public void testReentrancy() throws Exception {
+        if (true) {
+            // disabled cause test framework no longer has a looper
+            return;
+        }
+
         // verify reentrancy will work
         
         assertNotNull(Looper.myLooper());
diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
index b7d722c83..191034f8c 100644
--- a/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
+++ b/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java
@@ -53,7 +53,7 @@ public void onStringAvailable(String s) {
     public void testWebSocket() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
 
-        AsyncHttpClient.getDefaultInstance().websocket("http://localhost:5000/ws", null, new WebSocketConnectCallback() {
+        AsyncHttpClient.getDefaultInstance().websocket("http://localhost:5000/ws", (String)null, new WebSocketConnectCallback() {
             @Override
             public void onCompleted(Exception ex, WebSocket webSocket) {
                 webSocket.send("hello");

From 1e8237c284bfb431c310b1aebf560e90b5acf098 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 16 Jul 2019 18:13:44 -0700
Subject: [PATCH 357/399] fixup null callback

---
 .../src/com/koushikdutta/async/future/SimpleFuture.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
index 45e05abf8..4826fa55d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -206,7 +206,10 @@ void setCallbackInternal(FutureCallsite callsite, FutureCallbackInternal<T> inte
 
     @Override
     public void setCallback(FutureCallback<T> callback) {
-        setCallbackInternal(null, (e, result, next) -> callback.onCompleted(e, result));
+        if (callback == null)
+            setCallbackInternal(null, null);
+        else
+            setCallbackInternal(null, (e, result, next) -> callback.onCompleted(e, result));
     }
 
     private Future<T> setComplete(Future<T> future, FutureCallsite callsite) {

From 41544ae8f5cc985ad7f36a5fdbb057c5a254df96 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 7 Aug 2019 10:11:27 -0700
Subject: [PATCH 358/399] assertion around unexpected behavior

---
 AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
index bf7437008..a3073888e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
@@ -98,6 +98,9 @@ else if (server) {
             emitter = ender;
             return emitter;
         }
+        else {
+            throw new AssertionError();
+        }
 
         if ("gzip".equals(headers.get("Content-Encoding"))) {
             GZIPInputFilter gunzipper = new GZIPInputFilter();

From b088827a3d64ed74e933a6f5345f8c061554d47f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 7 Aug 2019 10:11:39 -0700
Subject: [PATCH 359/399] Revert "assertion around unexpected behavior"

This reverts commit 41544ae8f5cc985ad7f36a5fdbb057c5a254df96.
---
 AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
index a3073888e..bf7437008 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HttpUtil.java
@@ -98,9 +98,6 @@ else if (server) {
             emitter = ender;
             return emitter;
         }
-        else {
-            throw new AssertionError();
-        }
 
         if ("gzip".equals(headers.get("Content-Encoding"))) {
             GZIPInputFilter gunzipper = new GZIPInputFilter();

From 21df3c3bf0b7841cdb5a84f4b7e66eb817971c58 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 20 Aug 2019 11:02:04 -0700
Subject: [PATCH 360/399] remove old junk

---
 AndroidAsyncStetho/.classpath                 |   9 -
 AndroidAsyncStetho/.project                   |  33 ---
 AndroidAsyncStetho/AndroidManifest.xml        |  11 -
 AndroidAsyncStetho/README.md                  |  31 ---
 AndroidAsyncStetho/build.gradle               |  35 ---
 AndroidAsyncStetho/res/.gitignore             |   0
 .../stetho/NetworkEventReporterWrapper.java   | 160 --------------
 .../async/stetho/StethoMiddleware.java        | 200 ------------------
 desksms.png                                   | Bin 54601 -> 0 bytes
 rommanager.png                                | Bin 125242 -> 0 bytes
 tether.png                                    | Bin 40404 -> 0 bytes
 11 files changed, 479 deletions(-)
 delete mode 100644 AndroidAsyncStetho/.classpath
 delete mode 100644 AndroidAsyncStetho/.project
 delete mode 100644 AndroidAsyncStetho/AndroidManifest.xml
 delete mode 100644 AndroidAsyncStetho/README.md
 delete mode 100644 AndroidAsyncStetho/build.gradle
 delete mode 100644 AndroidAsyncStetho/res/.gitignore
 delete mode 100644 AndroidAsyncStetho/src/com/koushikdutta/async/stetho/NetworkEventReporterWrapper.java
 delete mode 100644 AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java
 delete mode 100644 desksms.png
 delete mode 100644 rommanager.png
 delete mode 100644 tether.png

diff --git a/AndroidAsyncStetho/.classpath b/AndroidAsyncStetho/.classpath
deleted file mode 100644
index 51769745b..000000000
--- a/AndroidAsyncStetho/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/AndroidAsyncStetho/.project b/AndroidAsyncStetho/.project
deleted file mode 100644
index 4e6d9d160..000000000
--- a/AndroidAsyncStetho/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>AndroidAsync</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/AndroidAsyncStetho/AndroidManifest.xml b/AndroidAsyncStetho/AndroidManifest.xml
deleted file mode 100644
index 2146fce91..000000000
--- a/AndroidAsyncStetho/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.koushikdutta.async.stetho"
-    android:versionCode="208"
-    android:versionName="2.0.8">
-
-    <uses-permission android:name="android.permission.INTERNET"/>
-
-    <application>
-    </application>
-
-</manifest>
diff --git a/AndroidAsyncStetho/README.md b/AndroidAsyncStetho/README.md
deleted file mode 100644
index d52d7954f..000000000
--- a/AndroidAsyncStetho/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# AndroidAsync and Ion Stetho support
-
-[Stetho](https://github.com/facebook/stetho) is a tool that lets you log and view your network requests and more on Android.
-
-### Using Stetho with Ion
-
-```java
-// typical initialization of Stetho
-Stetho.initialize(
-Stetho.newInitializerBuilder(this)
-.enableDumpapp(Stetho.defaultDumperPluginsProvider(this))
-.enableWebKitInspector(Stetho.defaultInspectorModulesProvider(this))
-.build());
-
-Ion.getDefault(this).getHttpClient().getMiddleware()
-.add(new StethoMiddleware());
-```
-
-### Using Stetho with AndroidAsync
-
-```java
-// typical initialization of Stetho
-Stetho.initialize(
-Stetho.newInitializerBuilder(this)
-.enableDumpapp(Stetho.defaultDumperPluginsProvider(this))
-.enableWebKitInspector(Stetho.defaultInspectorModulesProvider(this))
-.build());
-
-AsyncHttpClient.getDefaultInstance().getMiddleware()
-.add(new StethoMiddleware());
-```
diff --git a/AndroidAsyncStetho/build.gradle b/AndroidAsyncStetho/build.gradle
deleted file mode 100644
index 3c6565c21..000000000
--- a/AndroidAsyncStetho/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-apply plugin: 'com.android.library'
-
-dependencies {
-    compile project(':AndroidAsync')
-    compile "com.facebook.stetho:stetho:1.0.0"
-}
-
-android {
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java {
-                srcDir 'src/'
-            }
-        }
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-
-    defaultConfig {
-        targetSdkVersion 22
-        minSdkVersion 9
-    }
-
-    compileSdkVersion project.hasProperty('global_compileSdkVersion') ? global_compileSdkVersion : 25
-    buildToolsVersion project.hasProperty('global_buildToolsVersion') ? global_buildToolsVersion : '25.0.2'
-
-}
-
-// upload to maven task
-if (System.getenv().I_AM_KOUSH == 'true') {
-  apply from: 'https://raw.githubusercontent.com/koush/mvn-repo/master/maven.gradle'
-}
diff --git a/AndroidAsyncStetho/res/.gitignore b/AndroidAsyncStetho/res/.gitignore
deleted file mode 100644
index e69de29bb..000000000
diff --git a/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/NetworkEventReporterWrapper.java b/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/NetworkEventReporterWrapper.java
deleted file mode 100644
index b826d36da..000000000
--- a/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/NetworkEventReporterWrapper.java
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-package com.koushikdutta.async.stetho;
-
-import android.util.Base64;
-import android.util.Base64OutputStream;
-
-import com.facebook.stetho.inspector.network.NetworkEventReporter;
-import com.facebook.stetho.inspector.network.NetworkPeerManager;
-import com.facebook.stetho.inspector.network.ResponseHandler;
-import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.DataEmitter;
-import com.koushikdutta.async.FilteredDataEmitter;
-import com.koushikdutta.async.util.StreamUtility;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.channels.Channels;
-import java.nio.channels.FileChannel;
-import java.nio.channels.WritableByteChannel;
-
-import javax.annotation.Nullable;
-
-/**
- * Implementation of {@link NetworkEventReporter} which allows callers to inform the Stetho
- * system of network traffic.  Callers can safely eagerly access this class and store a
- * reference if they wish.  When WebKit Inspector clients are connected, the internal
- * implementation will be automatically wired up to them.
- */
-class NetworkEventReporterWrapper implements NetworkEventReporter {
-    NetworkEventReporter wrapped = com.facebook.stetho.inspector.network.NetworkEventReporterImpl.get();
-
-    private static NetworkEventReporterWrapper instance;
-    public synchronized static NetworkEventReporterWrapper get() {
-        if (instance == null)
-            instance = new NetworkEventReporterWrapper();
-        return instance;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return wrapped.isEnabled();
-    }
-
-    @Override
-    public void requestWillBeSent(InspectorRequest inspectorRequest) {
-        wrapped.requestWillBeSent(inspectorRequest);
-    }
-
-    @Override
-    public void responseHeadersReceived(InspectorResponse inspectorResponse) {
-        wrapped.responseHeadersReceived(inspectorResponse);
-    }
-
-    @Override
-    public void httpExchangeFailed(String s, String s2) {
-        wrapped.httpExchangeFailed(s, s2);
-    }
-
-    @Nullable
-    @Override
-    public InputStream interpretResponseStream(
-    String requestId,
-    @Nullable String contentType,
-    @Nullable String contentEncoding,
-    @Nullable InputStream availableInputStream,
-    ResponseHandler responseHandler) {
-        return null;
-    }
-
-    @Nullable
-    private NetworkPeerManager getPeerManagerIfEnabled() {
-        NetworkPeerManager peerManager = NetworkPeerManager.getInstanceOrNull();
-        if (peerManager != null && peerManager.hasRegisteredPeers()) {
-            return peerManager;
-        }
-        return null;
-    }
-
-    public DataEmitter interpretResponseEmitter(final String requestId, @Nullable DataEmitter body, final boolean b64Encode) {
-        final NetworkPeerManager peerManager = getPeerManagerIfEnabled();
-        if (peerManager == null)
-            return null;
-
-        final WritableByteChannel channel;
-        try {
-            if (b64Encode) {
-                final Base64OutputStream b64out = new Base64OutputStream(peerManager.getResponseBodyFileManager().openResponseBodyFile(requestId, false), Base64.DEFAULT);
-                channel = Channels.newChannel(b64out);
-            }
-            else {
-                channel = ((FileOutputStream)peerManager.getResponseBodyFileManager().openResponseBodyFile(requestId, false)).getChannel();
-            }
-        }
-        catch (IOException e) {
-            return null;
-        }
-
-        FilteredDataEmitter ret = new FilteredDataEmitter() {
-            ByteBufferList pending = new ByteBufferList();
-
-            @Override
-            protected void report(Exception e) {
-                super.report(e);
-                StreamUtility.closeQuietly(channel);
-                if (e == null)
-                    responseReadFinished(requestId);
-                else
-                    responseReadFailed(requestId, e.toString());
-            }
-
-            @Override
-            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-                int amount = bb.remaining();
-                ByteBuffer[] original = bb.getAllArray();
-                ByteBuffer[] copy = new ByteBuffer[original.length];
-                for (int i = 0; i < original.length; i++) {
-                    copy[i] = original[i].duplicate();
-                }
-                try {
-                    for (ByteBuffer c: copy) {
-                        channel.write(c);
-                    }
-                }
-                catch (IOException ignored) {
-                    StreamUtility.closeQuietly(channel);
-                }
-                pending.addAll(original);
-                dataReceived(requestId, amount, amount);
-                super.onDataAvailable(emitter, pending);
-            }
-        };
-        ret.setDataEmitter(body);
-        return ret;
-    }
-
-
-    @Override
-    public void responseReadFailed(String s, String s2) {
-        wrapped.responseReadFailed(s, s2);
-    }
-
-    @Override
-    public void responseReadFinished(String s) {
-        wrapped.responseReadFinished(s);
-    }
-
-    @Override
-    public void dataSent(String s, int i, int i2) {
-        wrapped.dataSent(s, i, i2);
-    }
-
-    @Override
-    public void dataReceived(String s, int i, int i2) {
-        wrapped.dataReceived(s, i, i2);
-    }
-}
diff --git a/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java b/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java
deleted file mode 100644
index dfa50ac3d..000000000
--- a/AndroidAsyncStetho/src/com/koushikdutta/async/stetho/StethoMiddleware.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package com.koushikdutta.async.stetho;
-
-import com.facebook.stetho.inspector.network.NetworkEventReporter;
-import com.koushikdutta.async.DataEmitter;
-import com.koushikdutta.async.http.AsyncHttpRequest;
-import com.koushikdutta.async.http.BasicNameValuePair;
-import com.koushikdutta.async.http.NameValuePair;
-import com.koushikdutta.async.http.SimpleMiddleware;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.UUID;
-
-import javax.annotation.Nullable;
-
-/**
- * Created by koush on 2/18/15.
- */
-public class StethoMiddleware extends SimpleMiddleware {
-    private final NetworkEventReporterWrapper eventReporter = NetworkEventReporterWrapper.get();
-
-    private static class AsyncInspectorRequest implements NetworkEventReporter.InspectorRequest {
-        AsyncHttpRequest request;
-        String id = UUID.randomUUID().toString();
-        NameValuePair[] headers;
-        AsyncInspectorResponse response;
-
-        public AsyncInspectorRequest(AsyncHttpRequest request) {
-            this.request = request;
-            ArrayList<BasicNameValuePair> a = new ArrayList<>();
-            for (NameValuePair nvp : request.getHeaders().getMultiMap()) {
-                a.add(new BasicNameValuePair(nvp.getName(), nvp.getValue()));
-            }
-            headers = a.toArray(new BasicNameValuePair[a.size()]);
-        }
-
-        @Override
-        public String id() {
-            return id;
-        }
-
-        @Override
-        public String friendlyName() {
-            return request.getLogTag() != null ? request.getLogTag() : id;
-        }
-
-        @Nullable
-        @Override
-        public Integer friendlyNameExtra() {
-            return null;
-        }
-
-        @Override
-        public String url() {
-            return request.getUri().toString();
-        }
-
-        @Override
-        public String method() {
-            return request.getMethod();
-        }
-
-        @Nullable
-        @Override
-        public byte[] body() throws IOException {
-            return request.getBody() != null ? request.getBody().toString().getBytes("UTF-8") : null;
-        }
-
-        @Override
-        public int headerCount() {
-            return headers.length;
-        }
-
-        @Override
-        public String headerName(int i) {
-            return headers[i].getName();
-        }
-
-        @Override
-        public String headerValue(int i) {
-            return headers[i].getValue();
-        }
-
-        @Nullable
-        @Override
-        public String firstHeaderValue(String s) {
-            return request.getHeaders().get(s);
-        }
-    }
-
-    private static class AsyncInspectorResponse implements NetworkEventReporter.InspectorResponse {
-        ResponseHead head;
-        AsyncInspectorRequest request;
-        NameValuePair[] headers;
-
-        public AsyncInspectorResponse(ResponseHead head, AsyncInspectorRequest request) {
-            this.request = request;
-            this.head = head;
-            ArrayList<BasicNameValuePair> a = new ArrayList<>();
-            for (NameValuePair nvp : head.headers().getMultiMap()) {
-                a.add(new BasicNameValuePair(nvp.getName(), nvp.getValue()));
-            }
-            headers = a.toArray(new BasicNameValuePair[a.size()]);
-        }
-
-        @Override
-        public String requestId() {
-            return request.id();
-        }
-
-        @Override
-        public int statusCode() {
-            return head.code();
-        }
-
-        @Override
-        public String reasonPhrase() {
-            return head.message();
-        }
-
-        @Override
-        public boolean connectionReused() {
-            return false;
-        }
-
-        @Override
-        public int connectionId() {
-            return 0;
-        }
-
-        @Override
-        public boolean fromDiskCache() {
-            return false;
-        }
-
-        @Override
-        public String url() {
-            return request.url();
-        }
-
-        @Override
-        public int headerCount() {
-            return headers.length;
-        }
-
-        @Override
-        public String headerName(int i) {
-            return headers[i].getName();
-        }
-
-        @Override
-        public String headerValue(int i) {
-            return headers[i].getValue();
-        }
-
-        @Nullable
-        @Override
-        public String firstHeaderValue(String s) {
-            return head.headers().get(s);
-        }
-    }
-
-    @Override
-    public void onRequest(OnRequestData data) {
-        super.onRequest(data);
-
-        if (!data.request.getUri().getScheme().startsWith("http"))
-            return;
-
-        AsyncInspectorRequest inspect = new AsyncInspectorRequest(data.request);
-        data.state.put("inspect", inspect);
-        eventReporter.requestWillBeSent(inspect);
-    }
-
-    @Override
-    public void onHeadersReceived(OnHeadersReceivedDataOnRequestSentData data) {
-        super.onHeadersReceived(data);
-        AsyncInspectorRequest inspect = data.state.get("inspect");
-        if (inspect == null)
-            return;
-
-        inspect.response = new AsyncInspectorResponse(data.response, inspect);
-        eventReporter.responseHeadersReceived(inspect.response);
-    }
-
-    @Override
-    public void onBodyDecoder(OnBodyDataOnRequestSentData data) {
-        super.onBodyDecoder(data);
-
-        AsyncInspectorRequest inspect = data.state.get("inspect");
-        if (inspect == null)
-            return;
-
-        String ct = data.response.headers().get("Content-Type");
-        boolean isImage = ct != null && ct.startsWith("image/");
-        DataEmitter emitter = eventReporter.interpretResponseEmitter(inspect.id(), data.bodyEmitter, isImage);
-        if (emitter != null)
-            data.bodyEmitter = emitter;
-    }
-}
diff --git a/desksms.png b/desksms.png
deleted file mode 100644
index d8176218a5e9a3356980a617ac15c635c318062b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 54601
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%0DxuT{>3bwmZMSONYp7K!Re
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
LNkvXXu0mjf-+b<w

diff --git a/rommanager.png b/rommanager.png
deleted file mode 100644
index 5068da8907fd0a89716ae84ac293392792068c3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 125242
zcmdRW^;=Y3^zYE!-5}i{4Ff|+2$F(y2oj2PH%PZgN;gV}bT^2!(p^IjJv8_DzVG+m
zU+y1pFV6#K;_%Eqd#}CLC)Sxr4K+m^OiD};2!!)e>4g>uga|xD1fin>hYQc&x4;3z
zQAytg1i~Wv`-=cd&m;$dFxB77$!TcVIJi2v*f==Szm$`scXW2JdjHW91oB+SdTp)!
zdXH2RzH%X}5)qiB;-E!>POl{!9Y~zO!oh%nuN=XUH&3G3O&~9iOf{4nffN@P7(=4T
zg&l=ChqlF#9~WE@5%u$K-KW5IrVYL``dB|J1uZ|%svAe^LdQ-~63`S1#QrWzORyF^
z*f+4g#UmYr$>a#aN3VOw;PSwT0J`=EgE^mdp>==|Jg2eHL0zgDU3}ExPk8&XUyTp~
zLlC-L6GT<e1BpS>-f^<UAZZ1Jz^pWu*PvWvklBcZ`6ft%8)U{Burmz`%)0*Sg8(v2
zVjw}tO#smoSw_47*+_uO$KOQBgY@`7#8xVOVxT#05Z_B(D<x2MBdBW(AFCFGjt%0|
zj0j~1A^U*Lh8P(=K_Op3#0qD+;8V^@d?*JnQ(tSr%}iqQL5AquPH4KiJhW_MFUdHG
zh2J8+O_%2B@%l>fJV+34?fe%Al$$^TT<!UT=NN9~*qCr!1Fk9eekbbFGjsFJ$L;Yl
zM`;jf-PM2ck&CyEGEf3F(C#sx`54*81S{7K9&J^NCtVN9-CNK-cl<jy@_C<|=jXS#
zw&s-kWDVc`)b)F`?lJAsefW6e559+Au61lM1wA(oQbfL9>-lx@s)&003r2|f(oVeM
zeIwS>J<as9zL)0BdK|=?nuJbqFVbVqpBFugl>Nfq&ph??Zex|}4oPZN2vq$+3c)9V
z`<t-^(v=D;zMgB>1{?%BYjx=U&4!K?XcN3X?(qbJJSgTeg95EyesKbUOkObYX#cE(
z45EWTFLHx8s%5Ayy2-h^P^r67mb$U-&4fc_nfiKU@ntdJ1yVbkv6p|6WeXdvrr|K-
z{Vh!+*rjO`mgtDf)1%XbE9r=L`xZUBo2@Mf16gJWo#-vYLIi?&lpbRoI@#CIYldzm
zWWs1B`r!y-&1WhJLQ4EvQQGu6N;GGZ&WK{+MhYzn5<{TppYFrj6#0{aYBeQ)W7o?y
ze-oh$QOL)dc<0KW9#5K^G2#4!QZhz34?0n1gSQYbB{#^|wM&jB(D#v#XP{TMMwAO9
z(PE_LSvhvu0A=-?a-`PCON;Ru4`jk1`7R7$WDi;Tx3n@!dav}<=9IqCQ!@z?EMSOW
zAcbi5us%!trt*WOh2W---26FzxSkRh;|yUu5ih<^gj}Bp6Jey>bJph1h%ajjwWkQD
z6sGL8827loX9y}$GA0f$ytA!E6HDTv=Nt;%%G&DP64;{JVmLFz%rcjDD!hKZ!KU@|
zgEGZ7{<h#Ys%6@98J&W3t>tfd+5|%J2C@}-4O&&2;opb^-O|NIgGpbi6jkIWPgB~E
z*}&gd?Yg!QEGN^drB3KhjqEAzrtTtLcwpm%kpvG$ShG=NkfV`XQ+SY9rM)Vqn2x3x
z)aDc6KS+aq#rx`@qsP&};Y*V66Ej&knI)NugID`|X>sXFDVEN;&WLvWcaztCl?pln
zuQ$JA{7xy;Db3P2cun=%`n$xp@KWn<4%(1HfBlC@RQ=vpz3Os>nz=Qmn{5O1SQZp@
zo?HyJIAvjOK|*~jHKX&s?i{UY4>YaOlBM7C#N-5&1$67Q&XcSlXq#zH*O{(r7*Mv7
z)N}u+6=E3s20K-;;HzeSOC#ITl++ZxGNm%jGR1>-;mV_utm1b0R{gsmT$w>-RwGtL
z>-aI0Ea>a`*UKfCC8Vm7;+K^?rM5*>d95!zI_*o2)3Q5E0<&K^l&pBQLvN}5cptPM
z>~2dg6|wbD>#&(n7qQ34!Tmx`4qzJI!NpTeIpbbwxuUnpZ&TMp5}GH$1%DJ`74Tx-
z4;XDSZQ2dk4HU4TvM{iysP3yCr)#M;7qb^jypnh|IQnZee{|-nP=+M`>~m-aG-Ebn
zwb9JL(}1htTSJrO%i1l2V*TTWHv3QmG5sPv9RuS!g^H{S=9$)t))In}X0=4Mvg{e_
z-s;na;fC*x6xG{vsEd^ib`5@St<A}-8~ZDJj}zMy{aXBDA0*Lm!sl_zXbfolU4A$d
zi@y<HNgvBRhWPbgr0nrp>y6`&&k1Zc5RI_+z0Z1`F|BA#X5H)(d>#=Usq$%rCsm3k
zgKA)TsC`S>_0q|B-FxaXE2A!>=jhvF)v@sL`{VGXoL_=D?AiJPE)%^&a%-B~lMt+&
zWIo%~a({I>^&sndC?l^0Z-Q>cY;|LiM=AU*j7;iE$~k9KY7;E7@_a?#^p{9i<51&>
zdapyaY3Qn40OQlUC-0|8P)Q&&f;CcPkW7#v;@!2kFGFV>M10Zms&@WJCMLI8hD0X*
zQ^lw4?g|E*p~KG=3~*@LSi;zQ+)xew-I)orw>xj6d;PIlL&HOL!ys{v5qgx9{Ha17
zlS^_gt1oU}q`X+ku;y16tKwD`;*cuk`2b!JX%TFJ4DeX#|N5hsrT6lq3bhyyN2Rd+
z$Bxzeqx0~MtPQM9AF?#wA!A3cys@5(&=S(`JcL~0DblYZ)I^g`Wbiq@k;X8e5qU7j
zVS4q@^jJURofMvon3FT&pjA6l;!ySea+uI2<i*r4P{g&}9K!njbK5JNSIZgV*`(?2
z^mflB#oPIVza)Hik}YLWO>D5<x8AXGA1SvCt$pmbk8b3pO-38Gt@~V#qR)-lAX~hv
zZNN6mfmUm6scY3a8u?Q!r7W9s^ypXJ&&AIonXsIvBf=iS^)C%YVJf=ZG<rMj<sZaq
z!A@R_n42UhoMCTJ%fU@i4IFlV)XR=^Q!D-3S-e$kgG{=Ae(J7Ausy)i!Q2k@J6M`M
zGFI2))nBcDdmENTB}Eb$RY|-^mP!&Z$F}6TO%?9&v-9gx(vR<Dea-L2t){H@c2>Bv
z4RKRSQ+HBv?Q!N8e&DRW`Ehi4CBMj<I?A@#8r&e)T+j(_YO^dE9vhW_XcuZ<Xy0lJ
zA5SgUzn#6dpFF1WX}c0U{Ih7-27izm?pV}8&{6$k^~dt=<y{>dQW;sgcb#%)XI!CX
z=X5lPG==nl#)#W6+x+_v&6K3JR{RX-fg<i8UB_b<%!3<87)K{Ib6|tf@rBpc9vov8
zPKzVH;2z^szK%9c=T2iy!}~!t{VZJ}<8}I-p}Ap;`Y)-;nf(>-d&NaMyi7r`zL)a3
z_VD|Ky-(AL)@S1}S;<*`{yaBJW{dd^K2VFX)em?MuoisR^(pzMXsAS+#F)`plj~XS
z;x>_PlWuyIxT)Q~>pu7~aaw(_HM2Fnvf0SC`PjR?-p2~QN0luywtUg<bxQg)^Cw$O
za=HE7+X3DWzg#6<_IGA|7#nGw_h3D)Xj5-9y^ubVnU`A*{{u06T$+O|1$^l8$UUE2
zQiP+129G}`T*l+cp~QcU9|^+=JIEH55)<2iI6v&&m&lF38)wNTd(3|vsU#!i^}qge
zFgrGxHkp@tmYUdU=Ueo!-*rGywK&i-K-)3wDZp=X@#gNR+hfUt23D|&r@rM&AHeox
zb5nEqdZOemks>ki2^lHv{N6%<dlA5!^cG55svwXzGYAwI3<BLe0mnTM$c+yK+BXA%
z#M3|^GKVjw{R$w270Z_|WVAgO4j<kpG0i5^qWi-n1zhmrBYwp!RWp&Aqt)Ouq2nW`
znrr4a{pR?tSNcVn`TMx5?eBf5Wyyk+V#SJVE88DeVt(FZdtxpM>61zV3#Ek|-`T$F
zJ=0;f2Q`6|xFWfA=>?o4f5i;x`3cm)SMEJwUrk#d!Gt<SQ7COAiQ$n-cpfe;F0F8X
zc<U-_dA(A?Gx;cDcCEHn+2Yrq|9xDDNdM1kg-QvSfxvsf@tHga=-*=$@psVw{L}vv
zC!$FI9sl1kl7RjjYm_$VpE3V^1L1!zO6mWF6aPP$&;PUL|F`*EnM^2p%_lLI1A!N4
z7QKvAD+yOg<=F@=7~hmr_azU<rRj?#V&x;puKw{OB%IcpoVW9ykd&0P+5=|dds$}M
zi-ZRbL_)*OUxmpXP@>_{_Nnl;M}*V))5T1R20S9#cRslP8g=8RjprxFc068sj!Pqs
z&d%)a-f()-8*e5`y-{ZR5I=N|NcXTicyfO}UQnv+yCaa(%~{p<DVl72bCd1~`S02L
zWmV>GZX|R!Ly8l7u1;rL80D2F{lR!rF@_H9D6Hz)eP?ISk2~({U0aPogeB@ZeS6a-
z)zy6Q>VEqIdU|Ptz*EPwE%qeKNFP``nU<BP=LrZkm?l%yiBPxFC<wo6*<&?W;<$;(
z#l=`#Cl-s0XYKlQ*6DOZo-KK^D+sCS?zr`I&LVz&swkRm1XD%D$7#JszPzI1tsrIo
z>T0(cU!NIY$PDGOJz3+bzeFupuOxganus-yaomNAmv_@8=MJO1+^Fa3N_fThoZI&-
zG3P~!Ws~<Mhl%%|e0h2KT3yZq_SMm1JQ1tf-;b`Ts|y~ay~95P_u5vqV_I+}{mf13
zS!us>ygp$#TyDj~!a5&1r)E{79t18u>F3*upc%@$tE1jnk(G!HhYkuK_;Ir7&Ck?W
ze8k1YMYbqe$@`PuP<-;4dWFu_!GVEd@3kPb-~0O?F1L9D=8so9>2mItpoRPcv=Z*W
zXvJO8MOHi+?OXPWFXYw#+l|+LxCr4t-=Eb{cS(VKLhy}2=3v@h$N=J8LA}(Ej*e{D
zYUd9mGor35PjJUuK5{*aU$yw=Y#~DjEu^3Z5cUHs9Qwbr&#7FD80Zdx3!PzSaPu_V
zzq3<Oxf!oZhJ9NaUEjFX{pjk?pZZ>4DOUt&<4LQ4SIq1yTj!75bwxxPN%vb?*5|D|
zC93LYqNAg!TwK~Yd)Kdvlao1TL#kPYg@w;2ZG2A_S0CM<2B;i-Ev&7f1}T>Fj}Lde
zQV$o?4i!~Zi><H@!=uAPqkZ@t6(0Bm)X>nNp+oYswhve&srz+23l|q)F){<|NwKi7
zhH9}rR{caOja$R=*)(Q_-n@Ck2Z6-rvjOq=cRR2Zoh-SG%P2<zbB_VceSc%erQMPb
z>|yt^MbE%MHpP-0H+*hsDTIFqzTG=vu-O;6>3PzP=6HKyc)hC#`BFLYZ!YeKQ=<e*
zf^ac{3`6i0f7Z5L_Jm@Ek7fJWt~!bu7#JG1zO}P+dzzWqku{$E@c#XKIpz1a4_SVj
zr{8pS>UZIHA8c*QhR%(6xww8S0|EbCp+HlZ9DCy6(zR-q^S}VA7%!zeK6)wj#Zuox
zl)BWx@8GNVc(!DQ&($Ht_~@vP$dY64_nVuW<a{<#Q2B?7)wG<PPL3iYRL5aPlnl_%
zi_@b2N=aM$y8x=dI|OhN^u{M8b=(doy!W(7h0I}fWu?WEkDO*{X-R4h1}7{1P+nU4
zCb*lP4%?l{ECGrFED-Jo<FAu8TnN(aC?Ft^L0daJRy;)^T9{th7ONe8-wq7y?d-N?
z(UUBVFYba(vY~7$sl8~y-7DMMmU^}|4yzr8Nm_2kv+Y3sF)}eSx_?nM+l$59=IH+R
z?fTiM$ZFf<k-O<iqr)mEXza$k3z2V+QSIMAZd<gV?P>?bfkb~)S33@-c3c#pRT(uq
z4_;l3X?1qCJ6Ky=<KoM)TN<ZWR#hIfm6m=Kq>OH<M9@QL0HFg3jiKmM65))2o~>ny
zCB7^@lMe%OdHsYzFZpHwS#CcF^iDsFYlOb&g(mUnrbHHQc|EZ9K7~m@45jiIw`?EI
z*EM1?ysMgRZCyN?0c}l9O%<Wh`JVJ29UZ}dt+$)0weM^^Th;A^LHHb~cz>(4=WHJW
zs1elU=kNcR9dKFY|ImF79fwr6cwcsTf{*R&?2Z<fmNGd<w9pwoTViT)kXwlB=paaQ
zz9o~t#>7MqD#izaEU*i;@y%;1Y%4;OYH$1)Uc9CbF*noVV|%AR1J=E6)G)HC$V<YM
z53QZa=TbR5JpAS0;80M?Vbt#JcDnzktdUy6{jkQ+zS;7oVbNZK9|C#W0R|r`0c$&F
z3lu@Pn6~^6TzImw+_!?3{v5f(o)n*U={n&1e>fYB+r2N>1_lO#fZcA*M?Um<sVGU6
zmG+UA&@~%cJ<~&uWLu%WV#kha!BsAlcjrLptF*BWWeC9^wWY8C2k{W21kMzDNfi;t
z@UxB7UM}hA$e;&-#~F%V=%-8=6wDp~Pe(^bS7v5rvN$<8MRLU5_Orp`mm3=!V}9^u
z_?ge@-HOAi^9Z-1L)+=VYtRfRW|}$i-x<CRCYKbgU6EqnF6cbte7Y|g%jtBSU0C>&
zF*7TI>tJv1`m;6!-<~uFijw4<<*rnkCx=JVI^)gpe!7s>Um-g9<oaapq-}k5*LKoL
z`dZS$h#z6M7(H)XJxAhRN>VE7`8$2o3Zc@{eUlE~o1Jw>pc1NOgS`elI`5Y8mVvs&
zO6PYmX>H$rIYXAD#R*dDK1FeD$pp~QU$6s-V({%*g-JXtj?}i<iBhjj!QgnErvnG^
zohLn5up>BH?X;7vo$~i$0ei^=SRZRv+gIhE#02R52!6ELOBTygG;|?r!-nWx2AgjK
z=7}lVs&l`|QYELw5cJ%k15?<z7+OzSF!}9n#?WEe>GA$%Q9VcMVGXEb=K~3hiYdSv
zkCiwyZ>OY6WQ|cd8U_6YYJb5cU1T8yZLPZgs<NV@qE%P7YNfrV#tVLRb!C^4VJLzf
z9(+?#apcRl3m4Cd+jSLJ{ZvBZrE~%gn(kAVa7+Ke?iJ5sX+S@*5k!i0Pd>**7Z_T9
zvKhLE3kjn?NsuGwoPcZ1x(WQu9g@@0IlI`KRs;Y`z-AB<TIJtagG-%sAt}N-pB}5+
z#Ip*{&(9r-M|kA_fsLnk$ro^R279{rK}8dvqf59^ljC}x3v^7<b#JQQ5QvkMhQ>y+
zuwEIH*@f{b?xZj1!#OPG*_nIe2QBtrB)BPUCh{3jho^aRSa(jA1mC-8Gk{a??zWnD
zVUv?cegPM5HnVhbLiC6i<gLp*`z-@zd>Xy$Clj}~w;hSB>MP#IOU*vCz_PA-0p&Iu
z@q{o?riJ+Re@nXi8HCBMGYNw`_*~7y9{XIzCGToRQmbg2y)S>_l$DjC35$rdx*40x
zrn?k^Md0oMC3P<8W;f%W@K;1$T=U@}zitpz`+EolRIh7hH$o$PxTTe)mH&WQ17~bo
zRD<_wki(ylddy<p3uDOE5XHUq_otObzqotw1=Fs!)YrRR1Ng2Ha@t1}zvMP+{N(B6
zbczBx0F}CW75|&#J65y&(eT5|>l<g?+@?LjEvJ8UO&_jxJ8u_r4E6Q(H8|iWSA}xf
zd~g9J_IzVr*l#hW@u!@zMT<VE?4g^s92P$l(Y`2@ThG)jRRPqrHr-bwMAUA%$Xy!9
zA+q6}!rNk?uB9bvQ10T9ta7A(=c?CctjKZMfp^C$ES}bTH}4J(Grf%mDykn*ms*R_
ze^a;WvOy-xm9l+36B~OO4$M-Hk!j~u$I;Q_I#9E@fMkBNc6&SEo3cIhJd|t1@TJ2S
z>I&;Ib&n%Kgh4ZpTlkzO{Qybsu*AJ2K89F0{jcTsXmp&Y#jEi_TJ}PGuIDvQsM~B4
zgQ1(aPjrO-qG}wk1Sw<F;jd?fLhyGlz2|@*my6xWaUkZ~fmBBQ?cnyk?a}P#H>m%O
zurvHKC@D!xN5>6TV^IRR+%Fr<_B^O)JZ^Pd@9_af438VMNGe)%g8khQ1vGr>SKyb^
z_Bmg6DrbXUBQwlMs*AfVE1$I;?DR=5)C>v}?4Gu4I{BhDQcSEUL{zY9#UbcY7Ivyc
zqp~xXmVSCI^a4u;sQbU&+Tk1h(LTDmx^NR9-!^P-yNE1%L9--4YKToyTS{sF6%?vb
z|3QP+cNNVt=w3FK+h@k=l9#{LCC`7o4zRJcZ6*7%|4xC&@cintFFQL=N}3pZ9Luf#
z=LasUfO3soV=2`R{%<+97$>ox(5asnkt^XPlgb92*c=ts=_(7+__8VYG;bPWw(;f3
zs~FFIE5-CW9^jFXkiZ%l8ENEXUV%`?KK4vaJ+3xy#z}Ob4`TffFpOZWZ>hvfvAlWg
zHaodqSg1#vot<?sHtlrpov*WY&^I(ZU@rnd7v+wW`k~<Pzz(d={n#Q4?Dz5dt5y_~
z&a^jAy6E2dAU=wTs76xY7eWhILTB-v4;$t??Y9#T65yxq+)A7u!WGc9J_T>;^>!=$
z8FBTz&uREL%=;~4Kz(+-TUgka>|I}*7=JvZYi|j7dUSZUhw>kR)+3(DU)*!0^}3q3
z4%mqmG4VN@DpK(P;(%suex4mQ7$Jt=9RM(@J$V=ziXYwLS+q;5R*%1^mKESWDPW<E
z&6Usy<lGHr2SdmdX=SyxcV)^wZCF1b*wXOhS8M!yc!eGf&apu`K{TI9XIK@_-Icyx
z*5Lc?whS(2bJoLZuBmadv9luqXp5io+qW?K@$<tKAJ`p$w3B$?|8V3DW7-+>m&#rl
zNgG3FXJ^KLYaO)X;mE;nccH$%eWghOxxWQGjsilK^v~9_;PdCwKi_&q#GTbTNXYE5
z9bEw$u!6V7qS){g9&~veJT5+2wYk>3z{ha5@F3uR*JFhY@u)df5>@lY{S<)@)nH@J
z7!A3(K>+~6;mxr}=Yxe;<(rh0lodUrB^TN*{9$|1f6}oh9Dp5j3k%-68~rLd071Op
zEGyGJHqdYOJvp4;rfO^y@ySv{U>DF^oSA?Qdp3sjn^YxdzCSDe=!5xZQ2S>0{QSXB
z3O9mT$AoxdOMUs#$_d%39RgoSv7yYZCncwYG(GEjh|7}IW_vEZ`g#q&$;C2#@YMj%
zF+BNab#-+_DTmYERFU5}`1}_g#C6vZ2EdrRWJ#YZUpeI)ITCC_Su;V(bq{|ir{~4w
z;B+eAKiKP<Aq=rP&GKd)$mo*3hjS_r4`A!#88_EDe_Mr($0}^TQf4M4BSXjyO7=pG
zVeVhHzs*!4n;wK_LHt%ggD~L{XmtQKP43g^c3AJJO@$#NsKuVVFz`k%h>Wo=3OUZI
zsc-q-l|}Q*lRZAVb6hY<(oZ17KSRYbgQg0r*+&SqtjJ>(_LrKssj|IxzOtT!10Fi=
zj(xmfEA5aUh|<cDv9UP!%bj<PPUoW{MGofwRzJCzMbKSD{SK1#cy=pv-a4oC?)p@O
zw$1%$;n^BByk*%w@fxuga=mnpE0MBm9wL>^W%29kb2(zOgUD&l+`+i>%BG8}e`e4t
zU7!G);@Jl$;SbHCh@ExmqE-!3L=a$k)y9w*y*1_=sSOJ!@J0Gj$q@1}F6R-03awxg
z-J#=VCkP<um+OFbu=@ZIwMFIcM+YQMf0Z2o(?D{KJGJ%`pxHjhP*bn%ImOh}@s;|P
zmWJy3dP(b;;owrE-E_HGI+c%gb8zs@`TQ-H<kJBIa$Q6~n{B+?27l70IEvl#@Xf6-
z$qOgf7t&bNQlx7xj|U70d3Pmv(Ik?-0x}1b`o+20Xa<I+)y*}CbfY1k080KhQh|B2
z_CH+f4%W$rN&thLX>4q0__;ho(>Yr`lRtZ~4ovXsrSE^+z5_mlKusXK<hJwc>!PX8
z(Vrae+dT*Wk9Kx`7}XT?8pQGzB2<Jg9NRXHZC*7>DQI9Ba~y#^SVvV^;rhz{_x0xQ
zddY9%&k=XWZStWgNW8dg<+S*ps(Z%+JVba9)lY)hcBxSoZ9n_EId2r0QLZA0{NZPs
zwAi@=stw=37C?kME<?#ouCG_xebn8>vl6v_s_b$8i(T)#<IVm29!{rA)SnIk?c{c@
zKbp*;$#t)XW^vKbMdn-aG&>MaAdsbg1ED%OLP(D0t^_gK55r=@hC1R~(Y<(&s|(m$
zRJv6B0k`>wwyxYv1hun_`ZuCjge4KE#`;@hLB4(tDPMB$B+R(MwySwu+Nf!q7^ppF
zAE`IdgFfvNyz<17Vfx0UqG#)Ld$DKu7sTTI1!kt%85yk~krvO<CLREGx&9E}MptHA
zwzv58ABE31rvPg$xBjZ3amD+543Hc)Svzh<9qto2bt}2_ZGoj>i&Ep1nS7`AM61%&
zmbmjWISxgZuz*Q?rGC)${^mgIf*$qzYtIbYfWsPohJ3yJohM-x0s4E9KTs&f*L=jf
zp$MKm5ygpI&=1F`2U@;K<lHKupeOmVz=A?0cIF)@w5GXvUd(0ZR~FslNw@>V^JI<F
z-~iTY8py~HSJU1e`a<A8C{!h)2kMg5(NQn2FuvOYgfZH7=j}7q61A)jA2&BQfcxjO
zeTI5*?oEk_k*!81TzWo>mw~n(K?kYN%!d<*_C%A$i5!(4mzG$=aFN&Zmo<=YSE*^x
ztB4juatDQN!7^CrQP292!_61*W!A?#H(q^x=O6c-PDYw^XJ<zvg?TJX!ea|yw!RzP
zXms~G*^)k$Q~4V{9qX19V>zY+kQ>$~%$(cbB~z(F|K=?zc^>4e-)?@>kwk-Z;DE;s
zXvb-6)zcOb9apv$%pfjq?s`H*<K_Yy29eT8{#9%K<@X!gG7lh|+Kuty;EcP8&3F<b
z!Qn}0Aqoyu_=G_2V@15jMO|DFL|198?Jn-Yp8iOm3KL~I2GP6#vnT|1Op^56#L01i
zGmw<fwJey-8X&yl7l(D@{<lOq*L{#>fRDrL|IwTQR_mJsV7{y@8fr=JALm_wnAlNY
z|6oDJYvOqUz)Ugc+l#LffUZD;jNGy;=GvMy^OIaPgn?h9by?q0)X(mgH6{1`^Wti-
zJdSy!5Yx!=r+6wWv8%~G3JIQD6Hi2Fm14h#c?9Ago(MYz4g0?G4WKxjy7+aaT@}mv
z7V$lbA6pY@sR;|2Auv4fQ(+~uD=}-%##z_Y*M|y}sIRs+G`K$j{I<+e-`|u2RP-F+
z!4#(V8=VSOvnr-5fAyLY`hGZhDE`LIq|NmSAo)~``vbb@Lo+}zXe$p4Y$|Gg{OIhT
zD0%sr)d6$!oJpnCB^}wTMCGN`kJgx@Qx~|n_s1IKm+`E{mjUf0efo&v{Li1M-}BQU
z+<K(9S!_U(F37Wa6+RZqf7LoE_eZEGiDx**;(L4Fy6KdGpe1U87!pWA+M_~%wLL4!
zoLhlf7^sbTKt<ILU?rFjKso+~j_}^MEg$wbp`YI$=llcyd>t5&1A_rHMh8Ujeu=5)
zdOuofYN~^z+x~AH{bHa}f{L`UYM~e$4KQ5#eK~a^JuY@wilA5HXsCnv<|lnxMBh>S
zl<(>(mb1)cXV1cW4j9DF&j%(^D+%xu33jSvP(qu8oT((Gv2IIp&;nM+v_yw+r#H_O
zUJOVpJ^4(zJ<jMUF~2o?`{Vr~MlDz|fRAmAn|D=!G8QPKWFpgW?tcKo^+UXovKWLK
z7q|0zBRc2tX!Y?30>3?|k^(BkANCO~9v&V+jAZ4jv$zD7{y7eln3KWap5->S2)7&l
z=k$`e;wcesjWv~$ZyX(mO|$iG&L@zmBAoK(*1jR>9!57`9lc3&e8Jp?%KV@jrzmXy
zNjB|kZBOOUbj8#J$s4gG=l-A?)E-Qww+!@V<v|UUZx%_#-&M$$y#9+4mgeg`a8ZMM
z0o_b2r^EdpGTaX{?Bq3z*^5&sKpWUR8w9l83RXZ~;+4D|psHHsEb3b_^4L*(C||xw
z8=>XKY<jT&SR$$5yGbLU{!uVUON%;y=N4u+mGNO1Y1*Q=b7YoWj5CK354=A8DYSr%
zADL<9yNez2!k&w~RLAkI$t?59-1!OQ!X^1jb^)c9p59wSs8*D)_xd9aTNGli3>~nS
zn%pcbHpi&!o7U@L{TzDeL8qP}k7j{%g|%k?*gvOg*x!?k78Vx#PeRG!{BQS4avqmz
zECy+*<HNH|s<0T6bU$U7OlDa6_Y!Gx@?UR}AFM3C5PHQdD}@C$=Hq5+a^=%$Ef|ie
zyqvWE%IbE@8iVP{-#w1Ro8sxbqB@>KMDCSG!uTu<-aC8mspXLq6vDr-h%v%$&cF@+
zb|o#Uc<dzv!eT%{W(xU8$1CEFSPqx1)-yI<3;?j21gsgF-JH*+&`IV1VnD7mYL41u
zUFqt@lMImw_}nr2@3b#A`Sp-bQ^YF7W25%wNcr7v6#)2H%=z&?^zQcINR6*D5@X?z
z6ijfg1Fj4jx4x<)WZ)KG!41xdKA0$!!Wxdq!>)@;(tDl{i+_yi#FH}jlz_2YiT=pA
zTkC6?ZJ0r1#aLl}$DZ}u0h=bWU5(sATSw^To(sfGKe5uW#u1jd!Pt8>rUnDFT93HF
z%}|r7#z&vY1BlZZa>xC4)tUv}oz1Oy$v>6E0pRe7TE~VaQt%;wNdGbQ-~V1B)!y9f
z#P=&!B1<ii-kiftuzPT3-s<J#fcO=C8W9!euV<ivs94g%?uc*)>vL)4`3;PTcS<im
z{rH?0=`<7d%vd$Ezq$k}kaBIo7&>Pqdw4&(A@JKxRS@a-Z_yA&T-R4J<4ENwg|2rY
z39?Qfu;1Zm=kZbFZUOwju3*w8AjNVdxO>em;|g$4fOJg!bT%7+6AwO9x|RKR)U)dM
z(#Eq{;PD(^0AfPU0ZYbzEm_yZ>jJPu(9Xb$CDUIQT636xKgS|itA?nX<qhT5?R7=v
z$dkvA5af*%MS^E)&O@jV`rZ>rGaSy@PVu9vxA0@Fl2h=xbG3b5cYG?Bjf&&FZvN^v
zcH<sYU%ZZZc-66|mtXIO&_#|l`WsO!zQ+IyBT{Xp+mWv?6pPG$VP&Pm3y^!=K$f>*
z|0))cwB0SQ8rP$RTRH17Fnq-H>2}ut7GP*91`=Oq*7n8{eLv<%r4ZYE+Sn0dU^uPJ
zW+^(bLpgcZN<~b2P$)*g7e*hlS)|ozw3FIFDl#!|tP%iE9yrjy88a}>wDftE=%%9+
zE2Dlb7hhl58)bU`5IS41rPN~nJ~k*YRN4qipE-R(;VNN#(Rc@FO+BN)4s3%14w7O;
zz3$;6JtCkD|8<w<YAkk%vo0$Bm87kfxq#CmCT)J}8yWc?o^6jnZZ@KMrJOeUPQwAU
zs}UI_KWS(GOS?yiWs}lSXmiY`hQ@6{f0`$aWn2H5Ox>Yx)$GxE9}Olx&moZy*pJK9
zI`hq+3}RIM6nV?I_lS7Q=k`j{5ov=UMY7!w47_o&8}T;?8cg&|0X#XsqRV$&h!5Ml
zBQY`fo83JTWU;c^hTevB|0&aj1DNCZ_zu<?;7~H%eDB^w<I+yMliBZh`|01fXbsWe
zkZ7u@IStwzjDI>5>AV^JE4%(C=!ya;;p)SmZwHiK*>cMB_Z~_ig58HHxfa5W)GW}*
zY>)caXmt9Fg%~1X+P}PUr4n}r#KG({ZZuh0)Aqt`oy)JBcb!7c$qh%NNuJmAuog@3
zVKqR1erjX%7!+VPVf#R|N%TXQJ;ts=UpOZ@3ID}Og#D|DbMBBAoe;J+Z+KSG%_hki
z-QC>}?a`I8Enn`4{8Ln#OqAIBZ3J6v-P|s%JI}LVzB~1^CO&3fH%mAMw)IU-=tbJo
zUqhKRQ!HKTaO3=c6abJuFvMcttF1Td&-cME6fp7kS{X$xWER8c_8GnN2uHa#AipXE
zjuIL>?5}HVJzTEOQr4_vHF{QWT#k1f_%_8Oq8R_U;Z)f2A~Tir#aR&`RMZb?qb6Yd
zR_N7^o3oA$4Gj50_<TG=_R9gYO$7r7AZlyOG6UDJ0w%}CJz8w!Rop=Mmx-*poI&^~
zap(Y|o%1kvJ`TAP034ks$Iew=@hr7z85GYn7K4sOy0i^n7<i<X<wjRW=+FG1_-y0d
zxjse`8D`C=kaJ?u`B*H}Q?*o<Q}B4fptQ)dT_cGGny&GeyR{Zk5f^R9t_%Z1CB}lP
zXLS=KaXZxlI7RR1!xhE@%0&~DWvwu$l%zp!It4S7n06(yr4P~&mkJ@w<U9xuV2k!s
z0os#;p`M<e;6QmlCIths!X`f;jcO6zz5K_3*;rly#No$Uu7I=c)cA*`Xx@&CiT-G)
z11)YiisjAg3eR-2B&~`{2(qzE^eMtM7bK;+ip;?pCB}U_Q*;ozec{=J$k5ncB;U<d
z3G%a73(M@!_ONw$<UbCVHiH=|rjJCh5h^~r=Ge4nOeFu*BT3O?`@7zLB4IcUH8ufP
zm!MEyVS1Pf=RoMuOY_AI+7D1(UKFCY57l3^>U!GK?_&>0Cc&~1ZU?W>(gAl0V6rUk
zw|?O3wctIK?0+!SD^}1ixOY1qt;E$?;$R%j-FIkCz%c--7G1nd05wyXM)C;xX5Rq&
zXEyU#FCEeA*68lDRt5y4i13k<;}jb&#KQ4$5em=lZe2P#_~<Oj%?C!m$`gs#Fm5JI
zgTm{aV44xGapa$LYsm81CyQHBKeWkMZL>&~Q3??!7K9_ZxR}CdQ<Df=X84MY-%Xl_
z#;KWaNGmJrfikG5&PSlB4n8M&XsO=q*}0+C4)(aFcLO4h8(S}Zw}x4#Q^Egig$UP2
ztb+qvx`2nv*~ecV9p}q<fc$luvhE1*S%jimb}S<)MLdyX`XQpkwC&|fu5<G2-&M1x
z=RBEGXsWbz5$+DwD)d*Pxbx?I5+i2et=Pg4tbWwjqXNhM)P&N@H++)9dAr!$Kh5)1
z?yq;foY6zGy*u-oaW^23UzHfXm3+*!$VQh%S5hM1{kBiHtw}7uj*rwpLlBj??#aXp
zjK#uu_O7D-gDCX}24sM%ojUlRudYk1KJd``!jS%FDNcsY503?`SMGm}@OEDBL9_3U
z2X)`PNdZX1h4=YuPBR7q#{`PXEcL{$a*{56`97}s<%9XVuqUX%yT_(93XPA+jx$_e
z6L+uMvSC-#oB6Geud8snY;gAS{1`%l@8-RVltN;2+4;3YSv>vYZtmVcQKie$-_PBM
zE19ElJxn$xUfYMJTikJ?=bz#$1^6CzLF(`gY~Oj|8ovjm=<O~?QE(fe!H6+E`xkRL
zE$?o7`9raIsUN1F9#^04awL4NDhx-Qjhe=O3u6bQPc&=M9Nmi*j;lIZHIJV54Gdxk
z<_(I&_0KQ#(-G^U!qe!-xJ(dKm0Bw{`nB(`J#+Pw1+6&p2Eq90O!1;#@r=B6?;<UX
zLauC;SC<Fh2pJC((%+w?G&>T}&`r$#I;Td>elZ+H<_&hO&;a2--XQYk54m6uFarR~
z*%2@kXC46I9jV&VIHZLM=pO>8j*NX@)~V-xf`jkoLBK^cz=Os!#of+QLPJp|4@OnR
z{+v>Ys!#axN*#tw*K?cj^?iDVsx4xcFT!hxk;7^z=RRnG>38w8SM$pNE9NWK<ZPzs
z!dG?($N;SIEg(gw<}#}Tlt0t@<8y9*_!mO6N-zG5HT^z_a@0pM)O>ajOSn1Xx2Vg2
zzRJ=#{yw&QDdVr$Ia$Kq9A1VXEp$E6$KWK)=OdbLNC0R4DjO2;7{{m>w**@Iq*W>f
zw4ziRwNG6O{B0xx8eszE+>8S@0Pu3tS7X8Zl=tTkrwEW_bpabReI2F+{xMTybGC_s
zq*_VMk(0bDYAZFs1U>fPZ@9Dn8F+tMcaOPXT$OdkvR3L=V}TxzCvgPe7*g4dRv+)o
zOhp1lsezAC??uK|u@qSsa(F?=&zSEIS7jrvqVn(BSYQI>Qd$8)dIW^mhzc14YI6*j
zl=YPe(O=o(Dyf~nd><C71IP`aNgn#p`kr)C{dKlJTKlwiIB#Q$vh)A57@mz`U$kfq
z00epC0$sT;YFrWbaRlm_0z(MqFyydkkWlrPNHz=qLQyzVb%uy^`DS*#@F3k_B99`e
z75|->Aw)qtQ(n4|5g)V4#s0-B$8Zj)Q~Ui)8<iRv9oODua_`JFLWKD3q|1v&EYT=w
zMXpRNK6Yfp=My|<qA>bQB7;{>eW3=}wssmiMIuPrIA7MTQHtxW*b0%sBC=oLS(X%6
zTs%GG!Q0#0R37f`_PSa;h~%O1I9-`f1?XuScXx~68#rNCOTZF!U|hgb!_!k`KpR5!
zmHN|s)!e!nYwP;SdV9e2>l{j2NpIH!fRi*F92_i<2Rxq7b2l#4y4_!&b^{!@pGY07
z31IQZyMQNHGSGU11}IN&z?Z*85-cgC?&ilgj$2^^x3}Umv$IanEDv)hCxXFvx<P=d
zb7P|--EXNs5(^8@IBoy5bZvFfGc@cEhukB_(Lv&xo5hkWL)HDy@DM<6bamfW^w-<Y
z0*Y)c*Lmny=@iaggH1rU4AQ~`0A3fck^3LukieoM<_m90073)1h{Sp<bHGtFEpowc
zg9ws+{0-Pcr)W$&^)oP^y`ohA!=hA^+ux^~4&avdcH@b{5#1&8Ebou8anVbM3O}Mr
zFtt6h6PI@}=~RpP=ln&4A@aE9;!pfN^o@Pnd|*1ElV%B4jj=PXi0&==@$PZ%*=?w@
z*9Ex$^H+V_ul%(|KI%VNtzP-9@Fx_Uctq{KqUFrka1^D^1vEN_&(@(31r!7<+cK+7
z`X-bqCwv;iU*qEitFX=coAWzUpdjFJ@$lGlad8=GDN`_SOOg950&eL#Ak(Q-R95cS
za&7MngaHbpmV>SB!CG@2bO(@6M`t^(F1-b*v4Nhga(*k=YjwYADfpoa5_*j=HLla;
z{{GbYINcG@MNq!)?o*awXlSVu7Zn>D>jyjx23kabzK}zpKOoN<u*AJBT+WyF_x~hc
zUdDd3J4(k#OsyAQ1Yv?^K}LugH=hb&(J}wp9e0$`fZI<e<$r&j<Mo%n8tFH?TIlFd
zsD7!Lmr!M?YXM~oev{S^tU-9q8R}a(YMSF-Q^ytZz9*_;;MCaNeo6p~e+^$;@^P*~
zn*Pcu<P#Zso8J3Vx*qVVN6VQwXF{9J1}wu6Z!j)HDlASu1eEjz)JGiu?CNHET<S!+
zM{hV1tr@kAYw(*bk_E~SVf+aV%xX#^MQL?jzL_oqX+tC%>6bsUCFlhJPuHjO@v<sl
zV;+#b-%Y^CHc$2RgHSAfb&JH&4Vq0<0Ubs&?Y=k8K)~e%qw#k(*(me|&CksZH8kF(
z!A92ysBrb!b=o`pxp{5v@Myr`rB(;JQm3NZV40el8irb~!S&v7RIkd9#yT#B8HQ;Y
zIS1DIacU*IS>kR}AEIMJLvL`{Ev>hI7LBeL!8QPhUom6#9!#4<g?-CQWl@%#oO}xG
zFy~jwUbxb@X47QoQ;Zbf`Tk+9od@`!D}?I{pkpQja#~;I_rO|ZY-pTbPdg}~nyqb)
z>*-sSxxWG1IUb}VTBLx!4D;yX#|cX7F~x44Q+*Ag#-e+xaS=#0cfyZKcDbJA^f8Ps
z&ak=sAS7T2ZCDd;Gk{hpytRFxJi<;b1b+NT84>8dQ~K_s1mlQy0SWyJL!rrpSIa3u
z#H0)9Z`QxL9X&0YGQR2Q0u2b;h6jD48~_2`u=ujB>cF)^7ZxZ1Z(q|DQxEF`%?~?F
zj=TWcl7;Kt?!{IF<Vq6GRNfKrYb}n@{2|R062SL+7Lw#;Ohv8-^ga}=Y>(LDPf?lb
z2!VpLvW~K~2rY#abW-qTfnCA%?BLzp{4vl|c4w9XMQhCxYx6x!&hU0|!BbM2XMavD
zdAsBjTLY>8@#FWy=<5CGB~UV{SfNm8V?4Fka}z^DpZ8CX571D2OXFEybcU4+i%5h(
zeo!o3=tG#PU-&7fKSM=KA>vwA;vI8f25=D&*PFBLc*xWJc}|nFrKM>MfvUs|*GRFr
zxfER-bHf~Vb|TyyUsAR3UX0zBPUVU}RUG$bPywlK0F}Q%oEI#ss5;(j{|lZrhif{%
z$r1F`G$$DLxI923!*Rd7`T^%V@fNlK(-_rSC^ij^W7%rthun-mh7#Pr1*3`bwNV+8
zW-;(hlu8F)<cYM=8btZ8-<I0qRK#*RG0}6et3Ahx7`A%Zl-)b?b7SL~cRTGH9@Bw^
zeVyF}`Vki{9**Djs4?A+Te}ET@gg7W@(wTo?eDvpEsh08qh&5}%nUiUJEe938}(#O
zDMyS7PBO*?DJea@#tcc=CczokU^h~@Mx08_AakLHzEGt`iUk`2an_i5HWbJ{gg{zP
zEw86r=nQ}WAFNO?slMdCX!i#Va@|d&qm#YT`P6j+bRMw+@2G4#H78rnQ-H{PA4FI#
z{{><QIy!$Ufc{7b{A`3b;26*e6yNAp(f&F&>Py<~!GU}Rd7TxDJj~svvj|rrD@CKO
z@K39LB7ZT86|V1cu8#s@F4f$im88Ypew`v^d|pt1S*cC7Dc^^QWWwa=FI_jFM1YcW
zkF<{0$3f;8BGVduLf}`C_Ta>3W1}fO9GrM5HS5L6T=F?^_@)5mYv9ZbtKZ~?-N`8G
z_GH|!*a=MC^H2^^xim$v=1YU6Ac;TFvDac3!X?)z5Z-ZIFjKFx)EodoRI?+PisaIt
z{)|<}6<qlN{h$(QM1%hL-ljs{m_j-=5ILp+|4pu-kOHH~3U3rHGBV&&gK~G>a%023
zp#c578pJ3-ZxcT%FcF`%HYyrde)1SKxx(&!VaNUb*^hvwTUP^g(}F!uCawVg;kqY*
zu`!bzJ1lj-#eb5#jt80NdW5;Y2I$W|IkvkGoibQ``pH>!|4X;yEE(c;wiOw!P>?_>
z%eF5?_C=pjb~Dj2W>2b2We3A5W#+!TC#d$6-6eB;tZLSB@SVNIf!)%dcrrQuY$Vu4
zup2+?=%{l$R_9<Nws|NL_vcsdLiyjk>x-f@0r%sR+JAfzU4-#gO9ow98OwGt1M!Eb
zvwULkUGfLmH4^H;k8ydn=bz@|e?C_-^{p4g)ed_#d_@`@U}DPx4kk6Q;L@(FwjQTN
zXQvkkT_E4`TE`@&_>8vKfbs2T{+FSo4>Q<e-;+(r*14_pQ5jH5OT#7?-V0pIzNCVi
z*ji}*g44HkrBtITD<|2z2HH19*K%p5B+GGt_-SXoIw4)R;`AZAq30b<P0)3qx7gwm
zkTP4R4n~ce4k}wsnvWV5vrBCsWV5X~AMwkyu>nuCtCiE)_Lnih-XQQ%AZx@2KqXea
z^w6W5n@w1dH2{$gBc5f<krC(Bef9Kcq9~qyM=uG;<G`1ln09fm1O<^!-~{<+qUpyU
zUC~%Szd(x>GWXPvqAdoARQ78uiWW)1?9LCq{@@x!R^jY99KVQI$6dBSsX^pzbm*YW
zx$Mw)O--|FP9eYc6Z5=M4xs74wS6J}`L|PbX{sc1p721}M9?cMKE8?W0D2}*_5@4J
zXlFcn<e#Ns+F~I|pV1#*cBIuF`%NB*z;;HVDgeC=lI=vom)4mbRg&Wftu5u_0UW{v
zX!G6i``A+(baEU7XrqQs{nKlq*+MEIHVEN&F!Kv@7Z)@j6h8n7_GCDb6?ez$@nnRT
z?ym2sarJRe*VOOfk~Q0N!xrW>?h~hP%Zs2Fw2AYNI^yx+`sU*#(4Dceuy8Bz*VGMW
zRnKZ`-`)Bw+ciho(!ds#pWJ2OGb7tH)|XM`*u0>xRhKyo;k@YsAMbrIDJw&?Djgh^
zMK))|c+6~5*$KrI!QF^2QjnOm$3NBS3#<$&d<np4@PnlPVciUe#b&ymrYxk_k;~|k
zpE%-zoTcADIxM7f=i7%|3znw7isCUMMdKd+5V+~An}z%DOe_R)J#<@{c2p3Q$tILj
zA%w*KH7KwecS_f>;kQe>*pL$n0>Yjmk(Ltr-gutyH-gV!BZ=!ipTNpu1w(CFe64%F
z^@x8foaCw=kk*g(dTN#v%|T;CiTXHcCt`CnLw|%m(~wX%{3b4FCXk=xN2Mk)N+Izs
zJltH6vMis?ar@`~5@1}?`5!k!SMQRme77y)C9mcT|NapGdaNY<f$l3QtTj=Vf7<&H
zPR3*(G=ICf!2nbFLWQ^U?2OmA$+2UiWq)*(<Xb6az58-ltD-6)Md;Aps|?t@Y5cAT
z)`y*CtC)|%SW`KFj+{s4^zsOz$T;GuR3>T)U%vG$Rl)zVW&ccm_M9RDW2^5Tf0w1Z
z95FmwQCuC$nW3E`#*zTGP3jsHB>K(bE1XRRLNK>P?qcqW$)nQI5&8^)n5=u@Jj16&
z`sIMYDs97}@IqGRB?>prkNVF&1n{1l!dW-A7S{?%IvLRqT-fCpC}BY)q_Wp!`1TJP
zrPx|lpu?m<qU|!#{M-<ysZe`EIomGEE&oE0-tR~2uY^O|2zw$FQTftUvl$#$)Ew(?
zSSyaY(lCK;hE1o?(y7PRObbEE@J}j0%l;Ms<`j8MJAALdmt=dx(4<a+Q~<?%NQ5@v
z{?q{oT5i$hAZ_%&+ZxUY*e}I&8nPZD2bY&_nGznP0Bz_48sCmPpAZgLJ3~wyaQ_mC
z*Xoj?fK?*{+>YP}mwH<A@V|+E+7Wr|0~|$MbO!q55ZYJ-bj94~iIuTsb(*_U4Xb0V
zA0A;wn#V^9hE8K@<K4r!Qe;zkRa6oy`nb+@=wWRm#StLYcNdvXlZA85>rnOvef&7)
zH;$vvt~4(~NVWM-^Ytx=l*3|TO|HH2HUmLEt*nHjR-bA}oAEVF2tC1+Z^5($TqEB<
zaWTC?TTM(Jbo?cQ))fLjY-SmdHb7uR4617HAYakdB&HR0#2}fGmg!QOSHAAy2R$6<
zqqBczM?tv8i5N!z#@)g68QOCo*z`=+7AdVObeNj82c(RS&YbrS^*hs=g#YZML>7vz
zYIFn@eyViL;U%eNip56<2NBM69i7Ig)6!DMqlJ3khlSh6GTq8!Nx-zv``a?mJxCXD
zkMwuyJ?e}kvCJsm+tLFD_+zfeWB#|&{YZ-{>bt$woA}O$;lI8tfmU83S@oN1D!R7H
zmaKG{a|)i$8<!dPLuie?drBJ*jHmg)kWJRAdxGCHgG^0O^L!LBPV|rkOw6ff&eqL!
zEh$X-H975OC^)Bzyqo_`;OST@7Oj&Y^9~vxkugCBzRP#qK=nC7jpxBNsC<u0`dII|
zV_^61&q_867Z{)YKrfPyC$44QUOi(AWW1LV&7=3ee_Kv4K&>{c(JR}lhp`>s>6P=_
zpQ6&DaRH=tjl0V1ync$y*rTNMiZ=R$LNSR@XN~H5G8p-z9Roui_|qDG*;=%jUkxJz
zbFPqv4lcn$T}iM>Rd_8IaOVwyASD~2_N<V27Vggv<p8twzn<DoZg<F%@L8NBGxgjW
zlzKcJgf-t~KY`ZRG7p`eVHN`sOV@Rgqi;di(%^n%t(GHper;Qo<C#-WxLoe&*oj?c
znmESIv_L)|v*P<+k^Bq0X-%|SmG7)1TYW#Fn0nI>s*<{mxdn4<OejX83oh`T25~GW
z{AhlDj|-Wc)fs~b5D0Y-Gy;KnG*q*T>p3Iu8${h8gNHM<0McjD61(5|Wj-T}-Tzwd
zs^94uoe3qGnCY?!{@KDaV-s7-_4aLor5YJMwff#5f;{~o1(J}3AU`*uC6y$y#f7$}
z{L_ja-raGNm&xi;ujmuP%kf|VR_S8r)N8*+nil6h0;D3Q@)|zU*M);ScTB<A!6)|d
z=H{;NxXb@Mw%L#uWZ<Cq<3>GGOcAq}pSZ$91in_Gu5R-N`I!7eh2}n`R?@eb{V~8l
zcmQxx%PG(Yf+uwwgtr9$4%}<R`S%W`PUHv|44l7&3F5d6Ii|%%dzwF}>O9@r9!bU1
zvDDep$F-nIk33*%O^d)eO1cqU^QJj0hvs8|XPl;u@5z}|6WQQoo)V~1;8W+c%x5@Y
zCr7Hyxr0%0R=~=(qM>F)8Bh@57i8R#mlh$mnim=r#<FT=ZJ40r{A3!h9#zTe&Z0m%
zK*?%h6j>|~{$=O|ZpCtxk=X{C09}hSCMZ4TxeY%>-0acg-DD7<BVv$ULV;sP&)rB}
zxtC;_&=Akd;O8gjn+;~v-nni^MD<Si0rZ@NNj>QePeJIrGHg@Sde3WoNE>8SLx^9u
zP$zESqAwV)L%p&^7~?bmQG2{#dQT7>UCW{Q#YKoZHUvNaZUYcV#N77#f&?70TaEyG
ztI>ZAiSD`<e}h7lvG6a8KPjNrQWhe|hWTI3L;Y{4R<8$mfo5%|ylM7#Dc@}rsfcFQ
zjV)dsd(14DmRppJ(*#di$M6>C-stxaaP0<&<k8@^p2s~$ZFKQ6{~+2MX<NtS>cvki
zu)F^8Ok>IMDKHTEq$i|PO3~Fk9g~<Kjk$nYF3h0+8MYZyA?7$4y@Rx@w4pUlx#T_)
zyIGMdqFBAk@v~jfb#ilyJN12!$KH?V?P5q^>PCgFjh#jWwk%+h<ty^p%`y2+=7oeL
zI~syydp!G|*<ilPV9C=b5VXp#vG9BD5t+4%E-ko-qNRkEF1Uq$=0`-RkXEb_;pcDz
zrIDHjk7wkB9>^(20&)|t@|Gg^jC61ADxKK`%whs2_Y&wRs-A{<<UH=YhP66-T}}*2
zT}?{BfIF8K3zJq+9Z`op{$@IV*Tg4B(Kc8=ndx=&>TSj9?LDB4rJBE~;>R$Mf-R5Y
z#Ct5ZGN0;qOZ+dA&MGX9rdy+UaCZytL4&)yhv4o(gS)%C1oz->gA+W!;1JvgLU8xf
z-+!Km3$A;*t9I@Eu2tZTLKmOr5~*s!ake&cK9u<FrIE%~=^re%_p+4kRXSrh0<G=w
zJryh6`JUB{98yZ-Nz}+iQCW-QU~HM<0%2MmmyWyyxG>eD5tuovsp&pnN7-+wa}t(B
zCQuHoCx@*O;h}w!F!fd6LT<dKp%(8T(lnxwGty+K>Rr3!opVzZs^6{^l$do~)a4?}
zJdMpgWUx^YQGAx&xaBl-><*`4IyUxcY9!2UR^P?VqSU<%wgnI=O<V$%74LNqb<uTV
zfxHlq-Yeu?9tHwX>?_CB^A#!^O}zo97=4e2Irs9}uU+&7epeq^Sy*z#cY)Y0e1D?B
z6&QfbB<uU$R>5yePOpcmY-|Nx6~KGyyv-u9UZdi(gqr6`o||>+ks?|^dCo%usmC*4
z0EeubpYwi&a~2I*iGccq?lmA0o4kVdWAL_l3CecxAW8Iem2oW>pQ+21-MJ;=8jr7@
z`YX$vM5rseo?SlY2YU+9)rd4mR3v{`($6vpt&E@5$nILth5;=s{>R@D5@fQRu6J2S
zPMw_wc|dSqG$}?t0I>~DS69yl*THsvvjB{nT<2wZdggy1KZiWW;7jJ<Iy!buh+ss=
zaGR-D<ETHugEeDmP)Nw7U7EDIiLLFp`<tNujpx%?nncCCc!o7VoC#gr%!5gRe+<U1
z{cgsAj%ERY^d%iO+yCC2FDZRv6HPwnK%E_Mm$UUU0{M@Vh^*nJqIo}|wc7kMj4h~T
z8teY=Wu!IdVbam{kq|54<2{R<ut!NL{09QUAKX0K)JcQ_{nkfajIXmaO=}ZI{|wZG
z;bMY@c(80Zx2OF->kjkbHYcR}l3WzC&<qKI{jew0mk`{wB>Q=q-Iv3eY#a<^ok&0S
z+nl!CQ!i_}_CkLl|1>7V$ZqwjB&(_cqAFd&E4A;UbSbWGL`bg#zPCx-n(T~PbVzal
zftkm2H=!Ft7$QCXV8{K(J0u&dQROx>V$2uUSX=ucFX9)yA6|@50GU~*%g_KFn>T<7
zBWAP@I79&a5;;HMsj}-3Lh$CMj$88a{qp0xtj5Hm8$=mczPBJ3*wyU-hW56f<COn+
z37kA`-!8qrxOHtX;*j`IdkcDiC}C~{P|EYmB6~@yoO@LGGEmLfee9LLFDa+J#npcv
z0nzyw3}}m3vEu4y#^vp0iNFY-%^X}&nYHH#sS3S#n%O9#mPK(s>w3z|C!T^4<AvDZ
z3TaFR^SiT;o+3}w?Bc8HkO+b>Us|$v^M+zRi&XvS%@5&M=b@y*o~QN+_&cHdU=<*&
zA*N)Aa?@P8FQrETH$145xe4N-TF+dWu==-}=rDTGH>$>D1c%TrjR{T!O3kISU(?g*
zReC@zTf~6O!ZK;jPPh%^gL~M(*9AZ@dK(~q+F#nzc7?F%DS&}Vz<Wwx>tWmN?X744
z5P(%>1->3%fRa-Ul83b*Za$44IPA`WOa}_tj&#6vNyiO&_FzG4eT);vP&L}&`-SF&
zzyI6e+p(Q%<rbq{<}vN0PhgAY!B1pQ{9M+*QeWh3z6Rqd9yQ)h>PR?@+41a~{pq;j
z|A;vH!?Vh@{NTfOg4TduFo?&9N}CFd7x&$wnSI%btgAJ?BXJSotIA{m%w?^-NiUAJ
zH~NDF<KZ*r$q&mtF+^1bdjgwJwMdNJF#Q&WDG3%wb}ny-ueprSiPUCpe*Ljyj2!_8
z1Kbf7r*uE0u}Tl0?#z)GXS~>cvPgPPSE46G!W!2sGQ_aP6vy7)qWPWZgZ(Z5I*R+h
zr06NoW)0i};=^`aeb3Ct<aq!MF50kP-zw7G)N}=ah!=y#e4c0jlvUQHS{<E>d?A<~
zaSO77NWI3QiXD*>`;F+lMlCDZc`T7`w)cZL#IHEiH^WIE(7%t$pmXd~@~C8$QOGS{
z|6FijSKIyfN_d=5LL`(t8FFsBgD**Lv%~R7_90u)vyUQVuhfdnUs<BE;m_gna;fVc
ztk9zpgY3WRc>PN*km>$>Sh{6)Xn%On4Dk|QGkHngk_cS+3seoxVB`d+wUg2&wc#;}
zLGV{-l#|m?YiiOR1MBRoXmyHA@9XX_I~)dr!J1;y9v#)x(pxsra?v#}d=HnGU``Li
zQK64Nt;F4=c0><WZO*IyX;Y;S8nmNS=OHC8iRDL9$(fm(OZo#H44-o{&u)nSIe_2w
zde1BK*7pE$z7A(oBHfJkgjfG#p8tP%I^95E2GaX>>-6#`)5zyi#T*s1akdc8M3b)*
zInZS!Kvx)D;E~>4y{Sy*m?3@cILO=mJG+&MuUfL{Uj%_-8YwH}YhPEb*z_*#(6pAl
zLBI7V>F_pbtWGj6O1_uJ9;s4F_gY5*4ek9_DojKG9kj~5D7CYHz9pu{-~#@V4WVIC
z)n6-1Ha|L3%X(z#%6rtAUQ8Pqq<yY$)17P@C!hoc4X}nw%WA*axeuE12&tno2elrw
zpFV9{ELfJ76gnne(+qLC2F!y?VX9B*;cx*CG?TTbOm~?ZR(ctKpkaf;Wr}P=$W9yc
zz0UtI>x8G3r;-3d0J?1*7qw3Q&$A!My)OKDH{7n_DQ8sM_W<>Q3D%dh-j6$=JQkZ<
z0-&RDnE3kN23FvEyQocGa{>_OyvWg-qHgGaTuC&2G>dtwbTL0_&#$2^RUmQmxF)zm
z8W$^8KqmIWpGHy&%1%@T&3}bibwHs2W299m+{VKCVW-U(_ecJCGV1oPhlz;}TyStv
zqMLAeMqahg<!hg@q(<;iO>s?XrL~qDCQ$x(see3izkamNwAB6ORCpGGFLnS<U*d+N
ziK!8`s;a7j&xxcVP0=X9>&L7{T6dtJB#D&Bw`Uyv<>QinTab>6{k7$hhLUKMhwbQ=
zlOJ4u(9n_Nf9Ghip=&d5e-<fisNL{J_bIe57!Qq2(ypDdD2yP5GxglKeN9?7BlR*!
zBT0kucThlIJwQSnV+h~Oga-ag0NQIdasKF-@(c|BEmzz0LcfOr68YoXUm#%@`(HrD
z)ciBh>C|&J?cl$<?al&i?0YwlO>wazNWSM(T@O3zHIG?#&nLKxbGVCcDxdSP#bXuN
zXv@kQr2Xkxqm%G@&yAjr%~<J7OeX3KQe&ZXE)DnarKFrI4vzhBx%+$Si1z1@xN}wx
zU7>eV2UJ)JrUJ}}gr(62*z@Mh;JLF`^+-d(O(5@Zwbb_o2FJyg6|c0tZ&3>^*?Q`U
z3E~OIY}%X7uK$H8j%TKjgf!Y#k=QrZ@HoZDE3xr}ita^fHX%z#^Fiq0<Xi^xK<d}V
z54aP-0O-*&OlLYtajhA`z-}0|&X9(nI_@~`Py1{PNE#}kzW(s$-)idW@Y#AFc4ZSt
z`CWVh0!*b5zem_v{g1#nH)kkgC%id-nFhiik3bjW?>vwS-Y7n5S(uTSD{-bhH8MBk
z-12ms)bTqI{cRsnhxeU-RTqm{#7yb+BpPvwn0W|foiAnG`S*LJ>84i1G}nmcw(Cn0
zlnvIP(=G>ZuWnUj^JKvKnZMwl4?~nZ5zeC_bc|Qu(LV;l)e<|PDd~d3elRj1F$A(!
zf16vBw2H@eggw`fz4VF$!f=FGx+hY>obRiay2U&QoK$wG9W;0~5x*FM5?ddvccyzH
z!kihxIk;qLcHHS(<YHGBdau6U_5BsN@ZB!DDCX$iQiB^-%h5H5QlUHO<BIq5{)}+;
zf<R=t(xwt}TNkm!hlbGL%Fx4P!gq*-eF#Qk$;ix16awZfs_Xvu!dn1(0g2<VrT*U*
zh)G#C1OSkakC1}b<M)e?y)UCcLdCgb{+J4&UrdD+@AEdZti~ZDV^-bIy+-%AYp(^j
z=Qjw1nzuQ(q>aD?p01<X-eLc|t4Dh^`LvB^6bH(G>&Dv~3saKMLrd2U1Fj}~5!ATa
zYT;B+5IN3|Xn@{T-Jm2Fg@E5yr+$pQ1l2iCc}2Q}oJFisznQZ`c)IjA<nYDj^EaZ?
zu)cX3!kEY<N0CKx8|;pGjGupeV~I$Vy-;<p13bx8lSLaGY1N<i+=vlMqvlu#T=tp3
z*Ohs`K2tNb7<#$jr%7`--M75LsL*Ft+b<vwo4B-3Y{86D$kX`i0w`33yOda)stjKA
zHo47WUzvVQOaMsB1Bs{5-Abh6`=qtVeB;u>Ye3)?d4S+XyC!tft}ps~`09UAZT~Yx
z<EOa-5$~&^9=#m=8j!y1z>Y}(Z1jfxgNQ$BO1`wgu4pXn?-iA2mgL-x!?MP7VbE=V
zbnLpYQ^q;8><15K85>AxtE0&`0llck-ebGDx^~k5*JTMx;u2y-O5>C-HJRXe#)a0?
zv{R+g{tO4sT#k5b?5`H=gA!um%lKMaK=Tv2HwR<9vx<4a2wad#QeEZJ(6?MuF%CNN
zDC$P&yN0^(=!J3A7qhb|fkymE$MO5{C45%w!Kft`6g@CQbBxl5Oi#gLQni{Vc#M0U
z%YijdeNi3%0)m}cy#Pq`PIOySY)nj}w9~JMLl(jOyYrlrA>nGs8kL8uQMS^EP7B-n
z*~-+Tq>@mp2vTSMaiiw;j*g!UyV`u5bQ7FdVs_m?`V}w~;fapz*TSNap>~!YPdAkq
z{+B@WPgNLrA3vsP6fK{8R%3Xb8#$a_=i#Np`F+24jAom$;Gl#Szcps|{M@V-qPzOq
zSR4V?@a7m;+%)suZOr+{^0>Ydc>SIj4Sk6Qn-FkuDbGMLsGLdXd{Fd_>8E6t17>MQ
zbToJCY=-SA>|aB%K-MxSDFjBSbR;=iwMAlcj5X#mlhT|#ZP1-v!09Yr`b8Q3-1@AV
z9JHZ#nV1tjixAep(|tiT>O{`*%y&G)PPZ)->+x#NMC_oW1N{%?l1b_rAN6&ZDQd%7
zg3^Jcx(Wn}bD|7sOWJXsw6|i%U&A3mx1^SE0*~v*?p_7dDRX5ZRd+6tC(#Ewj`@;{
zKb`SGt9ZB?JQ+h83N`ih=fWQU(nm!e21YkK0Cco13{!hPPZU`6dlP5g0qnZxKa3UJ
z{q(m{wsmRjS_pagn#42c&AN7e*zN5&D`@(iF`Gq3u2}F-<GyJ1uY7KeC|e}wDQFRa
zZKgnj8v6C4iY`eG>C&}NkKn&QZ72uY8O(kl;UXWN%OWrfUwI?X@wbg2NOYvLvb}tH
zI0;o)cG2CY*!~q8#NPZ>;mP9fwgn}sRK|b~J-T@fS2Gd~KYT%dPdA%?!HpgwQiIme
z1I&n*4ycX$8`n;gT)+EXSSf<JDNNsB^Plh}w0kkecYccrSG=I;r{2Im&E?Ed_%S+3
zE|F_?kcAK74RM8(Mz0SEGpjjsk)L^}<FRwX1TGV#3P<%Vhesjin}U}z6yF9tLuL5`
z1-|16HHstnjXW8`4<uNw35@ujjv_^FimnwE71^wHJ=}SV{|5?st<Cg>Ej>jL82eq$
ztBSrZ&_BPv^#b#(sw#kI(nOq5;b_B9P7Yp~iuSN-!KtXW;~?5v(OYxecw;#e|F>m+
z?d9kzh%#6%T9O0zLPrw1WgSg8HTSvj`Za6K%(a9z56?P&em89JDW)cV_8#}ZC23#E
zIP}}<JR0<UQ>tAk@(B<(6f3N2wT{=f2)|fh+u??$D-d_!mO7yH2vI@|oQON02&E75
zee-B4QF4Xma5rod&{+9O)waZs{LN4@hnOjK%+=U}5Y6s$*jVnAW6;d6QAT>b*KV;g
zX)#SGv8i>(ohJ+qSh@rw_@PLGkVY#1b{KN!=sxijp^p|zPbSZOuk<H<*G-h3U*9;E
z2o#N0|LDmng^d7#6dwq<pwHda^|~!QJY2hVsl@GG1sK$c0OFp5t=n^(+V4j*lt56%
z<a|?@4`@k$=)G%we`p3c=lcjY`>X<lv1Eyu=1E&KWWUB&e+9z*D$hnNNu_4twj3em
z#&atZY!dnz5=M8gSn-N=SW2EPh+Se=C-Gce9y8;}rnS989G&kfp2iiPM7yf)ahz=b
zD6IzK&tkEBOR=HZ8DZY;7-NQfn)wt0h8Uz+QLq3o!f^Nuv?@<P-y2gc41m_JLg0(|
zi|m6P(nuM`sr4jjur1P_T;Qu$<!aoe`j0PKg4)8?ls36T^==9wo!Zx~Rl&UsSP0no
z4ds;B5wp<%)n!eyeArw`b}xqfM~|`eJUDU1E1A6-vuqjmBi1EMuAPT-#iZC7*VlF-
z-<%N5m561`s5lAaNT`)N|DSbsHr08Zp`v{^I!t}EpUD%OV+q(c|Lf%Y^78QHcLFe~
zoI-S$2J(MM=+<8J6el1`3fKlHs=sVKFIT@+(=4;Y`M>2u&~gOm+;GebU60tT-Y1;=
zn&kqUYn(cPfCHu(b+FC{X&e#d34_zP-Vv6_F5RCnpOE=TeTC6s4hReqCx8CvJRT|u
z3gq!S5%a#n7ZUo75<63?$(h}XAJg!6gS<CLgMTMRZQK|lkAp1YnXAGwT3cl~6?n30
zB1G;h?$5z}jUI?G`F`jZ_6Zg$TO+C0*#S?m<)QZ0B3_Ge-y-5He>5+ZJ!I@k4AuFn
zM}ukk4+@fbc!AyXY!Ja{_M1H%T~%irKcuMN-u-Sw%sQwAAvla=Eg!MK)gCP!AF9?>
zT1K>ydp3)k>)lah9c@oW=VD@70#OVGc>+(Rd;=41w!Fcpru5qk&VBBgD|-NGWorh&
zxNLScHMzV4E(~;JO4bTNFMz6hA;)<SM}Yv!tprlhw~>O!)#cu&Y`f*UDR}YphHp~Z
zl{UQNPPjK)Fq#5O$wnCE1+?ypqc9xqpX)@%tha8s&FrEY9pgmbSwg9voD4Mce$^Vt
zWYK%7gq5n<q6Qa2a;Xry#z9wL3M<%2V3>GrBOsXB6ntSgmzl(Q@fnIzNfBy7Cst3J
z)mA|@X}&!8+%jWe0pZtW!-3CeS)3uZ3!Dh81*~%9J!XEQM~ebeg$hHE<1FP5d=O>p
zANKZpu#*EcLqS|z_+5mQ1~F8f`TaI`DOy1_7ZuD)w?4912M0`zd+~sT*ky7i1i$|q
zVJL!8qWe=bkF^)a1j?W;yq*2R@W(ACsd!r+yqd;_I!9OfWj-@=x-`LxrNP1ep%&rN
zFuEvx-|LYQ74HO~)&v?G!ob7q^>uVS<1wGCb{ZvR`46ESiVd0uB51Pz1>)#|U@3ao
zV9;|ifi%aW!%(S<cSv0FhFSBI?p?nS(e#hyc^F!mtXTKSW*!(X=)uJ764+e1VX}pX
zY5wyi^RCM;3-lhYhhu{**%nVuH=Z^wyyTpTdCN1$C^0@>RE4t$tprohX$5<B4C$%Y
zvNBwo9IAYi<V(M|h+S%-#oFhC@vwjSME!55Q*n2$@7&Xfi9J@zoECP49ITa-Iy1-Y
zOc+kh@q|9F^FbFSM2#2e&l7l9kI>19iyv}f@1FS(2A6jI7}|idSJYr=@-K`Kk#S?J
zuyOJ`eB=yFdM!oGp1xa5vAZE0jYUQW1{;rg_=RK1=ep11eWUSdjRpR2cw)z+Jj&2J
zD6p_x;=)u?s}!)~w0W-=P#4u%txGGLn`d=(b(?NSGe!6N-Xhj<MCF3sOi-JPm%aC|
zXD<z<X*#;P;{X#k3DAaM;m)R}rZ2eRjY~X4LYS_kn);_80a+(j4rvhKkSH_%sL8wT
z^<@_Pc@17y7Ke&bWs=?L^>TSM%?N!VJdD=gJtY73WNB2Qoej3Y`kjuSh)VYGsU>Kp
z=b}Qa3}cLC6wQ;orEOU6*)$yYqeVPB*H`F%JJ;94p*X?cr~QMc*!-FnMkEJX&->HE
zW*zA!y)koN=wO1ea3l(D!P@ERycx$WBLetK^tHBI5f_{M8l|<+-{w0|th~>B0u)6{
zc=T{tVrnaTK4=t#<Ggb$N$8<a)1tzO@!-XAjQM@XPK_*Q%H<G2gnS>ueyADD@s$|z
z63{zA;-&T*$tOi-!-gBHq{>gQC~tQQ+k(l)v})x@2-t}Y8H}gCo|>xd1TD#eHadHP
z$YToLXS?XvjOD!<@t{Np8#_8WwC!F8xB$M%`*Jrtr?!=o#>Fve&gd9h(@uJQD9m%9
z5$?B>m|ySM&i%@sCpAhh88z+?CG&b5eb{|D**LE;&nt7Ee=VVV*8qy)IT;1<p~f;|
zxV-IW`Ta7f-yVy4p0!N(Or#^I?&<n7NGhM1!BX#=?-Bu8uzEe3u5oBk8^U6TgzncF
z5JFhL4WC<d>d~4jT9nCq&Vjc%njLdIsIJh|MA>&QIEOv_nsh`T4QmR#$}fPU6iq6T
zA($)1cRI-a<P12t!d!A-%5TghY%JcxE<lJyeAviAVY3N*D++gm@pvuVvx_UbYZT2M
zFV+L^jlj1jenB-T8ZD?&6^S(&UwQ>8pK3;eWF^!P4~g4Bjo?VWe)rlfyg7*ozjq)+
z{{Yhv>C>}mWZsZ+c327Jr9EnL(d9Zm*@T*tlXIU3K;N?fvn1Nl+ZzzIg$u*Mh){jK
z$c0WaM?;t+3{IKr$&c{=Co|&U|9E*hI_>gdzwaY8`PEj*2C^YF%DXZo*AFep6~l`I
zds<YM&5Wm)<8iApVVe0q9G$bjLxHhk1|K9-Ybwlyxt1~`P>6>Eopm9Uy+t>(MDd%8
zmyX?WdDHyY)Cut(T)@a4M^zOd+tXW4MbDyC*Mt-g|GHrJ-H6DN1n7`531~4gI7Szo
zl%!UbdQrl4xajSfan+Q3!C{#dq`6rg;uD!e?TGKv4bnU#sdQ_@-;<`w%Ju!4X*}Xb
z>%3zYhH*cecfG$@=OX@|MV!#uzS_)PukOi^;(K@3;-7*i>{r5!6#7jO9<qdxr$P`k
zY%;_4S8t1<Y~5Ok6F~tec7&c@2i5{=G?3TUs$J`Q?*3B$*HQQYKo;m>{GvVIhfHi8
zU9c7NyZB?LRw=flvk0(nAhV8Pcm&NUw`-?KW_CUtjd%$X&dmiYN1^mZ8MesGa7PLL
z{}85~s=iEyOTK;Ki^j&2%p^B4U|8&bi?UbgaJ3^FSGJH626z5q+;0FmA_gr%X&FLe
zT6p|xy*nXp<yHydHK5PGfTtvm-ZHt8<c9kpg(KjaF3te2zl`2=AK%Ws^cxvg!BVA0
z7BLc^eV^uct{?@iQ3Pb%J{aV|?9|HBD;c@Wq^4Zl-gf5~b&Ll>8WN_oUefDw7dNjs
zd@yx1S_2(GV=~8i&W{(`)dB&sLpP#k=me~<$3GR@cqHB2u4!IG=qGs0lt&!02ptMx
zADj1Dsp7=z$BL?n*VY6#0MFT$-gnqfX_|m3YuH@^F?gUba1@vWJ8k{>W0chUX$P(=
z>)XdjGjD<kB&TKS_gPlj5i7?H#6KrP38@4h{J{JOo+B}s=v%I6FuiQTiUUr(b&?(5
zBXR`7D?DAl#Np{R?`Hz4D#C@iPY_<Dt)@L}s5sScSp)Z3q>+)9Ibjre(daA|bVXrT
z&4DQTdPks$HvCq4bV9;~^uWH5xZE*cPCZGK;7M0uraAb?`z5#BC5hsQFdMme=;R<b
zkHL%46Di;Iwh(5yRXW}sE~J85M;Qbn3XAzyeW>g$w<M#f8N|IFq$-(F5oep9tkAD<
z@v>N?aK#ncnmw`-9Y!Jeqb%@>BKRdF0$*B~5Z*^+)Yr{T+h_Icl|~8*T+GUoQ0yoy
z&+J2gJ<cM0)!7Hkd7jcMBO@M-osEmkS1<i9gD*ls0ifmzm~BH6z)0$oGj3d5_d6UQ
z3q}F9kG#q*@4(w=**$L*<bpmwIs(<`-brZdkfCT|Z)v-v<cj}7CU~d27pY4ft}~c(
zU_&U0*}-gNUo-GN9gCgdJhNB4M%0q^Q$CZFd@CfvU!uk6S6~K-K~Ph8>se#+^?aPW
zM2H%ZRQZn{?}r3^<Uc?5h`mztfDij5;szq4j6BH15H%8L;v(|-?`rK-__Pq=c8kXz
zte_|b>KP3vy9GH+=%gLJ`}rdaXBn|MaY8v?GKuHpg-~SwMf>X1Re0K1nxt3@Jv<Yl
zm}Ns-eiOj4s-86C0@(u_uCj`qEu)e^%(x&1IB;KJvsArV*qZK^dsWm}AIS^1c?s*Z
zYIY%F@$7v?KJwWMLspf{sjP&;cm(O{$!(G~(TIdeS6^POQ;oHB^8MZU)|NcH7*N%8
z*TO&nzN&3tsMUFXG+UBr-0ijF93*H?B`QRD+4G(yj-ed3Bh%l7oo`aPa9Trx!^Zye
zc>H$zRhP5RuLdhrxYLKSZ+tigZTcnAw(5E?*yEdD{sg3M$MaXbYev2JweQYL(r#!M
z3^GO^?|85?Lb*CQ?{x-K=mm@4!$~pLsqI%Nys(9!rLmXX^@UUzIlbdQSI)cvN`(Ig
zQT}E{wMn>=+Ym59RnwTnkq9Ej8sI9Mn#VcBW2Ghi92+Y=PN}^#6E!O7*VEA#{H<S5
z<Df>0y5Y+pvLe9fj=F!A8I-!{Zl)B%0-F*7H=W;cRTn6&-f;=N>hsu`E~-a!D${?k
zg(5Nv@gp~48BVGk?~6v@)|kM9!fE;4ldu=uVb@8T>6o_=3lko~`I}RYHu-=EAvAbp
zT_>kq%o-@RnKu4tLSNJ+G_h<g?Oh3JXR;Z0LLM&nQ~^Q6ftZ}d!cLroXS0dPCZkdp
zXuOiu<0}DK=nKCKrs7{e+5}*GUM}IK|1s&UE!7SMGo+&X%&~EkRRFD;iwi1`knuwa
zsp<~D$H#e!#{0O?t7Vye65<~T_TQDnn(ZH4Dz=gjE$EZqnIBty3|ns7(VEkJTzX5a
zLkm+I3lG!6|LWtlrkAx!`_E*H#HdS+tgue)@g5JCQGZ;3@9nV`zLKRS*)hUEODzVG
z@ey7BfIp`DA{_n)>-zBwi3Mk*8upTn7%0SS(AcJg#m!!_UcSmq?tYEGxY(~q$8OCF
zLy2o&kv`NQ{m7$B8T!yZEzi}I;j>Lj!odA{hc$8p{Z{ZwO@88g9WOGX1hRrW1D=eg
zqg0Be!|;g7uXR2&rUROAuH##JR8Ssk+dq6Bo;DERNNc(%{VxRK7#|P_aS(QNtXuB%
z^FC+;WR9>wn53Wt+I?O5OivuQo|x$}Mw}ea%4QQ!R#C-R6g`W{U8JETSdrM$l31Xp
z&tEf*6}!TES2IW-VfByBS7|tU@Hq~21H@&lYG`IM2oCFKYkVIq#)=H|?BNhZUYH8F
z{<*Suwg%OqM)-t*iZ|+SuzOQ!v~tGzD00CWEuS{Nm>^|>f%;a>*+NX7#gB2Eg*29P
zgyh*~%s@itkHU|E1fH6HWJ=Qd0TiOs!(lNL5rMxu%}&R|4lt48&st*i8B%pfqM%fX
zVjk|NP-qHxfsHz2X51+i5!o>hoYNS?5~pPv=C3qeU>TfQYI+!484?X-LTX}Ni!wkN
zxmifOcj>izE{4la8B7JHq)=Pr7LZ1FK;z-z6$}m7^61(SunYnQMP4LDt<!ae`l4>P
ze-~+M?c@#LY;M7nfj%XB<KYtFJBlQG&=*6JKyclDCrgOc6LUX0c`NMK6g$E-_^;W+
zR2rSB$Y!B4Gh33)fP^eUYA@mxlcD`$N&?QH-DDG2J}owlpTyP_ia5dml|q%ddBV7N
zGWpW|hOcf>9oop!R7Jc;lDpwz?VdZCQM^h8SN1b;B#atOY4B0FSQ%Oi6cDL8TiglZ
zq<F>g!h~i-nn*XWqhvoeoE36@H{Ab36FNbmIRbh%Dx4*YijQL;9-d_n5Y}|-ul@SO
zOvV1*vm}0W(d-B<%t@GOZea-!EqgbYJ-enyS!5}aR!D^-vM}==Qc=AHLEpX;?PL*t
zy?({LI101*f=$VSn#-p)qv$N7K0yGVMVzcusqNE;z!)^^6(<D#zP&wA?Yhy4va}-p
z-!AjtHq97bTRU|R*sHQtfnJ2bt_8qCNT}8{=Z7Qzv$Dr=3|i*G*tH99PI+f>S$BMb
zZhrY-b{3v{j!8b6Dx$qmau&7DMX}Cj9!)V;s^FEfj@kpIx8nT0jPMF8)cO?la~QdP
zP%$N37>9C<O=_D^8ajqk?94wRNI(TzgwK)AT0je+X3)1{qlBITQ_}pcY-Kk$iHn%T
z{ZcN6#lgX_d&p-nknFJo9e@F0^YhTsY7J1SUkf6hxt97!Qb*$W<8!r6xjBhIm2I7G
zQIhxCc2%8v25l3IWCkRu)aK~?pGn=CbOnP+k?FS$2|S5Gj6vlHd!Lz!Lc^pdvkj&7
zXJXZ`sEyB`{t;WyW@1w1Fp;({ip5*O!HRz4kZD;$IObmW;$>)8Pq8H8OfMnDC@huA
zCy>ye*X?S{;DZ7RZO>7lAyNOF1*&uYyKpSITvvMw14oc!IjslDUKAe9dgn;**WIA!
zU5$2s^;=R#i6e{~=SO<Ex2{EwkceKZ*Vv`*DT>_hhm>?f!OXB<mZgow6ep{-ie0+~
z*f(3%aL~8wRyjvByxWS4r`n29!t5xMz*6G1K!;5xLGq$^^Bt<YDkqDefz)ov8)9p_
zV=eROL!`TzNNZmaiQSJ*UQarEtTC90)J||oO_dBvka4rAl$a<AGX1ClCTus@dXJ+_
z{wb?pvM@=6Of_6f`0edy8IR=>Zz7WIiXgHABUW6e4VHcetxO3PKqag1cT%emFK<{=
zg$CnDyDX=t>Ur22L&=CS9L_?Yq=<ZHPutWPhf*m@<Rfs|VSXY)91XFLH{4!)Nz(|r
zJyg!Z-EcSLmKIYC$d2I*-~FQV?P1|R{u3~@2t~HQCjrTVW&U7YqZ^+d0dOpk5SeJI
z;WSrLjE@Z{^5&iFQu{$_E3qBI&taOcD{{}_#c?Pwwj+_CaWS2xc<qw2kmb*|_z5y2
z68>r~2crcC2labD*>cinksk4lXa<6AXy2hbvOUMh8s<>F%xy>ob<$;Q9<0!1N67|C
z5)fjQRo@Tzx+YRretj)mR%!ReGWxq#vA!FnK_&t%Ey5o5fek7OuW_U*3-0&gg2puL
zPU|ka5{^1%o01%|*Q`!#Szfbgj~i~7lUySlxBI+=L^B)ASNp-OW)?|xTupciZNhy!
zmsVcw6b%WBB}+$_?i&GDjSfjbt!C=zIQ^T2gpe-}-cU<9af@?1*xgJXN7YQ5aIju(
zkXAc0H?LBID;?8jiPn6$Hwj1AhSEP}S!EGRLd*v}G!4rBVcLg-PFP&cjK-{rT~~Xx
z1RGzWvQFb$eQR6h+1dZjgpbz{&sR^oPr!88(a6|1(8m9D^^?1yb&&*Q<BEmM=jmYG
z0qlw27*Bta6+@AUm$!(fX|~8hSwzSmtC)2)_2DgmaSjWcUYKs;Z~1=f%z->*5?1xR
zT2u?jpRJE%o_-sWO3ma4YgUzY39daMUbT@h(`1N2Rj_>XhY7O3o3euibRlj6WNuw`
zC}il>2&@=0-dw)zBkt>iWUgpyd_$Eip>y0}ZuMBm6gypVdP<90@PPK%m2)t?(qua>
zRN&LertN+t{qrBgzb*9rEYnE5^+nVlpNQt{vgx><3~<W|=`=MaWK@m4WrYmw2%S)r
zj3cQCUIRY<+Q9^*eCXdVs?$unrDoGWRVHOY;lbrGp+f^R{$2x-VgiRf?#ww$M?dRi
zes}%yh3+zMz!3;-#GJs(&gf3mjWT_hJ_r~}WegVrQ#3c+nsBWA8JV8`+Gq_n3wVFM
zFT(=r&CLx!3K4Gjz7e={4}f`B{{J=9eO+Cf|8oID!179sB$R!+S2=b{#F=Mp^9c?a
zeNgFw@f;b9#*}pO0*X{w*O(74IUYO?B4H%y&Tzrxg6;~X4A3ur#tiUy$++bZNf=Bx
z_2?p6KeilE?a9SYlN+_p34Tz8@j)&OHRef*;X?G^JeIr;d&CZ{&!KzEU4bY$U7%kD
z{fk#gon0hf*sVN}4;vjnMDT}R%a@E5V``XIEM!&O&s&d%eN@Sa85w$D*l|T;fEIQ%
z>Tofq(HqmyAZ8nS$cpNX6k9K;&gFpbR)Y$INvSI%wtE>Hc__9|X^1VhflCH-@<7rG
z(BrhP-R2;h?S39p6F}4cDbIoBT1<@0NkwB(^PIPGpGI&rO)~C4tAho4K;krSY0m@Z
zAJQWNIIx`X>C6<G0rrQzB+&d4Mum0XZah8y0;7mq|K~f0GE`u7@N^e?d)VuG>q^50
z*yegb_+Hl9mcfz#Yn><KWvi|d9S<dX>haeUA5UZjxHYE%BNH?J62&Z~lcQBUpMA|R
zK1d@xP<c^qxBX^ES9>!~Bq$<?*6N66=xejpA6(Z>NmR7LyRmK@_dL6ueII`_#%g4h
z29=^Q6ka=gG2L_{)G^^eEfvs9(mD)I0X`H00_X3X*$57V1Fv-nR{+aP(;!5P45;4(
z|KK|A{9sh8hRk;?R<Q7Dcl9YrcW#lxg=uT0&;@j}S_(;d6Q+T%ze9i`(ksYF6>vHx
z7gw6|j!=G982o#8e!bWQbZbvf9riaV>lu&{6V=o$<P?r$5LPn$To}~MyR*yH=yRbI
z=v$LNB_m~;7BdlfK`#}Txe$`8YQGzN|C`AB8~PYoqVmhNKk_K3p&<wm-QNxm3)6RP
zblNe({_m7-21qsYR4NE@rDqFra@I&_q>rcEmjuY@xrXm1&3Q#cw&IblE`|slnYvM8
zrwkv_IFXfQOm3a$(OGOiD5pMF7`xlKA8WKACue!9c0?1g&0v$rUl3WdkEnA^&$DDo
zd^03DtW*g!Qo1BcOPN{yb16W&M5UcgqP1TY9CBSOrtW3{u_fJMbKB6A-vZB`fFjhe
z%j=5tb5re+#ZxqjZ~96~r7|E47Wg79_{;xI8uu+s9nwYzP)c>%`Z#vV35~<9p*qr>
z7~mL2gItw57;!!>4vpYUHS+$Ah0%aUSIeAg9rZ>7wnu$^eYC#-B=nzP5O;WCW!h%X
z#Czo@K3v}+jH;NzteoIz%uK^qqPqF2y4-$E*h{ZbNgW%z<VRN_@<ieDF)<63OE!B7
zo06h12_v_eyd2l-K(_Ik6Xc#weqbhc7mm4jb;Y0a|4Xf`J(%n?=limruNUAd$OmdH
ze`tl$>#3{^zKz<1B4iF1a(A*4-iR!DOzpC@+SnLx#G#oeLVLkj_4>51R^Tx4A)Plo
zDZKRuBZAdi=j0dDS)V{XLBx!s<Iyk3pIq1GEj&op2BXGdKd7gVpJ*<NaY_UQC8b_x
zGA=(_dqXpZtw~}`daxau_Z0Y^F3$p8w}@Y+B?62#bMUzXs;8*_gX96a84SO%0f{(p
zydg{+P34HzNZ5wlKY7bK#0A&UAK^m6|1H^S%7_?a>|3Z$2o_1>e`+wJQBqmh*F!Uy
z5BUMD&We<2<x%5%+I8*0tGbLWsm=+Qqi1#bGIv%BM@eQ-M6R;R?*8D`1etG{uS)Pe
zy~Xhwxip~1&8oOn5`Ds&j;!0z8SJ3SAZLTRX+m`k=vLQCmo$$H4q@-<H0lLzspzY#
zwm?V&zI#s~+jI7GuE5yY+S=LD+39ZanfM;2hN#!Z?QA;xg+tH?==zqj0Pfr|?_7#8
zr?Kwlgj1W*yO&3_Y$t*iC%vjgLrSQud_QjH5PCm886R^88Mq>I+Hf3E&(B3V=4wl~
zLrIaiNJSke&Bi|0A6R}=;9*PXfEj?*6?4h9N->;DTcr|wQe*9nPRnIIXWkNN`)R@@
ztcj_p$64{{X7qs2T}$vz#QxgJG*Gx3LwVX$=TFJ7SV;h+puL7(bnik~HKTiFmm2!1
zt2?z~8Jf+c@^69Vh@{(MGeZo+U+&*%DQ|{$8@OUOf}<#Bt9-@?^gp?jL&{S6#O<gq
zsDAERwXeZTKT5!$Z9%d!5oDVOd5h}eWvMX@8xJN5vfT)SI2^kM1{p~QuhoEG8^B)w
zHr*}9IoJ^<!DJRQYbeCYh*>guUtA2l&CO|uw&z@-6hyuZ)(-%af+VPmaO2Quf6rfg
z8Y4i6T#$*?fG<!OJ%|iFQa9h)G9OaTqDXX&0U4y}a^E*-bLaiN!RSi7)H*DHB0?9n
zVPo4)cw*9V)+snbsH>(l^-xjZq!Ba}X7$62_BVy!eKy3~?h|{J$58=wGd>+vrqY(H
zoD8ceNJUs|WDo`)TY>?xL)eko??VL*Xd^#Id>K@mV&m3~q;^6ax`SCVJEOb$4TfJI
zrHF<zxunW&q3w!6{^)ROA&Y?mdV~-aA=K)tveVJj2ps>tP~*H^YAO%Eame{@Buvb7
zwRQITg`s~f_e7Ju8luRXZ8hm%hOID>2>k9`M3SgfP#q<F63SxK!OS^zdr^4~gSa2#
ziy+yDi&C=r+luQ~naK&A1(1uCN^fD|GVP}%gTZNvvTGZ5qsj3>Dlk`KOXuvc2|KVg
zU`p_;L&qR`bUC7wiPttweur+6shI!6@3q};cfaZXTxt9&D9UlARlhU->hwx=cIti+
z-3fDVxH0&jwhfO!qwT*3&kDf#Ehl{_lz?_ZR(h6bdTNRrUaaOv0X+QG^bc@L#bG2%
z<)~7~!-=yCfpT59&Gx<kde5A$Wlki!>8Gwp6$1G0jm5TRH12;(XvB7wpTE_Tph4js
zyZj>eZw5(+S&}}o6aGZBG2|sHJ<&jEACcuDUKeS*Q2K@h-KUs0&K{E|*0yA3kU^Lb
z@pEEs>xg^gfDlwiQIjKYSC0{_)?k6$fbbI<1sc}6xjGFlsa*szGYi~>GBUyQqNMQW
z@6X3oTCETJM@Xs>%@(D{=)$Ko$L@H@DgAbc|J)`_qbSvzbEzsBaoMaSWL0DpcRF%E
zbMBBmY<MP^gb#*Ov9v%{oe=-pX>fmy2#H9z@w$Rcr%v5tI0OuZ)v{Ieb|qj?m?)t+
zFgdeKkr{{2+U#$#v0T+ag?%@N1qUPgAmi#HLgWO`gA@=uJuKZ_54Zv^m#e$ZK-J#y
zeU~U5?!BRaI6JDK^8iYu+Zz1?t3zQvv-5|b0>wXoEa$wV1F+oQk{5?3<tSK&I(kl@
z{rlGfB2o#9*>E!_zFAP<qf=CLGI|;5M$yBf{V+{MKBBYL&6j;3%AS3)W_W+`OCYtC
zI4JKaZwYNn)H5|}cJtQJLN6N4`MP)9+l|-fSWs+WfdJNVC#4>5>3Enqyk;!v0RBoS
zG{~OCE}kdItst}wVXtY(WM$NO`|wH2kXI;d8&SuCAC-m4@YlD#D*6rP_B+UIe)9aK
zDg_#hm^v<i`2u}7Q+w96-$<n#+@mAX3HHJl$r!3%VzOSH^{tsUamL);VuK_vTAmMk
zu{f-MtLcQ@tIAT<VZt>jQEJwip+H!3saL;`+IJokn^PRahnQ$-o$iyX!{o`V{!5#%
zv_Iu3$6<fWS3!-DDd7Olfh|kZ9rBOoMJ`feIJ$pOnF|wQHK^EP2KDAQR&)rw^Y>5+
zM&BHRBOO;_-)}Z^E{=y;??n7b9|Ha0H?+a9t5EL`ef_GhTW>6H_wQ5h1c7XpabKXi
zOU$-<%YfQh&ki5|aQW%=O)sOe2$Kq912%HZ{CU68QN#_uB`V7OU+zZVnvN+iZV0{2
znHht1Kjh}IQ>r@W@x$kSnS$RND;A;T9sBep*PHl}A!JT!yE(13{km&70pWrolp)CZ
zE-~LQgWM2<KjTYRh-E;=nn|-K3SaPn8#jKAm|OR)Cda>np7*c=i9j!fDUcqBqDOBj
zW|Ff$yso+uC7r=u5ZBi6N>s109*t5P7oD8M)EDf>*6|)HK4PhlA4gzuZ4u$&w0uhI
z(nw`0MrSVg#*RYkW3OhhrMo(6+Vo4fR3eCir6QM>;Ct@)2NLr$n^<xNnF^u&en*si
z+u=XHS5~M%wrTOWTI5m_smhgKHm?-Aw%M=iI=rn3ZpEHMX8TI3SD?O<(0~Yn!;f_8
zxcqy{`|)4j-SGQWv)SHJYT{-v2J7@r{{#Xk@R`^7VgcFN5~V{%N#ngMFk<)o4g2kG
z>q)x%K|2tBOFkFqrvdWayEUh++pTyGKEH>HzkncBTI`>V!`+O55{{da7Auc+8E<eF
z1?FjS2ht1+iDB<YGMuUGVZ4<o@+{B?1Z@!eGMICAl9JyzxYyWc&l5h#28m?&D~!0k
z7k@Fw>)TGEVv>ce-aBhqPNPbKaO4E7n}gbZI0=`Sm^Ok8Xi(fPw93u?M6YWR^qt=k
zTV6Ngr%<yfO_UIrY+d0H;<g};BQ2-Ul2dlB%^0pyF;DZ<#4^r}eQ$@@?7Qkczg$Gd
z!p6$@MI}~swNitM^z>)vDmiWW9FgcfMxh@9C}Ir7?93F4grBIo$W9Cen%15Ry%>@s
z>NF)%aq)`O3k}@E1oUBVAH!XV)u0uI_SeKUCPtccrIGKBYttK41R0CzUa~>0^5&nQ
z9Evz7ts_2_sg+v)M`#(y-3Wwtnqs+J{uO;s<t5|my<fpU420l~#h$1+84h2xUK1`O
z<b7Z4{Sa`<z1^N@x<wXwxeV=xkfn^T1b{c5Uv%tdPp2Kog}ffjD&{vl<XW*_WCn5k
z>`z&(Y>As;4=*hKb=nNZ*V3Gpe+PHDp$AS&pu@mn)W?%=`)~5k4T%>pckG3euzLP1
z*)T#ijh?Eb?+zO`>T4}lZ*k?d{G8}6uTacDN=0D;MQy?~O4Yu~cOXhB+<kr)abOd+
zW3!S{U0YQptx?*1l@!+L#vDEldqb9x`dcdUkFyxL0rWPuO1^b%snYWJ>KeKYrAl|w
z{<1y$ED}6y`)xcetB4}TC~ksaZY=P-=nzMq6_B&J2bVUxs}LWIZW=60cyrKH&{Kwg
zs~vYKt@7W1)m^&71gcFSMDB;)f_PvfPm)2+-p4VM9${IX-1r=RVWuHIk(Hn#ae10Q
z&qEGVWHRk)?Y>T$)0ou2zM4!OOO<);ay`byX4qu>_D$6H4V9fGSONB$Y;v(~x^)0a
zaLA9K;{@R-UL>I+?!Ob`7l1i;+ZbJN=Lg(*yS@ItZ822sfQraD%L88uO!Vk>fA90x
z!_Ohs<6&n+UL7%iyA#%!C3)^FhU7+V&@hzc^Muu){=%viDf@|xAY&Sfd=`GtkH0U+
z&lSaNFAwyA81f8+=V9o4lKBMjqrN5zUHjRRmP9pJm=ez${wSvKg>Wt0gg4K?-_LkQ
zkTbIOyzXb^mzJM9(W##6EhvzmNYcVTUmW-#b&{WFvps@pY#}N;ce+b+Ztr<Hmlt6A
zyXLG}Y)^kwX)H3vSyx5%2tuD>lpr;BwF*E}`%@8?R$8$!H4$6Fr46cSQl$u1{1*_Q
z<zD@m_7QWfH)}sIFmCR|SVu`7b+qmSgs{>ddRzOsMMgJ)P7kv;D#Mv`5kW=JJRqQ#
zs8h!dy0RO87!l}}pv0ndv}|axb@L5+8aZrLJegByj<q1cZOOkBeF!GGH@)3Qert<-
z=aS<209=l=jbYGzHBr6nAD7ldjEay6jNk$-O-+l46GzFaipX;^r{@$Q;S%;9a=P2y
zeA^@ZF9^8$e|Fge<5otsv&xHnn>1N0_5?q!scoNo50=*X&;1ag%V)54*{0#1?sWFu
zI#ZQP8c}j1z5>J)#R|X#F)2H!1-W%eg&TZaUsz*@Dl3U9^Q)X4xeL-*$9)0M=Yu5!
z@8-@HK^P9+#KTZAO%6n;b4KC{@M2y$j*o5l)bEf8+`IG|cdTICwPs&GF`UL|n=E!e
z!}vqedXB?Cc13~V6}Y@AHX%z?-6o&-N$34x$9aVUs}>^OkuUYj+Llq%C#@V%6Cv)8
zRw9YgGPPN3SjA4z<wG0bB_+V+%7op*yD;<vg{MTVp(%+)lUA}IXEnWnhUI_>Avd`;
zVWJ{x1nj?!c8nbVP%i7e9M#tRw?7gD53U7budCiKsqb&v&f~w{-6u$a=AG=&?Gn_l
zWgSNM$Nu0~r?a(oPgi&MQ|BN#{?8NRQjPop5BJWlrOxcH*pd9~1+x)bD7=QO^%FY}
zC&_RXg10>XL{HfXH)Z88=Tm-lo43Ww$2zzZa!5=0)O0(4s~!t~?6r}KUT1C1rSUII
z!h^qJiA1Mk0wJ`tFXOQmB?1>?%g>y#AP$6usU~Nxc$Z#V_;mZhr}YKiXNQLYXOk9K
zPialpuWDM{1|rR$q7T*VXLq9s0*a2d$+&5MtJ?(P{}{So{na`yUCH-7saJ$bD3K7$
zLxZBV-K@i)@iK=5h>+{7tbUfy4g9*wmrMo?Z4NamiuVZ};{bgqfji=E_$xbQxi+?K
z<9avUPwr+{3ep4_20Jt?)Q~S?FDy)fB7hS1<hpPV&G7#*w$SwS-^+NSC6}G|u+N8$
zR}-9X1&sQ@i)u*ZZn#&T<EW>rlO=k$q;D-6aJ644X{j6S*uJ)UdQjR&Xs_%fMtXJN
zs;81xEVAVW&Lkjm^Jgc_SNo|g6{lpgeD<bH^}95Z8tD(%lTI%axEbnvYue&lJIY5c
z4!+CLNgTv?!#Z<zhp$}8j(D6j?=TX`gp|2uj`<}KLmj02--&CB!h)`loIVqCk1(~Q
z9z>xRc+b0%&DU3y5dAnhHpq|QfbnJ>w>Ev%p^n3YOT#uAP@@1Z;{Hj&-jKjXKk@QY
zPBhZqv8EK)MA=l!)yPNg!RLpOh-HZ3o8(O19s0FG7>xsaytld>6*>&h64pwnMg2u<
z9GBhS^K|tZ0eYLJ*O?4XDl9>r4|`x1#mHiytq0v~odN}dYX9Onq!$aS;UG;c>JiU?
zFO(wu)Nv+yT^&>Fo5W$HEm>H_>;~~!>GJ#tT<nwse)jq9jP(G1W1m=_-aCKCc!#Oz
zyYRNCd{+JM7#Z*~D*EX05%lL6m(2jw;_?r`wn47G&sS98`j5(?fdh{$nI5+s^rGJo
za9lA<*gqBIX^iE2(BLu_$}`acW0W_mKRV!583}EsXjCE-_`iCp8)Ig?!(ub8U5{1@
zlEFEzGmlTD)RKF*<W@Dh8AbEQ6krscB9pLcbtTtd1cdR1b043jJ_;E8xUgxoj<c-|
zhWAR3p_|>>dA`|sjToef!{CFPPQS_B&2iyu7#Zl%i*#>O3oE>Rkr>NZ^0zMu`N+%$
z$FHk~lLs#_vR%O8AFswfqbsQVW{?^bP<O+%EqIBWXVZ6n7ggrK^$(NM?pvIqHWXiT
zh4UwYlZ_dN$bF?AV5&H;C0o@F?m@RoXnr}8_c|DlJ}IHDi@@t)pT{u3JHRTO?MR%p
zf%_fS3<np-9bfic9ru$FK%pfmh|BZtHsJ#o#{w73sl&yNzQJ#U-%U}UsJmU<QQj3{
zh0FdsH!=b)NWhw>mJ0cEDNFv?@5IW+b}s63^Oy)++<J=QYPC8wLqeDN5<m59>&ept
z!_7$k^PgSE&b&nECObb1apaXl?BpSKkmg`2)xV_3bHAf}C|fddc`+WJr{<`Ld5uxi
zui!u6okNyx*pHS5)mE_-9p}1R@YO7`8Q`M%(?J+QExb5h>f(zY9F6bnqGYwsqEG$*
zAWClEPDz@357fNv2y)`Tdfgwq`4-FY633g?%49IM8Ce68Gs2SBYkeC-@7=6Cjmw<j
zib5L20Kc>^W3npir7?+IFdVG8yb28adt?)(70VR7ox9W@KrV`%oM+za-d~tPZ}F#8
zGR1j)@ID#B)=ydZn_8L{>$49mM1Lc89ttsLn|g-(@u%<3N?Sr+j=vGg5l?Oe%b}UY
zZa*3pBysy%Sz?m(30>4Fmo8r1Fy6FfWK-DJ`S!0?F2AdlHb*17-t&;JspxZny^t$R
z;3G<3L~y|?FggWJi<>j6_8YF?4dZ~T@kCNU(KaW1a<Y8)NKyu0!~V7328_+>B1c(5
ze&~nW??jWUV;$!(Ugko_aUS$wr#5HeMH=p|&&zHbyjpn2C8zVCBJm`(cbGB<%F)r$
z-{r-d{s`onZcl=sWjyJGrem~uy52|NqL%3CDJe@O$~ixr=a_iSM-)~!Nm+h|o7b-p
zLU9ZvQG*uAJhXFgqZ!aXKYE~B&(h~L=Tt?9<gJ}AwYnd2NKk;g)MD&*Rac(8^B+~(
z(G*8ne7wcQV*4(#)P@lDa<c3lYC1~5c$);=zjucC_3UTNV(}TelggCd0f7Sq1Cm>8
znwl&VK422H<9sA&GS6fdelc8%IsHEHo_E4?@d@Th_+X4k*7FEbn-<cDutcQl<u=9V
z%GiW0FG~&#Vt@(%w`;1GE{!Vrx0@{D&x3^j{@oPC5A>GN0w&Qitay;o{k!5v$;T1+
zm#4sc@I^e$Qz}r#*~7IxtohsLTju~`&fg>-pI2o2G9ZuBBu?GmtpgjH+sE?AYQA7g
zAIe!{&Ijz^N+j4eXc8{G2Fj(JUW#R%A_tc%9&(MyC(oSahjbYbns!KOb-C_*NQN0m
zM-_8^y?#G5l705K%$$78&E=e2+m(ZccOKt_!w+njcc)+onTk$A#tgPOa@&-=nqMU<
z4}0us#NVqzyVOhz^__||bn^K>md-LNsyE)kLw86^cXuP*-Q6H9E!`c`NOyOabR(rS
z(%pziN)9vk{O`S=S!>qfoSFCi#oqflJg!FQ-@jFbH{#VWLo{DK3TGE7(ONXjWI|F$
z^S!5Tek>SHyci!1+~HSHOfZm_SEk}xnv2<dz8y&)+2=Av-ssTIE))y#CI7&Td^*tB
z|LYRHL%HW-u2Y+_6<dS6f_`kRwVsm*{t|Iijtue|IYsb=CHU~bh>IM=@B#6j5s&F!
zB!*f7d0+1dzOp{UZ$Uc~08o2#k|$Tqsy>m%mkxo!fe{4rhZtq~Y74^$kO;;&Qb$L}
z)edn&*r)Xg3&I}3*B1n^E0Z*^9YE-=!9<ky062bP=6F$N#=W-xu_&!Yh)ej1m4=Kb
z{Ht~2&iVxD$wyq>?$Ib71{tnDhRQ@~w`&`=;hL{jQmsdklwyx_#Z5WJ9EtCvcYQ3o
zAtQv<BDNPY^vI<Z=UP}MEX}Ejh9*glEz%(GBmVioj>5Dx{S{jc*1-3C*@PMJrdM(g
zA?x%!w7DN61eMEk1Kr4;?o#!`jm+@rJr$L9c0i`GnXd}bXr!TlKt%~@iiUv#)566+
z$_l4(EE5EGYCS8>%nm|6oEf{F=I#!9muSl}sj}MpWuy0^5DQWndFrifAP`jDtEXi2
zq&D3|H3iqgL2?nBz9CAIXIQcVSnQ_Op)+f1M=Fc;ARk6u8^+9v=V#d>XfY-9BY5cQ
zRbMn~b4YgT(%&w-A*x<~?RUZrD;0t9+cN{T=@}Y-`^9sV*q!0q^=;g$>Q&sm8Lxq!
zx>)7%V#W9T&qfOh8>hhPaAE%)z%uRvL_j@vP<a<5$gR57{Z-OI6BxKn86s5O{v(`S
zPbo8XxL@yuohFlZKMw=n`kQ1YmwJkwzgY9<-WKU$sehxX6S8wj?(#@4v+cR&{~E|x
zA=P@Ry4WuA<f=N#a)43l{6nqow287u`qC8;Kskf!YLgZ{=eb)L=onP0$j8Er3%@10
zp5kd1p7YW`?Os!6Ovkp(F!T@Tr~E(vuFaO@9eiz3`}b4uJKq&ra%`a}+tEl1;#2yk
zK5eGW?PUVH?R%zrRlAG*%9*K9T!9a&e>@!{Go~Kar1%A1i-WUmTF*b8ySpW#G-4~D
zfpQf_PrvuRTy&e=>JH0sP-UO^X1urCfyZO^Sk3*q@D7LWS@T%55r8o!<nzk{c_QQZ
z)3q)uG7&9muYE|ch4#q)VT?q^1?8)l^6_13IJ@Wv{#2f06S8rzVAlkP^!L(K65DW0
z_g9k%I2kLUsVO)>5oBO&HMi5hwy`BQD8BY@)_X2-X!kj7?Rlf_X%KoG63ziJ`<vuo
z@?YB+jI!6WcNy@v`^wnpf&=z}!7SvmLwMpBBZXl^QpV)6HRhz@GS>pO+VbJo=Cq)F
z&LZ?$pYge0$2#%{F6_iB<E~=&l^?=%oN2O19xg66_{YU&yhBl5AH%BcD~s)>pZLcm
zfDYRrq-@(N^s990(c8A{iC)JDMv-?YmEydb2FaoAfLU2++~SzdWqCTVqe*hVY|wLX
z$Gh0_wFG>nE>AL+tH37C=oT-0wI^CjR(o>c)cd>iezK(1*DU;2)&xwaAI72HjqP3K
zvS@UfQFGMUPw<#<@}7(}$;Qe8r*yQERH+EGKaH|`qBC%&p(s;DgjId9B^QZd=8}WT
z%Q;Prj_A=e@|BVQ;I$W+KRQV6;>ireV$@aiVJD~hb@NaYHs*F<e#o;cCmCfr{1Z^s
zxJg-Of`^d61wf!N)GHg=K4+BF$`R>Xu|D{xqzL+WzaO6RB)EshQ-p1k???T}d!pD?
z;|8q54yK&=pb!hdy$Wdzu?q?!0|D&!Vg1L;*GcjDjfa@g;i3;gCr1TkH$+<2X-xcg
zzExzn`sN-2XzjcYFzd8Ir=JKFe3ndURfnAaNi1E1e5+Qft5Qi0;9FA2H+-=BmCbPe
z)15?Jh+N{KBr45E`wgPAy3-ZJQHE({_`u*<7JfocXw+PtZXkIH4;B8=@q`Ic*X`~Y
zOmV8Y0+}+Pg<wrZHCcadrCVi=y=;q_`#RTPHN__9-?mcB%2E`22b@EhOrOE;_XP#h
z=#|C}N#O_L)tkf{e^7j7WVmz}kTL>k+HVn~!BFDj<fLmz4Ugok7(m}6;f?y*1}1Pw
zeEAwy{l0NErFiroeoC4}fG}~g#xHzsJ}z}s1Q4`P1-_y|ewLN0OD*{~<7$MX@B9tY
zFYRJZF;j-){6t_;JZv$4ZFF{cc1kcAk_M|fYL8|aW~9IN{$6vHSXmi~lRWW1&ao+4
za*PWC<bHw+l4y4$9<;xz@i%i!`rvd5idH0l6J;*_rJX$+`1VT^S&gHi^{<lq?)A@^
z47A?PyYc=hG#B$}uALsCyQ%jYMdw+__BYSI)LPSso!?d!{;vD0{R~}I@80(4YiF;d
zW<}>3B&5);xlkE9|1}*IkylnbFfyZVigkl!_?>g0Puo55<uoCw)`#=$9vAx7k<Pvi
z10uoK-B$0`E>17Ob@t&j{7FPIs+Fo7t!k-}$2Mm%^%L$kfZD9+JN!iFq!j5PD=t61
z9(#Uphbcs>zk{L0AS6Ng!=y!DcY^_A-Hi>_XcQ%$-S9$>fh7Iv<0eJ>+TKM-pjV2S
ze&CNtLhi()wsg$j0t8ZOz0eNDlG25Ps#PwwIA1Qgg;qT(>Uq!6HwfnMTB$;x6dQt-
z<zN%p#1#6Kc_|g&Mw4C|u(+xC5ly=W=fXuKjW1Z#?e!XTg=AR^de)|85aIvx7PIOR
z;uA=uPz9s0itoQI#Co}ztX-vM1;jR=1hMK5sf(h%O>>)p#ou_qNky-7f5D0e(2-O3
zuGL|yZBieOnZq<_lX$XnmcWgVW1<aY4FD7P%12@2*ch$@7PvmhLUQ1JysjYzfO3Rf
zAG2g(kyw@7sV)8T5Dj@mn9EZW{&7qH4nABf+jJaRkMec29qka?t68QXc0r~0asjG8
zEQTM}#~^|#85QXSCnT)u<-<O5M#&Lp%Q8G7WsDIi*Y7vyVpivv^=C9e92v{O%5>sN
z0GF0tz^{SNvw@^BlpcltM;k!>W>M$OxqfzL1Oc1%`AcsSJukyd?cb3)Hpx3%(qAjK
zZ~xJ{)-b67avZDFQykfMjrdDA?gx6^X^lF(r{Z`d%RdSkC_hMjxjfa5q~kw4K}mSQ
zXRM$s=LjY0jQVY$g3}p_@1FC~B~f+41fv9(Am=9t4t;{g$;rvW(Q)Znz#1W)yPEfS
z+~D({w4EYj;+Q*pF$yz~+YS4Gt>OgyvSI3l^t>a_83ufz@=tc5A*fDf4-;cl7(X!%
zaR8yeVBn}~wPPaiZZ4-G`Z#MmNX9E`n2G@e&sWeF1~>iAAz-*D;x}p*_}LXpV5cvV
zgdb^0*-rDXxrF;;;?p_d?g;cL<O#YDO>30_BtSQTp{0zo6ad?PcgOqH`B_z9`+oS>
zuV16UP%S5`l5a%HF~0WmC)c$1eXzyE>#M~VYVRNORn=Wl@up7@!g~#^2O{uhh$K)c
zSy1f=4)9OPHCzZBxAOIPw>3HG-KVM>ClYP@Bh*A&rhT-u7?J5<m@MAtBl%}Dm%XZC
zE3fOqu&dkUOfw=2l5J;ZUUGa*SA$t79lx=7n)V)!9nsfCJoaL9Qm+wA$kX0~5&nXr
zMjURjP^f4b{0FSWQ1_pK*G+5uTTdP>RPk$dafkiNLHOtGdU%B|ww~S;$bp{iqq0>a
zj-TZ|2z)JV772oyV8`An<?HoJ5#R(}`0KFk7luL%&f_IR$mWlTH-}wo<ZMy9wKz8{
z1kZpVaS~laDQ1{8RJqaQR*7#K^s5g?;K}GMr8zrFXDyxh#?;$H7_&bM3#hUJXa5Mq
zB7kfRPw1B32fS;~vNC6uM$3AMh60dA=cXh;da2WID&4)h^2cIv+^cJndiy6HCJ)Ur
zAD@F(gd~K#|M18WNRD)h8n`z^4H+9CCtn*3HBS07vA>iR=GvF^_m=p2!_OiBo+zSQ
z5+x8Eymf0HL=bZ43WkM@n!oC@GJLcEUg$zedTkRBV6bw2#3A;uW;OTl`X&mXFh5vF
zX-eVf^1<E_m%Xu)0cMo>Qk%~>#)@S;3c+Rj0-meydq@n<eWoi0zgQ!O_qZSdA}*?+
zMLuG(3etSD;fwe17+yYY00x&Sue&j&FjDsy2>y358%X^xu7v3dXO5M*eukWCf}YfB
z9iNd~H8w2chZISJ3F)3iWcjV|G!w528!wg|P0ieFKU~uq*ihgO*fL@Il45i+E|Vn~
zNd9&G-#Bl(ug8V&v5pi5**C3P&9Xy+&ifbSkgl$GQS&gq=lf1^)k^W3+4^uHSa=xo
zM$!gV!3<FnC&I>%{F$=}*EAy0oV*x(-QVm)<P<3g@6)dX?M#y7i7;NPf3!TpfD%^J
zep5IP#v8n&2vBc7+y5EV!#1*d)8)j4|F`5j)*}hvl=N;L9K%Z}6)kzi%Fn#!>Et(%
zVn!%)RIr@SE1CclV`>Fr+iS>kq&7ytenb)^c<lqh13)oHgJT?t%qH8Lqi+I#z847m
z9fjDb!^!W;Jl@;vb)XGx@VmK-LIMYGSg+;D$M=mN4qaiMj?=+_U4e$g{B0uyJRqWO
znCW}<b`^9Ogf$2S3b*~)hgo$q0A`#Ph1)fi9*X^5GiC|9G+L|Y_=0^My@2GfJ<+W)
z=lhneUd<kpi-lz|mBuqB@c{BXU-2KAu(@TvVp^TdVJX%2X*!Fj$mR^FDX*s&6IuA)
zS1~$mp%}5J?SJluBbgN!*LiAcd}e2joVESO&Z1O8!xAVQ?^N(NM}#Qn{S`KJ9t84N
zn`N=}CUSpG$VpT>O|ef<dd&t_y}*i0sjs|vI;u#AAQmhBp{nty`IxKm<doz6lh;!7
zOtjBs?Xl`AnSrAad2~<{17;e{9_J$wNmmIFARhr+Ip&!gDThPZ;d&CKsca=FoH3!o
ztdJv#8rIXudG?rh(D00D0B1RpZ?1xG#U(I!ZN{iIl7ZjtizO@gQP!+0`s^{Y6v4~X
zN{|#N#yV1R+}`Hj{Q$yy0a>4}?u^w)z_;-rL_>DBvw0X`pce-q6fWYRDbyh7FY%F)
zxe%hFO>wN7Tf<5H%o4RmkUoDHi?QpKnSsMz2&6N`98&j$3%%pmFM?!*#Dx@btNwRh
zYOel!*q0UvynDL}@!W06GJhF5W&tQQf9_kln$L*-?i|<Eej0RHd7!D97uTP6Jd$}!
zOs9|iLh2l9%cU86mt?7hGFgA9Dg)a7llAJ?{KFPQIK<=^gzNhAP;1U6jfm@$Jeqxt
zMZ2u29$-i$YA|F(KF(hUBH;wdyYsr-^!l|xmhC3GxPpbB3LGzqX7#ddy_%nKcLuL4
zBA8Gwlb#2JP5&Jx1;XT3IDXZEr>DOpEsV##7nB<PZhl5=ah+Gi$#u%E!5cb2z()L>
z2`^gMT2DfTqJLfd4DS9bSugwzeYPrA%B?c5etDgVivFdLn}Z)goLtK=I^hP(9@d4Q
zB$ok3hu+c>2q*%`7Gc8{66B7eU*Vf=5?5X;Ch%xLz}1uVO|uZz=kW;HOvRF`8iKIT
z`0^6C#VsHZ12_=qCV4d>Jk8i<WX(er$}9ju+w~P<!+QPGeKKpVv>7B<p?or!)zywk
zDvZ=&hbfK;H2A;>3z1!-DnhN3XQ$0>?k3<W;Hu?^e$$rM@B1&ZXbRdSF!(1mrBp7e
zV_qA!toa5qt^<7<)pZ+9VbAaDkPAw2XTz`=Telnwm5)AgSFHqd7=I<n{kB4~m_YC7
zzZ0@Ge7M|>98AtZRqyG4+T1*_k*Wvkh$g7)Xu|?x1txFNy`1w>W77>;U_2Tk<&=cn
zVAkSH73xjm3mNv-h|L)(&k_oxpj-<SJ8T|l#Dx;o{4&P9X6lLVXCnDu(S#U6X<)(6
zQYEK5>b_#X*3j?X3j|%YdlUfKQs0%%+MO9?{-t-crQ<Mr?83oaSQm??lZgp8c4H%l
zfco+qLpcc!-M=)<u>JYtBoO6(mRrF)0Lre0xXaLGg3kvha0IW8p2tCN`Sv(fbJF_6
z@@1N6{d=TnARsBpz{JF<2YT&_!3-DE_0M0Fm5pp{dfFym^mS$PGvrWqXyrO!kOFdp
z1#?H1-`^88nAHkI<p*0IdKA4)U0vM$dkq4XlF%&%v70X;zs?DAR$g!cJiH6B{-Mfr
zqurx2a;oqTEi`lNNxiJ;H2f(1L=T=D9<`7(90^mBW$Wlq32AWnu!(*4nKnRQIHMZZ
z+CLhYO3!YTaAr~aaXWE@4u1$44T0n7@U#tEvTiUsHBHnVwL#Ad0r{fiO*Jjse(|JI
z7#uB!MrFhp^(-3m5fJbu!jE{|g@^47)nKry4rCHx-pEMy3Vj&G5WWNfMD5CzzL5ab
zD4Za+*|<|{&Wb&GvGwHyzXKF1;{vu{@AuGO4TaBItcCa>DT@u>FKnrmu{Wh^8_5-s
zo^>T{9~_z2NySb@exxu(wbr+EcO)h@u%+9qyU~ht3=s-dT0-xrIUjNZJGe-FDEHmX
zkYrf}T_eg2FT;PfKR`zF3#m0MO$_i50A?=9F!MA?^)!y0qmCB_QG7-JD;II%&5NU}
zML@vm<8k535ZjRXn-x*eIRe-RIyyL%$MoaBwGXb5<DczbpS$@I=|R&>8}EaoFEk`1
ztC(3f87QeVKk{jI;6KR1RV+0YeTMyr-JpefSR489$x=&cZKL>`mojn2PO$^*A*bD0
zU-%b=we_m0wWohF`}()_kF-eeGMSQSXr_+Vg((by6&kPIoY_hihDjw}2vq)wI@jeq
zvw>mORp`+p0c8O83%9II)8*r+;a#6cnKged{FANRA3#G&(uIJh33Sdt%2L?p?$6Y0
zKdV!*Re4*+{)idJv*tND%zF@~lWh-9$x+7D!e|YGUObpPmFIZO<;%a9{sgu}&6z1i
z84=e7b`cTCk?yp!DfTseY{v||J*bvxLjc19&dJr;l9x!x`Uiu9OB!3GK*vaXJqLsO
zq7)yVJP?Wh9SBan<9RUyK+`zWIu~I$P)7ga4!OZy*Vsmr46Z=LelskfePJ`cmixEh
z+HYVgHEb~_g{0ruc(^!y%m{Ojgm2j=v<m~_5RZAO5xB;JEQ*g0!haQU1CIG9%Y^q2
z{{2=yJMO19KUlKJH@4P9EL7OGXN=Pte>Q9_M1Jnabo^Y_+8}Dx6HX93ZsQDhH0kOe
zM!C{T(UDY*v@bFp0S(Q#E|*%M^>R$S<7UW@PyzO87G8-)n>D76@(>Ra1f4$mIkcm0
zClka`u@DQnm^;amU)dlu(JIo9r_>5zpveYPtJmv3A{5h4j5t7gD&M|P>5$!pD(pW~
zh72uCtw}t^95?uUnQQBM+P7|J>D}QTq582X-OlU)%XzKhhu-$y3Y6T!tf8sNR?J&9
zOa*l*4Aa)>;(BewWuwuRZ@O!$TW>m!PL%!gX&nR+!yv$Zzjnjo687avr3pM;SAG_6
z?-c4lecbzWA0S5s23C$A<nQke^Wg4H+zVv{?Lfe^mJ4u11tZ=2Rip!8$)UwXoH!95
zc%$1KCMr#qsLM;PNWQb5UM;TYlq)N*+EM3NAD-cwyThO2ix5A&Pa1H?fT}({{(l|x
z<Hu>RhB=x+U6aVoSj=D_fHnab)8Z|Cf%_{9_OyWVY=uAxrCLP_m5-01fNpb2QO?95
zYL?9^U^*}>w>7E8%R$?E$QkY_h#3irM4}I5*q<p`=_HrX&YzzIs}vjDwrGC}^zfLy
zGjr4rRIz;|Fj`IQW8+&aY4h#TlSOgGd#E%e8>Cv=EsKH|)fd^<o|T-pDsu8(R@FML
z6!vr#2V?4|lr>3rz%lm7q*39=x?d&JTQMtGQ_1*3D{tN*AA)9stH_+L^G|u){KbU8
zyUoWWh<)Cx87(_w<8LHv{v%#e@>utG7#H6EX<TWXT%0W(9e=d!<7cd6?k0ZOx-L&?
z)*e%cgTIDl!y^bYs6|=e)zi7XA|QM%0Yc*!t{(Hk^Nb;gQG<XHsaRMbrnOdM^c+lb
zq0r%_YspJ)B}fdXcL-o@yS$xon*fnRV-Ixqs+nLCf6Q(-`6XE_siSEy+8i>{RH9Z8
z0vz*4R&#}-;>8?MvYngT>j0K#HS^(;B!AFtpsoLxcvoxdqV}g*x?m<Uks4*esqOQ~
z@m?HMaV7OqR7G0P&z{CZ&PdiXGimg)?8eHyxTcQFa?+FNh0xPA=#HPO7OzVFQ$03O
z7Jg)?N40io>T3t91N^!1YU(G28V$T*2hMA>jcvhS9jCRQ!CM|>xkQrjN!Znl%IG`C
zE{QtTa*o@-jqXHT=TVuNNO9Y~con6KswWpD2{TG@GR2PA&8@#CfeGQ=b4jE#1=!O{
z+)9{Zbnb@eZvAWR%gZv|$j|L?moKXo-?0tZrxLf>oeaRk@b7MHd`hVo`SG3^H!?ol
z#0%S)Te~@sk$Kc7x-k`Sf_qI~3oWLicPwG<maV-|v(b+7b+olD2|}W*icjf&aQ`nz
zZd-95DGb;tjoav6M)mR5egYheEnPn1KuEJ-qnYVj$*%k^lzb1+&W@Y=y@&oYf5XpL
zm;&O^u3j{hauO5&C9-7cn|HruKK8k9I@^i0fAc;T?Wk$yT)n%~gDYbLAyhcELDgJ!
z`hK8(>(=x2k<jAR;KtE!i03+Suv6aO!=dx6vGh#*WNpzW<7V+ufQ%5N5Y{)@uj866
zOiaX*OCUJ{`;%;@U;h#f5y7zl-Y><$%m1?USW#X0JCWg6NBVgo#-JwN8?7_G1Q@B+
ziB2BIn>yAXD~_KRD8-=3be^@y6XFbo=;yx=WH$T`QW#}U=8A5j@Q*{fU}3N^9>=mZ
zd#xDSyc@0M*Pl(?Vu|nPCv;?vnDCHFI8k#!?Q10;U|R0T^KSu67La%ZgX|eM;*6dB
z>C>*MQf;n%RgWjL`_{L?!g|W+aQ1}iCtFlH_eHg$0RoOLxSOW+UAwyS0yQMy442gu
zbdh8v2mSo#58R``H5WQuO*(3nnCCh`25gyq0WeB%bz8{L%v;C}O?6Vi=<0t5c@zJ9
z2s2=*xOTxp3b4KK+3`B<lsnw-UtQ7fC1f`d;U!PbSWz3$V@4@k=*pbQ)n39BrTs{U
zABoq%p3abyLVFg-E%&iZ;1JZk@(W(766afAnpeOcfd+w+(jbflgKT(;i>!)<nlw>H
zB>OK|<OJ{+aaf<*!z3@N8n;sXtcznuQ{E}~b+e(CJ87R8D%ZwSb@8k{Ds1#vdn&2k
zqc0t8*-|83hS;4O$5Xkb)M*W%rZ!5Qx+mmu4a>W+f(S(}*>@l_k=qtTS+%oqc%P_p
zD|E<vjd9`7Om<i=_@AGB&{%%pYzl9#oj(?AT2)eJgz^(tu4v*V(J-})gr~_fT}1{X
zbx#t=yL@C0-||&<Oq`if1)v?B8u`}{7>nRwa=>DC$)`t^q8Rnb#D7QPOD(D8{O&OL
zfEtrjFt$wIe9TP{T(Yx^c?AR6N|xUBBjV`uCx;5Dg4@9G|B0wf-vO-`@HvlL0dopU
z&)~(yMeuiJ!c%^MPH|z<hm7>bJA5fAs{@$1^%cDEN}eEnL<7du4jkRCRJW_oJz8@6
zPSY^RQQ=&~u$C-C`~xug<`VDEnYBZk6U8J*PWVHADh^}2OyVw)JPxEkTFq5{MY*bE
zyvUV$Nv9NukNu7dzr9<<>Ie``0hmhNk^fsd9zpx@=+%;oIIW5cnTmLT(oosdcOfET
z_3$O^k*B1=H#1op1^k`YNcDH$6s5RiR2^UshHz;*5ilo+(tq2(lbw4<=Xnd8P<O#p
zQG7vM2EiUJ5Ub~(te{XIB23ikN(@K#i6*d0H=VO7sL_W30fFOk#a|$5f@(&L8fdmg
zp7XRWz;K&W0;oa??kK(S$tmO%05iTO?`1b04v@|xMf7L46RUH_8ws$B0QVXsX5)=w
z2M&A%!S*if0`_Fy<RK4DZ=W_{IK7}Xpr_PiV0sE3GM83zxDy%d34uaRUHgwSv9{a}
z_mc}n-1~Ugs1Njhe>DA>zT=;^hE7T3^g9Sar?R;9!T&uWNr@?4(T|?>au4KXz3yjm
zN&Kgoe4Onw6CDFI7G0X3rEgCBY276FL~v**#~s^Dgw$K}Ql+O;;-msLbrar=4qQ0W
z$X$k5QE8(yq7ut}$fys)>3woVF~4!<KPD6@_ef&LAsPj0z(=OZ)zwCK%n}Huyyg#t
zTU-U*Lc<sdQHwM{^Nz`89-by69cW#BY#g~~cN&*bdkj<=;W)4(U00!e1X4n(D8{Qq
zf9@A{*CmD6sS*as(?i>G60RO5P(d#|h1cg?EESyM;=3FD$t41T6)9*;QJPx1x@+s}
z!)}63ib_jdx>ZZVV6cdPznQX^mcL8`t7&RFQ!(>IC|}n_p|M56_wyw?P9pT+>c`n4
zDChOU>-9;z>wYq%!~A<xx~djT%EwMAi7A#C7eO!>S3U443Nkx;2&|g#yi8AB+Qf#S
zm%lonOg1HAHF%%$#C09gaJoOw2J+_2ljwE5i^&t%hQn%`b@OOnDQ@(nsZmN}Fz=Uc
zw!<%{X<yl1d;8mYuNJN}!n2sMgwOe{<@<4)=0KI&0?0*6+H27vOG(j?H_XGnh=pCN
z0lpB~7YA$Ndpyo;H}b?ZKFm2|1oPX1VGtm&p&feL_7(VEe||k$4}b#pc}{QJ)5pf0
z6Kmupo$jbfNlYyPA?wCAuwCN|PF&hFJ5_=)TbMP9P_Y3-;{*h6!}FV9mtp%uh2W7?
z`3U~+F7LEi6NVq#i8$h5fkJtvi<S0r?JR~cr!N+;H2~EhkT^V3O((OLZ*3S2091i~
zgs?!3p>$XMT^vrtFt!qk$o+i3fw5T3uAoPy<W(@y%`-zN@PKE<Jz$HVj)QS%Fn`re
zfg(do1|ZJvn7H0wM<kQ>pH~_O2U!J4ivuuNvDS``9LLK@SBrwDBpCB&E!A7T#15BG
zr4FkDBo8wx%Kfhny2&KE{J$B<?}D)eygtMfbj=E}LFV0&T5)`q<Iyeipt!Kj8~89%
z$N<)PA1$0Rd20<?DhkEiL{FEHL&M755*jVK@>?1kUu|UE%-@-3x)=LV{Uu~2eMo*P
z%w&s!^XPe+vOqRju56rxa{PTZ9^W*L!UpbM<*}nxl!kAAt|H3>Hr`8&5nYT2@i-#P
z_{x~ClEhQuJG4O}RAdwf7-v>bUFiTxGTp9I0F=JAu`zOTLO<Q=S%!Q*76HWEZH$1~
zJuul~nP6oSeWXfc<+<7!Psaw<su{s9jG%CK@#FbO$6kO;J|_N>qtb{nM;JZ?Q2rhZ
zg|CK^MW4kcAH8p`LfYcXgx@Hp`~M8&g$=$cGlskgKP?sB>>_9g3v&NQRRVo?6MQM@
z&+J%XWn*Ila4#Xx-!^wV&aU?lv9A8yKPF5_d-ft&6zB~$+kTQ?rwf8}+<yFd85poY
z27^3R9BeF2vW*ANtLPDK*>w|h^!_VBOqIhU1^+urM$g}1B+pAQsQhON3Q8G68HOWk
zeKsD_2vi-gY~bO+buXY6)I^hbDSXSH7)qlln7WNr==EbCmu|4PVhIeq3xx<@?)j~%
z2y1-6EJi>!<#DQeJFm%*sYTgCt=Z$@YQP%yBMDSfr*eo3zsB!eBc^0SgoQ0nbmvTV
z55(6m@3BI2tSHWXAs<HN?hfN5Z2WP;Ct`%?08@E0G-1~Q8(WHNnIMfTK*z8+CoVTz
zQH^TKfPQKV%mj&`p1qWAAizUDfANo4l08_omv4jk*uW~l4oNxS@qjSox3=$fW&hdE
zBMg`!<VD-}BIIqg>)Ts|EKE8)1WXbA_MjN}+yvGRd;^w_SZbalfAm0o1&N{UeE%)p
z1CgmzOjijjaO8Ibpl?62IGRY;|GLu5@mSY}wn&%)Mk_veHpdGl)knEw6=eBP9J7k#
z`fffCXIL6-1(B_>vzdO)_hpWjp*$~KYHaF5{grsIdXYi!7s*p}e4TF^63E4@j#<}q
z7LgaAhL*`V()XdQ-rwWC!Wx>%xb{&^X_S&?d_P9O<@;XprC{WRS8?tD#ceHr=V{d4
zZJ5qqq`kTHp)tLmLJ)pmbYc5`50;Q8_P}12^6BOs27}nR&O58RGS8n<Xy4tO(mCIw
za>c>hpHCo_wJ7(D{qC&&ebT>Z#S~X+7_zywHFk1hd$_a49tXDDt|tG8`s*MH!~v2*
zQsYCc?*J_0iMQrXe5wA{^HK?B6#G7}JC%ZzH2Zv`&l_!aSPz$*z~t{RrQ;Lzae<8x
z0Kn7bvp{HX<YY#gM2(;bxP2G+=gr5$r3=NA;My+unc?Pl9m5S4<e#RF_z+$$Q*pgz
zxrBfUS71_&kMfQy!*kW2{~rGXQmV~=v=B3~hmT%Il{8f@f}UqJ0&@d?n=20wiApFr
zOku6HAo~!SqCcEVNyQo2<@Zrim%K2vRQxCtKM6;CKGX}xDPk^>1f&@Zsi*{=x`@<Y
z^#pxUu~7rdGlN_Z>-#?y;|&k2CS&zIO6smM)}c~sPu^}dU~@ljyG39$QRG!=!w}~p
zpQ#ki1vBO43IARg8$<CiA;@mKdp@Jwx*qknJVP9P#!R@n0c_VMT{P6X4(L}I^ktj_
z`z!%{#c_1snP!426XyzW&buPSt2!`qV+t7G*>-<ICCk-eij$TN2kenR6-|;x+Sr1f
z5S{Q(Z?(1m@|~VacLI;Nk8@+Z^UqcwiSA1QM$foR;!`zKy<GH->|Xg;Alt3T1TYS_
zSTJx<w{Au7ynGT^F~}z7{5CG?vlFW>_RRR;%~s4};ei%_$-XcCrVe2ocpKq16Y=<m
z<c&q5KeP+Ms0OTPPh;W`j_W3M^KlMf3(raUCD1%|zZrXt1>wO4Rp1C!K;erJ)BF!w
z|C|wWrW6viAZH}#36R|Tq+fFfNNcZ@`(8F$C|(@@Zuicy|6TWhOr{zS0KFx*_}crR
zzXwsrkN5Jzg$$>7Pg{w`yxW*DIaTYw>Xm;%=sBwPKMg#pbi;5}>!YHW=E?aC4fp;<
zB#pzc!YE$Y8v0!;r`uajs}peAe{P@1;vMG}!BAk!gNRK1A;Ct~Qa?E2ctqY)Wk`Uz
z%Zk!wFJ?@s*EScutMntf3#Ou&CzSVG8;9yGXy8R2BjL<_A)NBWQ{FOI?Wqi^hT@`=
zUk&6Dge^E@ZA^VGqn$<4l-*JKn}&h=Jsn*)4GiqEiE~UE&(2uuwmXn4r(%C5lGEE~
zBSyAiRhpn1Da>1ew!9_X9LkZAkCDcZn@!L^@e*6w*&!X?bal&h(@R)@d)Ws+Z*r0U
z0y#x|TJDKvXF&$ZV^WMy6#0@qZnsi&lXbI8t`41GQ~2IXf>%TSradW#JenUG4ZehJ
z4}Oat0``7*A%}$5Y2px&8u(%`G9EO~)|{<)^h)Sv;f}ejB6XQy!H?8Din`t$Nvhxc
z#-*_W01%3T0n(%^RI%?l1aj(2Wm5*&svM;hg}V0VG3G+<r;<4a9;WNC%mfF)h5K%?
zE}cucF}FfiPK9JvtpbY6FZe7{A_v5OxQ+!-)sd#m;kG@W7nKxfs*3Mym0`wtIyT!p
zP-*N85n;lNE-H=D1S~gNR)P_kM}KGVX$KsXM4WJU<j+vx2s|Pd7gz`)-3NNO!u*Y%
zNHjU)g6B5;S=)8vVW-zix{o|XM>^*#;*yR$YA4fs?^by3@qIq^`c6Ya0|TK4N9i4=
z+SemleDSNVCi*(oaZNuJnF`kC9{3R>B!AGx<lWC7M)S>la(F80KwPwe5)ek*;^FO+
zN4m>2tx8udIW&qU@h|M6OpJ&_Yis9$(aIb{0$jD#9`KXN%*+IoYJjCzjwtJ0lyRba
zlcDq`u@rGNY4#O?@6mAY%@dr@fkjn#t3P)(1s0WX{L`1BH{RgayrzBq;8%S6cnbS>
z*MMp5*^YcTwbx|`V@1jdy?7ko%^Tlf6HzXsEW{qp37yn`@0?`jWPBGa%ev)_9YQvw
zURD3!!G=o$0!44+E&-0Y{XaAEF6&}mw__g*3E8>Q@#|AGZ*mRWoIVT|U=QYRvB!7`
zS+ZqTOMfjTXaN-$SME6&rQ0_Iwd!e$z_DxL)tfpx=a+|-I|cdB=!3W`C`T1!96MF_
zcFnPIO36N~PE~#3@Vs9(i7ln(<<dT&jp^?WL*K3}{_V@<XuEN<)FGrae`q~~9oWDg
zD5vu-)m3TUC6iDgP<$X~|J9IJ7X4|OG(;Wz0qrc2&$$p${U8kdt-E`@{>P0q$qvJ6
zs~ZXDm`arpD+<$wjG{l-vmToi3gl6g3hN9~+Rn;Mpy}!YGcYs&EQ_)DuCe<%xObZ!
z=s-h(0T(X`dd^QO-IW9tX6=zP;*C#$B+dlW-NFGTSv(Nyuh_DryzWwG+9eexg<$01
z6JapUT>oc+2@Yqd#Fd3G&ED!Doablj6<C|M-jJk_C%(OSC>vxFc-VbcgHZgw{97qt
z0@lSK|0b4Cj)49W1dxQ(;Z_>Op7x}7-zQCA6^RdmA*|YFoBfE^{7d*L(la^|)g4k*
ze9YU0-JkIV#C}vxg<rKT<xv$>X~}hTAnI1YoSmr&seXio)dP(f$<sV2d297#C{WRI
zb9{nVPifzIR;&H_Wdb>j6_>4zMs5DEoU`W=yT`azK%&=>{g1Ta74H{~aMB=Bd6!7+
z#0Cyi_3|-UApWZ^>K=U8F|>y^^rdkB-#OP(!#lG+jYZ-t)+7|Ln{x!g*L^=)q4P>V
zcVM#d-&QU$5d+v*9C%)rCL}Q?@MCg6T7j~lZ1A+j`PnI7KTW?Shs;`D4Q^h3d*T51
z&qFI|3f;&M&cyqW%<PZ-l7RS)=ryML$dsJHZ*2Aa^Bv<BBA(>$aflvX8S8M8Mcg>V
zz}L<O>B878(Ng+Dv)B~=_wL}Tkl$%f6wuC)7|G`diiYID7>7~E)36X9yn;>4y%5;z
z2`#z*VoT}!toBZj{tmq6mED{b0;o{ut7B!BP6Nj~)*qIlmh5to(vBk7aWFnK#RB$B
z2;9|rT2)hpyU5R|#`OWEDQtwWxhakL@0BYzTE}^FbafG^qIz9ly=1Kt^R7Ngph@tV
zW^s`ADN{z`l1a(ju;H<hj-SM$TxNDlnVw;HtFl~5oYz`YMk90;jr?qnz%*s0TU|Ij
zkVO@By$o++Gs0_&B5;D2?lpTE=w77EqCG)W0y1vPP#U~cVwu|Q!xxd!W6I>tsv0}8
z$TGEK<po^>ZRUs$HK_c_kUQ1Rw&=d&h0EdkXWC@v<&AD_Z7ts|b_}`AEb@&Q++rD{
z?XQhm!H)db(h`v{0gTn?T7IHLWrYhp`fcxsHVpFQ3Eyi-zztf_Gv|Yy^w3Xx)O64|
zU8~3_2c%~1fJD7NGUT<OO?>fjh}t7<Bpm~oa=qdJm-)i(mGu0|h5&iMpBwXDxBY_y
zfb(q}5-3RYM|*vYr$D;N*+*ny>nJisI~M}9OG<oqzSHma=DpEPi`(o_g_gFxdMX7Z
zDM1G3>CmId*zYA5a<v2mBNsh1YiMwsM~JR@V;}o=LL>iCD=t%UlJel=#5vq9rJ~4+
zFxGEsHPb}FQczqciO3Ng+J4|&i1`@m{jxtu=b?GTp4w+o9EHM$Xy00jEbA+>OB%bb
zvE*2i5wIpAnqPNqh`g3Ll$5R}{ZWM6%Fz*bb2G2{0@bjP%5m0_#0zCkc2&ZPpwE&`
zk1u3m`L9?|6Ts91EP$E@<x$w;r+o%!bIKEhFq+5*l17gIm-yeGT~zdloEp7C7rNE3
z_6g4Z@*gKJEqv|gg#G5^pn%7{yP{{VEw5^{<;@ng@SiZOoWzHdB_!8`(6qUObA2dG
z<K?pW*T)@dILMtiY|yD?-|eCym_nQXWmsmT3A~WZJtxfI3MA190O`Odd{iRKGqIL^
z(w+jGoAuD{Ap7;ttR9YmBZR0+j*jixWp{Rt+p|#MCUg0i?kP`Y<YEs8TJhQ6_i;3p
zc0AQVVxlaEFONjfAc+7X;r!n3LB#{0WX@Aw1xN?GLRGacfi*P5LU8CHloM9DR2(KQ
zB2)q!76bD2udH_Kna31E?nE3heB{XyB32yh<i=l}6-pVue8iEBgOQ?^IFjJif;*F|
zdfZXPS9^MMpB3|2_3M-jm5B)TM5`kVUA@}Y=rp_RAACb-#l%C0MRE*1J7G_wo-Vm7
z5JHO&g6sOnVi)4E8zKfnC>!R|NfJ*K<1M6^ECA9GoFYq3dsuXM)~Q7x&mO%@siCZV
z{miU(?_(lA=d*I()5T+^bR>*#7uojMJs`%nP@-TLd6A(|v2;$vpk6p+--mIbGTC@d
zFbMf)+mb_fYhAVUWr<IGuHlibk2YiQ>OOF>Lk02*u(Z_vfFIfUgnxT}NTpS1vgFVE
z@6Je@D*ttKZJS0PasZ?PC8<p`k>v9=_k@K;>0tU5N=~7>Vaj$6A?^Gl=)0^%EB?uI
z{gMUCiCD_*dk28<DEwZP3G30!kn8mKCI-<Sf||zQ%tPSCfmI*_xsg8%>$}j?x2Hvl
zpqr>xOd@>0;9ZtR-|uiS<iehNPd8;jRI;tc=J^K#F>QPa!<a=L&f%n=!s6dEWK~SL
zoG0ZDsL5s$HnqDwa}pxaktO`HPl)<;Cjx_Z<wQWIt|c`BGwaXLRi09%4QQptVZ^lF
z3&-K@{vwclw}3PotFFCwb|Zv3v;bnKp}CKMigKjX*tqq`pJ;o>U9)~ZFME`>R++Uw
zZAw#StRbqx(F$f4YGHE*`L<<$))Zthqm$FVEGC7a;;~kex<Fkawl^)SS5l!*I~&Wf
zc@9jZ8?~#>TRYP@9Lw9(nHp}=eNSvj^^QaqA}oDXw|iB#d(~;}Zvv|@L-`iMEbg3(
z2;>o^_72Sni|RG4#*;(u+hkKmqyL~;F&hvWRP~#Fo8Ft3K;HYs5yAxd*}EIc#|O8?
zqw<1_S<PIJ9`m$5_(TQXSH(IQrb#3GDJq~pB)<!LXJ?ii<0=$O0Y!r1VzII;w8A_k
zks?uicq(9h`OjnUJEKX)bhRxbW4}PDruX6R_Fe6QeJ@9(jKS{JWW;U_Iwu#loYF7$
z`*ueKR<GxoT&Tcq)Do{WLVCF>lSjVG?1G4F3cHakgJe!Tk%e`BNJ9>)fJ%i$y`=Vx
zNQ?5cUXQs^eSXKhDxC8cCT%z&9Cwl8p&?-nLv?ex@X5VFWMR3H7pAthr2-m1AGxjM
z^vCJFD%kI;erG27y7*}7Km|!fRijp5=A#5so#SvVC*WfOziQ*f-pRDGKFXR3S~Ev@
zA*wcT<*0DwWu(?ExY&nQu2k1@e}+AKp}wd2XR>!Csl?S;?M=-;Sd&Lt@y|V?Og8dY
z`*X!VEIM$ib?Q9cr)9t?8VT`3Z-=TNvz5*%4H-my{(!NXH7;aV7)B9zwdwY^Cw!TB
zE-;<YEJS~$>vlTppbGkv<mM4NN>R+U`>Y$#7>d<TZ~}b8)pwpKgHH%U$OJ&jBzwoG
zd+Im)kIjDHe6AqdG34UyW;3>}s}~3ltyr`B8ZN}9KiI;x&$0}j&&6`9{;+*T)Ott5
zm^NBwlJx!9)?wj3H)xgF`>S{Bi1I5nyeS^cZAOEqzyMrj`AAQrroh0v_n0pLS3t6J
zGZFWLU%kf?X|S3Wk&w+pl_fiqdn#<8RuQC?wTuuZC~<|+#&G<oQx@{7x-{m67W3d2
zR=GO$3snbQn-3<)?Eb?ug%Mpjaq!E}=Z;K*RoO9(orKSj@W<}Ck>xAtu-~;w!-89r
zu|-%7e6^L~EtjR!tCW53G3~ez?NaIZVF#CSVT0=V<Sl{BGa#uW$*u0br*cm0U%{SB
zlwqc&AnEv%#V1-OO-{Ov#SW(g)m-M{8s+-?*QdSS-S9g04YZnxIY=cnh!=5D2|S54
zNT_et^@`x$6fh$@#1RC)l!pb_Uq(VE>@u0cmErf)|1I!hU{VN`dS7jLonr{R-Cza(
zPAdvLO;Z;e_+~d}#>k}ki%OM^{_dR2$(8xG5RKBi@<6dA1!bnfF@DcO?0aR-**S!d
zFK!<pQ~J<Drqr3w@q&1T$n%3xXuT}$A)`d5jaUTb*4|-U1U?UDz+L!Q)pyVDsXdDe
z*161_i=5;G{Cl)N?uC3?%10&^2$(1P&h9?SpC-+t_@nQ*Y4TVke9>mp=POsj2xgmi
z+^5%I!U`=CH=C@s+-F1xg4`SOdL=6IefQ*+6JjA$QWU)^mt4}BPmIR<6l1C3NQWPY
z7z?^+I`l*Er1Ce4nxL9;UE&1*xqxQaFtdZ&?+cp5XQkPTy>5)9b38y(kgX!pu7<&&
zFE~F?l&5rqk6S{v5?xu=2(oKw`4;y$aH;BhMPe2WQyGSP*Pudx$mp2w4taj6q44GT
z3$ZI2QVFrs2sMGZ>c)Ah3L!Y0+e#_|8$&TD%n2YiaMx83Y$?WV-mGo!P3Mps{orHq
zx1kw<-N3#2wppBr3|(u(Fg1aAuF}3e9C#59F@A8T0OU)66S9KuNWP*kd|&fj_zXqX
z>!!z~$PCWj4E$<NRS1Q77Bw!#?T^Qn@f<vj;Z4yWuuD6G%@)j7lxH2p@wJ7+Jq6hO
zS<s3)Of!QTw}sVn(Z$5V(L0B`X5<HThELRJw_spvCc+wPCeR<f9G0?z(5|&tmnz#7
zFTLHDT5>|E8_LREptLI4S3)INSf;q#?ye4hL0T(k6%dfnlN;@+(4LYYgtPSYCzLfJ
z{e5JL@KH?zy$mvAhM!OYsw2l0pS*CWJ(9}lAR}sheZ2)IQG28D&QV2)2DqnCg}&wK
zt}@|geDo+4FgpVHC<j7@<&?#db3Kh3ncBR+(EHWG1kAkX#GV=jEY#;<XWH=Bg)!M+
zE5knFiCsfFffn}8f6Mnud+t@#r2`2(gEiFmikkoQwt2lUcvtuI=XQ3`31o&nk^Hu%
zE^;;JcYme{{(A*s|4@)L-y?K&!%zr5bA>)kh=V(tw!JIeVauk_Cz1+=05UWXXD7w7
z%KL3)H@)A3yr{4AMlII%I4bVP&nJwcU35P;)FSZHg@US{7H!y(F0bzM^X?DGNist9
zPoAOzFAXJX7TWd)0flW|>_r9=)KforOfdvC#g_T{sI)(49XB51>sRoXOZVe>1hdWx
z$3YG%PCXv#msx(6r^2?M&K4`f?f9-wY~FFDc^`X1x?^O1>#8fjpKlQ6NZve3ZDEBU
zod>x^RO^T_RD^~~i?VR-Y{&@}NGZ*sQFX*wO|Il$Hfg|ffUK}b8i}}g#uSA$xGN*3
zK@}U-2&y}QiPB3i7M!ueDqx?m#)ak5?A)TB#+Ls6#C0bEae=?tHR&T3oI@`!Jt5%A
zFXuVdYsYhguC{MVbvJb&2Df29yTjhyhY$I^b)meQ9)jkqTV(WJ;*<98q~2M)J*wCV
z-qrKmc!-1bz{k+T!)%=szuwhLLm0@q`~rIK({IA7ap*(*VA89@?%>ud2T7>-@zNlv
zT2<RsH$Y?yK8iO7ALO*PMq<M*O~Ee(i|=@fwlq1Lr0tY%;yQh!8CX^~#pKo&BcVi*
zRUFmy{%g<@!TXIdI!l~j9p!EWhk*)2fC<c)C1WLw;6P>jd!l0naFIHbs0a!$NHESP
z$z^Lw)HbzME?%U+6yW@y0#0!q;@2iuC~J}>{L7u(KM0~EGfcaWMXEnIj7nPafxT|1
z3vCQpD`}0(=ECL0?kXwiC@N#IU3Jdvriu}-U;lMA!px&!q_^#C0kizF{F%Lan{K?z
ziyTyr;pY`0WXBOBG|urTctsf3&*HA!_K$;S8|8CxO&Z8B`&9BG_g@6sNi}OOh=Jk-
z(3rYUP*?>@(@6G(t5qR8$-P%hfgHORMG_kcEZkW*TftrVzSX&XM+ivG)9f7*KRn-M
zaX6q51R<1P?$PW%>Vc<SgYZM1{xKAF9zZ#Q@hZHYihL+W%m*GmsQ4|I6F~nvif-5X
z0|a)UkgLn!OUKTE(`4w=OC9tqd7x`TD9fwYblD4t0gK$X2<@pI!C;YIYTw`I&6vH4
zJmv45MLFuW-#!AucdIrfGf&;T$$ySM=H(k?8s)HmO{>85u9ZGT6eax>b*%z%<9J+$
znTBp6!<@pF7qL|LT@wtiv<E_k7KifU@2{Sq9-nthi_}v?@#0RaC7B6L##Bya(`irx
z{{erOT@?Fd)V{LNni-rldRFr@#VjOOSz?Km;m-XmPkqh>>5F#j#Z1Yh$C1=9G1>)d
zT%SZGH&FvufeKe)0$0JT1sfo+3>xDTsrpVF@u3)dB^PvPm%?3b5{aDlS>er*kBwW-
zHVsBE_iZST&L|HZ5e`U0l+%guVAn!G)c;Ck)!g4trj7dS$DjiwzgT*C@db+Ez!na%
zL`Fxr+CF*MZ~xS%uN=-ZfBn#Rny7CP%N5Dv!3%wV31yp<L1Qn!7Q7s!|6DxFx#j~B
zf8H0^t9%VcI=sElh5LuPR|G+Bhl8xDL%4&{4Y=R3Fotf6N2+bxZZrOa_o@f&qnZ1T
zE|kd&_q!0bwaN(9QD#VOFRyLvNG)8J?p~DEeoBUq^B#Zhdzw!yLd{1PmZL~h65y@~
zge{WJ)0wmk$<-i;n#`X@6Ej5sszWB5e7T^-l8BDbU&JfEt(grVnm1EZrkt_0m-Ahr
zZknm<^CSQG{O2>iir=uo<WJUfJbPch3^0<V1Q%XKYBz<pOFG<8<6H(Q(U%uhWt(80
zR<(>Ug<pF*M3H_||3%riel!EGx>CRjmk-E0u<wE()*rr~oDfXcqAO_3?)1u+*H+4D
z3p9^QDgDwSdOF>G7Sp1knYB^SMt1m6G-Jy-Uc7lJHz7W2y2rx4gZKISj5YW0$_hc{
zk^>-apO!U(c9*0iotc_hV^d2T`XR)((7Ta|v}&&MnEY$~aZ}>c57Qe*ym(gd3a*NP
zTK4mO;}RoY;|CE#T~9%pPcgMT;GvkEIOx5xz(KN02sk}yWY>FGb7<FB{Et6{z|J#K
zaNNKEE93{_9)gdK?z0GfkgP`e2mkxCI`Nw?yO3w~keA0@E@Ee|coF#qzTZ8PW}Yzn
zZr~$&;=}n%tW^9cpV@fXpDzdRsWslrG!f)lzI>*3e0Lls<*!J7X{fCZnpIQBFzeEy
zEbt~28q;*Im}30(tCM@ZAc6{(hP0kPMQKC{hNyjoj5Pe@TVG9FSQCd@6!x`TOjUcu
zxH9dt@zMGmgG&;t+Z34q@d5F@j%vzhhQ$u$7e8#Oln_k34Vfkz{=Ca(#FL)a_V@eW
z)6L;bG=~?W5_Z(Bj1U$!UtO%Y3nZAL%$f)pb|iKlPvrtakb!9*6Q%BS*$`$2ygp|6
z1<nVpc4})EnH6zGzUR1ja}Fj;*Z&=Kpm~{2;KK&ZdTs+hk&l9;u-B-tMib8$yUK9=
zUng)Gcq%CIIUD5!q4{ms5xcLLCSAR7Hrc<fcyhs`JG%zv*UoTfI0JbuBg_&o+rVu4
z!$rXLsn|91R^XLof;ukY-q!X|auDIY>uy4b|D{)TRvNSw#(;c3JAwW*@WG?#`RqSY
z_f^2}Gi_5UT1xzS$KnRbotcH@M0I#HZJnxBS%JCGp%f%qmFtPs4Rv+Tv?}DCN{5TP
zDBR`^q)VcUec8V*6IH=~Gv?wMxHhc5QlKd+&N$gC9aZwa>%q!AUNI14Fe*e)T^iCl
za@7JqD^Uf_%90}m9+={NO8@)4TM?ThGT)?gk~CW2-TB3VtY@kyX9yWM=yM1RGjAWG
zhqM374uQ}y+h?VtE1F}K^4v$VcVpLMTAvi+e~umj)g^GWzoS1r_qRrImOd!x*n!cK
zl(6MC*}U|^Fn=sx8Mx1N@cJ%9Y{CVwHdj_wj1Y1g?FRlDL@xid<pEHyfNew)VE<TP
z&tw8SOz&O;bMpxcPJ3Cj_!PD3^2mjqwFyHs{AEE^(=t{D!N>akr!%D82z}E&3NnFD
zt6qB!CMIKjPx5PnF!$*5xWzRf?Wi{+r0NL?2DnN@@#}qogI(yH`1tC8`+a*cs8>I<
zR#MwhMCR&Xqb>`1$OqlstT3Dq_78_e!gklci_YLZAF&%_3X%IUt5KIutc>FnP1mbF
zG&4p_BS%2GWywtpgU$Fs=$1Mjnko5mbfrs+PvhHrlRAPvQq>QT7=izQO*(%$Ix_%a
zekRG_kg0rj)ZI4}``w?(zL+=#Q@-pOTgD&nb9+!^2D@KCYBI4r|FX=jRr6k6C&Fbl
zy0nJP){OBY@TGGJzDyOU9pxj;?mu~|7pX07VP@)~^ZG6B-XX>pNt;djd5q|jh!6{6
zjP6HDu=5>_$wLgQ#9$n5s^;c;zUj6r5*JNbhcDRU3E@Tl4@Xzw)@0YlH@dq!C8fJV
zx=TVz0Rg8p(u_vBJ4Pc&NeI&2(y4SK;OHFiJ@0p2`wz~}dG7m{U&m`Xx(}>h+2R&4
zhhe~Q^AwLhtE%2<!_bMQ?G@t#SH8hi8-d;7+qZAialE*~TT-Oj$t=~+0HqA0G&aVG
zR6PFOguUuSt~L8gMa~U$eA()P<nWi%)^EvL0|4$m^<`7R1ILce_P8d7bTt`sS53EJ
zKc0v;C&$^I-)}t|zS*3__-Zfr6H|zF%B1S!ai7)w6W0{{>#SR?9|FbYW7x;)gd6k&
zE2!kav(4f!2*ope_xmf5B}rsg&(eG-de_<7`eVoXQ=uQcZC|RJ{6(5wol$t%^h;*y
zke2cWO65O)Oe`p^#mtdW3aCSI@OUPZIBKuF@OnHabx>(IJtyueU|5!PUtSLuycO+G
za_#Y7pUnG1mWBNC_fWY~PT$@jg=%3z)0e2gwRTh)I<cs&-LOUvxA^c8({40nXv;Fz
z?cgW{@)3=|{)WJEvRBjMH>aWPnKjq~_%L7US3vpDZi<9+^1=5nYB~eS<UW?M6{jUq
zs4{81Zdc5+44p_xYNISr1jYLl^16wlX<QFEyVT)#n}na^Q-SX~WgI`2UW=pI)(X+j
zXpXd#wB-FTv28OyILQLr!72|!NEr-SIQKD7b`Vi^uFDg=J1KvZLd>RZEs)j!K0;=;
zp4-L%5P=sqDVwIB1zeDl3abzLD)JT!zi;4(o%S9(vWoNSc(OAwA}t9Z^MxiOFteXt
z7Bul*UZFS)$_b;5lMqmvi-0`vi%_Phkpx3!pF^F8x;p<sS}vx4?bD!oZ?T-(Jmcj(
z-wU=}LlH*pUS`__S%Q!lqWr(J4S0f(X@{6!l|9S~auhKq&?m_yH@rb`N<AR=`AOxf
z<M(S`gXHZpNGeh#U;3teNCN#6PU@w|S3B_|I%(hIPhEF!79a1Zom!rRwW^csQ8n2?
zwrr!U>K+%)f2rR5VXmse;itG%c*~c+#KszCNT=OQ#zP{;$P%p}kKr~4*_&ed!nf2d
zkeNwNt^HzqARI3{=(bbx<rB^QzS56Jb0Q?HpiIRX03xY!34Xbj-)aCcAz!PtVhcOX
z5~KCe0i&pho#e`@fWn6TsooMrr;6}O-Lj=wmg#pH5HcIgyvM32x9w=`QIB)Hb@F3#
zoj5r?(zzo%RJYbc))S172y-s368YK`9A*qrEuA``n$2qNXMIO&RqnFP>?OIwiGxlp
z%Z7o@h+1Neronlk#pQ~!;e+h*<ag-P4iAzu@@Xt($GUuYG?_B6jTR;FrxnT41m?52
zLk}urxmW*~SqELj0Jbz{QN&b_tCR^{F8M8y`G!5k_<IAxd7N7RyWQJ^n-1drDh+mN
zQ}bO^?MF}Y=q}-)8stmaD_pq_)H&vYtlml_&ra-0N@jAhVF9__VK4X~e*1&l%CnWT
z!m`wjd5}s182Yqc_&~lE?3MeIkhVvOEiwg(oqAXs&z5MZBV_p>V=D3#??x-?D^tHF
z_%HM`YWg-jS#0ap|Bn_*UhHX6DLFa356AX07mBc_Ie6De|452ODV7PB?rXc1jO1AM
z)rwh5Pj^4+ZxF>DO7S_p9v1?h?puAiV06@<nc-`078=$z=&vMKl{nnntxri>8e2+H
zzmWHNNL<w_$zx42HNVZkImETd75++1o3bLtoIf!sRr*T<>#fB~N4BzJ;wBEM>i*P}
zts^)l4>eDxto*}!Z*Uo@BH02C&5TZ{-SBQaHW@~`l`Zf1^RGKh^N5TW3#CWcYwV{*
zW3u@9ymAwso~xh*MguHutgZ&pV98`V0{wy-&hb$JGWC#s@p2Xs!ed0~=N8LOy7#Z9
zMVeiE!!xZ(lbHjybEef_bnmIFtEviV#kq+nrrRx<SgFXiJQ51@EK<`XsV`ChpGpM`
z4~e|tNJfKi9;Mw4#AZII>flX8x?TA4$LQsc5nPtOn1Ne=Z?^30YZ(@c2Z%epvk%u%
zM_>&>-+;rsn1XiT8vc1&_eHCI{k@u`wKCYvKvf*<dn8wVx_Q$<_q^HcJhVMjCPo|b
z-+3+~cp31mbH4|jlQB3TPSBLlXiQYz)4JIN%d47M9u^LhoQ}zc)34=jVM8DN&bWZ{
zbX!K@rVb*XU$cS){L5=zKTFbiT7!4)pQfmw<rNS*WmCQB(W_d&2^Ilb09XZMcmfB}
z6AbO*CO)u{k%lyq5@zInWS#S=ZiIadtHl{1A$*z@Uvg<6#r|T`zN9Zl(6bd&Hj)~g
z_ZxdM4U_X<AZ=)SoCx0p<SBgIEDMFkGS18sl!epk(&9j}<Gge+A2BLm!kJyD2MYa5
zPO8g;sez4dHDtEG5h7f}Z+WeZCRj3B5D~kE&npwN6UK4gs~3Ff$s;jznD3tyE2xE6
zGO2U>m+GC*OCUrdwz85h?-w8Lq36z*p){<y67CNY-VFy<8u|#Z>={@3mdbwb-TKRJ
zX4I^6$K=-OOfCB$ca!y{?%#tz@?@}!ZJemirO$se%coCD8C}4%IcaZXr1!VEwUtT_
z<zI$;{Tp7#OEhC6i?<?q){PzEBOgQDCuD+TZ<64H5Z>j`c1rLq*?3@B&JiLGP4h4c
zit;RKQ$W|ZL?w9KtBJidQ#efJ@r%MmvB1!K*(hTx&Nw%G{l3^)4mMaKhsT#$;=f4c
z?MCbqfb}MXcQxkSB$f<l!#I85`AwDLn87J6*OMQ-<?)FA_I3z*)ORE6@*J49KWs>s
zy!{?f?RQv`w*i-at;6qoYil$>Az^Cu%Vek*R#2zf9acM&Y6OOUId;r$$u5g%0uz<q
zS}6Y}Iz3V(uewH5&qbt#tbm{0F{J(l=p+dZnJ!gGCHP?nMR(c+J{G($K8tnaC=_T?
zY#p-t<L~QCo+fk=)OT?9e4?!?72az=OfNCSaZdPL<77>Z3=yJQ?Uo=uakg{N-?PNU
zE_-|Jdq7i`|7hN(jTJnXFRE3${Y!}|c-&Z$g_!$XO1t*A?>QCe4e%N=y44$&9i>tA
z2~|1hCF&pLV#CZBLxS-F@P3Z!*`i{lF=t=_7m$#O2a?1U?$o?Z7*!TwNJLFd4cx_b
z*Z7$$GQiY#Bz9-;4@g>%s*?$@(jx)pHP`d~!Pif%!g{2^)}QBugkS8Eq%32E2BOPe
z2EYg3)JmcMTnoJ4f^r^NF+DA#O{KA2A3A0}1#Ef&QRh{<uNmh?HK!>;>+7eqb{CO}
z<VsIx;ax<b6JDQ{t6+mE2QgmA`zJlrGM{N%$13Xq(2hif9g7-&#cSQ`dGNXQU!*g@
zUyglp(Smq{*4OZ7$1;|5*I2aGK^A#%BKuU`il}|dXU{|zH02>NBeq1E)_e)=Ml%}q
zCi2%0<1`a`j4XF~U&7Pd{xB}pzQ?xS5<*J%Yo4_!sqkzUD~rAMF_7<9LJ2XCXdm_$
zWVV=!!KM&|B9v4C`OVpYI_USoFk)XRVd(rr_4HhmPOhNuTfrnwTr;rZ@3Ef*6W?5d
zX33_|W_*{8^LJ%@MMyZFX_z#tYX&x~JWftIpwo@xi&z{bzml@&KJj_p7h4Dm<6dOi
z#I;rwhGuC^tRSoHiQ<KI{p?Bo@DpWXQLw&rY+niXcX{@a?$^x|lTg>&YQ-*OuyBrc
zc@XIO-*SxLgcve#p5Ykpo!Z7jW4>tUr|-tw%EqT(J_G;}9{nS-|87ea(s%0?eCkX1
z9jMlW{D#z%|9$}0w=Hy;)79H2xG$=&(-s$kV;wQ;Z$WTm^{@&R#0`g{2)zlSlRv_;
z!4(>Ow<;a%`AET8ttUdJwF<hLOW0}}Y+HMjF!!CPWLxV5CH$d7n^@^y3q*&b1SMEB
zziQ0j3L^JD%h30r4>+C{eY$1~d{BAXxPYFvnu?QlSgt=$%*U<sPrNs=Fzs<^Az~aB
zB1+c@G%~UgsOHQ0mAJ1o_Gu#GQr4cf<Q&Y}>9R2W_N8aaHi4jYg8rz@M<iYSlT5jv
zF_!6ek_ASsn+ELae^->%Lwx!xLqpF{t?U9b@DH7{2XC8De#?N{#V(kftHVXmvUG>f
zMSdo%j|XJNhJ|0PphKhyQ{9=!#CA;~h19gYk+u}4<_tz=7^JUXviPNZVNw3jTViPW
zmvSW3QGO+BZn)h2K2{%M75~ItPpNH8J*VqRVUDrca9kY|r<ZTHDg5x_BS7>DWWDmC
z6)u$O%#;;@IwPoHT`I_op_GZ2N){MyAs?B^e^aXNPxJg9xbe*=X=`dCjXD1Nx6(>a
zXdaIU(&`2d0;;*G;`p*O&D3%0!^*Y*PvQ2Cb8krk&eZQ-Gh9~ID$lP+0xq2XockVT
zMFt*c@rxZevWS`tn*=d%rqsCImT478q1hJK8d7^ED!2|ZG?=`vWvlZH|1Bm|cfb*<
zY3gx;sVc3&Dyl1r7S2<c%`rs@s*j`(xY2Og?_0FFmWn`;p55+!?5<KKJ&-)ziQN7E
z5tQE${SvkvnIh)1wPa_7K<vw&SLg)XR}aP0bBTz2E_9-DD1Ov-5mD?~9IA<v9<G;K
zTXBS`ifVL1KQAccpcPM3_*jNfx1;2SHA$F!Cz|FAZSpj~Goal}u~WZ}5j86gU`~RE
zY5r7}w(Bi_D<Fib|IQ5HEP*l#_K;wMwWB<8A6Ysqdg^hiSVMhP)iC@b!r^mn-{uR7
z*L1DS;g>|B#nWLI*qc#b2m{Fk)^g)Srbrq~1Z)+0v99ws&0ISt#8uhA1JiFhoA+mr
zbM2G%&`Z|P5OBxJJ$WU^QD)ioiVw_jAIm1clsVd4V5FV<-UB-!fQ08r%FG+gist+>
zYfo%ED|jyR#8u!43Jnc&&Xy_^fZVaanyEOI!L#k)3hTBN2wtG#;^G1}b9~MqPP4P~
z_ZgzvgP8{=Vsr`2$Loh4x<-~Ys)^9r#hkWh(@9JB2{t2%H;SZK`gVM+QOT_%w$X<k
zK%U8IB^S@YP1l`3E(ad+p9S)@cgTsT@4P2P!=L*m*3rhSEc_0vBJ;ZF`VJ{8e_NZq
zAt_RjodhK@HxO3|4Y?>(70zK<ta|Ut^P`0I-?U$;BQC7kP$MgsvHvb0_SdiwD}Jt9
z4PG1eftwEjVW-LHb--iW?FYrIzM`~xzCVHA&6Ueu)bvHdOb%}z>L&aGC;x*WJ}F{F
zb@*MswXs3grl9y_)@H$oLUmG()jC3^1jJzQ|IRO%JuLil*sOn;x_J!6X3D+Gf$ExI
z{tW%T&Z&vl!;W4}{X$1=J5eI3>#O|6h`ax~#>0kCx~HC?e3h@dpb~pyy4LPWBbx}y
zf`S_S8$)=I9RxkTL^qfF<XKW_bM<#@xF8*=%V4*FN{^=cuvBF6B>R|DJFNRMtge5A
z7-3#4d{(-GVS{717ef!V%KbS}?&oBunJ^?yUeWXt`t0Aj=jYNX80kLsy13$lCL3|;
z+koC(w@Y&~h~e7-q=EsJjb9pnoJ{Tytr%(wTf+F}_x)6)kvVMJ_sV8DDl4NSq<r#+
z&|Y!u5*D(&6d0ued{@&L+h-JJN5dV35DkuSK!FNa;Z-mT+$U;3yLFo$<}6O7#;VxB
z2r}*J7+}~j(rw0PJznPF8F`FJQQa%GKcszlt-$BO^a>6}<Wt29YqBDs!G@<#nNPwe
zj~&O8Lb&QSjMh^bNXglj6ql|zZ}xD;vyCn}W7;J{KfVXKnR|>Zdv9ypY;G^gM(+tF
zgS*6i|E~WlKt}Z5AUn5`pvywZ15e?B1kK#v#_GXhFC*RmiMM*Af);%?f*-7&4=4Ti
z9_XcRH|{!~7&7lE<iy6+>DB8YHlk>ug}k#1C#np^n2iP=45bPdX%1npY-mR7d%dN4
zT<VCBUwdz!4fy2aU@Rq8?ce-UI8L4W<y`;4k|E0!U;atR^+GMW?~KM`1J6Z>ab}WR
zy>1)Tc|x&{@71Y|zKFJUjBPV_XxOFM)l|PrhQz-OvdOIEDJ|k0FzJrJfV}c6L)^x=
zIPYNf$L)%!q8HtvR3cR%^IPs$F|jX7f_k)zXsmi%@X-R-3?4RxXreM75P};Ail*t+
ziS*UNW!wB^#r#w!9UyPlJ)#jnGJAlgfVsoDeui))R$v*{tjL7OPv(>f5k0JT8AoZC
zQzHig=Ud~qa)3TjINe#erA3gJ184)%S>HF9vhXJ(k~E=!LVa{p{gQA)i~4cR@uaVU
zigxQ;+@Oa*gp<&M@k7gH`{QkXa|hPC=NUo3NB;h4)YZV<O@u#d0eGn}>{P2b3-Y9O
z!V0|-b9hpbYrtJJ%$#4NYKI9A`zamd<1(=LI)xQV#($?P_`u?8gj`V;WFC5qca|?|
z8K$#_5Th#YvKgQc@*6QFfIjz4{p`)?bfXVE&Hm>4k>mM|2#7cO@Oe0?kN0i|4m~fn
zdK%4Gx2{&KT~`smdR0<AP4<44a^dyjcYC;u$Ag8*Q2_)SENcJd55WZ%*oY(%2p2d<
zk`Q&!46WoY^u&d<RV%EnQM(Je_7oX-3Dn!n7M5h7yzo=|mzf@cdZw0O4=$1PeQGf5
z_vUxH8#mxjBkC2SSfVAC&FDPyv$GL)OS-!lxI8I2EDI3XXuwF-ACCSQ>532g>r<RL
zdM(D0P%PF+Re%;$06!ouIKPY287HKud96B0uY&uf8g@>t&!#dFv_IYK=(-md$B&kB
zNYXHZ;%O?+LWekUVSu}_p-hcnvu6#wkL>!9F0b$M)bP7oqOEURHqErPj_Qa6HFb1r
zzq$2CM4-#vw<9Xf3pY8G-fHY4>_FNKyC~ps2L|O1u)}$|yLwWOl3pW~aciJ=gMF-5
zmZ3ty92&qnPEgUbT+;YY=2*rr=B2z1kCyGy9T_iQK7T+=a3)@D-YC11%40u?#@RnE
z&elE9-^u<Wu`Aa5fX*u9n}?%ISwOuGvZYmBv>uQSk6Mk?ztNjV^N~S4XS60=yNeie
z8H7ICNSOrMQ-St_;80<}QN@@lD*fg8e!6+1JXrPq&Hs72Ug=c*OwFN(uJd``$Bm56
z%K@*+vTdm`x73E2@>A28%F05+_)QnoRm-7o>v{6|9Aa$DjIq&Z{WMIX{hvSM)m;AQ
z^jtl5$;=_HZr4+#Q3i@_75n|`9Z7l0pyfF)VXb$aSy)uCdwn1CY>8pL@J5I8h*6!7
zbU&vCyTxY}Sj7^0l;1xge0<(+nn%o4eQ`q2{N5XlNafD@jdGC}@J)9%P|`6!*L_+`
zXBbDHU5uJa><el><^`<`?>_}qv2zWAPie}3KMt3>)QqcQQ;`nWb4u^zpKw1R>~mDL
zNeFtIUK2T{e8>2dGV{jZ;^swiRYVcHt_POMCtwn?t{(XNmlHt4i#~n6950x(h<+U_
zXvzfOr4+<zA|+^`AYi{lhTeL1PbXJa7AY1skiCXD%!0sLCRP?bf7V^ZE#2=dj~jII
z-c`^`xY<kRT2V372E8Lq^jTVV{PD0z$3N9jaIub-O<2G-71vXRwn2r{N+xi0+Y7q^
z&0lFDvG~5nru`W{bEW$sw5BHUkfR_%>=~f87cx$UY=-ESt6|T=-8!Afw^8ukP1zRW
zuG7U%@@IOkr?C!zzz_=<GSH#D`+@Zg5P9FFf0JyV?R*00z1at#h2F#Fb^3wlqgGc9
zBzBNl%>H}l_u%;^#tm+pw|<!Uuo+fEvd?GW7fS3u@|WppPR)ra7d?=-{oX=D*Tj8z
zTYI8GYHn#kqbxKiG&yv$Q5g#FnADO;XXX?{^R9hn6`)^QGAbF{eG=qepypn=aG59m
zLG@lDk_F=_jIXl^Q>-LLln<TVv|~u@qvoZok~uEVdfS1)gjJ51x=|Ieb&1;Dlt&i~
zVL_iU^6`kY)xYR=izD^mM(y<o<tOgtfSVH~<z^*r?%8w#Y&2O`9X~M%ImIfKv7~Mo
zbU74?b@DM)rJ1+Huf)3#Pa69*!x+chY<<WUkq&+04&xPysx;<2LoK_2QpZRsgHDe3
z-sDT-Q_4e-=E};i)(n2@z`?GHVm`5n^BAkVLX~&;U6L4tQY8pTCOyfFENt8%#J?Td
zH`6jUoAyb?>e?bC3K9P-bJgw1UnBj%TnQQ!1)DC`V#lI2f~lAu!)50wzW#WdLs`}o
z`hzTBH%XzEWUAZL8R;H92t5$Hj!a(+XWSt35ZACZwACq*RFL6F{_6gAP1GWKz5R*c
z!>W|?&3YX8)BujMb_Jk;1AeFftnTT(KSKVR5-ghIc2w#9#~TKCLo6QB*<k)#pAuxQ
z9crf+)UvSA!RWy!XBgWfC_qX8fK9I?-u-ft(NkkY0;`Vi+PG=Q|0SU{vDu)CX+1Nu
z4dDehHr^d_GQ<_-k&9t7nlBBQfv{#s`72)9J@Ed1IcXR0L-?oL708%|0LHLu?Q+}E
zlphpCgq0{TT+N;9+8OjcYIfQB14*>7=*LaCq>{{xkpkzChFaLGDim9xH$@RD(cNz`
zaJ=41R~Cn`$Z=Xp-9{IN(|nmr9k$|SVZFR}dy=qdFY~r(9Yzj<=9@uuWYUlXGJ-t6
zz85r{rL>(|(%7us+?d9$#;ux<ii4ZaZy2vInO&E`<Jd?CyNk?G(N&!9QzIyoj&?jG
z!WXC><$;n|kZDpM@HBwPYmG}uXlOi&-{vXh?^ch%L@U}Wn7+WQpA2OV?Fw*FKxrK5
z{Rg^6q}usnU>h8swqpSr+19Aq0H9^;7JVJ-@^#S2^{fymlNn{g*I|8uE_?Dp9(NWb
zqWa_juN`vvg=6<g??b4<+<_NqSaP5epA>n^L8zP;uJ`#^_lOF})Y>}1=1qdGFlyy^
zk&Qb08|0#HNUa$DKKyWNVkmpxZYS_@pj-BlP$-9Z<$ef%qk7RY@*d#8I)#A~R&o>D
z2i%#Hfm=~SwXF{|ZB}=~%#jmrud(otkc}*gDmiU^B7jUv3cBQfmdx9h7-Fij#3kb=
z+=@;#ntI;2Z5JZNB!?PppE_^$h*@r)c2QreTiJg7ig`<lEI;b+Thb9oH959v);YVM
z!Vc4f@f_tvqN;IN$3^f5o{!e!2wW&x^r7@NVk-^*(<M3GR}<cJRK>gDQMEGoz%=WC
zOPG0tq4g$R&FZq$e$wx~WQhB>)BJ1wJG7vHr<GiEQ100PMB5BILM@5=L)Jh&_UlQ`
z<5i28{wxt=)AUG*ZDUC!xf(Yy8-6Tp?~>zFkwJ_j7T@+CjRHjqi7s{WWAy&4ajQw}
zBR?^oF2f^Um`C!Da~$tpaAW_zr<$O+^pn244;a?;ar=5!8RU^is+Xdh%a)>M`!K5>
z{2B>V)FrEf&=^VPFx#o6gr#~TZuwK~qB7cdO1~bVSt0&jInarCKR_l1J2Na$H5;5m
zkfv(c2~o!C;4q}h(}N%ma9_t0@JuT&i>a1RAE7Kj4Ume^b8l9=pN#L`zgvd{5#s}_
zqj^-Pbi~Vsh<c8xYU;~#B0kCqaeI18&k>oGhklAH$Jfa1S8f~YPb`C0?dZ>^wFs;y
zN|5fEmBN4AzmFu)u=D)#F*g+mg#A3UeKrPfgLf{jyAI`LBs33k^<u6M=WxC#sjja6
zZxMP7>}on%(_={)$;L3y=dc9_mcaS>_}@sYgNd&tpt;;Bg^5!rhi0>pi$myxeyWrt
zBY3jH)r4xg_*&N?Y6rJB$188)VbN+SGHhMqwpsXiMQIpHXeo5EhL)<7Wq+0XsOasE
z@(eyP$@j&dGRY7sZ&{z`@00a*F4?K~VxrqL!OjIKnPZDj_$zpFVKfF|jH^k+IW$Pq
zW*Hjjn9(;@f=RmjNXvcV^xq)i`1Hw4w}%>-tRNfVM&YE7md31=^}SWO10|BJ`Ps@U
z{lT`M3`_QB+k^PmvW>A4KoqM^Qn#?5@~L6TNFr70?HM6fCnP?>+H1j~N(M#_f2n}f
z6RtkSXl<|-i*7pFlDf4a5f+v*b?lH00RIlG6aR)2cd<@hI9#XLnHs83-CdWxp&WIK
zXk9o>CwvkF2;O*F>F7i6kTI)sB8N|>^R<DbI?|pbR{84wXAyp9$Qc$`m#y6%h+oto
z1;en*@U|>4U!a!t(cP0(!e%y6!|xu4(7^Y)BzXk{?7{Bq80M#z>r&ld`%Xgd9sFQl
zVqNjq#|9Ll4|)}zscA~(nF=DbUoGjKeFsc$`{NQe`fo1_;7Vxi+jia0XZGK(9-22N
z5qVYv^tzi}*AiB@wLg7LGtzOpvFQ<!P1jWq@GiL4q7@WCkD-Vt=>-W@42M~3seEgJ
zyn<mYpb_M)on5JLS~-9F4ij5=EQN_}=)+&E3{yZ|o!D(F5?{z#^7h3Hk>lmz-PbSv
zg6y!*6#_p{KQWU^%y^sK-zjBZ3VDaWSt<im>yMq@NLfU>K6o7M{gWod!$I!Ml!P}k
zo6kz@y%P-xaRjV><B>#^jU~Iq3m=;%iXz&kG5#+GD{7dBOE0-1D+@!1BjL$NX)1qn
zpbGNlO1yF$d7b9n&^F&a9xIx^dOiuK>M(MvjWkzYbZtt$*1uxM_BXaQZW!hKS=z;j
zgqq^d4g@zG1(R<W$69{I+tHyTeC7UpN{;n^_b(JRk<l25;K>tvSGHKnppN@2@rw`V
zSdjJgtMg?c%IR7jmeI2QYX@pT@&JUcHIXrPVKE^kR}i?G9c*oVB?*572)PNc)`?Bx
zMN#)yZ41V#6F%%=W#0u5XM(zI{*ZO~Ju-VwO41MA`(%Iw-`&V+5pQgCMaI^BJlPFw
zy?iBSf%J<++c;Bru<c$g&T?^`m@fwe*+(Xa(${^i*~h{FA9vD-ZO?Zr!jNpyEj0P+
zRQT(;zBVctEFO@MPQ7%QADbM^pQqD~RVgpM?Ygj=T6_YD$hu3)+<HMttvas%n!t{m
zj1~2X>!g6=zi{(E)Ufh>y>7KA%+qn{mg}|llM7$^a_WuDMb>2J{)8l4YQ61t*WoW3
z;1Cr04HQ>%wY{#ZuP3_MX}_K6rzyOWx+t^md6y2!C{66)n9=|%i6?~bvV&kPvn)S7
zl69!T<Q+%IS=!b^|8kDtKRGl%wB@|VoZ5C@_ho^9@A%<DpfBI6*q1#3x=>p~$|si(
zSCX)ufj5f3O@P6EzF6;C<fb~sF!>fB5^^aD`DF2h^BO|PG-+y+G?3TeMHq%>`|3m4
zNA@{=dCX^b8U?G=J#uW(cB2~i{3E%zc$oi7mXh^m`<^-WQ+g0eK)|Wq6jemE(3fE`
zyotceECPN3Pp?ZqD34(3TD`c4h`Zdoe96tC!#ODw4k3w!Zw4hqy3qwt23|K3TW8wX
zG87ab-~?y)tRoXu(@!|bP2)YFJSZjvezE-gWtpPGz_S6ooV#TXA!uu&vw=<Ts`sT^
z2znq@Jwh#rD_@ITpFuFir?cH!e{nKs*w4p7KUgnr^Gd=^z884v1gYWsWQ~j+are8x
zk(1hrpbvum59vV_dctHWW^yfP9W|lc0tGZaYu(}N*tvHSU2c5B41xu1c)1tvH_mt;
zhQ?VITu5yEKur_6^JG7H7%k$lCzm6!Cro-mBUL1mA38rZdg9)eCUmdd;v%+n5p5Tu
zxIQPI8Z+zlU~fViponugiMjR;fI*)N-#Go;9c`^igE1j+KS*U2)Noz;%Isyldn^8N
z;$pFQ9D_(Z?A=}qrY1wA+Ge?a6z$zMhoH2uoLZ?-Zq*QWGw-X;Tk!>&k}8K9tc^mU
z7{sxGs7#IIJ|DjdlDE9uDfhnE^2`NNkg%j79u?Wd!D|LwJ601>z#uYO!2a>YDQ~#p
zg=ZCkZc-;XQ&imZ$9nFIERbQCDqI_$M8y-FiJf>(a4WvG--Cq?@$j!^>R+4jWb8q5
zs|v!X{K9QQl{4JqAo|)2qFFxcP?REKTd{g>jtr9zuR>EuHj^SE{Cqy45cVFhdMM@-
z`tDG3RP_7L_h&0`&O{vk8;NM1&kb9JepE-c3YxGmO$S1W;|BnvW)Yy|V+B<xs_yH+
z`$Sdp6EpWO*2l^!-p1ZM*D5mE8%^l$h)+md&;S_RipT6PZ^YS<*9se*`0MQkD<1;q
z=Ng-XV+rC+tuw7bX!@nGuMfjx#gE{7mI8>wYA^&a?<=j1NFO`nxJ*z7VRsIRBJGkr
z65U6x`LWjBU~Qb$B2g6Cs2pT!rM?fEF}Xa#s{d<kV-sX-(FxRK9buG}Gg24iC{o0@
z1|i1mgiQhLq<#ywSy7G$_uGnMTl;+RtGRu1XCx(H1_yG&mf`lA$v}KzaS<p$c{l!H
zP=CHfwxd{W$=4>;ft@aMvC||huO0hgQ!YXy;Kql4@1IL~Nbb*<aH&zlAKsXb5g;}N
zy$~A8%8~(D+}6$G5Ag&`w!Qmp-pTWKX|EjeOGICuTi2g{n|0|EJpJ71E`!8KLKU|V
zxHT!bLkshB=GKC~l&35?6;MoGqO`F#M;3$EP*96<Y`Yr-M=NmxO7d$;>_i!dky;F?
zacwP2LlrSxE|f50*BP$`_;u8!^5;RR0=0&Sc$$9){NE}8^ls2rAS#Pk$DYo%uf&ps
zvV@x<%$UkVBhE<9spJx9H<m@`X!qcw(!gYT2)AVa4lR47qQ0E-tDXMQMJ#rhvXCK2
zbd*@8nsX3i)+V_Fetj+Sw>91|+v68evRn!@JB3f@lVR|m4Wt`e?H9S)Y{P~T?i1qp
zNJw7m0r+_IGVQ09{DR$aH&RiN@DBWp4o}%c^1vdU;v0<n=AM7e75>Nt_A-0TStv*A
z9J)@--+}{wgjjn0dd4#(wtjrKQ3Su>3VOdqjrn0i3-|IGY!4-O**OZ#16j{Yh0h!-
zS3l&h>lzV2P%S-|DNRn+E^<XdY;4`nR}XcvPoEKw(1#Q;KeO!x<?T98Zv|=^uyqD|
zH*m2n6Et``F0)|6+<i&Rk&%E)wf~4d@OCq%Y&J^wgHxg+aR>nt7uUBXll3oDHupZ3
zUy3=jTb6wXTWo%Rpmy#LIt>WEnEifqEBW`MNQ_>yVUU40j2QQh)0&WS5?<GLNo}%Z
z%hf)N84p=EK$Tkw7i3|u;BZ-jiDFvTuudQDxbWPte8A}Tv0<3WlLYhHVV_kF-h0Z|
zkVJQjpzo2j3k}>Wh{($3#_@)os#f7Rdd~dH5n{Afth7nzfMt>sA1Ry-P25^4c!cF%
zp!lyPVfcq`*lbi~kckAgdiAnN&0IR?g_G3Vkq!7z<_@dkQZ;v$c8FT3xeA5s%dn@R
zG8OUe$S^UO<Kq$d$TgG(djye;b1pF^wf>;i<zTUWQ5>mcv6!h{Ubg^b!xxj&JdtHl
zag_Qa6HGB20kClY!oq771gR3C5C7aLK*%nUObM&wBB8#`8tgR-mAY6)MnYPk&>Uor
z{qdtPwZBvFx^VGi3n&a648@me;akXxN6)9(juBmn(XhHu|MG8&{O0vpGfE8VQfF5A
zqwuWtJ@H3q4%QEj!d&?^)8J9TF1mv%znOK)+N*o0fk1EJg_QxV^)n>MA_Gaq8U36m
z;u=Nd>P2>0Xcp1I9I0W-<~%vPPw4^O`$Jp)B-3OMKTq&_E2f2w>zYnGE!3|ma=E0}
z782bDz(5O2h%P9S6=J_D^nogrjVexY(LBy3hA!qfI76i8|7$|7J3xt(|9aoh40!NG
zd8Azt-aMrqW)OLow?=6|26NlzPu5~Ia_AMwY<E!vi0!M#CuJ(9GDd<|L2Xw}SqO~S
zLnhvK=dN7IG{W9Qg~yi>;weL}7|?QJ*hN3Lz1JyOOD7B+LD1S`Omi3=EXvr3ZAD_(
z=R>HEHM!T!q_CbpNA`NMcL0g_p3JtFagxOF#deKJuTDv0Aggx{RfE!Wj~PTRQ<Xb*
zU*6X$L~1f1)rGzLa+!l8n1F)h?Z4O;b_rs-onWnVk)0uI1~UKO50g3Qgk8pJq*vE8
zqihzE;tP89w3Gs8z3Nk5RNSwWmURX!KgqF((L-WeqR-rr(6uSj)O#IegGc*Mqu@ug
z9qsy9TwLxGI0<6uj3K5Rn1udhUwv}phs1o&ZDUbigwo%er|MfO)zt&G24X$Iz?ZX?
zrPBb4K%lhQh0eo{%w4a!IW9Qa@6r+tsN4wgrB1tN$)F%H0aO{EvA6!u#R=Q7F;-}r
z_1y#nn8!MwyNnVMT8}KXL!E?E#4WyCtCW7<bRUfph(O(@!B?<a(EMwJl(zxC0dgpE
zcd#g!?cYr<p{dP0&46A9c3S#ZjZjOYErk1`>*3Ef*V)iFUtu;(-7P4AC*KI52+%z_
zEZBb%>z@4IkT08}J)HA>Z3l+)1ZllW!e+2*l*-fgzN?4%)}CYB`ojP|W9yHXF#zJ{
ztsNimke`L4s~&ae(Ru^`^2V!P&yTh3Cr8a4m#0a6TqvyiG#@M=A3s*To1*t-BGFtD
z^fQrI<BLTOi}X^9gjQmTYsb{krX$}<xo4lV!)TW{oHg!1)f?HiLpqc8jhG9KlC-O2
z)g)ho&O=7k{G`^>Iy;$BqI#YThd(CXQ`=ZqUGHO~JU=jTDh6{4fEgtu-?`;^B&AIn
zQ}{pjoCGpMWC`w2wqJg^)k&m?fD-q=Y#7%#uL>?yMjsXB>hX`FddUbX1j=>!5g5vf
z7+oppZ|~FfPxxH7vb~aVh#*~#*%Xr+@HqH``0rk7MXX)5X(q}<0uyY;{RpMGOkY_{
zapU)4ME$jdzIm^POB6oF%IlF(;GhxaFHXP93`aIa-uI_zNW35@{!f|-fqYZ?H+Dhe
zX`!ed71)&kD4dN!F>Wje*}x@w?Pps4-BQ^koi(D*2v9B*R&oMzke4ktYkpn`ncNQz
z&>?2#6^}9G+s+tXR0(n2zdvM~8{WF%`$D7ds$a+{{e!Z`)-Xil?N}$Ur5}8<-gevQ
z#RoyiZ{hB~^8G$8RO1re!HeL?CjzlMT)7<+!lCbWKXh}X*&(4$rHuEK6Vi1d+B~oe
zw4m<zP#tgr?3JbMa3t;J3(`6-(mPgrPy^cer;P1h_nVEGKy<F!p9Hdj-q_HG4B423
z1TO!kD%X9$c8UM;+amDSSi@sP83Ygoz>Htk486JsLT~${wz+8DRUM(FjF6b71ML72
z)T!6}O`C)8TwWIb#zj;1Ea~dWc9R0yz3I9V$FeV$ffsw>(oLv)Re`>1x8`sEhGmjJ
z&l$e(9NNYOu~Ez%?bdQB(UA!g+6vP!yOb)H;>NlUm+*=OTajaUW4vm?A^Q@ZkxNuj
z;4%+Z`TSM&pDqLgdnhc4F6~UO&ZxAHgnO$IpQBG*r9Yrv5Y1)5Ag?qiWS#fHfCejp
zz@bWXzwmG&<q(1AoAi@N#ZYxZWdO$VX=OA^#y&8vX$FHBB_c=ZZTudLDU6)~#VI~Q
zm2vxbh@YZMj)MYV@C(kk4=>{ti650!wwQPDz%9iIJ2wwq_K2_<iht|pM?E192>(oW
z4lj<ce3zOa#$%y2dJW_+E7BBfa2l_Fy%EnToJRAzKJNK$qvCq;%j!RW3=F8tGsq$B
z^#7xH`|pNM-hNlJpbGhtz8+MCDe=sy{@9LiJ~jsZqWF>DBhN^E9Kzn3f3?1hn)^)0
zdlq_@8(e-tRVQ5M%2)?a>t0}{`{E(IaQv2L@f&-Zf`J){^hTa>6~L}$Y<IHhtgCl^
zK)|NCi;&MZi=VFD55z=3!+?Y^gH8^vm9cq_-$f?d1^LqD?H02Ayw7%~0|<Mc?V^wX
zv7qx2`&c<!(VkDdB)pXteL@WK_=Ha9y=vTfzuPQ}IPK{eH1UY0YiAs$0OS(tyC!em
zD3%k)e*CE0f&sIyLAtd^g5<8}k}v<_30e0+@S2v2Xc2E(zSEkG%cFzlOEY+}tdzP5
zK@F~JM_61391HhQZIb$|{;CgKp^NgUV-qzK#(#^fdwxx{c~!CC6Xn(qf=|+(m>>O|
zO+&%=FXYJN;^Tg0u5#;Ow{K+jtDS*(4wvzrh`dl|Qs-NTWf_gd-^=AcMxOXdt59Pd
zbr-d;@%9H`VhkwT7rmn$_%m0y&Qo9cw-3hKG0)-Dr~B(8N<T(}+?lc|IXKLY7<edm
z<u!mJSs=xw@h;w+jPl&h+P|*^acN~l8c#19UtRqYgK=vPHh5oCRRuVKe$>eNT0Z$H
z!-7T7;`m)W!<Rjxl>xKuU{<2SR!!T#!S6Oh`JQ37E#S_lZZ#U;9Sok<zua;ha5(%I
zr^2{%(9_j8{9z2U0Qs&q{|-{ww&#xIfvJj``}lq%#0$L2$oB_lIQgUEbM>_3D|~uy
z>C@Y*?j5ymwaXJSkzW*Pht>-wBm^y|E2~Ql3w;4P6Zy@4-|c8tBJ)F7o_Z`I5wOX%
z_@`3zsjhSL<G>5MTT{@pohbrvaXHFHGYxgzthp~s->h8R7po+|zi}axmgsq&XhE~f
z2Cez}fB&We{H`Fd4Hf89Sw|ufC6`(G`EM(d*xvH_Io`ZfP(P|FoBMAccT9#=#6FG#
z-pJV3qdio*a_^J&%qjN^1tns7=&Hx|u0Lw${eMmhcIX;6hj)0GQz6YKw1@VknOEb*
zjyYwHT7#Dtjw|2wiLi(SE^@IU?K10rf*wp!T=Q2KQP~eq7ip^MnJgtNFL<e}5^o>&
z)BD5jr}AOUs*N@}7oZtFW~Zfoz=pJPAs^EZ_(WOPmD9gs)^U$!b+MUgWla^dB#KTQ
zc>+=2jA2k&7JQak)aULV<)6Cz_g?PqKsL%B0tH|QDq1`mn9Od$W4QuyfG2)_L7K`A
z4HO0V_AXg7NJ734?&vZ~+h_P-O`NCy9hcQWae~Z!to5_f5VDT8%g`#i>ojQwk`JCk
zmo`|)`kNf$qAhUpzWfl1Rm{b3q=57J?n=V~+0PQo{C2hb^ds-xY?CvVndf?;9q-?e
zU#IyQ;5I9?@puryu-?0`3EL%RDi!Wk!blyK=xxRlx<q{I!9;Ce{BKY7p375^>3v^L
zSiCN?|IFP-+F2ctrr7+atz{Z8y!_B1)3V4=|IF|zqHOwWC6*brttp**e?V_$2!TM!
z`N^fyzNlNPtNXj(v(-%Agk?FDq;r6PC=KJRY^==5X+;tB%Xrv3Du$lz33;sf?Dw<W
zpm>ZD-_JY^Meq7XtT+^0DwV$|n0-y0n$zCbfY1^W{Pwv3bV9Kn+{y?V-S5DQ$dB}S
zUmPDr-R7+pvOP7s*v=>f?qiVF%5r`&uJ(BaC3*t4n(N(pfiU4<`Hl8BlHX?;cFO_*
z>RM@HcY@*fcMyl?T%5(K=WUBS4>|td?C#O8)ff|5VbUFJoKtg#UVeF}J`yJO?c3EZ
z)2`G1m6c(8s|*+Hvh~7Ji2z{}zirG~-~Ua)zH-|VFB@YMk?!+~kBTcf4L!qKD{KsY
zbarAt+|YJsbe$WmK%XDi-OkX1ivN(-bX~a$u{8&WEU;2d#YH~l5L_E*`OjDhB70!|
z8Q)+?yb@t(s98jK-GKHxsFxl_ttq8S@fM!>j}yGeu*r*0RTaJFi_!CNYo%P!q(3UO
zaJ-LGk``I&cyan8<MR9OfX%do@*hF-bZ8{x?NaF&-Oc{vj|=4F&)Vgo^Yd4aY&uSz
zJJ+?)$F!jYdaDx;H<P0&K);%TSy`z7WIpH>arjGjxkfKEwy+2Dgiqg1xFs#hlEwq-
zUu;HUR7WI+$m5F54arS0ej@IZcIj_HACoT0Q144nVOVs$LjEu1Ce^gCdj7<$N%B^j
z4<xz~+%6vO<^S_HKxVSUndK{L;baiY9<~7`j)+~ivRuV8^KwY^vONo#MCzRCNB@lM
z8ZU}rAd~?b)vZ|1E`|srX<Y}fs|resnnG?K$!FxlTFe+fx_~ba#+bMcyq}bYYlm5)
zPaljHg{vCaTWLK)E+@D+X>fLN9mvy=5rX>icR;Me;5Pr@wrlP|+p5z?m*JzXb@-5S
zQua%yh*T<C@S3eg2GyTp!uv<M>*Lj!VjbylUg$2D_h}D$SM?S?s2J_`zGqwP^8r7N
z_nnh$#`4C3eaIoc+Ecdc)U!?i@{$F*FNBVR;MA>4a2;ou=4<nwfh>mr%^R@T;9((r
zR?zzSTZhtVVJ#BULE9&s6aJ4!jAd~O-<ez|vLFX!lzi1zx;Mww98>UuVZmcG7hBT-
z0B1c6)<$%?Jw^@DcOj0fx~?i!@TGm<n;KObcqG|jd7f;&QjE7*p&45DwjKYvuLb6{
z_IE3Wzj;-*J>i#&qb#dYw^tOvE4`1mDE^*?1iOGaBs<6@Nb%1q+z?ICAEv$^el%B6
z;AY={8Bh`*d??hRXa(zrw@;NCa0ZC@KTj^AwCgrg5h|a@4CJv=mxYZr>TSlMlREiU
z&8cU>ccg0>fG~{|j?TZEM>%sAiEl)jjV0d=iDy|^F|P3K(6nsiFqFu>XdtWaZn|^q
zubmXsJ=hT^n8JeKL~FANjr?r(!u#l#-0x#r6=cW7sqh0>ngQn+VEr@uT5#hl4G;)T
zw($+i-1lIYLq`o)Vnb}LRcn#FqFhav9`XG?iO@GrcT~Ux>Hb;PXJ>@NsSA!t<2{lV
zBvg2699YTQcWI>qI{FFvQ2|~KKZYZvqEu2XwUCJ2(8@t!&FDXVixS7opuN$>eSlhk
z^S~|()a`6?(r96QmE!S)*Tq$6L3;mv?CNsB-kU-oUP<cP0sOv|Yd$9@A#I*-b3o|L
z55^~@NPR3F86S$Fc-oHR2<qosS^(Br)Ucm*TsS0={~-xe=g<vfQO^CCUcWM1l>RSv
zwrJqy!f_byIS_A>m_K&x-@*DJUZzfBNk9Th*SO@a=@;7RrbCnw%1cKIJq^e&r%pox
zay8=FLAG6`#uxn*nzKCWh@WDwbi(cQ{P|#HKEXSxYWI|-EUFWV8~d49qLi})j&TeD
zmbvV~lj7K`4nkTT#h6>Cj}_UVKp8S&&9(1C5pxRUM9ja;R})o*m<v<qNhuYoXr$B=
z_bJc0FT$G~t*g#l7hH{4i8$!ac<L8Mqp7}ER+_z#pOYi<(D^_iKv1Lxqk~A~p=~pg
zx(mk&J8-UlHMWZaW|BkOXl&jVf;^{SUg+HzfR0SQ^pF;8xuYIBU7g3o*y%a<+Oi46
zJ$!uZvJedYjI=z;^QC>CFnB`3Wlb_jI^$ulFbhc`oYgt=dUH=eZY&3M{h<E2&#&h4
zyr;Msd7`L}`EmeL^NQ0WWpmV>)zU4Zzo#$g4sX5O*th$pi|Q7gUjDAs?+ixoO$0?X
zAp!vt$f1<0>E}T}c+$4D8A&hW=kCtcu+U?Qj2>zBfEgOA(h?TsWcjrBUh(>Ff@vtq
z)i9Ne^752cX7Reb%JW`^Q>el)R&aH;f-k(fG?npM#Dsv^^<AI#iLA7;9?4mNUSE$M
z+CReX=@^RJWQWGt2-Z)Q-l2*AIt`q|=aAB6pO}REDw6RXd1djF`6UaUNQA#LDw~AY
z(fdB5_$gwU2;x6GX1@s25O$duyy#0p541Q<(}_luEE8NDF6!LIWJf58^r-s`gnIE^
z>dS7jKk{Bob?Fnt*QgW>KSqD(^b?iW>Z$c4+^)Ryv@$YcIZLwRgIe{+6<9$1*O}Ty
zD78wYe-nJEmI(VCH)JE^iHxyP1)vI}e>t5x@7_zD4>PZe9K-1BO3#LSRQLk72wq>q
z=((Zxa?*K6k0&@aSv?NO^M8VltMA`^0@HY>;olQ-QaqtBzreP-EY3TSlI_nJ2A!PF
z%NZc8c64_xg4p2b*+l9hCayz#kn6%qmd~}Gu6t`pS?4^7>lNGeg27$a(hfZ0K||0R
z$n78K1#$}>2npT#{~n_KeB=#h?SCuGD*4`HNqs64i)LJ)ua#6jmi@1Ut34aZcN4G8
zb$H%rbu$f0kh(st&?N8Ao-iR3<3*P3h_yPp#Q+IEWTdSa<&Zcks-5$}7^mobg3xTI
zsl&_MWVAb*X_j2=Z~hrtUli_d4E<pfW!`%7#ZY$@g__qJlU?kZQNytuj!E!E@r(R?
zwy}#k6|bO%sUCd_1qCti>Kq|>N(%^jn|46vFv3>ajN2?K3#wJ0@kH<Gd)o%Tx(8L&
zRVzo;s%-5$j(DgweJO4KUcb;QMvRo<=Ha(`(5+I-HOU%QFsJaLWiJj)2}#n-XkltZ
zE7+&Oi3B#B0U&0VF`Nw(3j^pfU?SGlXH222tXG&ftOJ`eUUr+sXg7!c*B(>J=?}yq
zbZ_=Wc5zVNyb&)$Yk6XflcZnnrM^LrqF;U#>A6*zEXctc_S5a_CY@roJ|TkduAAOe
zLG2M{-C!3+M$N|4r&E|fjR_*2&HtA;2uo}`t-FvHl!Fcy^EjsXx%O)HSfTuYnXC0;
zaLY#~!eXPZ78MXk>jj=L`frWhY}t=ci5)y=`~(B=-yg|?_b@soy~}tSasNXLuT{^x
zLd8ftAx{Huo@AJz$7;6&{M#D*CW!;~b^?1I5%Dtg-<#u1b#XQZ;nU6E$Bn8{sHfa)
z^@L#Frl{TLNpWz6vaI$GE#xH4#zU6zXINLp+$x{N_tQlfU}c?>FqWG7Svbj)w(6RX
zqC=<2cqT*;1#dQZM+?>RuWwG(9eQEhIa>}V?BSAAlV!9Yjl@a%RW-?VDs$;s-M2_X
z^ZUnC3=Q2~*d%Ls4Bm9vsY=_XQe2u!4Dxp!ra(ACc!X?(M~M~aA}s%-RDR@j-T0J=
zE~K|oXNM8$T*>}DagN(|&o(yreV6?=F2$<q8YbdSaQdlJVCwbKhaYiq-;kN$H9#!D
zr%$*EvQJ|FI&Lg!q<t?NNuUzinw(OfPvzUsqE{_Zb#)MUYntFUy{}n8;Q3Y5q$_`$
zDO1#mKnTV?$0MGVzF6qw5XKJf^)eBb^`1kJ4Ldm2842y7gT>`RuUnY?RaDLDE7R(?
z(grQwIuUPGie@J1Q5aBwArJ&TLY`WsNeJBgY<?lSmhe2-Wnb}ZB?6ip`QFsjRB*cw
z#H!e@`oTM#0|DVP@7ju#DS;`+7)urZR|wSoFZ#lF0wPZXKiQiF?Zy3QcRzDFyne4~
ze_u%Ud&d4>&i5QqF(umO)DvtrPf`_GIIHFs?{r^@rljr+#S9jm7AmO)ITC7n9mQOp
zB0BW@27R#oXS9nyshM`u!`#ul8LhaVA=D(UPr;G!s5h)$a=ZOsiAQtff)Q|_$4#!x
zUmILO+9-0|KAhRdU}~TUPji=PIqzY?b!Znk2q@?vCJO`AK^&7LZQH=7gRjlaGS0c!
z*P3S!`v)^?)xvc7274%|Yu%p%+iM3sB;<|eU)G?}>_uptmi&pk@~py%(ADo*`Y{An
zQGUlQ7*vLt)M*qB%*Iz&o^zgYZ=5@XC9v`*Y|N=vd|asMm+2UZ<JRvY>*&kbrWWL`
z7Z}mG@~`lZ@*b|OHnBeop2JG)!mTi@Rw`W2o@T&ySkC53>zdEP9Ma@+q<|C$Dbg9`
zg$}4j-s<DKZ)@0+iQcoU;uB`*@jCgihcofEV3;58=|8SIpFYu3IP7<CSIgdq+}kBj
zckze%TObN()>oBdek4W5!ewXJz;CR6T-qNJkp7e8D<}PZaVk*tBKLa7Avc&9Po159
z35j}jJN3Lwe&Ue!3o<WF%!_po6<BLa=|}hM<j2;c-``)TZikXn5)SO6A!Lj>he2Mm
zBpKRgj`>o&`Tp;8py_=#{^vXT^6?)^UUewd%Ui|*0T`eBXGj$A0w!h2&%u0iVDHi}
z<{TUPAe*Wv)R$udIz_RlUv!qbJ(TY+B<}g9=4kS5Bc=I`p)Nw~b_fG&eJRliR6%Hh
zb@=f+iX*Sxza(V_{_FqPo_+ZAJ}@XvYE?aGmm^a?tx^7IwK3>ru~Gw4Yyn#<0D+8;
z&WzD3su!dZDeX;alnGq=Jvy`qi&6*>zTD`dZoDrN9tY?<ptIrrQRctkVE{ng0K^CW
zmeI1H)VRLY1Rd9{9oOSG#FlV+8jzNSye+M5=xShy^Na4$pWRQ3$jf}}C>}viyHbzp
zqdtY?r&FESg*LV}pL%bU-xXxr6ISJ;A9vzp%3zvA28#4(!a&EMhu4xz^Tg$k?Nygj
zE6>ec_*b+ETkf!XiKhwPKnyRUm98rF|1%<gTU!s3ROkZ6dP4CnMe;P;)Hxlt6|Ebu
zJD-g#if50CtwoAEf96A6QO)bBSjz-IQ<R+c4wyc1^yd>Ld%Jg!c!Yu2O92nq)(v5-
zx+p{@i#L1ps4TchNOU)EHBs{#(d718l(*hLT6VrOf6XTP^{MnzQIX2}WT{Jx{|R|D
z^X)bfTgc}JAgZLoNDYksp}lv7=B65n$w2PK+q}>Py8PGXIrO$^$`GLiUtaL`|5!T9
zhp5`N>(9{L-Q7}x4Bai=4Fb~LJv0ai2rANzT+-d$9ZD%31JXV8v%TN<513DT_IV!r
zSZn>(w<o<{JsC}RI&viM5Z1&#KwK)|(+$}K(NP{EHbn51{7&|;jOSp&jiB(93Z=mF
zVsvK@@hB-kZIc_3pmiL(e+m_FCg>IIt(nMb`q1A;cKkq~1vmfzS_eS=RDesYh#*3J
z)>iylB6{5cr*d<D?;P_FvMn!7OZ|BPU{>7sew=y%bmo@xA<Ay%pmn!vd#p2fDxbR8
zIpoI2Ao6mZNZ+7FhMv|H6tGD85{z~fM$IcWKaT8joDdLK8<P&jFBl@+;prHdi5I>~
zo}p8k=vKca#Fp|67dHSYx+1<Grq5AWbe8@_j?{+7fVu7;_)!%X^s*CMuz2skGjB00
z3D2VKseX0ewYvjg(sD2R$yPH%fh84VvY6-1za`f0b~3F<m>4<nkdfphB(}7c&8eI8
zlqkBpH%%CeuZ<pHvFMR}dZtQrsNW=&h9}I8&Y{q+KJd(K!2*B}=!7~h#+_ESMBCK2
zT<YmVAZ?i_Lle?cKW^OZ=rDZYRJsTGV)^@^E(#!t^lYqjIn_Osl}sd^ACca6>>;EO
z_^LeMBj1~QIzyP)PYiHLM`=#!9Xy$c4>CmdT2g3Dl9YvrepO&?!N7^kMeO%_8%g$b
z7NyE!{SX|2zO2CS4|dJ5c=v!g%Mdm_`GKmqXpife+5bs(novkZTbj7<7bjEXv2VKz
z52ocB7jN-ko*QKoK0?|kl8Ff;U`<q)b_gerLZqOdwbzh2@@*%p!ZK+EKLSL?Jm=H^
z?g)*)6+mHFP1s8)m1HPY*p*^f)U5qg$C?`zbXWle6*t-APMCk-`Adz0?DYbDo6{QA
zh*5Xe`U8Q*Kvw)$Cz(mw5oM$Yxv`-eQVhNqdRaTxkotT+H!3M48EiJx3JWA>Q-t(k
z@b7%iQs}D`SdWTE&cgqQUPY`z=Xoc=SYa<KhrCZ&w1(<Wz$+-~4nZwQZ_EGh$JdVv
zjJAm$MpgOa6jNg(162re!em$}wgEvAUkUjC1h8wyI<?JHhWu3-_M1qUh|n&g%Cr;~
zd+P*}K^%ERkrL2S#&-6X-i=|$ufyiDOda_R589Yip>UTyt!Dc`jWq1-Hok5mve{^{
zD2DO1T3lORw(X5FC5yUD{Tp}s4NBod4=*(O0{*-sJ7+Ynh)Ac13TzS%IZ->Si$&j)
zwM7An6?plgLoO|y-+M;?a8P1>jlL8+#txro3Pl$;eapHLscj(N7a{)M&PER`co80L
z%R;MCd`Tr1LgiCnobp*5W(``n7Jp>QB@0BC2EwYT7YdW4(MYwOdyz2e=@nWv%9Xa|
z2z<B=?6en<mzI%p-;E<2gwNTDQ6$wgHN^l!<;F&DWXo~W?_8a<JUg$ql(Dh7nc$MM
zim-W*5vgO#CT2Z*=kQCH0g`~_Kz`8c^#>DS)?56`yu;^`3?W4Q$!_&O;J~+=(06D@
zodl3jAx#&?ae<laf!vOP-3RD2X%Acg4t^T=4QPec&sQ%A-8i5{^Q0~7#XEgl;d4nv
z&f{Hn$h9<1D1eLUG+*=)$=UQ5Yu(?FMdhhHtUDy1Fp7JR48+VAurI_C_9ScL-iMMV
z@^+3I9^sEd(=F{1*R00+t=>v>a@C=$U$1p+r1D`nR4Z!>etQd?p~jwd@^cVlX3hR0
zwbf6_%f$i8IoH~`V2wpp>h1lYa-$7bKhxSCOaejtM=B3t3PIFA{;|)Zz+RX^CD5B0
z;D<Z|NDV4>hK6g|j5qGa{okZ=f1(gbkV^Hn-+Z=BI%pX1=I?hlE~pZ$sKwjdQ_b`S
zqk|7z{v<^ThQ8C`k3>srLo1JB&x?@YT>I%iM@#IF%HBsy{)~-^AMm&o&ZPBPNlh=4
zTq;d`m-YW+A+<>vaf^J8jbm8cBlFNROQp4J*hF%m@Sn44Ixz}CAtBVj5>m@mNsasV
z8peSbxc1+F?(j1!C3cS?a=VRQRN8?gp*1)V@DIhdJYT9s|8Ev;hPc8bWz`INbXSwx
z0ZVwXq}BYo#?zxuLtZ2D=&)x|bPcTxVN3Z%ZwKvKhoAawz9ivDlG6P62Cf3@PowHj
z;f54WvyTkE;a)bgF7XPyd6ti%fOg$D9w9=Vs%6y#od9tMfG?MT^JUqiS#u!`uqKo4
zn+wz~kM-!GjE-_A2xp3&aKm|!2{_vItBm{#z37lJ<PaU=bzKpuo&N1)b`!1lM2h|o
z4vDxT%G~M`gGT5{qJpx2Fn?*bH%=I#t_E^1DG6dFq8wKuEt@kXjrtu%@Q329-sA?$
zvUwg0R(B&tq2<xKia`zy9gt{2ihCn6Pl^~>+|;&MjY5wyDmg}DTwZ)6UsAI#N-!^8
znz@iql99vXm5W)%S_l-+SiimZkcNZkxrZ=Z&bs4~XWC1Nxu6myDi&5*|7t(4NTJdh
zN%4opIvO6TCR*lAt#vgIU@N@fg`mnS@mT8ye0=-g0*!=PWWxf&LT^t`CdxunRu_<C
z&YEPnt3|s50Yt4{X%+kcWPqCl#2?HVgOdh2pW=BT-4fzfev4Ju*&#PToktAi*^Dgi
zAaSqX-|rL~&;8hMnxRjKkrmw-%O>Z@Mi9&Gca~2w(|?=Q9<z<>Br?y!n<$_}2wK#5
z3kV!|-~t#G3B6b>2t)zOA+}s(?%6}^l9r+!LB7F$)wX;fjQjF84KM8Q;jBr>G=k@8
zTr&1$-984$;0me(;v4`(?4VLi&b{(nk`6Cq)29tS>usia96~hMFP*AHEKQrM@5JP}
z{E<arq-AMq%bbz}V*foj&_^0H8`1d0!+I<cttpxx!Z23i>YQMCC~prEmt3Vo=LV)l
zf&zbQX^-}`Z%HTQ{H~mgy-OzoXPb(DVbe)AE%h4=IRRrV7B*hlg^WzKOwXWWe;pl)
zuJOG+MFIBG5fwwkyG3RP<PA%zjl}54NNr&oX!b#E7PLn5S=#BpwNw|{ME5!>_t0*a
z3f$jdsyb6?b}%MpWX%UF%g_%^4fzu6A&3OoXU17}uxe?~q3uPYROHv6??8pf>M?8U
z>;30|Bsa3hhP6I;s#!^P_=|6oZ*;*=B&Uff=g&B(_u36Y_KufqfF-9d=R04b7}BO5
z=qFlWtYk750J;h{uZ{(b8el+;KgHb2EqdjCs?#(3D(UIaY@|0=YM(Rw+1zqb74$72
zR>~@5q8eMX6SSebzsF>9!M1m+VI#GGm2!^jUoZ6o0bPJ(<i2O<u4fFqF%Sv$km^nj
z<xynG3!;S@BPuqfyj*I~g{^bW-f^DxhXrpj;XEB`Y_8`}ZFie`2{v^vTO-Nl@BU}G
z3<^Gs#RHPq{iA8Dx72}0GXZUU;_P*rXhhld-zk$uZ2<9x3=3d(2km=*NXcZ`8lW$U
zkV<*B{Sci3r{s&x)*vpej|>SJTYTl)a}aE&KKmV*28w3cNV)-}gas)wiAR})L?yl9
z_y6*rVu&#Po;|{H1TfgsB(XON3P&T~LzwayFoRcMI1yC%OXP09n_y-;r+J<PQAAo^
zCszJo>kf}3Jd&gZdl}hZ7?K2iglLFXo+l+U&lQg$1~MXGYe7eGMYkv-XzisY9Xq3A
zdKc;QinyX|&q0lO%0zF{QB3sNzEsPdDn13)t}yp=Hh$fP78dhUV>axY8$x=7@rH7(
zl3HQ$`r$a2Y>_y<4}iX+mN-5guS<MP2j(%?GD-u(gHz?eBoD=ry6nyU*&?=a0$7e8
z4Zz;@c)DKPE{LTG+;mUc@VVAVLgHOQ-l5Jf2mb=UF-P!Tgbl7o=jVOj$9!2|xvS@;
z`-o(}hsK5&2DJ%~qQS%1=(G0o1^*xgWhDm?(H-{fB1-8(s9m9rC^$Kw&}&XMU}RY)
zhHYKs1)@G5q-DWt!!8{jZ!6iKVe2ovG?KrjdH(02`Irfs{k^gx5hg~XifLf%WRRW4
zFz!X>G^;C^*%pJO=`Ere0A?qusF|>nB&yhmt=j4mmB8GSEwEQBH_aSQSS+7ACuyB~
zg)v88s0$!WkUz0()N!TS3IlRSV5fvgPK0>VyXr-F1Y5~1tr73Jms?mM7WaedsBiFU
zFS7~zkDNSQ^PSdg-cR$Ng2B&ZR1|ynH}Wj1Q{WmDk>Y0$C)-cEf@+AX0`5o!ms><c
zppUH-rD|EV6#9l48zTw|I#a@i&Gj=p+FV?o#@_VzpLd>f_a%Amv{kB6ycQ&_Q+}wF
z<X>>rJ?7No;f(0Ta0wW<YNu=_TmB#ne3eZ^@r!H>Mx$#RKWjr(8JtiEbacjg;mjWh
zR3V70a-%#+w1r3ZRa?7tidmF32&1CRv&$o!nEG!bkJLRP8$4QXzJ?y*K-WGjq9B-G
zc6+KX%?o*ThCR9?*WVC(DVJGuf`=&(ho7nYBbbckq!b;&luY5&mb+s4&6I4oh=mEi
zu4xv6Fv@f=AeGQ8ny8L*N_UG^+|^r)=&xb$Mz~@Tf#fBvWb(9&`uV7Gyky6oW8&9e
zjsUpKkCk<&%|Nf-PwZRA4SbXk_PL(Fd4cfRdB&CU*v&q`+!A6aEp*yv?2jt6X&DVo
z54WW@T}b*>v(O-7x6Wi4OT`ntIFDkf1y}uhx;7Ut8)f$QkA1W+>?e}09&*V=&3e=K
zL!3G;#au!M4f&;I)mAKuq9XE%a?7xLSxxayp_S43;_+70KRnPi%;ZTmGdyMfjAwDl
zSX1&|z%J{C?AWu{<|}#kcPPIKwv3VQMSFEu9wt3L!j^h-u0W@Ncu0XGmAfmtfRX?q
zi9+M5`_JWEW`n`umqq+#;epRB!U8`(OK`ATDom>u0cK%f?%e_Yk|BG|A3&S%F4Ow;
zU#hWlvfpXw?{~RELwAUj*oZuYP(s`;(oo~pRe2-RSg4%M`VI3GzBekE>D5fV69E87
zf->Ff{lYNQh`Nfihwc}4p!tCGkGLYpe>;GjTOw?=|DqJ7jk0GY+KN_^u|O^ZzC0!I
z2DEv~W$}7+p{;h8V9B`bH6tDC;|J-!-&l4C`=`L*0xlhf8gFkQnwfg|el)>#*q^um
zY8laYvo=gmBOWuw>Iz=-X6Fum(Sz?h@$@Nndyx4(uIKf+xvHIKbzk9&HB^}Y+j2?-
zcH%_g0j};Nz@Q>aDt<B3|JBXStr}elVi(~(y6&9VxKD(PBF^*j<B;PIo47Lun&cBY
zqO}Xt#5pA-Zzo{$EwfoA^(*%=chXFM81kHA9fq*Ri{rz}Z+B%hG(Mh>xnx3^lQKY6
zN1O^shR-GiLNK5vYN}3E6roxzY`b?^s5+RofJ=qG@dNQ)lowid+3)jVHKX(LRlaEy
zI%4q4_B1o{kN|IEc*?UG=0eNTM*4^(VU_6yw#wLH2H~!$nBprOWrhUP^wyL%Q0Zd)
zi>z}P$I`%gilz#RWat+;cBYE@5%PX>+c8EA<zj)(WC7_<qT1R-r}hFDvu$IX%xDW`
z(?%)>g3tY%*@j9eF&zG{GEkBn@+ql_sgqpkK<T#8X{_q`>xbKayr%mLWHmOvn79T=
z1GdE$`{o{tkZF!7ks5-0D1xE*qU!mTbJaof*^ao71*7!Xow)`7`!XV^)}<bJ`AMNc
zie<LvJvU-QFJuIz{(A>zMGk7V7~0$BnxM|e=FW!X_3om9wC#DP3?dL$qUuH$E7XlD
z=CLTKrY;QI|3US<^tO|rTA!f%?1x2fl1A=8b)sr;a4U-88_@a%{s)7q^p&8kf%p^P
zW^7lRS90-QidKCQC9Rw5<kHNqvg0+5wfxE@^T~4ME`4$uGe~4Ij{}MIvtY>}of)?O
zTt?O@94aTGcxrU)o<DCK+t81pHt#?TD`ZO{m1mM5VCZ9xc97mmbg#lv`gT;g3J2PW
zwnU195xaahl8^xwPUHEiI5C4`>AtwaZxi~>sNeA`TuZ8wtA~5`;cpqjHHhKqRd{gN
z;3E5hnyyN+>|F%y0>v46FwyD{U6RBa(;orb=WUPKo()kJKiE~|?WX}eu>THrXu39l
zh{3(hqC@=t`7<%V2UI$_REw78_Eb8Y<$58%yH?TpSB0o&w7IjVT!CZY{(MKeF;l<_
z*vEvdy}T}w1G<ey!)ZfYNKXSNxs!=9heV&QZ$VX=8oRnJ*pa6WnZQSZtU|vS5G=&}
zNtc0yju%eE#&?Uefq{U@Lz~{0hHroa8g2%`&Pu=Hc<c%@iUmwx{>bMg@jr`ux%~AI
z{&JzX-*F*!6!b8D7LMD2u^#f0)^eE_OeJ}qK-+f=;N&hcX^r0?0&koVmDL9`N#CO-
zCk<euaNsSXm$XpjK(WbeY{W)H90dZP9C<1~FtjlY4>k1yWBaLjmK-3e#=Na!Je{?r
zNr<bD^IM8BvR{JDqG<~%JT#?Ccv<~N_4%zh#F;vSy^RQ;JAH!8u3{r0$DaGS-8lDt
zW6B$z%3TI!i#=t5=4|r{!$E}pX5u_I!4xI&xw+OfQ%uG`zzmEC+=lc2Sr%_k+DBda
zcK5a7^)%^}q~=Plp_RxD5iP*}Am<)Hktd^HXrP`5ai$#1x1RaRc|Q@oe(#AH(5FRE
zC}8Far~G|BxMfUoQ(t%c?+oC(k|hrVTlw#Y6!PvEx&ej{QPWZBZ0)|sfG5M{$raDo
zwh~?KN0j@Tx3Um+;=)WLO5$LEU0!6!!*tJa^LjY2x4uRWs!m1l|2-%ix<%cda*b)(
zj&eb4=}t#<lzI0MyDCP0H`BG2KMCgb?Ba;4>p{D1phWQaFr1#qwU3ma!^(s+jnISx
zu1BAeoEZ$N+TY~FT__vG+y6$BoOc!$daA#%9)dC$22b$+WlXz{xN*Zw0I+g$uK|cC
zAS-;P74tvq>5W9?S*1zV&jff0<jXV0i|#nHN5!2#6xe9IFpW<tnq^fdKd{(UULuSo
z3>KQX88^T<!|8a4SoT6q;4ds}Yh=`nN$ly&(c>D(CI&vyM#6{@G}(&1bJK)ZYBSt^
z<t95+BW36M7kN^;1}U}`sD@P8X*Hkic7%)>$C*5HhUFk1W88J<aU1REqpNV<Ouo{}
zMpaCT<|Dx&Y2`rpHm@L|6xcOK4QEgkJ82l{|3Zhv^{^&Crx6y)l_+S{Je~LYPaCz6
z->36ujTa4vpsRp0lw^I9V6%R4^6#Tti*EN_0du>++h!jW)m9F`iGj*Ox~V{BDQbx{
zfOi9IQh-W_fjs606{q9FPnXN+`VSC`dHX~K>xohwps6m~V@mjY779?E#z^D8LCLcp
zG^u(6Fo@a>+)t35dVa!9F3;Y&JzC42`#Ecq7OvvW?3{{!k)^kL2;toO11{Uc4lj8`
zWq72g$9(tf(^HL9m#YYl2?{@Ezu-Pw<BWyFCmDn9HZY5(Bm%iSJ&8fVM<O<hk24N7
z9Na*!K&m2l6l6xghtwUQW*BhJ#tE!_7A^Kzy$|N73x8{8{9c5LMWe)oouMZo7~>mI
zedmwJ_cbe;pQPWcgQ*tntW!w3_DJ}s?~F!*UPqcPsj-Pg!W@Ho{=aZi$t_5+?{IdW
z6fBCc>(Pb%jJ)r6?LuKW<-~j92G@N4crJsC)@7Nf=)59feoIZgMz@9ZuP!PDDRvww
z8^JVC)-H65C=#jlj`Ho(uPm^iFLW+jQRySaQ6@Dg@s3EmgHe1x7m>@$<C4(b-joo{
zg5nCl&+El`;mB*rm9H`gf-Pj-*H9Gs_Uo$-DS%p<(RJfP0|g_TW3G!cUWF`s-NxEl
z{CMcqvS0h^()TxNh(D5G^q`E-uM?Y^3zB;8hfsi-->PB|s33`mM8)mOcjKp|29Clf
z&}qmMw?=6-HSZE45oK>>@>FH^I2>)RAmVthdz)_qb?6eQBAe6`{l)*w@nbxq6n1oq
zS9zS0E@B`2T6*o)2|B7HWwiOJ9@YP4JP5v0MEKSMWc$U%^kB=30rc;j^G!{bm|HZq
zxZk%<?z%rq(>UQA*M>N4{GrONbgD+lFMf@qhZyk<ma%}He)?AUF^44V{=TrU&&nsX
zsI2-FS_C#Eb!Brd9J!<ds0y}5GES#&Gi;4)R>~fBu3GN~IHI8MJ;gHd*!|<WX&ec(
znV2ZHYA(O^ZSTapnPrSnzw460R7Q8NQyp=%aV}10RU~(s`N`7q*EXMym>xFq*WQSe
zx$bPmA*4qu(_1K4eXxUGDV12nLghY%gyRNjSIAg#J(yX~`-ZSD0I6>($&@XH&5Ux^
z=kp57JWNf0w&9SqkhyyZ&H*hF`ssdu`PTq{9`vBWLI{C)2bp;TH&)5n>>Z$h_YeK=
zDbPjr0HL9i#D=PGlPc+Yh~xx<jeNl22=RS{0D<&m@%G!Tu7{I;U@sp5c%?gQ+<FN7
zA8ds~cXHb4+r&5g(TNZ(TYfKcIqgNSyuR$|$dnx>eO8Z>ar^W5@a`P<P?EO+WJQf9
zQ^7Eyv8T;lfy3kkvN7x$=bl*xwK?_dpo#n-U-Q|;2tD2-cMaPTwQ#ze$OFS3ll)o{
zfC*yy9&+&$zcb)sr)u`b-ayNHXW>S_g?zHiBtljP3F=#yeKw5A#xq6byF2)qY~%5;
z*aN0{$v|mo?k}cIXH|(#Sm8p9O0&OJ67L=B5PR#sB<up&e=e{gd36bIi##%Hbqo7T
zG;AUIghf2cb^F#E*Uuz{+Z?Sq(rG4F8-^Y0!?b+GqOO8|+KmfR=xLit+~rXDO}C;T
zgHHjY7ghR2RQ5dK&^`HdHQ%zsC3TwFMdLbQY_bnjESY~;ytq*I8^eSn{GkkgV4U&N
z;Svz6zaj$~;@^nYw#2$~hITdbg(9cl4d+h0Us_uk@_rMIJ|CFsCtkoa&X6}iMp%ys
z#Q%Up-?|sJsGz539#QUMzXok9ukAd(LkhY*8T@9K8-0BI3P`LV0%?~W%x9X*xex-$
zhZDW*AamNK1?a@n6%WSg^y!if4$Eo+dKkB%r#9ino_7FxGTV$GHyBNj=RyU6J4=#V
zTFJ_X96c&i8QoS2%+$wW+58ph4GC$E<Ul(Q?dC~8;r^*+>u2E7Q-uOTsx#~G<}tZM
zeT5D1TA7G&LrxijhWDG=7Eh_CJbiMZn&xvtUmeaVAJxrnsZ?OdV$5}~K8&kH`ul&P
z$?FpSl%js%HL}zv{J{)6$l@TZ;K^H<2gCS>{mpjvZDTC5^NLhLz!z{7bZ~0_9k<I)
zb-e8IK@i|rV6_>gx=7C^h3WnkTFgrer5*8%e*0ciMp}v1aOXG!#`X8^4r{*dQ{@oD
zXCq^4O9BKc*1i(^(ZYkg>TqK*FuS-NJsw`jPu_RNG=gpp^NeJppM>Hc8@(>r)NbUp
z24-mP|A>8<eRH~LpTav7G^~6;e>aoC0aT(5+B;!pnV5K?N$Skb=S_U-@Kg8*<VJwu
z4+x#LY{S&hqxJ6=E&ESD_g1(@e6oxIh-};0UQ>gJxWS0ce>`6+6p?nZPAHJVQ-!Y1
zJ{laOs2pIQ#kO~zcFogld7>lX9_;$_b6r)Q>vuMt2Y^5Jg~-$u)>p1C?^Dx#ZYKKD
z%6eUX=4J%19>pU)+6lH*Vvn2x&w-4<-hM&x?^@%{`f<8o{}De9x#);__KBauF0V-u
zCC`0Z7ER+SO=$YU+AjGX=L8LkOpOr$x!W!zQ8BGzo}IgPA-A)!vGoVn_**4(W~2({
zgEg@*iKN-x`HI-m!H<?SRjL*?JN=kJ#%yri(QkJNYS2e-%cScl%Mvk-kx#1M?d98=
zir@F)Vq<g}Nu4Ep)o+@VT-_3bUR{@(BX=kv#OZj9)qi)A4CzBxItV$4U)9iW@0ba6
zd*B6&l7A?@m~)tDyszz11t08~4o_RUOld6@xM}digd=L>rh6!}bP<&Cdxjt^;z*35
zbH?bHlu2a|{rDu@gvDEVF}Ep^x!ql_0aJ9+kK!w>4s8yBws0I6>$De8qte(KKRG$6
zpMhI|X>-gOB?XikHy`4Mhj!Dx<W^*($17E4H@fm>sR7L`K+~4rDGl4_%|nY95!ddg
zk1dXY1+p)vA<E&jLBrf5t~kz)8t`$0;BY@|<5F?;Knc*1SmpGD%!&o!)ji9jwn@{y
zuPDXs7jMlG&8yFD2zA_au~M_Q)vSm2l%Prqs!Ci$QmN}sagSDH`-HD%OT(f(qvv^U
z6`Q%SG*TEFKEShjHtWga9)vsLZu&`hi9XM+Kj58|p0@5eE|p-p1AC4i+e_zV7o*;u
z=c|Cle~&fSf2**LtNv~>m}X5@h!bO)kL9gHWlnXEnB}pq(WP&!wQ<|2Mgq$VImg?C
z9luL&A(iZ+d_3F|LMO@T*8*zT)>Nu7ug!rPTo+N(@csKenW+vb=yKY7rdJnb48j*7
zlH%M3AVWL))Nu7_hMgikcjQ!fM;0|1Mt?%sN{joU)mlq&P%x4c%+NF^K?T$%F%rz)
z$Wpq<C#0BJB&aoyGkoOoTR|mZB(J<8MTq**c<YckkSp_s5tn{P9|DoOzfGC77RFyY
z%>Jo@6?Son8l3rF1&uiuXvF&m-~z%5A~{ny-59xBijVmBcmGvc$+FFSL&dRl@geSh
zDc9Hre1@S~e@u{|oH$C4KSdYahn6{eM%pO~+y9n%&exoJhr+6yXi?wFuYap?+#byR
zh7eBqP>hNh<vE3lO^*7rg58~5^Gb}C-UKWnyN(y<+~vtz;)WyA9{$KSGvRL8*@Ie5
zv6beR(~~-n)@Os^{|mV%xfA>3)mLlJLs|Io`V+-7I`OmjUyJ`YUr--9IZf^@=m#7v
z)moVuP!oTedBh2QPOwdkkK!odw_laJc?6iZ`SxGr76m5RF?Se79uMAzYSa2Z*9RN$
z?31nqu(UUFUx0%<{?gTK{Lpk>nfCdQ7%}V#;hhzW^q9udxz_{(gju-B0Gv*qtkknJ
zSbhCxu8bQa@VG2ab&t0TQ(jEaQN=2F0`&s#JM3LPj)9iHx4Z)Xb?}%5C23d^{MV;=
zr_vUCBX_m4>)FDA&Z}&Y&Erq$GM$D@CBlhHQ#Q7tRF_&bQ#@>!khYRfm+xb+(f~vE
z)v?e}LtGU5OTqksC1AJ$swnt&V)INygs$#}M*gN~X?=eEuY}^sl@=gW;L!x^;8RHi
z?+kjm9e^dT?rGM1cPTV`>z{*UrLGZvx&})(CGpfv3cx`b-sx_?UnG8z>=0S7#G_H<
zR{>y!d_=SE%zbB2j$SgBAvzmuHsYkMdH)ct<1aHn(dlz}96G)iPDWelL<pYd48Ju6
z`~AAhSi9#9J-zLUNj{GUN-F5v_x_gbxB;tq(e7f(_C#U$%nA?{?slMvQ(Ew>1x=Dq
z>lQ~0{)e~bqQ-%?ncw)E@A&f1gTOI&P7DM$f3U*>@2S10z#bcwqmX1^$#3B|nJPOF
zIWhSpfsYZ>l<Uy_eRe|#mmVpK7?U!Jh(?2T>F1+8>hEluF;5A09^?21sv9(q{Lbsb
zAoCBpO6bFXFi1xUt&12<-Sb|D$MYbF5XCSJQ$pm()*I=JGw)aXiidUNA1(yP3P;19
zA>2yhmm6oS-w^Y&R67{Y6Hs;O-!OOuFbG<5lk5QvS?B&#$9WEaSwGQt(v}bbmXQBt
zpw}s%gv#;bcrjp_2E>2ch8nUrmr@zYu27fS?RaPc&*=W0Y@`*Hr{#2qw`S%WMQ+Q{
z9ly`#!`8rcR+hiNO3nLEhrPy}>2hJc%hC6bkW}0NgP^$xfm^m=gEOcI#D`LL8wRL3
zK9+$5GlElp#Cw9O$+qTiUEb-63-KJ<+995XAfH9LMbS*2Ein$Cp?3RmhTi?-fX)oy
zN&%|Z)&HzkZf-A<G}36bK&_FP1cl3K-dmPAk=VBK&KuK-NsA8*{qB%6;o}9l@(dU{
z(!M|s>_A|&?2kYc%ai#DIE=$-gZjajesqNvVJ<B&=j@gc-hImzNSS2bumFe(KF9s`
z>DulxeInRdNRwRr$I7EAR8zav-w2UN)s`PayimG6ljygyRg3Ap?xp=*2Va)|E~h%R
zr)vFfIiY0%AMd<WX*6JA;up$KvMGyCiSEyjcY7>am(za+W9UOHej=6R-ak5JOUgJ=
zl<3Y}l1iUSTA17k#(gC~V=n}o?t|%&1|iLhbVj8SV%0!89jKBz_?ROBQ^woTh|Z%6
zy9nDbM>lrbFAaBfOyA{Vd&Bj2EbHy$``6iiCjk&xwwHT9w$N7i!|Cvme9b9r_{UT_
zT=mp+aM=zQT8^CGQAz_EI|iLEhOTSOcWSP0Mk6mdxk~}n14XSE`Q3|*2&?p()Ug~y
zYmXQ7=I6igyB<^SZcu8$KsFBe{C&_|4MFpJK1YOy39-T(ovMa>?>lwjUyHi|G17(F
zZ!G{d3h!|Eqj;kQns-(yK9cHtm6*<~mu<I1w81dfQI4qSM*g<%uNdA>Dyy~G%B!aF
z@MyC~O|jaj6FJ+WMRf`d_RKYq??2V_MaTPevF_!9o*R{H`j8KDV$oWM#08_26P^nP
z+8d;m4CpYYQ)kV0nV?)=Bf1hW0WNpNw^{VsIA=qQW{Ps$3NxC`L?F2VLhcjIr<Wne
zDV9eleq5{WEZNE;0|W9;E_YXDQTbV~wz<(<A&|>D`hfCpjSU786E`)N?Zc~N7kXz+
zGKkQ+JyUI8@b!+*1M?f9W}pm5u@G<tL|i$1mJR#Y4)7U84D?|p*M9Wvg|gG^PrV&r
zn<sAS{)}9+0I0*R1Jr(hYRTdQ!L;pdJ$WJ9cy2B4aPwc&UT67;9aIY+BuE<FV%#Bw
zkoH}I<fM=ltn<adMD3k{AmJIqY(LAmTZ`pkwd5qtkc3P4JqSM9Y<+X{b?Z5KJ*xWw
z^MyLkv%3o(^!4FiPiHo@n}2^6@c0+AMs41wPyBt$QAWwgPcF9Wg9rowMCR=&sOhF#
z#X0gm2=gU>z~lMjZ5`IekU=sbe^Yb3t|#>MV)m;u9XVnOA4L;&+3&;a!nfo08gB{_
z{u&m|I;vy~?QZhe;ya{vh2ax;{&zdSM>BGlF{Y+P66z*pC^M)kOjM9(RnzH=&$7Ke
zLKjZ(#UFlr3j?Zd<YXD1*L>e2S<<71bCtrJUvfNW8V;0g<AB}*mC^j{3?XKRXAo%G
z&wb4#e4<dhoWbE@yiU&OONP2#xC0L_8P*m>Ld&b{QAska8Q=`nkqj_8Ta<2^P}94^
zE5!TznkM<5Jq93QU~Qih0VRy29#{Lbq-H>l>omY2{KtC3hj(=0uc&Y2tQJppAy7P?
zTp^}<DB9a#)0)5V#cJw%@#x!*cf>Ep$*e7hBhC8B7Jm4^IW%yk)4X{Mp!6o4s$(9P
ze8w66+0A0#+-@cC_~23p+v|)vr^9lRO8Lf=2;;n<DkC=RNNS=p4RLvn@6;l7_J?va
zL9gC*ls)`4G<_A}?PN!oH#%4<_`gJ{0ym)ep7Xau*_H+fmd5w`xM>jH;3e)xG_=cC
zXOW)hq|#X9ef*T0!>xD5gkQEcE2(BpM46%4;BXNwRrBRqyXSk)ho<%kH*smDoYez#
zcMe%P^9}UOa}{tcV~5>Tk~?NSojq)-l_?;%*O<BvU(RV|4?U8h7!mz2!2IV(37aec
z#+ZDc@s<TJ_06mx-Q_PHd;LO!HKo)}GdyF?G|92VO3wcTisFGyg-X0CcPrKc1rU%E
za$gU*{U^clj8TqpP7}c~PYs8K?J5y;+CCm-FWtW5cs!Vtd;fgf|0T|b8qw5Snshx#
z9`#m2@NzF|`U1j-5@Y5agj|Ji7Q1MU8g%?CW&EPS8Kiz_l{ktLxv5~JM_F{<qFP8^
zcRX3|Of%P)Z)+Y!I$Ax4Fw$+8nr4b&beX4t$x?~1a#q<~>Ej&ub1DX@TbMG3l;s2u
zW@VIAS7DhHZbQ&Cq6~G5$#ypnb*3)<<i7C<as+*zXAjXzRi_VB5%fOe703TVsut;@
z-rG^rNP&n?gzvR$4p~R&6IrKd5!ROa)J0t_nC%?E(Yg__D7S_e%-qw9^kSr>R34$@
zBpMu#A@TJxm1JEwp|oJck&@omRd7N!HvKAzSQ6$<t<FLS)QNN-R&(@#SJg?Mdg=Hd
zbuc%?m;h2#C-sHA$gFYJSy@avLHz-do|$Y<L4}IpVNF+8%)g2RfYv5{(sp=~qIbR}
zy5PCN)8PPZ2L7OZD)|ekZXPSjA=9)}Gcms?VjF=9gKkIYp=<7D!KB?woDeNi=;ON8
zSzZ`QcfAw9<%Od^RszSgw^0EQRdW#kNF&aXS-Ko_F)%u=P9@po_9jOqmq}45gfz~!
zVeu`i!2PrQfnNgIA2D=Z>`$9%ggnK6C^9ts`DA;P4eg8<THL+1$XVZ=55M|=01R<!
zR6}HMOXo+><Al62V_u`PgDPKT*U-CW^TU374%i{CUYzC-f<w66zU+?F@hThD5<cbI
z{{eX*LSJ_Yr}n*uBeM}kWBK}e5>mC7<v40G+DQa_z{|hthW!WP$TUh!W+5yJxP%F_
zWW$xE#Rpz(Vi$GC?4im0Es;7+3RB~2h%QpAU&bmrN2@>JGPlbqlq&n3Kp-`B`@gni
z-jjQD@)3Sy_D+?UwY0ov%AabxjZe1Gquw8Y5Y*Gd%{$wcm|+^xC;*m-sv&khkkAB2
z?78g}>%Z*`5W0}YUE&YBaLY%4`r;XHU5v;0k29P2!%O!}J|Srno-M8?=Y?*U_}{+V
zDVw&754r&ZiV9ubOL#uWP`~=$eMk#Lf@|DK5YZM705Sl8nfe%}_2b0!Pu5ACr)_kU
z#?|BAm==O7PJdYqk%-w<=i`GmBfaW_S&?;kg3-y4oGa+-t%qWtc{Qv|6_&5gk;p<w
zwjF82Pj6M62RB>dvr_?o%Pe9vYO=mpJNCKjO>%?>nHFQ5A^Gl(252{JTm=;PYK`vD
zhmj(rt|Y~!a3JNy>x@&?8h%+0eL8l?`+e?76j>T#vD8_V`x2}zYRfT(BhQ!DBplDZ
zn+&HGlNDSFC^<|Ls<$z6X+W2g%KHj<^mxgWwHD2Xe;xbIVowD_p>IUKE6I8DGu2rL
zAw9XXzI9UTPzTYLnf@Xk`fV-Hrl9wWOk-%@FA#FsvkVD_^PaS9<Gd~7ISD_#ctVhT
zJ`v3Jx&dW~_`i;p#P-ud{Yes}e-GbqGB^wJ%k7C@ZoX0a_n*G_N*}f}*|Jj|!t;FD
z%Lu;<doc=rE`Rm-1Nd|6cz@$regRfV!p308W`*Fwl0(`2thUM^rq>r+k72d;^M-w|
z{nw3#YRV=K>Yx`9R*cfNE24`%&syK`wA3Tgv@0sh%8z)S#x{2kW=2Ngx@!+W`&!Hv
z1%?m(i~!e9MGh$yB_|W=7X}6sr#W*v+qY?;r|CddYtLn`srn^{ze!jjvw*7k75aPB
zleElGJ{zOfaEY!(SQrWuE5-&_;uT*-&vu8(pfaTwI>{BVUBK^Vs&br@?_d+vLJ{|^
zW6)utdBHvdy)HvavTd`Q()#lCYXcE?84<P%oC`5BBO|veq=PiX)&pGpr#S_6v;@aJ
z^eBELl;xow$AskuIXyjy*ULA^Lq+}hNKx`;lZo4)^P3>8b;TGA_(Aj4*`C2sL<0fa
zWFFPP3wZ$uI)_jlbjML8=0s@$A8MA!H^4sQv;av2iC)kKV4B~489&SXnjKC1B$PMQ
zEiBR3-L>bKKECyGgzIzMxX3*%<5_`a5CvTd0j`3My@7Z_n5&zc-<T(f;3SdK{7-B;
z<OO|$Sxg;`$DkokedWlW?kN{5;j27~&Y7;S8ix*X>W&0Et7pMh%A0m*xY23Pl8v-`
z`w?gzv0T#yOIM?;({Mo!ZyUxeqM!1Aqjfy!A>CHyy5i{WT|%VbEx(l6{-}r^vynM`
zt^V%s=Y~W(4I>9<y5uNcjp3$C#f_4Z>(THCEPI!&bW<XEuF{?4^}}o97~yQh9;=|W
z8m*#U<)~xR@HZNRhKMc{>3T`aHZh)WA|1GhT2c1QS6GYPNE&`Yk^Xgi8yJ{Wr&<hq
z+q=+3OX=wYi&h!4h3{DufWb=744^|FtvA!=sFUJKUZA;loGT;_Z<9WS?8I7p+qRQv
zAr11y4%bRqe{?9SF$#Zn1i${a>2>>a-B)Gf2CL;cG%k4^t5v*z1=S)+h%??G?EVmP
zzBhihG5>rv{<YCH9wZiN9b&!eoZNH-;KUt`z6h6Oc;E&cQe80QvG%bee<srC%F-ws
z)|H%g(VQQUG7q*N+b#w^hVzcDHbI+Q6CX8cdTK#M0?|BX7E<g$R2T5Yy#tUX0OSC;
z^ecT(6a^{Dz%Ist_e3}vw_9b}if4@|l4VGj!!X;~{#sCcPP7O!=|#18j_T&SL+c)7
z1iFAVuk>&s_p98|hjn4e@_F^VrAI3H!porlE(aGG#4;RDO4-QUcEUf18Pw<(ItT!1
zb-n1P2j@MP0=*dNZr}m$O(nQrN^u_YlHt@kSsUoK7cbIwn%7;rIG*m870c)dWxO5w
z{+EK&i4$^}Sf8&OBl*}bIgrYz_^#-wFy{FdBzdzYm>smo!HXXH9JcbI8)QlC`RaUa
zv1<E*=dJtU_PPXWpNOR~xZ4BqtTA@x?(TL|oYtRs?eZlAy*p?h5_)hNf_97O<tGL5
zjmH6;ly*Kz4y#82f6L3J0{@mXQqy-7W%8WRbo+GG^`V>wdrEC%IdzQ>BS5lUmlE=K
zy=gVp^9ZU*h*3Wh;9*Mq@_S%l1SL>=3O;AT4=3xW<oWD!G3g7Dxh(w9HtEgL{1Is{
z)Qv$!Wy;}z$%nMB!9i*B+FQh;ArSIQ<X!6dWI0XQb$0mUSGxepZ>jIB{xS->0yE+~
zdx~wRKeuoJkGz%rv0RwOn^w{JhsSHJMeOtoCERlC4$6{lPR`H0!ja1refAAW|6SDf
zsQkBZSm5*xqYf{kfPm)258yEEE;1cFjC;l`+h84XQB-PWQ9R%t$yQ;AJ&yE4LXVJg
zgD*y-CzlhB_t7?Zx?P|`UC!8r`cmYEFC?M{ps+augefoZ6r?CQ+4NWMYHZo}Tt=GW
z+8$XA>8I1~@U`k-FudGvs~;%taJz5L>*b;SJ=EO>*sC^M!OK&kGZ%moQw9Oh@kCQ?
z9qY6Lwnjn1X%qQLdBr09krSQV)M`QR@-$3b6{Sfry$>IQ=FYwdu%GE7r!XSeh>CT0
z!=oYVUZU?!83(qW{2V1GHdndEfk6p}omnJDy&=*i6Gd&_UqA|NgeyTOS<q!CqJJT~
zJ4I#e`-lgTZR*bxT`T#7#B{m7K#c_T!-vs7u@XWsTQ8$80iMMd(wf?UH68Ah(S9*`
z9GFmO-@Di0KmYL7Ky09oHGste`RteOgbOLcf+JGF`yC|+YI;fRdUI1#@LnVy;KihN
zVpX}DH&!&+?6urjuTH;wj6K7>lRi6Ge*s`K*uW{?y!-_r$oF*c4rUJh?fM|%+IihX
zDj#+FTDT1ZuIk2pRzxd?*tyEtQwqMHd!fnDjEO)%y{usMJx2y?%tQ@PP0$bb>n#2A
zyz0Eo-tFm}__W%d+SHfJ=4Z;f(@qS#rxL$yTGIyFuoH_Af){(I4;F}DJbHk;aGClk
zEsM1s=!IK|+yu$k;Q4H)y-t$$4o<`1XvQp4m1w=Jo=^Im_K-WZAoyzFkK2Z>Z<B*L
zG&1fJula^tdTSQ-kSG;##_u^t`{NW_sa!iUoLB(c0yrPG&mk*K3qHs6_Uu44TSfhh
zy5di$q%Ve588(3+wrJyy=w{Fw-Px(xz>y>|gOprv3r;G=H|<%CaLp_L>GmF4MBTO~
zy``%HYy;&4ku8{uVGO%au8XiZ-`1(gER37y5P@2lG6X_a6cJJ<Rkls*CXxeG30nzJ
z6jU9Kh#C^nn(CPsDt^*b0W6|e-?VEGco#VNv#)=EMNo;@^u90ysP+o!dHbD!7(~>m
zzI@36AnlqYdeTCur}q@!>XF@u61+i7UOZOgV_4+m<o!Vt-3yfs%yw|>O)r+Kwya4s
zl25HkxyO6Ar3jWoH}zkmSiAj{2EVl^x76r2$@&%g>TIxGEBH*X<;re7A?&jJxBL9R
zeY>q^@BgZ&p8esQkz~oNb-#}@T$^EIbr?dvxOv*M=UQ#t3WXQYG;d=wB%!kR5)O!|
z1V86SzsW98&8<mWV(vAf9QPfHFPi<hg9z%XKWt;kjAT46pwHEaO#@OMU)E=`q$a?n
zJ`;7h6*Wz^frii=U4ow0ZQ$fr`c$GI=un@c{*bWoBCm!R@HGGJ(>J+N{v9KdS09;m
znB1#@;u)~qkVNVg5Sj%LBFK51T#$xPjs!bTLn3Xs7z#{mQCcO#9ec$xi77I&U;#);
zj3CHZCdR+%0`9xCQKnFwt2-?(<v4_ZJ00)S`+JeLRo9NS4~0-4oJQ9U@0xFAaII}X
z*;3Q#N6Le~o)*K6e8&3+N&fdiPEvQty7~RpnWSs^d3?}EDUo=q#dn>k6@E}N@z`JC
zQg8O9_ROw4!>u-XC&EKf_hC{(iZws=5)4py7Wxf$M$XgREc&ZMj@i`TYFK!AIU@yM
z=x@+I<Dtk{+8WIQpEva)z>0<g_NTT`hidxrEg)RWy9@W$rhnP%v(aC?{s^Kqx72RQ
zTtB*-E^g|z)Ui{+GD&9`!HzIKM6z^^BQ)FCGrv#BKHMYV8~=&Ukw0;@zH`i-YHM~C
zXjV~$!<VDZOOwQx`&JYAAhYoe3CWa2zJorW_SXC;5~<N)DZzLd^F{4<OK{cLNXic^
zj;tSVyo*9o8;`vd4@p3;9H?72X8%SAVU;gW6~foA1a&g$BNC*W*JEX+6e^t5j{n$6
zat0&5Ym6u9($gz&$jtbo7!+#U3xWMh#?asuE76fNJe7}e;EBD;KAS|ZgaTm`z0cnd
z35NU!-nrOf+vWJ+oU~oK{)5;6Dm;&h<cpiHSS|MB7_F0G`#}zKi3R2rzhw$yB#tH#
z2FEmzs$3B5QNT4kM)+YCYjslNH;uO*_RICid=j)hQx_LpTLs>rQvtI2T_2k*f(g0<
zg1n6LJWn}l#O1fC6vjU^0oxFtZjr31kBCc0xcB!vqmv(n98=xZW3w#d6!plxtuvmD
zxwCh)A%XZ-9IxCvQcBpQ@0WrrYesyRnA4)xH!+liNRLW_qvZFb23T%uYq;M}5iZZ1
ze(+K{sC;Lzu%P)X*XB*uosz-3n9EzG_V-=C&21*qL^yz^NL}Jy$`ar-`68=>i058_
zpCY5MWxo2eMvszuqeiUr4M)mj<Hcgi8!z_4-jGW_6?WL+rtegQ&~(9J;)9&KK%99b
z9|{1IQ7CfxskiEAigv@Q`~G?P{u+V&enxPQ`YG6}xY*70FX))kMe~=B0QTHaex@34
z?!N-Z09bDF=S>V(pmwZf`=jWKT+L(N`x)CAA<HD(C(6b|EH!xAqdLL}(%Fhv^O@P#
zO3T}-K09Qwtd*A>dlJ)&(+0R=0uEw4RoJfC5BO2YFrP?LR$ik7Z>84q42VnbpWB3-
z7MJD`1>|h9-E<))BtU(?)yL|M&TbZm*!0R|%^P8t{NP}{Y@nOyW=}pYY`PFVqx6Lu
z&p%^@es-=u2ySvRLb{R0$qK=c_T;4$JbHeS7f7pJ2wL@P4}Edz^SWfo=Ncy=GS|~{
zn$9C&CpBW8r<E8jHOKfPSk0x1CZzbrl$Vo#>Zs;ucSrm_4CffgSLloJupWBw(<(Cg
zr;%ZHqshr0x~(y!X(`iv&i)~QfMJ#7;vuLM-a8FWJr&!LjGo0VPT_kEr6A|#EV*p~
zHgumqe};GBa4V>)meXw%IZ{*o{jb+XBpw}VYyeQm6@&oGqtg#3|GV+(fk;%^KG@5K
zA7hzi0GEWbJ?7Lp=naZ%F0s_WRP^AjgV=u>L9>2PBAP9<4-6LXj~~0KgS>Ehu>602
zru6@1lm*}Fg@r!NpMu;vsQ}HqU;K=zs}%bqS9JyOWnS@7sPlXhPsVxGWB8c0Qqb0X
zhZ7{13rpR2UlCo$Pj);JX$tqAcDw43R(cJF52%GTU*7&{B-^S~mIzNI^}qnhsrmg#
zl|nl=Itz9<-<5Q##EkdiSMO1?wn|Jo@L8bfA&;|UNQViF<lq46O2VW5mo@Z{{$Rik
zFM*qi0h1QO(bF6BQg-$d5!zW!S>aaPrYjfYF-P06dYP0&<VY!}a@88@XAtUwZ1c&`
z**(lp3jz47S2kay-%D&QEuT@$vh0vsZzN*k#8ufIsB)qOegrCTX_9L@JCDhq@!0C9
z0?N+xC(-%kIDrc&0m!`cT9Qei64JCwrIJe7b5&gb3IDIk<6_4H@Vl{<(|tZuk`f-Y
z;qN0yof<eX3vz!r_WKvo?z7=HS~JY;<vYSK^>8IU<Q$|z32fWSeKuRc6EhLm$P%O&
zz12rqTB`z=@Es`;ja3WL?WlW0Pgpx?o>v|g+{eR2;yreAf2kIIEwG_<86`S9`TEaS
zka2mlwUd*)xt&Z6<P|4S|7X`}+4^80r6MdEc(rf+6dG2q<9!1;L?TA63^8v_k&rY)
zvL-$0X!@Q%$1Q1l)6CLW3@Y0bbU0VmLgg-Zs-%iSy?5c<oO<0{a)!(ny*vL)mNEu4
zbLb?6+fygM^!$Ry;aVohFtZdj5*!rP6`#+b!U1xGe%}v(tZQ6%@Ts_b*>1(V99<+Q
zO$usJWpwjw!QxY!S6xKZO~1QDjFVID`Z!Wo!Awe2YgD&+vfzrRGl&#s>d3t>3^0)Z
zptM3!D$lcaA)BXn0uFx(T}B<0k@+c<7U-x2Uwp-z`#~dTT8<{r29AoZrD${1ociy(
zQcY7Y@I#hu_LzRK`P1LUd{-=qmpe&7_*qC08G+qN6sIh8N<c?2gH_4fwsaK`PnJoa
zeZ_2p?hQcq!Y5(wF)ugKjF4c@4~T~Zo$4`#^Ml5c!{oBzNyL`Ccx)mFIS47O5l1)Y
z3kFqNC3eo6dy13u90=)H|LKF|QG||UDz3rwmJ1JEi-xC&v;ovds#AUOqBMimAtyMG
z<J~V-Vs#yvz}4F9?cFX8%0O2Vq;T;|6qHdR?pUd}ES8zEM}b{^q!f#dET{9_{_-<`
zTON_5wum$pb-qw7I*t&&rzQoRRW8R%MQJ_@@MrAD$2_?oUc?c@%zer6Io3ltM;R&k
zSn6(Z)Hx@ECg;UGj`p6ZfUzmiZ1KEvZoLd!i|a23-5Y(WXuJZQO7nO2+R&wWG`lXE
zf_RBt^BG~fDMUB^eJcFFn_DS6#spexAotJlUO0eDs!QS1ty<YU+v=frJ6qj^;!{lC
z_Kc)5$UtBJ9W;3s<-e2>QSXnG>3Z>wds-CMuZqzQX<T^8UHXx`!xMPA&<+nN{jX+a
zTP~~GJs#obyOTRcG)~kTeXH~necS`9-PbWtTo!f%C?m?Fom^c+{sbm7G`EM5)zS2}
zksOC+k&TH?4m*xLorr9&rv`LS9d5oyjKiOn!ZCcJN51`C<GL=^EI+OHhynq25`MTh
z(;oA^N`&@(3982ecgvI0$a}%}x8mVIt`g_5-{KyP#@JjQxD{F<e=9WWD#n~e$P4zd
zBCs@N*l}YWi!{F@d>dorn#5#0Hn^M0IE~d&wrGpgD4QhOg9V-al*}6k9|$MZ%)9Oj
z8lsk?wc3+jHPBte&@oe#-c&yd+G_Vn$(SG#FVa`-@<_FB-Z8nDOkxpRnRkrz#N1qT
z)Ee)k0i9a)=FL2j`ne+s2{`wy0a&$5vrOmjBW0h<&o#%YGZ?YgN^oUl(2<PFmkK^@
zj9}c#(cJ-V@Ie6nARza~uicDCoC{-pM>roH4dsct@|}n?_LdepW)a{#%?(yK<gTPl
z-zD<VlSQ)xN@<-06j+dbk5`gH9&YGQy*=h9oBxGn6V=Wx{NKz=y7$KP1U%@nb@Zse
z%J=`01d7(36zAR}AUmH(g<f?>Ln{SyA#eH`ZtV44eou>5hL^E8Y`+8BqeYyPx{>hi
z_xX6fy{Rm`JK@v}J8Mj7Mc_zU)-h?(pmY`w#7bVhMLPMW+wx2*86|oEYuyV|eg?V<
z*Dq>=Zga~P78jav#V?k^3->=TeC5@b(dUO}3C&9UI_)`JkW-1Kf0cMl^rpQ?ifgQd
zv}|eeoIPEiC|Gc2CDsJ<w*aqk|KNee5KuUc9qQPV#y=epzI7VUviepDGPxNbXJYH5
z=3a4WBlDtrDWg#*y)v$I&bmc$@JCoWMH6AoMxGnGBQ5P4i|zSVfQXBh4szsS@+bXi
zdKE*bJ3?OR<BRo-0ErB;L8sIUjG#~8F+LNk5?}@@GwFGTAp=Es5W~aGpoq=-2}%fd
zZ2xzpjm2aga)6AgZkHOAYD=EzDs#_V)7l8w0$s8L7K|X)FXRwUxbh#L=}t)KBT}ya
z#prI*wuu-9a&}{L&(I1T(SiKn%QqRouDLkS9M0knyu9w7;~ST^KOqtUH_5wD9TY?#
z%={wF6O-`gyITa<QSW&>?q;(c_WuD>L9D*+at@nijk}G-k!!BT!mQ|J(O)(I&&jcC
zW6z_z)^=|-b?smclmw&@P)Z=n6s)n)`qs0r8&p+=e!t&J1LP7qV@!mw)54L$?z~v=
zV!#`WbV@u`id{-P<d(r)r+%uqVgCFa1vr%&q5T*RN{SfM>kFiT4n;*ufjrORP01q?
zs+D~}jQrFZnWHI-{_yYhfkCteF|fwME@-~2v)*(E&Sx4xz%r>EKewr8f7&>uNW?<z
zzj3heuSK$-Yn@Zfkr3{@NRu`>^pPnOAs$Y6@@KEpL0%M*<xjePzPjNJoNgLu-2l#^
zED^N*6{fQZ>Z-ySXY9j;7hQnS_852FeGiTtd1`sX_%@GTF7UDg5^FsLXn`b8o9*M7
z<umx#S>gYt<UbytEuURO;2e+x$C?fvKAE9;4$G|+Kqg@`1^t)58%4LkXTEwre*Pc-
z79I!S+^@qeuasp2@Vp#*_w0T6+;h)+aM$iVFNF{*))@ik<8f7%p|0xa04Sx5ZfgYh
zQ=#S4X)HvE?QUvfvq%Har^_@QFKrk&{GS$N?y=AR@GOBvp*Z}pIn2(dQ$F=dB{6r@
z_f~>JP$Q({-du<*t|9zuaS+1nKp?ngT?Uexz|J_~Q!)12=P)20;Wa7cn*(PZ8q=U@
zj7JODO_uNM0W9=>p!Y<p3I4e+YRY2MV8b~|RxAE}TW>Y2HJZBiZj0lQU+V-CAdhwC
zO-P<)=nhvf45&aS!2dopsBWz&=>0TJ4IQBWx+*c7&M+%y&_-ipeH|BFcp=8)F>boy
zW*k3$0>_Rmcm2=BF(`nSoS8%Q1yJGC`}-X``BQxFGf@H%TmM<D798Nb@fXE|KUaqX
zP}UG{yBxh&oQLC|xgCGwAO98({lFU_HwI82yUxGJCA)vw0G#%tKj=UCs#jn2*~cD#
z^n&~EyZ5TeWYSYAgOWZujqle9dgo*{PKe{hhv4~CF|de;mNL^hhk$=QC5%x4u?hJr
zotAmAIMuE?P0HgEH9m>Q_Y$O$(S6V%t{e!`Pn#jX-}bPlm!Me);kD;V$rkA@V>cb1
zYro^(#@-{XK%8@M(vy#blu+T{S>~f}wb6hP(eI(IYgp%E7*N{GrRs)Ltpw87nvx=Y
zLn9yqG0Fw+WoxZZoSc;?XH!&ljjE}EKmw!&fTKM0etW%M^za|_`mN`p|0eDQU00sj
zZy+R~b&c_4gz;zu=YW0t_u;&A&&THGHop4R8*uXE$>mMrIXVP@eX9y*9asTm&Ir2L
zS>V6f*B3Ph&qxmV3>5?Z3P)9rP}k3Gh?8@Gwh#w4kZnzI;vfB{XY+3iAWu$U&)kT)
zipyi!0G#&2T>jFR-E{XocfaYe#~yvzY&Po^g@Vy0kfGW>{WKkNHhOApOE+KQ3Z&Ei
zB7XpmCUCQxl#Ne&@iguhY)YmAK@u)nDR6i{h4fS8fJ5E9fLlsAWBW(PAbZ99^m);m
zqZmB<z#{^@NJeCXiZG?%2?3Ra?X;tj1FArdde#JgeV@{%)Z7V>H255Cp;W!pu9+8m
zF2SUq<ubrU>lnVy$g&JlDUd0HM@sy}U(QNQrc=yjv-n(jQFsJ|ITZ58D>?=G1HbF<
zb$hVZ#m}67e!fxBXo8o2Rn^d@fwLM~*KpQieSHIGoN*?qs>TgB+>FDApTy?o*7EM~
z93EW-y!tGOOZH@d5zkGDTSVSF6>9Ko8i70qAaK|H$8hxI^f^Bl&H=X^1m5=w?E8QI
zH~c@3pTM;ryAFrkug|~dW7k1Gqh0?GEjI?s2H@K`CZo~Gx~j&#ZcmG#CC`csZZh|{
z<c@SCP2;e2DxIV0kUP~aEOZOj0KB--u6NNcI-TOFiQt8YPo+F|cTvz#tM?CZF|7@X
zqF~Q2Legm)*`VW8tBbTq0z3+rsUrxfaC47z3iD}<-|MR^>_{CTA>f>ZF%6_ta}I!W
zFxEf{)mks`$l_=#Yykxsqi@NOh)?>dy)$3yaAGCrPH;k~6atx)ur|CFZ7`e7Fr7_M
z&PvpY1X8M?9!QL(ilRWL=%Cx}pd0-DVJ#Znga)9EM5TO+s;V)WP9TKAu;0b{+B(+O
zHgIxt8(;qNmzRb<r|B4W1zvt$A8YF!_@(-3EL_jnHE_XNz*wLwU{T-;4+tDNO-}o_
zJ`DVmk7M^={a*a|2d=`Ox#R%8{4akOzxp>nfL{wMfF%mBYyeLG@##;0YBZfrAK$ZQ
z@8*+FKEB~&?z0fPN*1_YCI!r4dY*8{55D{5+WkcaLaC&W@AK0=a!L;5T!GZ4c1K)r
z5-ZG^?x_VYPmQAjLPb+BiI8IxGv^g7N<D0c4T-=7m^%)(C4v8c_Rc$Aj<Rh3-)CmF
zo_>;(9?~E{Lhrpwmm(eku>ckn6}uuu6JAAMyJGp-UeQ-Uki4RThynsiFG&bVNbfy4
z{cN4`{Qj7k-Dl_Qo}2_i5_qo9=OpLs&d$!x&OG;Zx9fHT!|i+9reR>kf?T`fw;Ec8
zRZ`7EO27Ld+`lxG=!#jPwiim;Mvv1ntdiFh>M2N3j%0*nDEvDb^-<F>DuGgohET{v
zII%C6%LT=V<?q4@qcCQfVA{5gWm=?y!99sY0?YKHMV{^AAWGycEW%Xt{(eNt4kVg0
z#9}7n#_fY41S?mpWYOYfY}?kMjsGr0OWNR|aS4ACVBYnIcf1}I`$HuH(R4v6ji9Cw
zf{~y?V#nfSWD?igbrQt0SHiWwz&w6Gn%{XWryM?sgMa=AM{Me5My(D24NU-ES9ErE
z^fxy*uXJ5!O){ArmoF3&LJ|~GdAM!?+jfxB3qte;ZqOYNkH<@DbE?s=HZZ7KuX)s1
zh6Y&e1COQ))M$e0VTO^3XcvO2vKNg~M91^0+ef1c161%LLyyeJI9=5+hL8CKzzPI{
z+&~nlQjO2^TnHs}{Tu^!vEb|adq6O%SgmeXNs;RLnlY<%UZc^FYHgSysW1$q6yfmC
zk(#0b$MFJL=*oyrC@UQO-a_Kxc^=tJ##c8Cg{2}S(lAXwRUia*ATSh<$Ei!#)7aEN
zGLi6WFM`*HZIe=2=UvweR1|ac_xqg$xm=cFF;7eDFxrL<qos8i^XD(%mH7*FPya54
z01g~!aM0M8ubSmX?7mPM_(jxU@4~2nN(91U*g&_Un9E}4GVJPfe8Gmt7sARdG@d#Q
z@%~eIziE*A+MoF0Etj%XUp<-t>{3W689uyiMJyIu*3vTU;Pva*B_t4!S=jNIQqdk7
zTY?t1>N3A-0hv1Su39Ku4Y^k<7*yxUn~Kb9HA5Xv+w(lHRInIT5mdw3(YgRN{~sN=
z6Aj;cQWENWR%?f=MkdPMzhD34Z)21mLwX455exMEF$Avb1fFy_RnJuF2Sink0(E8e
zBBD$KD)SYx<(0gDf$O<Jp<;Q)Kso#mrdi&X>-t`{O1h$*4ZdV@u_T+TN))T-RwZZz
z-%(iT*HGU;GL<ZSE>9sCj^lR_gx{|}!Ox+mr<>ls9%80NGM-@csF5U7DORmo&FncZ
zvuV>NZT#N=G$!ECaY=>^ZwfqrSuUjsB_fG<<l*muHiN%yjY|F<B?%QqKXThxK+I&p
zf_`3E-iz(NF*)|t+u*@DG;HZXeCQ0W8Q#D#-}p1{zwr_l=_^PRfL(?ok2(q=#8$&J
z)(#&&tZ&`A)x#u0ASB>o#lW-;Y}>{2B=NWv2;In1p`SXbO*OizmsWLx9}FlCj23*U
zMn5!Mp$Dsa+Tcem!uL`qz^S2l)oWM(4*T$<9&?4E4ZH>+{K7mhLZsB!RCvLG7j2rR
z-<AxRA`sbe-HPzLPy~y@ltws%!6yJ=VWlsE6Sf!1V0xKhga%sRN$C$S3XVOh;#W~9
z7f9d=%S4pC`Y^2{kkZ9*T!l!49U|TUG8OJKpU;;jBUaNph+Yrs_n$~6iO1u?0H3;w
zzJ3{WEtr<&YZ?SCeRi>cUCdJ~7RY8YWO7-Oi6p~^52LxI6)6P|Kl~_Lw{F!p{u_w4
z27}}GPhvJ$kiqw|2Y4dk4ep2Ft1J5jBtX`9@oSA11mS;@aaQ#u+1&reo~Lbn@a!_`
z=dXpUPG#yD2l3Dk|IW8Qbsj&3a$#VF65!>!RzMSg*MR!^dV~<YF)OyJt*vb{Fdiu_
z(=>?1{BSNJ^jy8b`!s>dV!&u$y*kgmTAz5-a7Oh4)O~~@<fvDzO6f*b{#0Weh3W-I
zp+2S_N9A!67<5W<va0ct_=Z>Dk0K6765}bJO^~;?Vlhn9sEBq{6Dz75)vV4qFqEz+
z8HDD2qwTqs(-))XCR*rcm?oa<BBiUeE`~<e^NS3XK|sZ#Uvw9X#Vht-9@XpT`N5xu
z5Rb<zzH@b7A+bv&5;Qh8mX!R|6iFe_rEneFza~vTQjjkc$!4<@a{UwwIUL&|o6FJC
z(!!`wW7)cG8!J}6%%)A7b!*>lz<zBO(<asdW<YqW80+wFQ<S~_YF@gavgOYUBLg8>
zkgtIV1iBcm%eJlzj{C;j*6xh|^V=tATCs(u&tAZ{fAJ`juRW8`E5_eYKD~w}06UMS
zh9-cVS0`7G9y4}DES@+to5@)5M4Ut-=})^e2wJ%O{AxUIB4uSLS#9G}L;BIm{b-n9
zeNN38t41*F1y|d^qG5N{s6^)msKzPmPEbSE)!GbI!&y2ODRBb}D-6Sz)CD{#{TzK*
znJ-OZrt(><bPa?awlCOYS1o`HN8tKVfbe|#8Up??`)feCpwNp{=TnM2l%gq~S6Wm{
zy8Nz7+=>NjUokjmhEkIuON2#@*!W|56Qu!Bp=@uVP$-c$HA19DSHj1_7C|8dsZ@%F
zh6WlN8-vMxeqBPbXybZeE1!)Mq!mKKlF4M~&txd(atI-5ZfarD<oy^nyp4w+ewby;
zmJPVxG~O6A#NqJCamJ2JLlJOlL;!Xqq_2_!Lm>n*c);_@X#*lD1_mJrhJ-|nzAlG<
zzuZY*Zue>Ntm}k7JOwYWCVkuGT>posIB3a6E}hX%_SRWgfTKGFGy!<c7~a+f;HFaP
zS2NkZxh*Ztr}X#sjq^ee)-*6o6H9>SfaADWR_)1uA=GO8sNhaCHy$k(4EL?-;j2U=
zD&iAXwpX;aMZ*5-YeO;+>gh)n`34Bsgy{-EhGIQJU<eb_6bQifJijH+i$)b?$=FsD
zyOoL@ZK6Ya)F{M2>EmE;!cbC~l`WR#??fPkUu$3*foh=?U<A7Sp%W319e)^<Iba2r
zk%Gril`pJE$mMdS%KmU@RJffw%qX03pr%?vuRoPaQD0wALqh}UbQ&q8pE{5p#h{2U
zlreUK@4zk=$!7ZL?CK<+%TZsSX6)$k2*Y66@)bP&%(HCRut6LC-H1_52B#fRkC{qB
zM*2o}sNVQc<^Tw(3>K2*G(m-IaAaTA2tfGym>`=;vcA`N!}9-wVc|OXz|V+(>0-`2
zc0cBP>#uxtMmvwGX#fpP0A3TMl+-sgY@Ix5-$#!+^5{eJ+5CBZy}hlD=U@nfm}P=A
zC`#WOa~vDX@|Eqv1wB**jOO;MExyqz`>1yoZK<nu%+Vn?)e77ydeN1rK~z#Ud|kA#
zE;O!cSAyqxctRkg2hxv>`0acW!zjz}mPnBpIPK1lMg)5Nrl?Ti8_;&BkOp-IgL<x_
z=R8y%^at<+%6~{OMIaKS3=LAqgX_w2VIl+Ni9^F5c3l*UMG6JG)PbQ!g48ICO3=c;
z!*RXobeeQ3T_OwNIrmix%c4%M>*Bd~aBe;Fxh$DXKMnOMrcXP7Q6tB)c<~aR{P*MJ
za`^$;5gKni4jUWis40!U_)jqy{!_L6Pt+g)(L#V4L_sLOmn5#$O_cqFsRET`gs+#9
zP22kE$?iGDp<Nl6aWB?;PGaiy=kk~DJiz;AwDXr+XJP0X08Id17kHjW+lY~`9(&x0
z4{Y4DY4W01Up?B+^jfia9M6-uju+fh9>t=sJZD+uzVFabM27?+7$B#s8suu8W@x}v
zBeK2dK`ohD)$pkA8SPb96$rz8wc|Jy!;sY0LC19wwvAaa9H-pduaX$G;ypTz&{qdE
zuq+c%rNvMET<YhH&RS5z{FUTNlp~~G`TPoRprWGxXJup|JQr$Oq);f3&1T8x^QCSE
zDChY@iD6Y1ISl!S1AS7d6!mp}o<A0km9CF`KJP~nJlAgnlpc;<^wSECja@8|&1Oou
z{3(<7rM|w24eK|vVE!W3tXWHczwYPX6ELO@&O0bc%kUKB@Mq&1)jWAw!^4kw^3);@
zQ4%0(1Pnw;K&$j%ses0Vm;u7#u~$0S(3#t#&Sl<)yPkqG4<g;1<{aQJIt8E!z-vE2
zK^VNJryJ8Wb4^W6YetV6y?Nc*wS`<RXBmbE(j(`FgH-~lSwUd5M9FBWp1te2ctJ6l
zVG5*6RjvMTdtiW2O||rZ>V<~}C7Ol^^UYC%88xU;v7pe1g_Gw(qZA&Sy8rMvDrN*I
zt4)-=REFn$!yleMKLTJ37)BHoP^wk5Xhd}UD~lGr(xRxgXhuEsvOa=8EXObm-#7<q
zjJ}L+p%m)(jlYX!#W2lSP<Tl2w^<RPQR^;}$s~2@I=`|%7DozSc*qm}OogIdpinI0
z*ftWsEfG9y+kbD<G-+*VWzwW6v@{Q6{rdGh{`eDQGMUnKsIg~YzmXOvOmBp^1sTsb
z{#7IU+wtxhLI|ITQCE~S%Q^$<HZ?efuvoIiBU9LYk)v9p4W^EUBPLP&>q|VKuP#jh
zUKhOl@*L&D6J+``oA#M7VZqw9YY*GJWpi30g=Ja@!!CugeIXbZ(=1E<sx5(~b~E83
z@T=CP;*~~q_^bUN9m^YSA5@Py^ybxqGqrA@TB<;;K#yt}gpq-$tZhgd)J}!U<M2}e
z(c;6(ltnp@Zw6|1LU@$|K0&0SvI<{TL^eXB8dXG8YaD>!`!EM|7O3fva@52hR1}>F
z5RT{V@9!s@%~C8DgXn-6M1f3P*9nNBQ7T}J#bTvnPbQOoKYv35@mL&By11SlXdZZ>
z=rp!tQz-gVCtb&H=gjo?QY;o2KD><)Z6g3dHj`udvX@x0WC{KK{rX1U!%!E46Awr+
zX+je?21pky)dN=zZ(yL+-%HPnfsq1HBmJ#v2vqxD%0cq~1{emLHy2p6E`zh1^8aC=
zPzXen1RSyttnFZ9w!kA0v<2!EfF=O1YZ{<!_@=fIqyE*|*|Fc+wQK4+x;uwEQVL;+
zfWZ64&-aK6B$IxNTIeB%M#Zu$EHj3b9<JjB2G1Da6{}vh8ZK8g1=Nsswei8K!HSM2
zR-+20X_h?N@bgBEXQ&|n0|yL6ix~&rydntcQ>p_PSldAGqY4}Oef{AqhG>U_N_^DE
z)c*UZ{(>4w@JX8;c<BR)LOCK5jxP2;M?Rk~spw@g<&eLhvWNve{T7bn;(1Q#bE`#}
zArS}*{NnMLAIf(Mcv2EG;<&cw59tZo`{MC9xonQUzCNUsG&VLdVZsEE1~0tu0v#P4
z!D#A2>ATX{voLA6$=eQVBHoaMo`~X}s20r^R8-K)D(Qf*-OrQNy?-GYw0N*qO_2<u
z6LksZEy=NTW6l@*+Kmu^WkO>bno=-s7`*=!?8O_oV@5kgeT8WP@Va21ea2V(?YeGu
z+_>>`jz8|CKW*8xCH=xn&!5uKv8~YvL^6b75HrlcxVi{olSufapja%AfK8{<!~zX_
z$8$^fcC@&ynxT(Q1&kWfXn(#cL#ukywTx%jW*F^Ih;|r6741}GsUAzTi$JXbs3ZrK
zZihdGPheT*fLwpHb3sj8s0LOgGOA}^Nt!}JU{pjj)bYb1G4ctMQ_97MEqzjgX<C@3
z|Gz5!WEftcQQ)t!YPdfv><e2t9oNJ0JludFId%@)w#n!76pMbEDU39<G`G;!Hk@Q4
zg<bSmy!cg?E?rhN6{4{RExH0u*e}VE`!<4YfNd+4`cxJHs<%bSvscA_q6L7m-2E=2
zsRBbO_^W1B2Qlh~PXy*H>!myU#*)e~I5D;rTI(SdhXckS_aB2iXgtouHl*W{U$~Bc
zZR_Rs(EHa{nkE3d=z<holP6F5_kq)<9k_DEvZJ?d*w7faV#t(%l!ag_TMXNl*tUZZ
zGFagKaIwD+14v+)U>X9CN>4g!sH!Q$g#&q1&tEO-Qw?|c`e;sG9bu~)OEuD<7AHnk
z4OPRc?lUR@TzTx$AHf@mSg3`6;FT2q!bL7Rv`97L)gm6@F-M2<lp`FjLQX2{3Do_D
z#Hm;;lF9Uw&1T5u@<A%Zuk}bI5+(BCr(Arg;8@I0F@T3@8YGp0J)z`pc+BCo;d(B%
zYx^A~wqIM2&17(02O$g+R-B0kOu{e>mM<?4>gnt2)5d>qa4K31&OfA{#-=o6WsQ(K
zRl@P=On}hvSMli8^qa@v+YZ$NCr$eLCC@DCqhRm4Ypf~lmqd(cghULckMnc;jcGV;
zUy99jcm*4Ga}S$3`dPWLi#aPc^GdGBlA^=QGup`qIsl$70@MUxm%uO$Hf`Lvxw)lj
z@xJ@+yK?iUjcM2Q(h0{i9or*UC<F_;MX_jO+b)LT5|4{g8(Xnh06eU?NivZjW}4WJ
z7wJ=HfYDctc(nRmMYQU@n&?l|Fh~Ec_Pbg?5bYF*rXix!?^IG!7QXS2(yNfw_4i?v
z3Vqa3x~g}tMkk^KMExx4aG#K1g~f(KI2eY7WeJ2ZgJUVzVA!@lMmL+y`f7TGBA(}z
z6dz5qOo}R%866zQPg}%dF&Y{YrGEZU@h_UPD4)|J*<6<1zCJSj8SG+_rluywju}fl
z9w(hjQM4VNe)<{Kty`yC`Sv21z-jx%IqASg|1aAKD*q#Gc*uySE-N`eHEvJ}^+(<?
zj2?J3<^+@`MTyENK=`)+Vg?(wNtSLY?y~;>@x$PjODRqn3HuC3+79l9F5l1>9eSQ!
z#>3eHF9|`)aanouJ6Ky|S6-+JsA~W;0eDSVwD8pdk1bui1jli_1E)=!d*Ugl-q+jL
zS6IGe$>DwdxyE=rM!_zWgk#E@@D8qPU|Hpsx_sWnatsV%kW82uhFOx8je6H%?mjdc
zp$L!~)>b13YK6J#(O1(Rh(-@ovY?9Es0L0QE~I+;(R4!S*}9RzJ7t3$4%IP&HbMU<
zwCA-_3)@|2gL($FdqE`<WwJp~TVP?D7PjplYuLkY+jgm~FFfaA7lfK72wMXEbV6B3
zDb(sur_&YZRy}v>_f#y}WU~GA_w|zL@53+zqehLQrMZRvOqR`?w~)zX*tBUg9UUF|
z2Hndru|;s<;dKmaOGDoAi~mAl9x2NzfI<WYJJRPbMV0V?QP%0N?!uSD_=p-ofS|}w
zRv7?f8Xyg3FYaMW&#p<Yj~@mz+Ubv({B6+&=FMKo+=9)kuE+YBv;3UCynAT-3O#=v
z0nh|sm%()%h7TXLc<i`+oW+Y?9lm<y%7dlMkW3|Tr9)p|e`%I|Xvo4sz;Z4=@Mw)J
zNQq@7F-@yP8lnb1n!}Ig!lPbgbdXSJ3@bVjl-F15LWpV-gf#+TOPMNO6B@PX+<|Jd
z4%E+JS*D_#=#^xBL*k=)$h9UXMmr_KkbZbf{%00AjxXk;5~}cf@H|=S-_PZ8rJQ^C
zzTu#r@U`V(L_#SnG>FCGB$K}3R|oZkq)Cm6gvTDv1}GGYn5IEvV<RI+v@vYhFoa<;
zXU@y4T)C1$As@6!YV389Ljk8Bkl=)an!$+q1VG3k6zz!$A)ay{oUAm|auAX%QOHFF
z`w!ki1aku-$0Gd^z|u8&W^snzU6B8;OTg#ej-8D0uVtIKdgd(h`fAYxV2_8Co)?eD
zSG2aYyfS+9n2p(7u0<Li7%5>pHc}P>5@3`Jr|K;l!Qx-Y=kZ*Rx;le&x*jk}MQ71&
z0JSi!npjV*5xrsczN!Hb8q8{Kc~PUP3I(Zo{W2kPD>MpJGNMZ4s!;^LU9K{95Y73k
z=?gW|5fX&xF_(|s!?s<DMY}|L{31UK)09ekrX5J|W^f!kQ0^;MOiK)Z%K3e#;#`D}
zh01;5l)g|PNF__*Xy!1o;1~E6=<Dl42+6Qv!)R)1CK*p4rOU>Rn_0YMDH}Fy&^O#(
zjtMP-^N(m?#K?Ncd(~t4Y7K`7EVodU`_xRIFcc!7#PSEoZivd!!D@{`bZ&rGCFNiU
zIy!A$Ue%AY3&`go6X5je<nMc)56_%Mer7vq{K*K+oP};<(F9=k;lODJ)qJj}r<?x%
zK6m^+ljfXpR{H+<lZnEj#fzpCy1N?Fsf4f$i~dYL@Ob^aa7Y5A=Mjs?OWwXG^9aK%
zsouq6@roJtp}`CdO&ASObK$BH9N>Kfo@=#k0JRWM)%Xt$cr+3aRqhKF?W*Y!sL=(r
zPN2M9r6;dO4^;A_jwG&D^cRg{lw0_W3Rz~y@l!LoT)tFYpU)St?LsMH6Wte368Z_F
z387~np387hPb!rv5uH#KFq{e*j$;nL%Y30gv5==&v`MGa?6c1}T-RgOs#SDs+eTks
zAASA(y0Gufu+SQC?zAK)Om7BaP_VZ@)JK+FdvFztZWvVL`YU?*BRi;=ix=t)3^Mq~
z2%`((J|$QtFRaWlZ*2y57Z892Yhl4!l4D!B6}WEZEV47(i385ec8r;`bSPgFfZc>b
zp|G7)fXjqQla?GXZQB1LWp{6H|7HD|%rq&88<r5R6v8kBg@O#cQh#Eb=efAjA!b>`
z;ufyw(%08ZAzvh!OqPB^BcmGM(1-vfqZsX{S9{o1$=%R6g^>f*yN?bAQY+NecE8Zz
ztC0dV)e%+bQw#9a$3hQTohP8~Q_a_h;q|b4pjt{H8vXD*UwJQ)h?CD3=<m;z2$<i(
z=l9k}H4wsqJ+WA<A`%lGYj_SV%c8!%zM`csH2k*hl)4Q3$0U7yePpw~B3~>XC!I<%
ztfiTT#zqo}IBV9d<;53YqPx3W7xul$Fny%KWyiNLa%4kL`7f*V-4CHkU&^u`fTtL1
zBM9LOql((EQez;MNP<^GYFIrkQ{YLHN9XsFw|C7o*_(q;|CZS8*KqZ3uA^yf2RDED
zkF1>8?%SuC?Vw43CIEYIDnJ&6FkT%wa`e~(4>;g(VUSq2Vcn>Xj;@wOA})k5O0%<l
z<Ks}Y3%H(xOeU~mCa&w}rUf>x>y^CyR4P?6@?kDn72^pD-J*T*QSV>%u*2U&LZH?J
zR8tgGL-b+(UnKzHF@%pt2OUMd`brf(V}N{dR3^B*PZuc%9-kT|2#JP&j$9naKbN^&
zhD;_~5<XIk1J!zfVzKC}>?vb;!{<|}REa1g5(%1{n@jC~;q*bz3%fk*pumw*Z9!M(
zHayR!wRITjR1(`R(jQFg+qiKPt5&Vn!aZ+7q)cc(vYsQSw*V%%j$c?;6+18rI2gU{
z_x>wGe8LC;K_Ou{5l~GT2mxjoS%`ESh|18#rapte&)r7B-gPq4TYBM>caZ$A%edma
z!#KAw&6hv*8-5ZH00ZFGSy(gLbxJ@JfISHDc$_7#E+m)BkxHi49D3;C|4i4{ZO!)g
zoY&W}by&Kto_xZW!7Ubi?=hWD`=Q}No<hEez#^7NV8sN|^{|VDQr@^wD3lCNGMOxS
z>rrE^_WDP|<m#LNH5VQBp{ojip%D%ZdT0REUi#2zs_(Cof~as&xQ$vhA8r>l_^LrS
zO#>J>l`xDnls$c~VoG2bA<5^90g(#3Fx=8Hsk!|y#P7eSSuy7z%+rTzef9PABogsb
zkzu*8)50_jT-PI?FHk7tgW7^(DS9(v#BhcWAC8o;VBtd6ty^EJISBWo@#e#k`&gWR
zOe+m7Y3TEOqx^cw)RczxDEWV>_Wg@0Ie#T(U`VAlK!g$;%KlBBezk{nT{gQqCbgv(
zKK^UODF@Q>-|yzzcV5pqD>n0)FaMF{;jON(CQSg|P;6MgZix4xK*A~ktA*=&W7^t|
zE@t|hwsiE@S*Dq6X|5NUe#qu>*iI3NhY%)q(Z%(0SVfO`B0<a&e#@@sQY`u&w`EzS
zmbB3Ds_Jp7H(oZTp*QL(19n0KZ4!?g6}jp#gdTeHYWg5539Pmms#^Q%Yoieeby{Hf
zm`V;*L+(FT_Nv1nOJRuA@3AjC0%5Oy_!Ac8`Qd(1L3mWCQpjN*-?A){$z(+YAel^3
zS64?vLj!enbwNR(SJDPB3`+Yh6!N7BiK$eASgbxM2uvUZ^!E1g>Z^-bzI?eJ%<~pN
zOA_95Vja`>uLoOz?XgQV>MEp!jdG}8B?#4q3aSN$LY7JnLg7Hyw0P*HPV&V!=2~?<
zcx(Z@?<b@_ehz0Hvo8;Q^GZH?!(BY8+xj#C*rVaPZn3$kiSy3C@ZoL89GCm^efPF+
z{?C8TE)?>qL^45Bb3JC<ptsj0?#3{U7>?sh1{Vtst_zMONF)ru?nm)@!};%__nJzj
z0t02Ds^pdP=_a11)&uwk)Yqi<N`_Uf5eNx|im+NetQCk>;;T7v)e{emTXa&NpL#G#
zVe_y{qB26@AD`>`M93ecLog4ZJi{P-pRlOTbzQ$`*)X6~!5=Gm_@UCC8of|Q3x|Zp
zvMf@m6sc6ILa{HANR(dVM-*&4&%tqAGMRodnGA*@XliN>bO-!a&u!Z}>FVla%a*Nl
zb#;-;<#dk!EdWEn1=AB;aBLfiWD0s*#q#c=?|(-`|6~;sAw-!7Bn_6Y&+?x|UD(bW
zYkQY$gqin}y!a@lTz@YA_pSGE8SqbiRcQjSHxPmK$yDlZ2Tnh@wJ)39ck$xIlXCsN
zDPbD%x^#k=(M%>&AYZU477G}LhvymCo<qU50f8Y5jL0}&-|O|q!#a*lp^y)T$;3-W
z)-cRKmp*LYiv@;T1Z2aj2$PqMvRUDQtK9;j$F6$mQT+k+wd%Or(7=X8e16ZrA1)6E
z<H(@e*>ydo#=tL{4AT~B9f0rUyCuB<DWz}tO|vYZCd&QO(k<66ggN}MjZ&5S4O1<N
zM3QtmMLL~U>JVIVxh#%j2ek#hnxp5rm}U$ipsA^m*4E)Tj?0oIOX%$EAeYON&1Or*
zhZ=7k95h03&6zEXAKM81faCcg_o^29bs_~K%>Pqv0aX4Q*yms6cSHD53d7*3SBtFe
z-1XuAYUs+qZ~u)bIy8Oo41WIY`?>lH7xIL@vNQqMqv3fTiFl%a+Vq2;h{vrur;xpL
z&YYKy?d!>qOr%Jq>WRe@6pIf1nJn3C!Ov3{eK}fBdbqBQsTkji>UIIP?cz9ja=Ahf
z?)U2v;_*0zLJ<(e<1y;$>PjRc9ydv)l6amwpdvpsP~m%p22*WcQ@!}8+Mpjr@I&{d
zbflyd#xM8#8zrs$u<pPY;&CcH`AELMTvX_f#ubJc6gEpd=?~D6{!C@xf${t(g6Ub9
zmWg2-6*>R#v-(4sVpx_*GMNepKmyAONBDZd`SnBoy}iA7o<ky$1O(}H9gU5R)Ya8t
z7#4kfeax9NhqY_h))X$%c=ID^!n;ps<fuc3gEXP&RvP3=t2_h}Fa*LN3^2@q{K|ob
zT^$EJ*mdav26!^g?;cx2(b;{GcSFFv&*BQf_)nkDec$>k=YR1cp1pMzhE54+0<b4}
z{fr(xnudl3?4Y$wAQtbl&!p}PFS@k5t!+g1xn~|debd%nqbTwiW(+H4(9qaOGHKJ>
z*NaOL!!*DZI7Nx)dKA0@hG}9NCPt9olMck=G0al&or`5zrM!3O(b{&5LZMJH>b`M{
zV;TmITQ2yE=Ev1ge^?+G8h-V8-!m_J@Zo}1P5}r--dC22-NK)+a4@QB7}XRA4R&aZ
zC4O{3U?62#3`q#XAIU5PG9UyJiD~#lcvP8Wpp@GW(<y#B!w8}iZfWR`pMEKj%jGal
zlh)Q@q*AHi7!CUR`dPbnJ=?ZzqqDP<o}M1vyZ;u)xd+C%{M2DIrc!?4A6{9BFY0+$
zB?Yxez#ya`^!_EK=vPJIpKA0yQOOLVd?04<^6GwOugUF_-v1%5t3DYq|M(1aWoWti
z9sKoMf93KS?L4NhGED&XcwQhS8%B&AeeYT4T)1j<dh6ub3pY=izibPx<Kej=EJ)TR
zz-k~-AE#KbDP;1P2?IyEepuXdk>O1!3_nUxa1k=}YK@AXb0Gwt>yi&c)poIz!!}HR
z;0@BNXmJa3`RZfp*kS+23nt&i0R!7ED%Jmfp<dX2SMGoJd*X}5!hkS%HTA(T;t?8s
zwVkk3BM^`fVT2xbx%klxQx$;gc@%9w@1KmvNhFh{XowJkWHMQ5vkapT{w#q0(%=4Z
zJ4oq~Or{w%Y82UQj#aBx(bLmIUtd4DT&_fVwBgs-w-r8m&M+p7YlfWktyr|}Z@~2H
zoi(yTG5$vNyuSK-_&$bu5Ta6!Sb9*O=Iei2K&G(!3sqgu?^b+p4ghU4-pQ<Q{*`y!
za1sC3SDPjPdpIQb%s8a)qqnbrYJIZshYOC3-_TzeWp;G-(cRmJV>@_Wkz_nZU8<FA
z)*)wP@bJ?Dg<KvlpU0CfU}6e<L7}3HAq=FnkkTgrNa@!N1i5g3uDs)S_IMII=Nl)}
z5E#lzp~?eWriBrR?TFxYhN%t*iU$RTUXTxWln8+_KupN@@MUSrUbM(CI?q7WBdFFk
z=z1Q8Y4|_N03=s>7{b7`{AfuyanA@oQ|RrN`}WJ-4gLN7CEb63VzGeZ*d!7Onwpxa
zuWuloPLa>&S+#043l=OWX$5G5uc0Do!u4;f=ftB%V7M``?Ln&kWo1}iHPGsSprOpc
zGF0zhi86Rq2t!mTD4Z`K@QFaeV#^kX*(>^YtM^|G56%H8Y5nr0%=+eEY1bq`6M#J)
z@0u~k``IVQ7N#A4#rHBjiw=6{!Rd3Bceh$|R@R#fm##(%15-32M4Y%~V5QS|W&*od
zAa0nLhJjslFiZp2_9zr=KeQf@0mt!hT*ohjlm72v_*)3SpwPeJ{nkUn5dI7jrEgyd
z;pfsF+gA`Z3_J;r>tY7cfLJV!=h+mCnUdn4p9=6w74|+!C=2WOM%o$B>mRKr2p?0m
z0n|Z4rS1dQ#dBT%xI)qri;*x45{WpeWQuq!j%CI$gK2+;Y5G5koNzdp$5#aO)gII7
zH0gATWHL!2k-#(!ve_J4w{GLrS6^krh7ELfcIv#oMonCPM2hyejiEl4fQ(lj!V_LI
zLJTy<QIEZpO%p*yt5mj?Wx=1)YmCa`zpC#QAqKTbfdCp)-2L}8Z0N|dCtm7*p9@D#
zrtOdkeC^g*oH3&vN7n>s0<cHp<3HKt#bU9J-`{rbm1{SwJhqUu4jDUY^l6D?`p8!o
zuO3&(<>>9p(A?BaBAFoXIGBkv>13LQ#s<IdJd>fnFM|-igl@4=#PJ+J_#Uun241@t
ztUH0WJ`&INg4Q?#PkKnt4FtjbzkRv@!Uzqrzo5i|DSDv<uR1><G^VOXK-sCNlmV`~
z4n<^!Ri(fvVK6NVQwR(p@Pd}aWFkp27|m-K29|00f=P)4G0Q?A@PgIOcAe5#U$wp<
z9*>vge5Ldi`?|Y(=;`U9ySt07uI^w;UqKswjX`nPNciN1BN#ob6>=^F_a-i754*<T
zzX758l4noEvsb1BhD0Ii{j0tGs)w(VgKC-p05O5|1b08RdAAn-i9p@ht#SydIE){L
zlgYCtjB#k=uL-~&iTiFl%6Qj|IUc|dt{rBa`{{pYUY;}iUn^HH`_Gj9Cg0nB>}kh5
z`tU=S|Lb3mp0a7v`qAAT8^I7XHnkCpCoxPxvY`&g@jdZWB843&)Ws8)pL4feJiqAB
zuLV#X1nEhi07wbpG&@P41t5^ZCj!!wAPfxC!ZM_9Iz8Xe3eyj#+jfy+vD{9lhU`_Z
zT}=ywx&`VGAazWzT6++t1Js`Tc+5gdh{fan@FdgkBrrUPC;aJqNN`InlKw(yyAH17
zmg*M@#R9#3ePl8jOw(l4s8OWTX)>7%TeohdzrUZJo*uH<9EC!@LJn9%V|!>z!pwKH
zaL9hGh^*_2SQx@DwhQ~}J*tQEqg{a&A$qA8eUySeN|X990^uJ+Rv!zjk`E!O*BeN{
zc40&ve|c;xFR#tAyQ2Sr@t1&S8kkWM(AEe?O~HG7p)U@ky?;#r_E@~*<`+vB=BIzr
z;VoLYApFy|ZF~LbF=PMszN<d8a{v9OJu~l>xu-w(%;U$cTDf%O<_&9U9X19lCcsT1
zgh|Xau@VB)F^I=43{f9c^ZThgyXY7FIj%2GgOGTxi|e=uLm)A5r59Aoi_%&nrSB)3
z!9roX4$^hO^J@wm*9i=_Tcx*ORJ19olER^ufU4{7-{7KT@D0Nt9*YyRVt4^5NyOtM
zQ)xfF;Q5*WmTCDzcT&C_vT*!kcRYuDKJTY4g4M&eZF0FBnM^QvCl;f=zK(IDhGWFW
zkw~U+U6-Xxm$G8T3iA2<c85M`XbiT9e*Wwx&OBipmTUPfe}>}5hDCO@B1kggk%xKz
z3Qt~CCk?^`%*yD1h$Q(9l(_*^PYrk;#0;c}^TP+%kuUB#>u*GA4r`uQ(?6_K5*m`w
znD+lac3<eru`OTZDee7h0<c%Zah+n@un}|5I_KOahaY+5zmGif$hSTB%)d{cJ!ke|
zn>Tli%w=q&n9pMx7Q!&41mU_asrq^h(;_B467d8Q;S+$8aE|{|v<u|(1sq4>B7J8e
zQ0p@SqaXIt`wNwSbGpHL;kh2*_^o%I#59ePh>ohCuZGn_QJrv-p_&>9wF=Y;doe49
z6|;hMQes*biFl%v^LJghl)k|8a9kIGU&oLy`0aUNh(076@wmkSlgF~}J|mbmX(ank
zZXllB%>UdskH5aSfGu0L(9_eSFF=jgj1L?i=c;qZQ6EqHq5rVmPbxWnL)0$jlPDno
zInaZzMgT&~E{uVF{)VXGR!il*B7_5=ImMr!+{#NU`uvFDu85R0!ez%H$F?HO;L!W?
zU^}pKE3Db(8~zEy5tBwBM>OK?GaPT9;mD>mGFQZ2wUrgmE#vwdFJXzk`ZNJ}Q^0fG
zY(qoioHO2b?(+Q)IPl36PF`}{+_`fOU$Jc2L2Fm9o|4Vw;u2#0nT&}P<a0SNOkyz$
z&onR$i+J3^@&tykFk>dJ6AZ;E7Ae{;hT-S*rIa|X?S~{KzVJ{`6z91f((@m4T;Iz#
zEdzlsuw$4;Nq!f~)AE1{J%LbKIP5S8>jV;sM1|yVX}*A^7844<L%JTWWBcKKA#jV5
zd_G4mmjfv<48J}holY^bZ6qUF8W}mPfic7C7(YD4_|_OB(>4uWFNWNJ80qlNgR}hS
z*>x=K$?1zu<2B=*(+$4(&e4n<UJrT2bC*;v@S~P(SK|M&n$3^wP>3=Ch;AcAlwFhw
zN%&fI6IVja0AcZ~ht}<~*1xt!xbYIQQ%AGBFULkHafCovCJm;6b?#w|ZLO!p_3%3T
z>Fmz1AzNhArf!z6*unzGWtHQywdk;AMmyW|)u#!-n~w-cuQ!=UJa_cb$IsvYfa$|$
zzwrFwb6$M@gwF2nNvXQJ16M4WKe4Mflj`W~#`Rnhi5N~+_-c1n9T>jhm7e2I0u_*m
z$4JCX;#Qn^EQS<dhw6O<g?(YcPmm+D9fzXrrx7g6ByPos#S%zQ(x2@om-R()lF4LH
zKt~WAi1{f6DT&2m6@`Opd!HIP@I8G=A)lv^%lUHvViwYM$rthz3k6@h0KW*ZKAE6x
zSPP@thBIMQGm}O)Fm_mq;b~}$IV8!F@U~()8AK*u_HwKw$DJ^l8+-HI^qYmex~Zry
zIE|gg@%tFu@~$yVnb_tVf9X}U*6%pPAg`4Jy??`~{(4#KHKHn)00E5&9(k^dXP0#E
z67SzK;q!0D8{Nzkb60WQE%&fGy3NdX>P>@@ra`Re&^dD!TPn`L-R0kJo#mHD>hQlN
z0B=ej0Q5=d+q~fa){fuj<o_gN%MX~;()pdKEyH6^E^Z^0?!a{l<ntNw*({#p;kkLR
zEbO9<YZnoQfoWO@!|=5MOn*R-U9|m_Um{*w3lhl~mKjGFW{^6tNroQ2X<)@;)TJ9S
zq@c5_gKW~TrjN(sz6L*(d-I(lu0M$g*DY7{yRI9I=XENE3t5(h>$nt)IWn0(?1Ha|
zm`Wz8PbV2Otc~V|G_B3`jBaaU@`xtJ4^Plm4-H11gzU$3HY40TB3q=?{2b0dH-fNe
zwuq=paKUN&($mw+jJsB{x<^;`YwS4oZxhUX*BA~vcr+AEzvABz!KJq|*Ob_?=Y=t_
zrEt*KL}vgfDTla8e_rsz``6H&adyf1YD&ZVPJ!P(!I!HUe}I{@=*OR$uw7`wuL;1L
z7C*gyyz#mJ>GFQ{=?TWMSKa5#x$_+@`;HP{?cW+d{PxF3S)SEIQ&SV8N3~(ZQj8c~
zkCV^S)7M9;E=}jQZS-d|z6YL2Qpn_yNZh(QUzx91Af2xFrGp(8(=tfL6L_YJ?fS-F
zBCukXFFNEJn4U*0Rv>QrLO`J>Zx;)}GU9tbrVvOxKb&81a9odgJYK5&cO1W<Fp-Fp
zh{uS<EaI^kanqwQk*4T0lFR04YOG`Wq|r>D*vh!p1WhSH-1Laa0&%Yg)9FVPatP_v
z$eC7&p1Klx3&fhzTz1Yh`g#j|<In5akkQwi#?UdLMKI&iQJi(`7;sE*93|Hu7+#eK
z)T+GS*&u;1s^|H)djlxHtH+bFc;eYE{<ElSm*xI5d3bs;vbCP~058pK$Cx=w8*xnl
zGzQ>fKU(VneCP+Oy*s}+;jB}qapxni$ky*ZP%wLQtAjN~(AwIHVF;#8n?^hqW81ba
z4jwa>hQ=oPdV2j5S^=FMTYSv`+aF__NTiU`Bh%Z1VOS80ku5j~Ls0ZW0sw|#Vwe^P
zK`a@gSSVl#6T48PP{{ce`mP&HG&G3E6T!TJ7;)1iQD=cL$QOL2!-o1g(y1hkbt&3f
z>S?NrlTMf<OqY5i$EXHDYg0X`WQ^v7OTFyH>tEul7UpUVP6^wrsw{{V+UK&o5cfNz
znuc@LrH7C&czpYTjcm#5>rP|)7}q4Y<>KL7cIH@wupnngWOWrH;3>WLqPio#<K#g2
z1Alfd$1so>#7sJJf}i|tEj>ABmz}q~4Kwb=yzldT?CV!>&rNspoW7bg0niu(cYkR@
z`+0|P$Cv&<{loM8Hr=vqlXP@+0PvsxJXsRY$>j^Uu1jm{FeXo&$d+xJ88LbS!&_VF
z>+7Ybw}-~YMpE%O+qQ0_P%Qct_QF64LCkfCISw8krs)^>6^nWD*<PG{mZpXl>g!Vs
zZ>_^~9dg+$j#o!hgFg|ku`W$xI!4lhww5$wMh>Gt=g?4>prs*6UECyLdRP>(ygZgH
zkT3)dhJjVs2KHJ%q-y&Mr%_?-x8oTNSYWGEVi^Kl2l@mJZ6o>6<%g5ECEx$YCOS0<
z&=>?`8{x*cw{p$7<1o!QWbDE1aG0Xso}X(3*Y{BTVPW~Le>+MVszn3@c*z)#Jl)L`
zuXgS7^S59feCjtOzI-Y7fAdP-bHiOctgk9f05lZb_U?r7u^+AVe*W>6OU^okUw`CR
z)IYPGW|y$2PD;t5MT`A4#aO}Y*|V{2o4UF>rc9npcXt=LT%P^+-=C2qN3gBCmxjhh
zMvoqi=en$4zYZw`<Hk*(sj;5!o=*Du`e|%vprK(RhA^-THcqj~kyD3r>PgcPj)`kK
zq~jK@<KQ`Y;^c|RJk3c#OM^?yGC}5$<nbIAq>U-<vbB~1L>y!TxVHae7!{pSRoAf!
zBR|MSQ6)41I7R4z=24@#?mb6Pl(YHqKR3~(Nq|N*<KF-`oZrMpFB*?wrF`Sh5FPQ7
z6tD<Lfh-dPRrc2i9}l+ks*L+J4XTd@-U%`gGwIDc{LkN3kbQ%O{``F|0BzrSFMn>X
z;};vdxMAijiaI5r3BX$#-*|tW@%dl(csKu{;C=t<#M#G8;YVNl6X_S1@7(^voI5}!
zlVRQ~uauta>h8ug%~GX)GMNORSSWxHG&eQT)Z9!a(?@@Q2G8@TuWw-3uvW6!EPcJb
zY+ae)9Y@BQe85EL%Hg@-dM-lRSR&9smmbJ|2t-8$5;N2rsAyjH025+qu=C*b;Ezf)
z%SPKDP!Lf_s}>kgy?!zHqHNpHBN#SzG@p9k5g=ysvxhgaHLI^jjWYIW7JT;HCO&q_
zc#K3H^zDH0FWKEH1$!dw`=?U8r`qK!1Q;=88@1g}A;DovLDZNFAcOZaz>Ayw{a+h-
zX2~0?hw=Bhu(^lyO_%VA5sjSi^((mMrn_0FNq{B*Z%KUZ%9wHE|7JYfarpN862~4n
znV<gV2}b|<1x$Mv5c6;l4nVP3B%95aA_yU2SifOI#iYB=&MwxjU0ZsrYn#b${_i<v
zeqkg=42)tns7sP%gIy9ek(CBNe7+=NA_IeOK)fE@0@%57-kz|(S~2d*TMTGvLJsV?
zF6CjB)ztusMd*TIqet<%_a8~Zn$7M1*vOWCeO+q6<Y6YCKd*(4ynP%-vJU#3^7Z&y
zA!@M*86g7(7*@HfMJUlORpPfA*$_4MAGcV()!{pTUQ2)Bjqik+y%Mhee^}R@#W5!z
zz+E%jIc4T7di53e#zN=;C$BT^+3}Sj)Uy8CpV;rHDg5=m=b8HJ$1$8eT#A0*QT5z0
z<04KvaXNJML#ZNP@oXwAHDyUsp%`mP+1LvM>^{hK`0`-FD9fs<ukon#hH5T&)t(cT
zPkTTt1}#Z49b5U?JumV72R5+2SKk|NW$ZuF<O>(H@xk-Pft7?_JCNF~8hYA=tF#G5
zoZ1t7qU2!^_?q8jV{vZ%{R+POmlah9?z~Yj4fy7j$k8qQZRtiX9xMW&>HrKGm+O0Y
zFc|t2?0y8sf6}27xc8yC?Dv}|_I%?HuzG8TpZxJTay>new1TzAQ^Jl6H2x(+9E2)8
zsd!Yu|M9dR2`~*mFIpj^s)S69YC}y1(_F7Hip>yyD_3Wpx|TLRam7*0c;`6Ax99-b
zThc26ju>Y#<I<6Q@PhHa@$Yy1>rF(Bui*6w2MlsF!WyFSXZy!u07;X%EBg8U<Lh^;
z@dtm}-#yPD4j98}&2@ZKUwxVYyd^QQjqk14!Xf|fVa%elcO0|rN*;Y_Ee}367vdr)
zQ1XJdJP)KxDdb;~7LaA*FDZvLg#-exKi&ZGRG?q(4P4{YsKB66ELnvF$jZM%{dCWP
z?mUUQ7Cv~{(R}x+ec69RVwW!O8haKJCY-)+jPG1Ins=Ww0Yn1&Z6)kp%h+y@2<!w=
z2=o4fMYXm|Wkltz5Hsj0!vFkj6`Q*Ei~(2+*1=c)NbHy?%>34SI3HkUyS7c50KCN@
zC1P(e{vkU1i~QvO=CO6%HYEx`+0d)2kEeM2VHzOxsyuw59#8sifrvq@0nB7TCge^z
zJOfC88fgfpt*Ma-&xO7`hE>nIE<Bu{eC!a8o0KAM>g)5(j=DHpd`O(zuO7|mCyfWk
z3XH#EkSiwi4Q6!3;6!wL7p{~b&2k~^YhGOZh?yI+c=)A$?tOOaZX5R-MYaHsEhKTz
zGqmkLhTCSgGh7z~Y69?<!kP|dy!{9Y)5h)G>*E$AVsHF$yB<8ZXbZo*=Rdek5lqV$
zAc`(#UStg{dHjKDS|A-<Q8!>F!L0Yapjx5*Fd87MdHU)`fzdY&C8Z#h+C*8oerJl1
zH#qae1Np`EM{@C@_0-38Ea1(GmZabVC)V-34~}R0;bS0cK!4FUoE`&5_HMV(u3Cg3
z>Xi=?6)-ISUK*5C)Ov4q+pwU}gH)VXHaUFzPfO{`?^!v<Yys|h2DbDtb<zlaJhPof
zeO2yy=pw+^8~5zIk+|zA?%&YG+i$*GaX5nK5;15_2lmT=WDJHiz=YwY=UgF>%Qs{F
z<7I!u<{OD|!;;){>jj)}%zpmDS?YE6DwWWpN`7GqKn5KHLg^eZg`Y+!^n%?V?8m5F
z{K62vTVr9CvOF}!P`tNN5B4Anxx`mpOB-}=T+cV|dWAcl>||TNi@t5%954k;Xck<5
zRx8)OeIEc9LFm5HtqsuQKt&Obs3fjKahrDd0*SQp83~3Q>Q}GZYAt}S2X!XhMv|L;
zxr|>vv=YbNGac+nBjCr^kXhToPd9aQ)67|vVxqbT@b!nTa@v!k0NeP=1&4E5YaMCV
zgP4V^OF$xqNX79|F`T9}qCSb?c({Ez@}2#3I39MsNFTuYhcV{V0~vA4J;Zw7z=^k;
zy7GMWjwiWi+87$+X~^X$$@C5|{tWc!4RsU6-7+k{9sn1L*(#zwV(>+{<UB<Tf6eU`
zQX%jONKVo`dLO>=u@)wbna_{^wu0qbY>GNaxmP1*!ja<)zH;#}&O2qIA8qO=_}AKC
zUcDP$A95f^kddg<(0#Gs^}??^@WWa=zMrVHum{8pyhM^mpXuVyPp#WyjX%K3EpXG_
z)cxi<KK8_`ECqfErJ4YJ$7ura=EavTX3lpX;HuVoE{a>2p2Y6X(Cc_)JxSK{$k{HN
z9hc3Xq+3dQg4x*J0OAUm*-m=ONbdaF<(z-ZJ;dKA65x37@A)14{0}eixeuR;Q8Xx*
z7)vF*Uo{R@=>!Rd5lHE$0IUYTQr|83&qYZ<xIBa&zac7B)}%@<1_`CgDjf@+2mJ+%
zL>(V{&ygH5F~PU)UCCoh`pM)a+Q-<tAOzG~f=doda>J!#n11L8$i$#KAJn9Xp?Tb1
z#C}Jme?yWWlxWxXf&hjUX#LAdMj;f2A!`uV=<i-2velSi!G<E=owb6Edr0BmU|8D$
ztF{tL#o1q9t-JVM&?$h|89S*10IzMtWw4Jp;LMzb^M_CJ&sAGFW9BT(g8c?vOu(eJ
z6o2{l#T+zkGIaM2T>OL*>K}?nR1)<OzBo{>3%o+*Kop_QITr)_{UwobzZiUBul1NG
zAs$CI8EjdziQE793cq`NGwZrtO#=2JOdT%x#F<UJ|NMPu8r}-M9u#dQ3bnJ}rmXsF
zDZ-`d2UKk;2>ShNh4iBlv|86`_!`fHl!co}G2=H&`R<>WlehPLC;Flz;R_eC=|77&
z{ieHFRQgyt1)w7UZ&qy2_=jRagBX7+_%Q&-ljP&p8>=TEfi)d@K7aeadEoX@Sn0T5
zOeZ3qzL3?!_k%5VLO?9#iw)&nzcV2E`chRt)$6Z@;?+eTQzHz)AR*CXFmn7j{_7KU
z96n_+KfQk?&o0lBbM<w+CnFsboHf<r({CTk3CE2lE|Sn$^wT_ssBKJlhyvGmO(_B;
zD({67%%J7ZsN(gj`yaxHVIcytDxe|B|2^KxuO43ah8TZC!1!Ts*hCo71e?2I@kYoM
z{pZ8=s5|Qy{zZ|B!}aIly}X7WsK#GI6M(m@@gL$gUf})bzx5tYJ#IhFIsd;AZ*;oP
z@g)DAzlk5;@hG3Z{#?kLfgV7_m`4||?X_1)=`WIIJ;YqFdxDQ_D5HMyiGhJqEGR1%
zW>I5skV-z(aB5gMD3tZraiJrNnQq{c3y<W`DZ}}n`xo(tXScGZOQ$LKMC?0E@Zr;2
zxay3N3?DZFGcO=tpd?9M%XJsq88f{-GAV0${Gy!Z#{etl{~wk19iZuNM6@iz2wODt
z4>YA&v@Xw&|FncH-Mc;)Xb3oQf4m=FjoqK8D^sAmK0))CR$B8#|7LSN$QF?sx-hr&
zU~cM$%{|c358W9!Za=(ik$KyC`L@1lH385VI=q>)$bbC`rXDke-`{X2@x>c<&w=EN
z9^bidF^3&CnbS@<(7(HJ{l!WslhFn&lwuHXUHbbl42U=RzuWym%b^*N0M*-yX#Wdp
zds9@2L>QtR5)RuH-3X`16tQfJeGi<#SH`q(^1(~_@dK-PVo`>i<^g*IniFu|K?$xq
zX9PzcF@|&^4H*}TPVoJTh;iOt|31|tSKA{4(QUlo$27o<``2)&qA7+@qk^cszNJ!U
z<9X1OAd@rs;U8D={L=0>Bt>=N{_w-A>3d=!pY6%=z|2`}`P$`7h+FJ$h*Dc$%ra?7
z#+a0hF?!lK#vV0=wz>q3sW|Di9W0!;nya)9z#9Wy1Mqs|p550ge%pPFJ!~R>|N9&c
z{>eXg?`bdv9KU}n5C7~PB&|m1&w*){7pXv#yrSq%ib|<fBUmYAG_P;?BZCWFL1#b}
zffj>u`(MpkfXISxC|*}Z8?`7Gc1bFUgY^7*gj5V$6j{4+6Zbx{l)InY#M}*zz8`iI
z5(XSPCdRdAwD9&5MlpPJGo~vb?*(L0*0A$~<mfBdpBy||B?d_cgtIJ!;m@E5buN&V
zk*2{QW%c86JxCeQTF0;NTgMlFy@-zf;u~_#zjit7JBmlH_#tQQ$m?ddlLV5MNrU6E
zb>=McGuyG$7C_K706GGoQ4`<zGY1?rp5HySm`V3OyZevFmGHu{ZoYi`lYH|_Z^wuy
zz%7>Zlc5)+PF53MrAIbEq$k|a^+i&WP5yI*Toq4ASsMpTSF51FltQmUi9%G&FjC(?
zdMp8n$rg#lEhg_fo{x_m#@R=&;eQ`q$)BFv%9<X1eZG;HI$ZGX;~Tl+q)|+mG>lX{
z4teRfst}zDDI?c~*bWg8RU$}(L<njT0Ye1F-zr~Yl0dPK?K1#1k``Xyo(GnIrh1;4
zpW_FAT|?&^Wc&fP_QJvYFnne^^)qMDA2IS3>ItfcKXVp&AP;^wlWzIb5da+l7zANK
zVEF%S_c4C@IA%Swlp}xhIOdi;XsBjG%HkUzJ)VzWc`Wqg!F83jGisQFD8K+OJ>r#@
zUSs%efw^w5vw<NuD%Wb$V8BGcsH$5y5J>%7Zg1g@9Amgo%kY(%OplJ9ZeDnC6~BLM
z4gY+(o2^-Wd+bU~YB4zPpakzZWhB!M96@tB?K9D0Fi%1Z;?$Q~P@@WxUX|;m+75>5
zu?PFLVnN<tdAX-_%NPndmfPEJa7{`Vnv-nklzia(3wUJiCfqkr@Ats5@Ru)8_{)o2
z{)ON3m)Cp$Is%{xfF=M8Y#aQ;Q#`P-o3p?2M`D>hu+4X3TarJ2?QI--*i`7wRc`^5
ziihoqN+(NHG0-Y;aEg99piodW1cETEX+&xPA`t?rg!>0;8`xf<qQp-<m<A+GT*GGb
z=1!h{VGZ{_v5tr5_xf5h8n2(>Z-#TGH*nFhZ5(-E6C+w1KpMW`cf88^57nYT)eO9-
z(vhO33Dii|kjOyzCPB{Mh$#`MC^?k_rKty7rzL*qzrlobf-nAPAwT~6T5`Lg<?q@v
z;gX|y_4#ESHFFlPE9KP$;Pr=|1+W)F?FjhZ-?;qXeK_szr}s?b53puip6kE=BpWw$
zK`I#p_e9wMOCrUAM1HCX357$205buJR!Afwt9h_U%PRfT72}0vWj&x6Lg80cau6=o
zp5G~uvoURxF{4Is@%e}Htxq1qk3T$>cOBix=z4t}zgFzm3?Dkaksn^Y4>PacpL0$c
z&xm0yU<bK=C!*9NMLEJ0Eu@d~zG~Y+q?L~v#igQlh{1}38B_Kj*<PJ=36;u~wJt$V
z`eO{!_58m-Z{m)}H|`eW5ActdA#O3Tt&uP2D^y1SbOc}*MF3{B<9*}LOg(iP|Nig4
zFzlhZSoR*=hi(~y3y$4~yT1B%(v}6eLZwV^En$<Amo5}(-$<pD43q(7kPay3{8WHY
zX8=T3P(^yR?EVJ}aD<!;MgRtA7gYHymI0OtF>viXYd3ZA;{44#I(rlUncu;JEjryf
z<m(7Ha=hT={Tn##uvU)Pzl~AD>kz^$d;FePIa8t{r4zB{$|i$4@aiQO62@A=qUaRN
zuwB)R`vgEzjvk1}H7_D$)l>5P)r5*Xz>?5X&wc;y<dZ*pnRQz;yY2f)C*XZ2Q@rG8
zR?J?>88_d}MjZjr1V9sj*PjGfhfd(Br<ZWd4;}=^^OvMO`Rj~X24BAX0KWX0w?Ur=
zIa@K#HN0(=01$0~QUX~b&<XGgknI8|A9Mj2O22hPF|g_?kKdgj@KX`0oNzUxU+s4(
z2O17HAQo{G;sz3j&0BkTdBG+go4bJ*Ufss*H8$NveG65?$TS=|F~NxkG;r#nEgU$d
zh1SM;-^dpL+YQctR0XO=F<&$iG@x~~%8e9Wt6oGd8pUvjqpd|4Rq}iyY9#!ye^nzc
z%K|{rbcNbABc<Oh7#?RhUVBuEwHxxh^VYe%xV(qmy{3<DhMDgolaBNE<(s)CS`erS
zz@9~@HTDvyYJg)~`9Z<qh@bw`U;BjEvyDH1?Rfm;uZ!7tp9bFjuH*g1t6&F(dQ`8N
zE=dWi?Rtvvk5DG4A;CyOvIPp=eu1D+T(y!^Fg5zEWx3_gP(}z7Q5UQj7$gSnOC<qn
z_}23v=R(m$#4SdRY-7~O7LGl9EUQ;<;fYr}dH$8H%v;sNqD>z5TYT+muwdUdiz6qe
zIO(7Ujy_;G6UH`DSC;_K^c5kCZs74(i}EOci)t)DsV(tJEFiL-s=+VI5u)hkYUhgD
zeIiUhMP<dyx&3IA$&i(uCq%9_m2`N@HSf7FJWX%b;D%o;;^mdQ-}nP;?1q{5Qun9N
zaZzW6tAL;A)mujZbOhja!uS5hyUstH|9$88NG@Er_no3i!{dDSbEol+a}I;94A@R(
zAAhYX`wCA?tsPJn<xq6pEkeE<+^|K^tn~b)tdw0<N3lwR6oTT>SLA-h;E{kRi9u8r
za;e3FNz;!Cn36(1$EHo)%wN8N=N4vJx^gowuCdwFY197}kr{5ZVB#>7L&m2#bV@yk
z@7u`qNezq~UWbUMzyS&l6g}Sn8e;oueS=lf3uV?sD56t}8VCmTq?+M17M*OVrmTV#
zgfPHN`k{XjbRu|^>r6c5IxFqV3yNU9$_NrlO2fsM#BNTKG1GkV`!93XzgF#0I{$`%
zPo9T7eL8brS;ISSxrfy{0-z%R8m|#w`xBFn+mHYL`h9z+@dsGBt;h{OdWQOjM$S56
z3Uu`O!&qWg6%SfgO7W_F`lW?FDE2eLh12jou4FS51UNbT5wAv-oPLe=KPd-x2UI*a
z#F50cq8j0-;j9Ze17Ze=c$x{5(oEQ=l~a$l*|uRLFRUoAa@htRTbgJ6whWs(Y_`71
zx(LS9Lt9IXsci|4oSfpYNlhF$v5}D@>Pgfk{2Gsf2YrrT?H-;>bC8Y=Q6&vf)v6FF
zI2Dz~yhQ$jD3vEG$4iG&!s<lJaH^k`@Q3@TgfndKt4T=0l$B8?6Ctq;-@|hu9mh%3
zanp}q<*vup>~TYWJPCh!5pm=s_8rs0e*stN)msw)jn{~_Mm~}$FyT+n@BBVuCM4tj
zI@X`B(ap4rv2;TpH~-)<Mzq8^bm~}NF4*-d7xe+T^k}74WbyYx=PdZeNI<;BSL(Af
z{=$heMX=Ur;BeO-et33(wV--ufl3ApBk(2%i@zD=4u_%xwg-6ui8%H33F`Ns!o+<&
z>|;l9;pRMR)@^0c%0A|->1XAp4C}i*db0&Ob7hs{Jsl~aJ`FAD82hvcCXP*W^n@f+
z_Gx7D$Ogs^PZF<7`l^wxfUNW*L~h_!mn!6?ZzQ)Xm_s?DBfT0MFp!*;F0&vdREh=|
zWdkm%y^-`qs;nf4Sh*{tY8pw69z@y{g_0uhlo|smAr*t>I(~T9a(?rV<>ZTdrsCwv
zE%2j%(D18kdFS`u&p$r<zuXmw{1{P{KaJf3odS5hv5Qjx-@c!7-+3&5Ip^!dmu(vQ
z>qa#C)4BE=1qY4CojMw?GlRVMS*)iQW9$wRU<kPI=#l*Nma`c%Y7}&4K?a3^QSlzN
zI7>t;_$ydKuto=-oMHOm(qf<g<GKMkFa|dS>f@rk?w4eT2b;t;m<+7kPVacB6;gs_
z1v4H^ztY<&;$|GS_V%-RV;76o*=*d_!P2$;yt>7sE0d$QzsSZO$n7Dwb!!~j>Y*+j
zr!gJp=y8J4qZ-&}SUuCn8nljXrmZf4NLs$Zbfn)x>3F_~j~W3Q6g4_9!V4{`?kFR<
zeuEk{1j_d!)u@lG{v8U_H~vPfEOw;|U#aP>0R@F#^$x;Nx;U)(Z>!@UkFDo}x4**r
zu01;(WEybQsd$$k&+-?RbJi{QuzF@Y7XIv#9SU3M6o4iGZ+QX$@Y^T&UD4snkN+B@
zR_ouG78uq5)5gM-kuZHc`J<=6rfxbn_pqWT%c5kAwrS%y{Y!Vz_{b}}ClZh};r(Zf
z;cK6H8*R;P(3ABSLbFN>-T*<LNO53Ap`TI{APiq-xR`-LuP+=VBC3Idk$_N$sOl^M
zs!uhnbzjNBgkqw9D-+<%AgW*(U<UbQ$HOaT>Fvp}vD0B|S10Q?bufFa!=g<EGJXB@
zXI*-Vg1(|bwkUCJ58DNs*RHi{0P(QH(K4uy3z|}rrj#I^iZiSs%^{;;`Y1tbYbzsK
z>KQX!kZ!2Qh{b|nj0tvN^uwxlIRsv|Ju)Dp-yZ{`MJ4@wBGH8!-&>T}MfLba3}T5u
z-d9HEMuhwJD(7CPp1rIgIj9ztHph5+-c~;HgZV62pJi`Yy_?eT(+^V27x~Qxf6hn1
zm;2QOKobB>0CoVX^zW$$^8D=&G3q~yARYJZLPHX!jq~SmpK>7iDI;NhCtEuES=XIq
zVMiZ-%oUk4a~9jeeSY_Syz9jM`F~&eBdw3Tg4i7-ARU7bo;8M<*PlUa(+KFx4>V8F
zh1n35MnC#{=;4P#D`BUBlZ8SL*oA-`h@laHS~>#N7V6hZ0z|dQfbw@pLQKjj6GH+H
z*e>~kM>g9}zH19xw)V5O$75~AqNCrV*w;aS#-%SO=*UX?i_jUg9(qz>y90@!Y4~-D
z1aH?EleDG<%_&J!8WQOQ>AFTnH=0ank&J7GmX-z*b*-f1ejo$WqGW}`{&p`cXj2B^
z>?}O0EB&eU0$ydHsN|W4WFVSR7$iefHp*d-f5I>LGnBNB7aeLL$_0Jub1D%C2~ae`
zAb`3U&oA7@b+^xB&g#9x_=h-R68!GtWFMT%l{+gFtO<Z706GE?;0F)#fx{+p>(*X|
zb@o#{bOQ0FG;HW%b5E8{n|pXHQ{b6=k%eFWBg><&R~h&pKFL2<ZRPY^XJO^--E-RN
z;&APG`|y=do=J1M1$y(9`t3DGq(;&ORS7__i4o-g-GUzpuyetCRFi_M_CA9UlB%z%
zVep3<1sKpXuC#(luTr|$F#No^W%{4fFnp5a=KMJcP7$Py%y%OT4#lFNKQGDH&{GJ9
zEerZ=-x*ia;E5PC1nF!`Kz&Tom=dHDl2{CgClOX%aLyy?3|Gl@hsI6HLHO48-2X_|
zM)<#1<)!M^7M@EtNUw+?yiK$QrD~)htn^P*c6yY44<l7IQU;~%W%)HFO#)diJ4nZQ
zX=yhf`N3Rfuk3rnjK869+1KhEeDg{eKa2;j{1F%E2*92JT?DunBA5m6o2M4@=*T8+
zs7o;Vh2=b!w^^1g@Z!u_Y#GXa!kaK|(a@VixVy2CI8%gQJhT=w_7pdN>{OcT>-`GF
z&_Gv&V3jqrS`@#ufC@#BMNty8l75)h?1f@~c|Z|WW)KV*yE@d>N;%#E;y{B$2UOD=
z7B#BrjxZe|0x~0v;5H5nzBK%zF*hUz^<bvJ>j%3Z5pPAr@aL}@lHsbcG=!21r=kG8
z!oaFwdQbSddfNrhsU$x&>m&wcPLVHouxftA<u_Ck5Yb@>MV$g&s0x{1qE-EhF&3g6
zp%7IfGiD6T^uTexYTKw<&{rX6Eh2K%qWs?BISiv335&Ta^L*s?S9ob<-y3#M8Upqo
zgLlE<P;d~7)+4&Jkhft=4|MkXU;9wdn1UlG<1E_1lTbMgP(u>{jU9k83t%<yv0G;m
zpV3ZHTv6N0uXcaWoQ3nvD>?I^@f<dD7Uu4j63!GP|L^|g2uyDJ$jLO<ryx_P(SD~a
zoFdW{FknHCEcVj%z14U#h<H#OSio-;GzZW34{E$?5P_jY2%?qe6>W-vaTj6A!tjqX
z9A#YcG8N(=U4<kGh}HQyYP;W$e7JVGungrrjT+8&)z2g%29I+1`ZY}%sgUQRMr@w}
zZoH^=ov5MpAZ=3da#5)QsLD)NY$Gc}Ggiz$r-oU1K2&ik^&|?#sH@|D)wDo`uoZsV
zA`#=oRXMKv!E9by-u;H&kNb~-t52n4|1qpK4Px&-iE-%!$%2h|U^d=k3rY6nuwo{x
z>x9ice)K42`Zb*DDZBbq$QD?zt(Wf(VQtcQgP>CYuQ%SH6hIIOumCS41R(*~-pv(0
zKeL_q^zl40Z#5@<?Y=!nNw7X)^3e;Ya`Q(|ra6^@{=z_`S@KSeD(zS*8BjU~!bP~$
zVrBZjI|aWkz|B?~0d-<vH4-qS0YQ-vaLHDvQwo*w#w7!9l((r?uvju8(XUw<k`x-g
zkm?KkXopjPLLYefps(JmBpur`-m=;RyU1|~hIW2lPskd9g3>Vs1R$#EKowqLL^wzo
z&NmcgKVec)t1@5)K&{7R^%R3z2xtgMTFhCU;X~h>%j{*_-thbIEANDZ#`Etb8+ote
z(gDO{7W>pEIbm!I@0&D&>B$(eqJz778`gq#BsO+oWD2+)eHb16i2ghzWAN*blD&U6
z=X~ido(x+7*}+Z#odVDi0FBB>fD?`et}yU5ZmQtMD?LB5iCY_z9DeuHdzOrFf5GMd
z{dF;}=Q87CC(~3{4;h=Py6!a%ah33~3=DV4X?A=PU?sq41t;OB1iYY20HeA!ks=~3
zTf<_Oj7VU>4TX#tM&LaLtG{U~x&TI*5QNhVMYO71Rj{d2Y=#<24vOte>Az>J&KIb0
z@_t0XDfq;olx`8*akfQmhrL=VWoM%&I}<pNwE_yF(&LYQmS|mq7rmAOuRosj&t1t_
zM~74?WI-KZr9OsNDHmK3ZStRx35(gw`nmRpvzfi3Yq#8o=>)hQnOp8*?aX%KK>p^t
znFq}K+U5Lh<yMX`1aZq`STe@cDI+=fkbM{tw@9bs)Ym6Tr{X?Acxo|seCe)=@W1x{
zH386g9Z0}V-ALblFBhLSolm{{c2Y|>?RlRoQ}p=x151%kk*|FGOj;URAd{t}yoON@
zH%G(gQ3Dwbu}XD5KoFBPV_-J>1zp8Hzj)45iVRAUvm#>Q1EY%K*`pX7VN!}am-4~J
zKtozlKqkvpNDZ+I#j96S1hR&9JrRx&o-fbyYan6`zBlXS!S3_Z0-ig#hdqc~LdkH3
zllY`sgHgla?u?gTL+-zt^F82kuLfVMCPQ7y>j%C4v6K?>A4K}O;(HCh>tITu3?n?s
z;2)RrwP>2Sbr#Pp*viL$_%d@>_3pNN@E4E3{a@tF@4k<BeeQSMJF}hiOn<#`Zn=lG
zz}gy4Mlxp60E~`XjQ2eHb4BLp)q2l^P652$xJT^1FY}7QpASR-U%ia|j-J8;e|(nx
z?s$C99wL;E39dSOJYWCpIW#x4LT}bzC=IJzBxO`n1XL8%)WIv^0<9{om27EHLGRhV
zW`L9TbLnC6ov2n;E|hRS%6ln2{6y5{)OIvATpt#)355`dAY$Ok%KWvAhMu=mWgZ@r
zp*$D*VFJJoh(Ok#qkzMJ?h08u*fDS*PH^50F>p%aV7>M=FK#h#jBZ7lL?k`rF?bQ8
zvAz3Lk(4%5zN(~9QZ6#`9aazzuXb2MdeyrNTwki%t&j1a`5U<Y`*WGUF1y?BzqcI>
zw_Q%>Bl9`PcGwy?jSf2@<nvmgQvk0&41EgTdKlTn_5FD!{N=?xe}Z7vmi*?QYx&$a
z9%5^E7c|xRM%8u8?x0YA0<j!n`VH*D2tx2dh}{T`d@09ng0Or-5gKbV0jU;9wfSDM
z6%U@b%C9kl{fGGkbtsKmYY<w73Za*9FpO8(TU9O8E)^^1DccyzXEux~;zUH!BeJr)
zp=7WEgCt@QtB2$;zc|uNR~j!t^$>f-gu5Cp`0Ek+mr7w=cwRh(P`OH-MfkNCqVhb|
z3>j2mGDdJdVogDdpF-#=)E+5oO{mwPT1TSxB#Ou}dHB~s!oqDz@W_kn_}F)5?-9ly
z;E9E>Y%|Rx8u@Y{-|InTnz58xjQk(`ZUxGJ8kzuT>`u&_h4<fAa>@Z?dFP!^67THa
zJB~YNOMd^@IzDjYUs<wp3$!-+rN$*=8Y!|0Jv9;WcuNM$Qx<0B@6faMg4yz>1<A&s
zg5FfDjZ{22#h4?v;~J~>M-23aJqC`KEw$)HcNNXU8v{oYNB>p}8^e8;Bxyq;5Yz}H
zn*AR$MMVxlR`JZEsSH&(DHPe+o<wqVe}hf<Q)PR@mcFp{(G!*DEi||lL?F_RM<jP|
zrF;?;uMfx~0|`WE=u4@j2w4jcQbcMFFz|~{mB>&kPBB%-?;cpqwcnk?s~hus%)Mv3
zaQD*~2ae^^+pge{nX@QHLL38Xjw;B(EF7)-uL*$0?lk;mW}e=EG~a$`F3nH8y61cU
zDvGY;!P%R5*A0K>iRV{BbDb}GBc<>Cd67JL7%r}=-5-%*g>o%G1yR6XtYdYMZ1N3*
zFe@!_sQM-&9`W{wfS|fQK()J4N<TfIwkOJ3w{sOwH%bK5(7&MiU?UL&tHGbBm}mwg
zSstJ44I)=7)bAjuHyCQ5xYqd?a+DzW&OK4~$}9B#MWmfFQZHi0A>Ih_Cja+nSVlzt
zHv)x8(@^FORGDE>mCOYHG$iRJ!7aafg-`x`HfuWfJZ=B~EP{>Qw6rzwp=t)d77@_U
z1VCdC`kvbw`CMI+!+!B7>Al7KSK&!`WmPBF%)FlmAASXzVvw)`89UXhi&V`=mEUR^
zX(=Pm1<`=8Xf9D7gvV3LBCk|=dy*kZv{jIgDiv)mRjTI|4^<@)1NK{^LQeInRj*Xk
zIKGf&h`1jLPqg}<-AV^q_f)1egs4t<)IR#54ECv}yHG89U_{8qpeK8f&j&$4WW7&x
z;&sYcX*tmAH<S*I=(y-meGx;62q@8l5<!vvwoNHI@*bc6@k{)0)_nSM_8xiP^<?46
zMZ`unbMnk~n)Pz334q4l6akop^VQ3kGHo2!{_;`c+xqt2&mtwP+T6!=-~0!6-uo1!
z3}}d#d)x=KbIIxkUoE^V8LOz5t|;Sqf$@zcAkpam7_qXK>B-78z;^Zit4PugYP7`m
zXUUfgXccMX0oy6LY(rE!y92cJgLFu|9#YMIRKN;^g$9h-qnv*akHzx_)*jT1lx*j-
zsZj!h>Ky=bdtri*7#cpIi8n*C!S4hKQ#(<@q{>CB5rk54qDllrq{vX&7W}~qEh#o`
z?&A~RdXoSB#}bN;yGP%1550_-I+_FPle|r@sG0z1>}6<c<fGjgM*V&6&b{6;p&{i<
zdJ3_7KZ}&Gwxh^re)K#yeDfhXdu{)~EVH_l{Pv{xYqb%|NCBKD%d)|-G$fjQB48%N
z4SZo8Z-^uy8jYyXk*{F@P09su)jVdXG(MsVxscU7?5F`%NrckbAS~Z#CY$|2$wWgC
z5itgm1~oz=B2j=^$3B!Ve}`YE9FN4$>&MfOXz@e-W;|%E^adJlF@)%Xq0|9Hi2z1r
z_d<OV8XI}+xs9~n`X6RJwGrFh^CRc0x5E7|VUBI(19~;p1VCd?_xjs0!s^@Gu3+@E
zalH38Phj=u2ig?NtiF%B1nfHsPC5Y2J_Pr$31p9+LiWV{k#Q@SJF}a}fCRSnJKX-)
zS9$M@zp`faMrcX-vSZ<bIv@=kDHfDo6}=#@(#w`r+RnlS-LQNjkZkmS%w%Bbl%hZx
zt>%k*^`iEmBUvLpFKVgGsoRL{+O4wwe3fc>QEPcns^P7aZ$J}4-rP$2H4;*(Sd41(
ztH-=EMJTmIh@vDxRZ0wrhhh04{$w-6ngilSxd1Y(=$FyXlI@THA^h$HLsTjwszrwa
zXih<Wf?xl25m$ZlX`WrujpOYdg*bT|?s*35;C(ptn^$s{USZ!H(Cry-Rsx`?ZM8LU
z<ECzg|7$@Nhtfcr25!Q_$`t(K`cxc_oD2t#r+EJ1*dv;7^F<0Pw&1MZMs`~-o`8wZ
zEkj^n;9=~JbxZ>JqRS&Mtm54>dicuK$8gSBM?uUA<b$P>?~aVpRd*7tvJaK_Fsoab
z(zw>3$j~q$p7PrTy`n#ASlUX@xGd+6qlIU(hF2TS_eYIh`0ZBozlV~((J(@!ov)OW
zS9pmCCjOL)1I55Jc$5UlfFzg+Umed)f@%Bbz%7950JdM0=gFWgQ`FGce+`I6OuQf_
zZ-(bD<_q~)Nk7aV=HsK1#nnauSDQvTn7%-XxCO<jt_!IcwANAR&GFTrJ;N{lzJhH%
z1@^WM_1P=oA1{+0+sY?^hxIC}34q34fQA(NFW-!r$q%$Krh%{w+-c*mC$^Cq(}H`%
zB)sY4=-<@Cx)ob^VDU!Q0I}vYCruy6<lY={*JDGr$e35w1U6$AtGo^d+x2*EaR(p$
z&f|P!SwCO=$O#y2_0W}rf?e(%A0Sz~9e7?~xJ6|Fn+&@P6j?bTe5qI&^QDDd+ZWXF
zivE;5&#lZGqZl9}VmWHAyJFstjA#u+qZAQCW*D_|?Lw55=|qGmM2FR&L=40L;r}vO
zF=KwMfQ$i2|8qM9u#5ir2&IO-Y6Eayqw$xK<1$SD`!EwhAAdsWq8Ox5z^FF4ubPpU
zgCA2!o|==;oaU8RwsG^%p5tG0HjpW}d*wPJCEWJ{+<rBuedFC6dE*~=Nw2P&0BG!q
z5ddW%(8?`*<*Y+E`r&!Bs8N8{dKl3N`;H><o|D)%s+o?y939*Gc<J$l{Jr4tpPTPy
zv$ESC-F5|sO&-CwrjMt7`DXGflQeW?0#hM&Uu&W3!RoC!zJBMktl6-c&wl7+_B~)C
z^kw}YFKF2!>V2x7wk#XEk`b(CJe6>9G#oF4UmR#yJ`r$i@Cv@VpmfS!dT4}8-l(Vy
zjT_XSiW^M>42T@4Zmg`~CR3dhh@g#*?eyvo2neX#2WbE+9vEIHhzb<_$cPuTIh1A(
z7&}h_q$;f#==GbH|K3)@uUVj$;TP4T8qw~8Xl;h55)n|l6kN~0)<!ge1+)IPklTJU
zkNK;6aCURPKb?Svq#q>77W`qGJA&tz!AmQsAJxpKfcHn&8jZaRS_=5}#vUpK{DZ6b
z$O%)q{e3?nZW=Is9Go$o{E7QRU!I;N8~Nwv9)6WCGJobQItP27@4cTZr;p>m{`d@|
z?t6i{zMQ`-+Ixs&lZ+W0GI<y`Ty-3mzT*(EP3Xw@vr0?qfXX6ogcbHRCICj|d`rea
zl)Y?qjI25jKn67dGBkogh+Mi#-?-Yh9x+JOy!~ieBYeEV5N$^)SS3J)Qpq1G(-9TS
zk;-vIswbmEiac2k3x(dY5o!Vy%b(vXDxDj0pxkmTTaD6w7=8z)<&%wAkd6q|5oO?x
zdxP~oM)s|yDWU|xleK3N$bgBa<It93^ZH)?`;NKX^XPImcjwvN>Hc&AKL2*?%Z^86
z^2leG!F|sYdvOKy?|}BuyN-j8oz1!@7INgwS!{_88QWzM2rUJyBLEsZhfn{Opa1X2
zIs3cs<E+umSiLzq)^+ggqx1P|roiLDaF3x~GzO!a(+pp_3F%1+rh(yl5HpGG2_ztI
zd%U=0E1&-EBfKzwEuX&nG)9ge2HhFx%Ll1_qtcuAjLNn$Nfqx<6?T!4bbyjmmx=)`
zjrUFX9;xR9sR7&naUG>ljq>&|i0;0uqA*vJ7FPG>)i8FcU=1o#0H#nn8ma{oYRn&~
z7=bLy1V>oDgmQQuJlBs7$RJ%Jqhx?cbVLn_7=FsZhzEN8@n9&ESte^z8M;tSr$AOa
zH`QiDh}x$!jKqY*psfz#3I6`bQoi&1IXwGn2iZL!<R2RUgZJUNhvxD_%VgN_2G0A=
zdpY&_<<#Bv6tSfnp)2DT|7MGR_N*EnTL9Od$%x^NTnl^+FtpmACIA|HIM!_Aler?F
zS+<GA*#b}8bT><)+bFu-Rfm1dY$rXsg^T|-hlY7;@bX1mz%`9M!}y2rB&_Yoar^(h
z!rY~ueD0cKc-yJdAQAIx0~`-5qjJ&rWLeRz!l{*2#^WlZUMoV(5rcsQ;es^FM$5E(
z<K((QL?9pnuHzd)T;+X?D)RxVq$VniZZ+B6D#lJkq=D5ag4%0e(z_o*I-xWdKp_t*
zsX+MY5z`D*af5U~i4X-T0_g-lsu4H+*BX{@@U3`|ZZXPiNk+O4sO9)?M=POp9;*<i
z=*M?l|GH{P)76vZfBtVSKe=xqYqw@__Yep4v}th8p>#jCfGcjfhxNh3KmX>HoIbjR
z>u$fAb5?C7K6e$dt-TZ;oP*VsA>N-KDEt_=z>|1}Af{JUO#n3Z0?cg32yXn(S9?wg
z;dz6F^P1~;-{cV-dFw2U{yc_hU<r`6i`Wy}nX?6#hhJLD%8i{|@xmIeyX<I2jvE1e
z1;`ZwXHp3#m+JbWVQys{o`{kIuSzkS8Z`*g0IpY-q9v4&4aH~NfCL1!0@4oJ8NEo`
zUM*SKsA1lokro5J*yw9KcCJxa9ato*L<u~vOtgd<)J<4G!Y4&u`1u{56cB7@#{3^F
zu&i={W(Cn1YK13Nq<g7SLm_IvHY^ftu7jAt<4>>Q`+uCrzvpeDJF{o0`VDV@Y=K_K
z^=o<pqVL^s7moptedFC6-CEC;2k*m?^-0>=k7MGz)fAsyO6=A3h^@V_rPu$cpS^%w
zM<4&*(!+O^D@9{3gsuU2y|D+61KwHU5E6o~UC#K!C-TtW=CI!#j}yxkE1l9k9d!wl
z6Q+;iqn97WrRN;v8<L)&O1(5ikh13|tGJHUhVE2Y1u?K-ucGKsM8tPQrGfVXqaQ{F
zLQmKWNJ2FO9@fE?iuh!8H9xg#zhd4!mCA`~*k33GiJq*X6j;TT4wVxJZJDF;Jcrr?
zr8JA-e{P|iw{X6I@FGzbF?7Q}7;%wR<~39!P!hkruP)A}&3*jxz6IR*$O@Ki?8Dsy
zd;3qF2H$%h-4DIY$v5B4e04%!G<^T{D>$|>%~>sV95cF^Lq|2!ws0N1u$)AH9&z5`
z%%8K8cYOJeEPo?EgRTM45de)hI&v@zFC+mYo46rcWYV8sC>#F)Hee4%rr`3(?Df35
zrjw^$TFpn^eH>G#j)JTO{l%a<T~vCOJK|B+RH>6?Puf$BO%Q!h!}j5bVG;9F2Y8j~
z0ci*F#%>TE59$p<QKL}DUREP0RgTpQemAM^t=IDIt3Dmk8}K42h3M;qO1OfldxljW
z*Ia7B3|>?kq3l-H3xq{}hC(`o*s<@f79k))jtt@JOw{|Mq3?TmIlsDp0Z+WLg-m|W
zO@q%~2}?FoH=>b`0UwKyd`tD>Z@Qc3fad}-Fg0#*WMhgGj@yr;lX03}S;Lp!XydP;
zBLF%A@CHW!RPX<`D>&qwLwNiPchda$!o6#fU^T=|!7&Gn;M#W{%7tefM00DipAyIv
z%Az$!bi^y=uyw_WuhJG575-6c1;TWLK<U*NN;N)8!6D_5x)6lNLnCMdt}i&_ghh2>
zN+OH|sM5yjaRlqV8yJ2o=w6Us*?ac_;-W?XP)00=H6KRg!>gasQ>GZIRsN<C<n*CD
z9yjRUN7Qo9%e4qnR{rm~<<C@#8hBKx+S?8>kY%D4?fEw?sEdJN^6a9G-1GM(-23=S
zHgx9p3KD$jG4QGL*zni_rp%m0UX21M^t5I{-^_NJEt95O?qT)rIDQ=g&=CNQH`x0R
zJ%qLfKD2Txb#qtk{l*{s@xo6o*vzY|ALGF%mUGR!j^?Zrry^1f&{u?fA@GcaB5fNM
z&3TG}ui^by3)7bjSj4LgHwcYoxE9MuJ6xzS;CX((JBi>JU9f^yLm5O3r0W+tmK15!
z(78~e5uR^^J;1DDIAye;Q915X#6gx>K*f|iQ5In`jG)s(8Kx7yUKK1-75XYXaP>J+
zW*#CGA+pN*2$cXmw=7)bMdksNctA)bg6~);bsnDd8IooCt$m3YYuER3?<33j%|nY>
zxTa^14ENW<vrFNYOBvpn=H0*@H8%5VIRP_g(G7I#l~EG_jkf{;2n0S7F%BKk#PQE8
z!E@ha<vtz#HupTSoTnCU;yrKMpUW>gltZVDM<mmbvjflCE9(TPMP~yl?W-89s4TBg
zs>@}S*Lo4cP@(oG$_851@fR^agdY-ukN{Y+tU(ZZ%U(zjq~a}mWdkW>5aCdV_fQ^T
z9QM|mGFUyrkh@Vf^d+x3QZHdBCrCzW5=tk|t0X<q->Z4+C@B=Rozak$X#&)!fif?m
z?CvWfPtxxaNyH%;V{2cQM;=?wZ|`5sf97u{TipB9{PH$DzYK491Lp+<z^g|1xBHkD
z{&~|trvP4Wyvd3H0e)~5A3ON~zWL!_ke<70$94bXmfwe*$%DNIubVMLFnym!E<5``
z-hS@k96V`+Zx{;>6m6wV&<sNM5mFEu<N;(r>Frm0<*OALRv5@CmHZOLi&wqjib+M4
zvjn84L@>O{*1FPjL4G~VqnGp%6hkSM@HnD|XD%wmf~2yaYSp3xh9T8ZU#!|<N$tnf
zfjrfQK}of9!>c^shJb_xsW_dPBG1oV!*B1O$HOmfprg0A_j-FKTz)+62To`0(~CLd
z%YS6$-ek;m3P48yG<E}qH*n6=OAs5ncHH<6Z-9%A!Wq?sy}pb1Bd=ht@7yy#r|n7R
zuIgdoub<=p9$&^a7aYnNryju6iNi5tW)Kkw`t%JW(n2Px8!B00jVd1(qDH^DVvOV<
z5r*itB@fq&3_y~V$50WGFv{;!nh2;A?+IBBlMCguREz`gDxZTuPS_hLniQ=`81UE-
zE->{Ri$U7-YMwiRUw5E{Cc*(wf#L5d!t--B^ZP%~<<aL?u)ZU+*WbsE3(qaX{Okpc
zs!wtz@GI@fYXYF5Q4?Rij46{waQt2OQMajk=&wsB;Ph$m;WH_u;;hXU=r}#e@B_v$
z;>Z7>VNWFi07Xag(voewy83aZJ@^V&UT`QEpFNF<tqmBi>93@&tZa)LFl8_@_g+?!
zqE#hkVPFfIj2QTe*2JpnHB>6x$$>Jx6`^;ptWltn1T`ODlD}0AcGR#6C7(_pe;kz#
zj2L(kG17wV4A>D>tb6pF4I%ngO+wia5EGD0(BlbSp0}BM{x+Y#Jh_bZ+xp&A_j4)^
z>pRKUB{*cSi~jD$=&B|F8gEH7rMW;#nqM4Z(@!E+GW_nSW;*7t<#$~f{$x9BjaiJG
zGLo-;^lhB*t^0}h<@W5)o-Me%xOfZmSNw}V{qq$*e9<8sf6_E2539rU1lZm{wYzF0
zKn*Xe>Ved#AyBQARJ`yC!Jle|U#T;wHo#^;RDjBsxoW&ZM(PkMj=`%@OfMBOpq!tY
z8u~kGh$52{p*k5b!ofy0q6k9x^RF$F4i}cM=;qG9yv!f}wTR7~StM`1@UiDXXFpyd
z#)w<rCDJqQm07*YX#$|3Q5C}*IQ!Y9h`#L%3u#QjNe95yr{awtM(4aW{C3d>z8#q+
zxbz$E=JOXH#p4gmCjQ*Az2h9@ZI>tKZ{qpITbO$1i+ra25RN}_D&yORQE!?-PrBma
zRu!cQji=H*ASBh>(iB50WR>*5_WIi+xo%M-@?eC+f2j1(!{e7#R0xGP(9>6CgiC@w
z%3D@UOsqiyb_7FFo~j^2Rmg%Nkg*t@(qr+`E&THT=5qg&E9mUa?=@yWZiNx6p}%HR
z4?Mq|#Dzz4=$dVe1(xbnP7?qPjRCmr3Pw+8<EXoy!paq^FF+$2;h25l{ik5JHPStQ
zEq5;6#D9l|KWHN|@cWC41)EnFZQ#WVj^O0Et1%1q-g7>Rw#WR{oqY5MPcZ53m$>}&
zeYx<g!`XNAFq+~PhN&3NXpTSB7K+Z97g5U?Eh?m3h*xssRHLeT+Euy>LZjz-5f53G
zC*=_l=?S~~MATv{Vg0Jn0yP>D5ClVR$Lklhjd#@O?+nxwL$D7=2s&-a3v<`-oBQYT
z_?&fY>)X4E`$jgwdr!tKI`F&yV0I6&M4_V(9$P@&_2)8i;W`cjmfrd<Va&K!>RJFz
z05midJL6HGE0Sxj!;P7kY6bteRyg}moOd3BU7w`u)%Dyte=R==MMA>r;&8q|*iUSk
zv<+)u@~i6usr$VUwkuh(zK`4PoWsxWU%=(3Oy%5@4&boqqZ!uNK+H5TO8w}8rSvFE
z4J&rHGRJR}i|VR*%N16%N*i5Gg}y45S`d5zk=KSK#gmnPSF_i~ARfJ_^1c=Me^EX6
zuZ|FozIH%|g&0JAF@Wjo4!9CBuFKYK8J>D&3%`C~9?vh{Os=^14Y3>91po6<3XaQs
z(;#;7QB3>Aqgao;0-gQafBnX8czHEOV~W#(d$sX@>q55yzTS9~wE=$jeZ1?egZcG`
ze?k4rtD&tC-gYp&{}l2?hjlA9GpjSh?Kj`e#-Z%*JMZP)=N`r#7k`_?^389auRR%q
zQx6@(8Angy%oFx!zwxcq#bcNl3K3vn)ql+yHrokvi)e*^H80wW3@wsXjJznP89c8X
zT^P{Hr)(P@u!o`_P>p?5(MqV$PpA<D80v6|Y6Ku87lyzS2Cnqj*z2%x=~n*n+-e?t
zdNIp3^x^HL%if4a`1N%Z)^6kbn|t^wU=45N<I~4+UEXHY?SCiskCz$r^O**G_5!>U
zrt;Fut2u73ApkqGw(2%OO#n0jcx|}-YCd`FzT9^IY?2ooj@z4K&C*TWv8|W?nK_Fs
z+k1T}8qkh4Z5)p-T*rxD|1)OsO*lc^GGM}pI!-x!9H$?@KgUfQ&&1Kq#1e7eV7k(u
zc&AqD3pJiz#jP%-{i}J@YA=5kPrM@ZF9*)Ak9zoFx*?SNtsoeRGGJ6oK<zM$dhHb|
ze35wpL{b;gDTO7$BlY#cb|sAh0haJb44WpN1N}vt1uHsve$ht${I8|VS-y?lY=OOf
zxx3|3ICKI}zU%v(9J$AuM>O%7!zOUu+|>;K#iNM1t7`A(xc%VgAEy8Bb2;yZJLQv_
z0K7G!Qve#<HQt~64Y&W~1GFACfwP`p&Rt#o+%t0)+lKo3z?^ugI7dw%$5H?Nmp7;J
z2VZ@6`KAmj9$L&F9$Cr(<C{6-sL7mi!~~9*K912NTCmb7zm?E&eB<aU+WVovzS=?<
zoibcu#T4UT@~FK?ia}P99##yxM`h7mNJvV<d?H1KYJ@_ngn=qL2(mI`A)@MiR1yMJ
zZ4k;e1Ret;3o+AAt0YViCS6@wR(168#8b<7erYGqy|RYYTQhjxo1>n8`Z#$1DHQ(l
zBHs$`t#F8sG2>p@4b1rZyTyIuTKUo+KFLLQK1u4Hr(yNBfrWx~2`~+WY0#usIZXgG
zGzP`Tf6dI9?fm!5S>&Uh{ZRKYtbq^CS%tN7%bWjvNeOw|<K>l|%v;sPum3iW1I9IT
z%t7Ng>BvbObI3Txj2%wQw0wD94_|Rm1{woW72^?#&W{%{pfX};W%c;4lmm+Z1%5Q5
z)N1IJ1$<N);A;C4MDqNRu)U{FCyWFrq6Li6Xh&%ArP5ky1~S8z2{B({SW1iDg3bJw
zH!*uf7yo*4DGS#2uy#`yMMom#o2QY_5ODY;<m#<#DA>$~@)+Nl?GP67-Sh`J7r5eE
z?-6GnI)Rz*KZRo+n2mYwvzT*N`Ip8APJ?Ssqw`<$xiypLVZFM&b)i!LdqSA%_4+ce
zcw^pYM-2bWcC4ARaBjPT(Z}t_Gyn51#{KbGOvioeT^fcE2t&}AG?_ZCnW+=oIC}pP
zoPFAXv<`2jttsUTDcBMU1>e})5{iL-zZX>1R}8X=gyf?}KCA<f5#w7T6G8D|C<R=q
zNtERwK?4c_BSJbT(S=fxV?^+0NUSL!4oKh7$4%eznWkT4VL&nCu(ii#>9UPH@SoKz
z+1ShcWn0+XohM(k1K#rHThlBP-hKq`XD?vulZ&_{7}=|Q4U%fr{NH(>xNuAhA3kV2
zr~PLUsk#KBt&v49uja~|{vhYQ>DN}B0?-ivjn|m~4BhyLCWPiR*E%j^9-RBuH2%JQ
z^uzsK8IKp1Y~!V69o+ZC5`Of5a~LzMfisUD&;I+3XZo0WCQToQnMjdHg)Mb16g<c~
z;Mrv(>$zp)X`rMIf(O-hJ0S;F_zTJ-fF;3DA+^sxN-UxUjp6%5T=<GP0TCs@(zb^G
zexZ(n6@!K(#6ukc3)?X0+T6*)+1;$z(8tqr*6_mOZEWez(9x5}lM+u#-t2yi=fT<z
zL~A{bi5UApB>@0Xjekf6KL0y;KXCuI-Xl&Q)56DWm%bO5^XVD)%3i&aX=nnVvCGNA
z%yx#iHFCyNi?MokQg>{0GaNbrR&9kv8{Qmbz;h-2uE(+sJ*?Q+%kzsil8nz`baR{o
zr;a3D*TAt8>pA6Z(@7*6m{4buXi0&Y_FMRhj{hSA65s^U0?#RX@I=P;s$u<-XCJuv
zMx>TNtuLU8vR^a`phgNjsYnb51p=l8355@sCL|Mn0iOZn3vBKx&?_z0tysr{Pp)Qt
zSCOsTx>>Zki|&j=(ROfL-{`-!$RiYNj7%OGGa0?3um9qm@-g7CC_&IGlqLWg8oLyA
zNlx5v6o=jZ5Uyol?Z`yH#uU8sSh(sG3W*qfi5PXC{~f7+EqL>sA3rc4$rW94MVFpT
zo~0Z6K?wdD6O8=JJS;2Dq2tn=ef&fkTSpNSlIaucm^5WHB9>Iz{*<u48F<oJ2Xd|-
zEs(`B5ip_^`pN-?M%tB1V}cCQ1fJ5%uMz+QjF{gFQ5SgkE<ws52nI<JY$GW2_A>jK
zwQS3n2um{m)zv)s;zqXgIb<?9I(zfjuEg^suBSt}9eprw4WcQ{3G!}kuXr*N9-q;U
zS1V+G>n!3k+9_&neGN?jG<K=?4`3M#b3IZ^H}076KWrj=^)j5e#mZOK@~cdNrxO+j
zeDghg>xMgNc{7oKsJG_@DoH&K^sea!VA&eM-(FacFbsr%siRXIy5A_wR3oPJIAmgy
zqYocLV{03d1dit*T!)Fx7KzrlZ+J=ghPo8`7fJ=cS57HZc=t+YK*i|akQ9V%e6F9K
zC^&4~ny04-h7rdQ;1n}#UcZUIKfjfpLJZS{En7QyZow9MaxMsP9G862)yBRCHg?0j
zHKflzgaZ^~Zp>)keo9W=Zbm!Bp}tN-695g3*MvljeLMOoG}jT^+%vS-95oq!_X%>3
zE#L=Rdid7NS#$?aJ$cvlw4Z$_XFu^O!hH)YVWBxJI+CJO)=qwLS%H^V^&&A4Na_-T
zku6D5={i4u?z#x+F?~#e<EAyx)YMEY(Ttf&U<jkE5g<fR*XQ_;iHKZrX?B1>ViLCR
z`IJETi2~QfDP}43b+Bq(ACE2Sqc;zhY58RbUV%&|%Z5%nC_xZ-(!+M%dNwF#g6;0q
zeT0-aLSWu@ALDO+2Wy8)0;11r<FBC!fX1$m0<>ccZ{Wn|mtk%lV%gD&`@_#aOy<Ek
zT=Ti#ac{66D{OnROcHz341rx4DJa<GX+8xTy88P;^rN=rEm|pf@CAWkm>>*<Q65Mn
zs#1+w6htlQmq>Mxk(5a3AwA!y=WM?XPmL7lh9j6T9IiPHcS|qk!}DP2rX3>=y*Zp@
zjQY66!N6L;n9+`-&#Z<f02+HD(k*q2UAl?X_H@b{Q*gxzaNSw-K0J?4eC~JL8*~y_
zzIz&&A%W?7c!t1q_4yrWsv|S+i>{=YldwCSK5g|YjQ{_9lw4;&FC3Mi_4;$!?>qOC
z_}_mIEh12K;DzOw*PX?PWQ?i6gS+QT)zAb$Lt`jji^aa_1oeX%|K>V4Vxm7$a6}W!
z{xOehzjPN*sw#rvwzplu$oeEB*LPw#dg;^HOE9tte)$m!i#PDit-X8`NG@8>+uD!g
zwkado_gnX4Y;U4p(ShZgi7nnhES+FF=up1KYlERrfyS;xGR8smNm^>@lJ7GdK6?TA
zZ@z~vPxAZcmvNe6{2?;2-ZD67zfnwhdI>^1ml}HuE;!9yX*iVa+eZr$64@D|)Kd&u
z2E*u~;(5x_lak0-8%0L;or;<4kHnB=qC|@=GL~VCUG`)P!`K;P>@#C9@2%eBeZRe5
z-~aV-jyaC|y6@{c_w)SyxbzYSK+p^uM0qmM1WKPLb$^~u^;&)>q_;Dg=m4rgT5Fez
z>hZ>EO@1Bp?ky}cp{Rd4IA7W5bn4v^uAYme`u>SfP*kWfGZB*Ku;j`Z9`T%*KPRn<
zng`j`2OF%a!&CtbH<6xjxttg3kKMqRiUA&>?UNcq#CC3rvEJq~vJ<X*y%?ZK^npL&
zLLir?f(iK4eR_6WoZv}}ukGD3{<r753esjN3^eQeuO5-a1`NAxJ&K~84*>>b8RteW
zm_>l?u8{Y^|7f#4=h&><uu@MMv5+-0*^5GG>l8b}y7=3ShwRplra|8Y?@y)v_O=(K
zRgXe%*?TaC<NWjnJi})mhb-n`0_Ry~51KLH=EsG_wFFI>-hYfQsQ!b!f1rD|XU;{a
zd5bm+vY#b(-R~*{!ICvu2{Vf<_*9G-#+!lI$H2QXn<I`redN`6aHtj6&VuivAJUw+
zu=2ZpfAGgcj*Uy0w7eJrm{55lV!*a-23VVx54VgrXx3OFjBZh2E-(g182nKBt4aB6
zq_ZK`B|hsZz-cv{vTA7*wkH!pskp!x@A5BuVlqR-2niTxJ4!B344QN#m<fygX*|Yz
zi;QplS0Q87&i1JeMJHTspm#VA^7ONKTc`as)|`LI{-8Dfu^R}U*4I4`zxP)^dp~1%
z?Dh%V?vIgRvs_w=W@nFBdVWvQFKKyChd0Lx#<K-(h+KT!|7r^FE7L|AOORk&N;65x
zCxBa1*DMtvZ{<9F#@M^5?d;jz8SFa%CTloFm4En0d~#eV+oD3SjR+yEAy%Xyamd}J
zd)>^9SVf5MG=O#TMc>-)ZuwIwkE&NGJIjyoqQJC9i`4aF&zAOc%tS0tbFQs5R!#0>
z3T!G4O`ZQxIbj#j-iP0zS7nAV1$8!-*sZ}>c#AyR)S2`ZahhK_x~Nn}BQHm#)VrA4
z)3{?6=aU(26xvl-rs{!@JVS$~`@=RbVPsWNY~bOk#neg2g$mCtQ_L$0uZ9KyS~d(w
zcY=6W%DJ?o(-h%yj}@Z2-{ePqx<vq;*FB>qW?PC~e_ef4?LmbwR)-HUa3^e)lw7J*
zu}Hi2R;$}UT6XtjHx`BlFme-y{`GOOpA|j1^_KyHprFXH`!m8{rggE*%4_>8Vtph-
zMdIEuQviP!fR%s<&5Q@{$_J_c^k0brVx_$!Xj`Kgc^0LW$_+3_g$Kxj4mh+$vtE9D
zBTqvi_fj4|;Y*L9xEa5#SR*iH+(Vxn!M#4JjMYXb-jL}kpzZU!6?px4&slZauJg1n
z<>E_#8VyO)9C&otBaEA}1<3`H@{&lMVFCRjV>J&4ZKDN_G%W!jhuPdJ>e&d$KNgvF
zRZn$4FG}-)no6?q=KL0OK>USJ{A!B7BcbwHamc!D*!o%-^Jj9b&SG0TKA;1-`qC)w
zaJi--F$e6CRB;2f_)ABiS_JH`K?6tgR7H?`j1Q}2f=Pjang+}tfx8+3!#R59Z+L*l
zfz7H<LNe7n77AP)ksE@o)b=m$!L557xbD*j%wv1sBvpV8qgF&6U%vd;tRr_WTOCCb
zb-yb}O1SXA@c=Q#FViX1<qPEV$Oup_k|bFdL`@I5BY%Q?(MRco!(UqO((sPzcPdJ}
zX$VQxz({tTBvPeGISnRTT!uaK_d>0B9Elp@t1o6I-c9hR$#k5SQ>;(6hl*2lUuX^i
zuhX(vcA)Z5Eq)ePFXp}9XE$jve$I-h=%cQ(1Jbt>v0ac)SA_JM0}^FNnqD#8+ysd-
z#|yVs;TU;Pb@UVsmJqrM+hGN%6aDHhsow8N6pb1(zbsoQL3I{GPU2H_W%1M)YH~#G
zp>)0Pmn4dQi=QO)h5OU^w>I{FU*XtdeDG}boq7F_9%Jkuv%Q9>UGHGlmm9BbC=c!W
zOQ(&ZeoB&Chb+=Ay)<U8pQciD87uyz>&0g|g9RD_g-xM4Dy@FRHPy)a&ky<m|5SOR
zbGGZ@{`T`vC3K0VawSK(!$Bb_2Qn{d^yfk;Iw|6|4Rd`)Nbkw~)(lwxsDLydR=ZV@
z3BKDpL<+uy>2^hQ9EeqxW&k?Y<;$(P>O!HgfKyD{qzSt)Jw)g}b&TCtR{6vRWNsV!
zaZqIVRvbId@0j4Y$r_86ubum3eml9Oe&gt!W$qyt6RwyJh_}QldLlG)cT<ux%;+-l
znj}}2>i1vvGnnUimC*ivUTomv{njTxy*n7Y`Q1*9$RdT{?wn2*%eI@%7zxq;Vgh|m
ztx+KgN!9#YYyD0<x6k9la~c8bSkXo^@YDs}jJ^g>xSDJ{xu|ofM(l%j2=kxJo2Gi}
z=zN`fJS)t>;5O<x-U4$&8wE4c1B%??0p3SknQms&9|PUeo(w6q*G{`yKo3ue9!GMF
zUX^_IYCrWrW%P<09=?2@bYYfe5U64h_(%-_tBC{G;$LqdD_<xLm=G;cZxx+x+^vnT
zcF91ea+$PD#)^^Cj+%$8`oN@X!`(6QZ(p}lAxmFF=bSsiDnEvGYy%Xfb<*Q6RIDat
zs5p?83Pa?wCZiIw;*-ZXz3yNle7IVZo!#zd^tn-m=T{4j=e@@fD)x=>n8`Ta@3$uc
zAS>nuCKI{*ol70w#s9s_Vb0TUt{ve3)ZkUD9tL!z@fOORVWj9-zCGvZG`EdA#Z{y)
ztP?8DCyJc>HmQAaOLko`!R1+Lvj3}xj9hg>r6|31NKR1t6M-%h<<c;Mo-7<|a3cCT
zbh)-#*QNJl2aAvAn~j!+HoLv!$hA=T6RU%r*hdJ>%V?+OhplsZ`P-R?S*iob8@Ao}
z9ZOR2?cHBrFCdH8@ax*g=PIj5fhOnU{yeY9KwiG?)<QNRHL=qbVKY;!$I+VShPZuX
zS`^5q;WH+PgSm||AGGPa^pwrI+a{OC)@!ui$88$TLV<B-qS~!CKLiu)m{|zE-+8^v
zYQ4WF)7+upLqv<nyXndzMfFz{@D1)UUB2n}*VAyGGRTSV9X)^vo-fu*;v@K|fft~+
ze=8In$rCdU{;n+%N~Ow&O7*!sH$@mE01*9=8e}Yhx95E8oBhck_l{HNwG{ow7`1fg
z%nN4r&C`53)6era$e+w+$1`e}R4edX)z9Rvz0ekAM*X5Tn{Iu~V4oxXdcu2Tz;lrA
z$W28@`<lvhJX`+=C4;jh4_&<N9JrJ`Pi{fWMP$bqg`Qlj+&q4U>&=O$s+zswfLfbN
zo?jO}^SAx-xtjwAu8@(_iJoxdc!SGDZ99F+mCpm06*3MO9rbEnVMCYn!mOJq7nB+Q
zd};JDOy#BN3efeHN<Fs!F2XOKoI~f#bm{N9uA8j)+c}BUYlK+OwCI;?c3vXC?q5~W
zeVNA&OELfavmue>D{Z5qcM|HrU#l&=`!jm2v81NVr^fDT+Bokm&g)w1ef{rCshLJN
z0s(*j9%wwr4t>*5b$BZ`=a<@~hzku1ZO*2bv0XDAwg#|B6JnfSOs)0G#E&liucCfu
za(iWPFI-}c3{bp{<T5e)9-FSm@ai-%u4yF4nAiF1P}btldCj&KX${%1eTNx1%$%G+
zDN#xc2<;BME|aMyvkfZSV4dJn(LEVB8}0tO_T>gF6h_!tupX-nID~`yi!z_nN7O=5
zgF)I(y3Jol10Gz1j!f1ZE9R#ST8raszkQ#_cu!k_75sY{L^?(};-P)e%iRP!^v^ao
zAXAW2%6(d6YA;YW*4jBgLAKIVmlIwsp8qwQeQ~0bh5GUasxsb?c=-5;I$`DFOfJ9P
z`r-yN#ZcvMYOGXs06Fr5HuRPifL&Bc3GzZs`m^bJ2zSbKt3hQ<r`s7$?s#-CEPk(x
z-n)f1e+l&<WR3Qe1O?FAMSyZZB82dKfLL-?m&IH|sibCx)F)7j4FtP<oA}JySzsZ6
zomrg&<_+@)4jdFdJwDU&b&!Om8lFax14qp{U0r`|UySH?_iNGfJOG;h*67MovS<I9
zVeU9`GeD~N=o*xn<0DZid%pr&en;J?UNc`lKM~RXJ>K?q?7Nwm&r*FF<%{T>)9jkW
z<WL_NsA^85sG58_n>5^vkxsNyf!3{WtQ4%V_mtX{$J?wx*{!_h7XhpYw(1_#i0h}M
z!#5NBji*)L<|_aw4CT?LAp@VIRgFq3cP(=Zg>VZc^3`=wwL9eJ8P(|{m}xj1|Ds`G
zPEzQYoQJ$El65sg@}U3Ub@_-zZ26#{=R7n~-hbE9ATzWLwwgtEq(NeofQkEN@`*Hg
zluzvF&M<z$b(xwJ(Rj82(X9kQYJz~U2EmXezsUtKhy>h5C3kI^7HTevy9~*L*!lt%
zhMkCtLI5cS59;iP>Fq|35nko$L#;b4Y&ai-(b_%t31Zif3-Ia`XW#1-tXnr*mPr}Y
zw?Dq=y!h=@;Q5`g1D`1y-hwTH^7$9kvZhgg8ohL^u=t4;liXXNL*8aBzl^sXxz}UF
z_LUgnz5V@S0ypY%fsh3MK~SMVQmov!^}v?Ju>DyBn<OT$SNN_5(=yYbwmKV!e%Sym
zsd4m2rLf`~OqCuXHFEnv_cm!(%zZKNR39+=IS_=!cg6H6*S+aX5Wge8Kv|wg_p$H>
zJpgB};c>r^0o5?^konq~Z0iO=1K^$%3@iiL1i#ZQJA4A5o&71%8<I~)QyltDF{%a{
z!xk#<M|+#YO+n_Z>D>H}vAlfJf<u1RLXvyLV^<L6{Wb2wRxQda>~`*UR3GZfae*uj
zj12b(*AaOi7=XM5WHBK8mWQ^JaBETMIj`;HSY{_2J~agl;Gg<iXe8l^sPt$aSVrlN
z8{YG}%$TPdbLDuV#|qhP)I~&~0}ykWkJWGFCnNWg+@NV<Nru}T$F#sms!K;HOF*9=
z7;2y7Q7rND7MysI-6}!dR3X)aiu9tVEP@&NagiGW3b?vt?#8_<xT>|2sh!r%f_0wq
zRnd>1)699aAHZi`KfdTU=EYrapOi5<Ty_EHxm7I?woU*k1y7#=Fs3|dOpz*_OlOBV
z{u|vLb9E=7FQBa9d;aC=LX_+1o!$wytxtx`I4~raY-WE{+4+#?t|b7vwId5}Lq8~I
z4a^Qa5RJ_KL@mj)Pc8=KR@A>rTJ3f!0i{vt*`Kfq415Q`S`2YfoVG<Su<$eIE?vN_
z4gqg*=M#EiVH(37KmS^oj`#t$8-wMznvmn&4LfZb^=4V(o+RAX`W{Id1NTuxllFV%
z4$EnGlccXB%5RM&xydnP>ln|u17{1`ZHF*UTX4IXp{mnhpeW}@skv$d)blk+k&1GU
zeBczA`Vmn8KB|G?a0r{B!BrO|5d~xh`UTpE9u#nIzt-U`-TsJ<1T@nvFvoxvJU9T`
zXz^GHA0-+UA1b)s5UJH!r)O>n_5U+?{M&3sAmdph4m_z4Ik7)HVs2H`R`xtp2?#d8
zKkH40GOy91Swkd*oBj>=#%__jU)1~LA^;hp0ba9kk#34Vz)vNc-It)X|4Y2_r+A6o
za>%l#OA7{a-$5YUB!LtKL7XBmH<`PS3Q!NPLG7#zip`|Zkh}749@eX|rtbUcg?_47
z&w6C%$zTS38B2=k_igx*6R!gE;rcw%a&*+C+kXC`w;(~6)k}5b=OHKO6djiWVjwr1
z|31M}Ua;G)y>=+;YF%m^(nbN0f=<!2+P4!`D<eY(cGYNFv(azl)%kxV`mQ`!aupv~
zmck2SIhD6A-W?(${5MI<U25SIH`|)z+N+aHfp(xaLS?4G<~);P|8DC2_2Eh%g+x0a
z5f3lu4%gOSfZ5sJG0U!8JgFsELFE@)qlu+%ET<?5)b&_Oo9UlGIziadAN}h}Gi;L8
z9)xdR^eVg^nQ^v)m?|5@rxm+(yWqDel``j$9(1R=jO6#^2hj7|fNInXVa=m*U9qCu
zrprbB=cmNfLULg+$H-~0nMAbuUHLJfl-_n$SIch$J}MFC%;8RP8f@p5!&#L>LZzi)
zNe!uXE8>68IM0givw+I9xuoK;5}HYx23HNFwb4jN5ZB#M$&~qgzb?HPPqhy+gVh%+
za1ivrsLkS#9!m~^SGevP{SLzJC(1cbRJp5TgWNf3p^ow(+QRg_FlvL2z<BM&V;BQ7
zMunO@{BCD^yrpUu3eMC(A07@_bUfy5rRL33eMI(hcy{>X1;;)6N5Sto5i-wk&I;fO
zPa$)G*|f4FvhXiSd0)%7qaqZP6s(X=rgd$xP%qiK0HMS>{A=X6*ZJ{$Q=@FvQzX9=
zD=A7z2977wyTj~c{~!VxBc7GNsuZ4$N{+Vb8)6T|4@Fr-9$ghQU#s6y>8@E66tBoV
zmKH~(T1^A0t!~MZ1Qls+IAO4-1ScUiaQJ!SCfxR&wI9aB&pj55AuiZ@`UaC~k;q~R
zdUZYQXN*KmoUW@YTd%ruJS<SzqmP^*nB9%`pUS+ekil5Gd5h8Zu~0-<)T1*O_crm&
zC)|^=-1DnDlU}u2j}~|$P^cEE<F^T6P7nf=ZZYO95G72fyYbyP1PjoOd+0*`SQz4J
zOrIF(p;1oy$kZUW=E1rr?>u%1L#77%ITHX+8#?G$QnEMvw8vDI)7Z3SrG354EL#}i
zEeJ9AnkL2a(ksuyaEld9SGZ&_CMh1fni?doUR@y83ofG5I5uZ1k==jnhfJTze3_8^
zhwi)7$1Oj@HT2nOt*n8-BSy{2m@n%P^VOc%#3_AtCi<r34<6uN2AjWMZ88j#TspPP
zbH{xy7(m=F-rwa~8yMYfja>CTG3f4O3Qu79&)8a~m(w>Ufk6GYDtaXpu}Ys}nazDc
z&zJTXfxTPQuUElrCJ~9sGfNpNYv{#u>H_$jmrvvGhfr6eH!~{<@GLksGL07_d&sRq
zjiA&qPOkHdwBK~DLd=TJ**@VSg}t3DX!j%wwOue*tO-%~r<xSm;T9jdF6%BxMhr<+
zAHD1ZZa`uu=_sNLs@|mO->clyy}UEBX<bZ+Z4<%&Y!JX2MXM3?Y+t*@v>wY<b0BXy
zFWOW`hXablxba1^EON}3KcXc=8UWACSrctRsno%~MB@)D*~ozpuc7DHI?W`*W4-c;
zhs>4d_M*j;?<YQ^mYlVkDV2$~0DLguoD&Y57_MajaEP()DW3z!eaKM#34c7UV6AwI
z-VIQ=zG{9{Yz2xveh#>?K<^+wU`wTI)EvLI4sjmblY{8|*FtJ7oXAA|TL1Igfs6Ee
z0p9BG1tcu~U;p$UxTRmF=GSNXkNHafyQKq1{nz?G4i4YG%I4-kRSZt3e9wHw0j$5S
Lnq4U}w14(rq+?{d

diff --git a/tether.png b/tether.png
deleted file mode 100644
index 7ef3ed4f5eb0b63b990d7c48d7f18723752d774e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 40404
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


From a10143f6b864fefb7974954a6aafd33c53f9fc23 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 20 Aug 2019 13:58:20 -0700
Subject: [PATCH 361/399] remove android specific classes

---
 .../src/com/koushikdutta/async/future/Future.java     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Future.java b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
index c6bf24f80..87b63eb26 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Future.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
@@ -1,8 +1,7 @@
 package com.koushikdutta.async.future;
 
 
-import android.os.Handler;
-import android.os.Looper;
+import java.util.concurrent.Executor;
 
 public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
     /**
@@ -87,14 +86,14 @@ public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
      */
     Exception tryGetException();
 
-    Handler mainHandler = new Handler(Looper.getMainLooper());
     /**
-     * Get the result on the main thread.
+     * Get the result on the executor thread.
+     * @param executor
      * @return
      */
-    default Future<T> mainThread() {
+    default Future<T> executorThread(Executor executor) {
         SimpleFuture<T> ret = new SimpleFuture<>();
-        mainHandler.post(() -> ret.setComplete(Future.this));
+        executor.execute(() -> ret.setComplete(Future.this));
         return ret;
     }
 }

From a2d5234690695ded0e674579fc74787ec8eaeeaa Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 19 Sep 2019 14:59:07 -0700
Subject: [PATCH 362/399] failed websocket connections shold be closed

---
 AndroidAsync/src/com/koushikdutta/async/Util.java               | 2 +-
 .../src/com/koushikdutta/async/http/AsyncHttpClient.java        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/Util.java b/AndroidAsync/src/com/koushikdutta/async/Util.java
index b250140c4..90610522b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/Util.java
+++ b/AndroidAsync/src/com/koushikdutta/async/Util.java
@@ -51,7 +51,7 @@ public static void emitAllData(DataEmitter emitter, ByteBufferList list) {
             if (SUPRESS_DEBUG_EXCEPTIONS)
                 return;
             assert false;
-            throw new RuntimeException("Not all data was consumed by Util.emitAllData");
+            throw new AssertionError("Not all data was consumed by Util.emitAllData");
         }
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 3845fd369..3d395f916 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -688,6 +688,7 @@ public Future<WebSocket> websocket(final AsyncHttpRequest req, String[] protocol
             WebSocket ws = WebSocketImpl.finishHandshake(req.getHeaders(), response);
             if (ws == null) {
                 ex = new WebSocketHandshakeException("Unable to complete websocket handshake");
+                response.close();
                 if (!ret.setComplete(ex))
                     return;
             }

From 164356f510c9191b2a38774a8e5344b59234882f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 1 Oct 2019 19:21:05 -0700
Subject: [PATCH 363/399] 3.0.0

---
 AndroidAsync/AndroidManifest.xml | 4 ++--
 AndroidAsync/build.gradle        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 5480224cd..98c19fc9a 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="221"
-    android:versionName="2.2.1">
+    android:versionCode="300"
+    android:versionName="3.0.0">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 513425626..5a5966ae5 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -51,6 +51,6 @@ android {
 }
 
 // upload to maven task
-if (false && System.getenv().I_AM_KOUSH == 'true') {
+if (System.getenv().I_AM_KOUSH == 'true') {
   apply from: 'https://raw.githubusercontent.com/koush/mvn-repo/master/maven.gradle'
 }

From ce23e7ebb6cf7bc27e012074a9534aaaeb6e3aaf Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 2 Oct 2019 09:54:08 -0700
Subject: [PATCH 364/399] kotlin extension method for futures

---
 AndroidAsyncKotlin/.gitignore                 |   1 +
 AndroidAsyncKotlin/build.gradle               |  40 ++++++
 AndroidAsyncKotlin/consumer-rules.pro         |   0
 AndroidAsyncKotlin/proguard-rules.pro         |  21 ++++
 .../async/kotlin/ExampleInstrumentedTest.kt   |  24 ++++
 .../src/main/AndroidManifest.xml              |   2 +
 .../async/kotlin/FutureExtensions.kt          |  17 +++
 .../src/main/res/values/strings.xml           |   3 +
 .../async/kotlin/ExampleUnitTest.kt           |  17 +++
 AndroidAsyncKotlin/upload.gradle              | 118 ++++++++++++++++++
 10 files changed, 243 insertions(+)
 create mode 100644 AndroidAsyncKotlin/.gitignore
 create mode 100644 AndroidAsyncKotlin/build.gradle
 create mode 100644 AndroidAsyncKotlin/consumer-rules.pro
 create mode 100644 AndroidAsyncKotlin/proguard-rules.pro
 create mode 100644 AndroidAsyncKotlin/src/androidTest/java/com/koushikdutta/async/kotlin/ExampleInstrumentedTest.kt
 create mode 100644 AndroidAsyncKotlin/src/main/AndroidManifest.xml
 create mode 100644 AndroidAsyncKotlin/src/main/java/com/koushikdutta/async/kotlin/FutureExtensions.kt
 create mode 100644 AndroidAsyncKotlin/src/main/res/values/strings.xml
 create mode 100644 AndroidAsyncKotlin/src/test/java/com/koushikdutta/async/kotlin/ExampleUnitTest.kt
 create mode 100644 AndroidAsyncKotlin/upload.gradle

diff --git a/AndroidAsyncKotlin/.gitignore b/AndroidAsyncKotlin/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/AndroidAsyncKotlin/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/AndroidAsyncKotlin/build.gradle b/AndroidAsyncKotlin/build.gradle
new file mode 100644
index 000000000..4fcef5bec
--- /dev/null
+++ b/AndroidAsyncKotlin/build.gradle
@@ -0,0 +1,40 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.1"
+
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+
+    api project(':AndroidAsync:AndroidAsync')
+}
+
+// upload to maven task
+if (System.getenv().I_AM_KOUSH == 'true') {
+    apply from: 'upload.gradle'
+}
diff --git a/AndroidAsyncKotlin/consumer-rules.pro b/AndroidAsyncKotlin/consumer-rules.pro
new file mode 100644
index 000000000..e69de29bb
diff --git a/AndroidAsyncKotlin/proguard-rules.pro b/AndroidAsyncKotlin/proguard-rules.pro
new file mode 100644
index 000000000..f1b424510
--- /dev/null
+++ b/AndroidAsyncKotlin/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/AndroidAsyncKotlin/src/androidTest/java/com/koushikdutta/async/kotlin/ExampleInstrumentedTest.kt b/AndroidAsyncKotlin/src/androidTest/java/com/koushikdutta/async/kotlin/ExampleInstrumentedTest.kt
new file mode 100644
index 000000000..5f061d834
--- /dev/null
+++ b/AndroidAsyncKotlin/src/androidTest/java/com/koushikdutta/async/kotlin/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.koushikdutta.async.kotlin
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.koushikdutta.async.kotlin.test", appContext.packageName)
+    }
+}
diff --git a/AndroidAsyncKotlin/src/main/AndroidManifest.xml b/AndroidAsyncKotlin/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..2653eb4f6
--- /dev/null
+++ b/AndroidAsyncKotlin/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.koushikdutta.async.kotlin" />
diff --git a/AndroidAsyncKotlin/src/main/java/com/koushikdutta/async/kotlin/FutureExtensions.kt b/AndroidAsyncKotlin/src/main/java/com/koushikdutta/async/kotlin/FutureExtensions.kt
new file mode 100644
index 000000000..ce77dd137
--- /dev/null
+++ b/AndroidAsyncKotlin/src/main/java/com/koushikdutta/async/kotlin/FutureExtensions.kt
@@ -0,0 +1,17 @@
+package com.koushikdutta.async.kotlin
+
+import com.koushikdutta.async.future.Future
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+import kotlin.coroutines.suspendCoroutine
+
+suspend fun <T> Future<T>.await(): T {
+    return suspendCoroutine {
+        this.setCallback { e, result ->
+            if (e != null)
+                it.resumeWithException(e)
+            else
+                it.resume(result)
+        }
+    }
+}
\ No newline at end of file
diff --git a/AndroidAsyncKotlin/src/main/res/values/strings.xml b/AndroidAsyncKotlin/src/main/res/values/strings.xml
new file mode 100644
index 000000000..ed12b184b
--- /dev/null
+++ b/AndroidAsyncKotlin/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">AndroidAsyncKotlin</string>
+</resources>
diff --git a/AndroidAsyncKotlin/src/test/java/com/koushikdutta/async/kotlin/ExampleUnitTest.kt b/AndroidAsyncKotlin/src/test/java/com/koushikdutta/async/kotlin/ExampleUnitTest.kt
new file mode 100644
index 000000000..acb18c312
--- /dev/null
+++ b/AndroidAsyncKotlin/src/test/java/com/koushikdutta/async/kotlin/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.koushikdutta.async.kotlin
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
diff --git a/AndroidAsyncKotlin/upload.gradle b/AndroidAsyncKotlin/upload.gradle
new file mode 100644
index 000000000..1d649c648
--- /dev/null
+++ b/AndroidAsyncKotlin/upload.gradle
@@ -0,0 +1,118 @@
+// Setup
+
+// 0) Setup your sonatype credentials by editing/creating ~/.gradle/gradle.properties and enter:
+// signing.keyId=<HEXADECIMCAL KEY ID RETRIVABLE VIA gpg --list-keys>
+// signing.password=<KEY PASSWORD>
+// signing.secretKeyRingFile=<PATH TO KEY RING, USUALLY ~/.gnupg/secring.gpg>
+// sonatypeUsername=<SONATYPE USERNAME OR WHATEVER YOU USE>
+// sonatypePassword=<CORRESPONDING PASSWORD>
+
+// 1) Setup your build.gradle for your android project and add this one line of code which imports this gist:
+// apply from: 'https://raw.github.com/koush/mvn-repo/master/maven.gradle'
+
+// 2) gradle clean && gradle build && gradle uploadArchives
+
+// 3) That's it!
+
+
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+
+afterEvaluate { project ->
+    String user = null
+    String repo = null
+    'git remote -v'.execute(null, project.projectDir).getText().find('.*?git@github.com/(.*?)/(.*?) .*?') {
+        match ->
+            user = match[1]
+            repo = match[2]
+    }
+
+    String githubUrl = 'https://api.github.com/repos/' + user + '/' + repo;
+    if (System.getenv().GITHUB_TOKEN)
+        githubUrl += '?access_token=' + System.getenv().GITHUB_TOKEN
+    def repoInfo = new groovy.json.JsonSlurper().parseText(new URL(githubUrl).getText())
+
+    def android_manifest
+    try {
+        android_manifest = new XmlParser(false, false).parseText(new File(project.projectDir, 'AndroidManifest.xml').getText())
+    }
+    catch (e) {
+        android_manifest = new XmlParser(false, false).parseText(new File(project.projectDir, 'src/main/AndroidManifest.xml').getText())
+    }
+    def versionName = android_manifest.'@android:versionName'
+    def package_name = android_manifest.'@package'
+    def artifact_id = project.projectDir.getName().toLowerCase()
+    project.version = versionName
+    project.group = package_name
+
+    uploadArchives {
+        repositories {
+            mavenDeployer {
+
+                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+                pom.groupId = package_name
+                pom.artifactId = artifact_id
+                pom.version = versionName
+
+                repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+                    authentication(userName: sonatypeUsername, password: sonatypePassword)
+                }
+
+                pom.project {
+                    name repo
+                    packaging 'jar'
+                    description repoInfo.description
+                    url repoInfo.html_url
+
+                    scm {
+                        url repoInfo.git_url
+                        connection repoInfo.git_url
+                        developerConnection repoInfo.ssh_url
+                    }
+
+                    licenses {
+                        license {
+                            name 'The Apache Software License, Version 2.0'
+                            url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                            distribution 'repo'
+                        }
+                    }
+
+                    developers {
+                        developer {
+                            id user
+                            name user
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    signing {
+        sign configurations.archives
+    }
+
+    task androidJavadocs(type: Javadoc) {
+        source = android.sourceSets.main.java.srcDirs
+    }
+
+    task androidJavadocsJar(type: Jar) {
+        classifier = 'javadoc'
+        baseName = artifact_id
+        from androidJavadocs.destinationDir
+    }
+
+    task androidSourcesJar(type: Jar) {
+        classifier = 'sources'
+        baseName = artifact_id
+        from android.sourceSets.main.java.srcDirs
+    }
+
+    artifacts {
+        // archives packageReleaseJar
+        archives androidSourcesJar
+        archives androidJavadocsJar
+    }
+}

From ffecef77dff4faea4064a8f46bc38a1b37581150 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 2 Oct 2019 09:55:23 -0700
Subject: [PATCH 365/399] kotlin extension method for futures

---
 AndroidAsyncKotlin/build.gradle                 |  2 --
 AndroidAsyncKotlin/src/main/AndroidManifest.xml | 11 ++++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/AndroidAsyncKotlin/build.gradle b/AndroidAsyncKotlin/build.gradle
index 4fcef5bec..0fc520f7d 100644
--- a/AndroidAsyncKotlin/build.gradle
+++ b/AndroidAsyncKotlin/build.gradle
@@ -9,8 +9,6 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
diff --git a/AndroidAsyncKotlin/src/main/AndroidManifest.xml b/AndroidAsyncKotlin/src/main/AndroidManifest.xml
index 2653eb4f6..bd4409ada 100644
--- a/AndroidAsyncKotlin/src/main/AndroidManifest.xml
+++ b/AndroidAsyncKotlin/src/main/AndroidManifest.xml
@@ -1,2 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.koushikdutta.async.kotlin" />
+    package="com.koushikdutta.async.kotlin"
+    android:versionCode="300"
+    android:versionName="3.0.0">
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <application>
+    </application>
+
+</manifest>

From f3b9b1b775d3144eddc71e426d0c944beabca0e2 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 2 Oct 2019 10:16:09 -0700
Subject: [PATCH 366/399] 3

---
 .../.gitignore                                |   0
 .../build.gradle                              |   2 +-
 .../consumer-rules.pro                        |   0
 .../proguard-rules.pro                        |   0
 .../async/kotlin/ExampleInstrumentedTest.kt   |   0
 .../src/main/AndroidManifest.xml              |   2 +-
 .../async/kotlin/FutureExtensions.kt          |   0
 .../src/main/res/values/strings.xml           |   0
 .../async/kotlin/ExampleUnitTest.kt           |   0
 AndroidAsync/build.gradle                     |   2 +-
 AndroidAsyncKotlin/upload.gradle              | 118 ------------------
 11 files changed, 3 insertions(+), 121 deletions(-)
 rename {AndroidAsyncKotlin => AndroidAsync-Kotlin}/.gitignore (100%)
 rename {AndroidAsyncKotlin => AndroidAsync-Kotlin}/build.gradle (95%)
 rename {AndroidAsyncKotlin => AndroidAsync-Kotlin}/consumer-rules.pro (100%)
 rename {AndroidAsyncKotlin => AndroidAsync-Kotlin}/proguard-rules.pro (100%)
 rename {AndroidAsyncKotlin => AndroidAsync-Kotlin}/src/androidTest/java/com/koushikdutta/async/kotlin/ExampleInstrumentedTest.kt (100%)
 rename {AndroidAsyncKotlin => AndroidAsync-Kotlin}/src/main/AndroidManifest.xml (85%)
 rename {AndroidAsyncKotlin => AndroidAsync-Kotlin}/src/main/java/com/koushikdutta/async/kotlin/FutureExtensions.kt (100%)
 rename {AndroidAsyncKotlin => AndroidAsync-Kotlin}/src/main/res/values/strings.xml (100%)
 rename {AndroidAsyncKotlin => AndroidAsync-Kotlin}/src/test/java/com/koushikdutta/async/kotlin/ExampleUnitTest.kt (100%)
 delete mode 100644 AndroidAsyncKotlin/upload.gradle

diff --git a/AndroidAsyncKotlin/.gitignore b/AndroidAsync-Kotlin/.gitignore
similarity index 100%
rename from AndroidAsyncKotlin/.gitignore
rename to AndroidAsync-Kotlin/.gitignore
diff --git a/AndroidAsyncKotlin/build.gradle b/AndroidAsync-Kotlin/build.gradle
similarity index 95%
rename from AndroidAsyncKotlin/build.gradle
rename to AndroidAsync-Kotlin/build.gradle
index 0fc520f7d..4b1a4ac04 100644
--- a/AndroidAsyncKotlin/build.gradle
+++ b/AndroidAsync-Kotlin/build.gradle
@@ -34,5 +34,5 @@ dependencies {
 
 // upload to maven task
 if (System.getenv().I_AM_KOUSH == 'true') {
-    apply from: 'upload.gradle'
+    apply from: '/Users/koush/cfg/maven.gradle'
 }
diff --git a/AndroidAsyncKotlin/consumer-rules.pro b/AndroidAsync-Kotlin/consumer-rules.pro
similarity index 100%
rename from AndroidAsyncKotlin/consumer-rules.pro
rename to AndroidAsync-Kotlin/consumer-rules.pro
diff --git a/AndroidAsyncKotlin/proguard-rules.pro b/AndroidAsync-Kotlin/proguard-rules.pro
similarity index 100%
rename from AndroidAsyncKotlin/proguard-rules.pro
rename to AndroidAsync-Kotlin/proguard-rules.pro
diff --git a/AndroidAsyncKotlin/src/androidTest/java/com/koushikdutta/async/kotlin/ExampleInstrumentedTest.kt b/AndroidAsync-Kotlin/src/androidTest/java/com/koushikdutta/async/kotlin/ExampleInstrumentedTest.kt
similarity index 100%
rename from AndroidAsyncKotlin/src/androidTest/java/com/koushikdutta/async/kotlin/ExampleInstrumentedTest.kt
rename to AndroidAsync-Kotlin/src/androidTest/java/com/koushikdutta/async/kotlin/ExampleInstrumentedTest.kt
diff --git a/AndroidAsyncKotlin/src/main/AndroidManifest.xml b/AndroidAsync-Kotlin/src/main/AndroidManifest.xml
similarity index 85%
rename from AndroidAsyncKotlin/src/main/AndroidManifest.xml
rename to AndroidAsync-Kotlin/src/main/AndroidManifest.xml
index bd4409ada..98c19fc9a 100644
--- a/AndroidAsyncKotlin/src/main/AndroidManifest.xml
+++ b/AndroidAsync-Kotlin/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.koushikdutta.async.kotlin"
+    package="com.koushikdutta.async"
     android:versionCode="300"
     android:versionName="3.0.0">
 
diff --git a/AndroidAsyncKotlin/src/main/java/com/koushikdutta/async/kotlin/FutureExtensions.kt b/AndroidAsync-Kotlin/src/main/java/com/koushikdutta/async/kotlin/FutureExtensions.kt
similarity index 100%
rename from AndroidAsyncKotlin/src/main/java/com/koushikdutta/async/kotlin/FutureExtensions.kt
rename to AndroidAsync-Kotlin/src/main/java/com/koushikdutta/async/kotlin/FutureExtensions.kt
diff --git a/AndroidAsyncKotlin/src/main/res/values/strings.xml b/AndroidAsync-Kotlin/src/main/res/values/strings.xml
similarity index 100%
rename from AndroidAsyncKotlin/src/main/res/values/strings.xml
rename to AndroidAsync-Kotlin/src/main/res/values/strings.xml
diff --git a/AndroidAsyncKotlin/src/test/java/com/koushikdutta/async/kotlin/ExampleUnitTest.kt b/AndroidAsync-Kotlin/src/test/java/com/koushikdutta/async/kotlin/ExampleUnitTest.kt
similarity index 100%
rename from AndroidAsyncKotlin/src/test/java/com/koushikdutta/async/kotlin/ExampleUnitTest.kt
rename to AndroidAsync-Kotlin/src/test/java/com/koushikdutta/async/kotlin/ExampleUnitTest.kt
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 5a5966ae5..2ceb51187 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -52,5 +52,5 @@ android {
 
 // upload to maven task
 if (System.getenv().I_AM_KOUSH == 'true') {
-  apply from: 'https://raw.githubusercontent.com/koush/mvn-repo/master/maven.gradle'
+    apply from: '/Users/koush/cfg/maven.gradle'
 }
diff --git a/AndroidAsyncKotlin/upload.gradle b/AndroidAsyncKotlin/upload.gradle
deleted file mode 100644
index 1d649c648..000000000
--- a/AndroidAsyncKotlin/upload.gradle
+++ /dev/null
@@ -1,118 +0,0 @@
-// Setup
-
-// 0) Setup your sonatype credentials by editing/creating ~/.gradle/gradle.properties and enter:
-// signing.keyId=<HEXADECIMCAL KEY ID RETRIVABLE VIA gpg --list-keys>
-// signing.password=<KEY PASSWORD>
-// signing.secretKeyRingFile=<PATH TO KEY RING, USUALLY ~/.gnupg/secring.gpg>
-// sonatypeUsername=<SONATYPE USERNAME OR WHATEVER YOU USE>
-// sonatypePassword=<CORRESPONDING PASSWORD>
-
-// 1) Setup your build.gradle for your android project and add this one line of code which imports this gist:
-// apply from: 'https://raw.github.com/koush/mvn-repo/master/maven.gradle'
-
-// 2) gradle clean && gradle build && gradle uploadArchives
-
-// 3) That's it!
-
-
-apply plugin: 'maven'
-apply plugin: 'signing'
-
-
-afterEvaluate { project ->
-    String user = null
-    String repo = null
-    'git remote -v'.execute(null, project.projectDir).getText().find('.*?git@github.com/(.*?)/(.*?) .*?') {
-        match ->
-            user = match[1]
-            repo = match[2]
-    }
-
-    String githubUrl = 'https://api.github.com/repos/' + user + '/' + repo;
-    if (System.getenv().GITHUB_TOKEN)
-        githubUrl += '?access_token=' + System.getenv().GITHUB_TOKEN
-    def repoInfo = new groovy.json.JsonSlurper().parseText(new URL(githubUrl).getText())
-
-    def android_manifest
-    try {
-        android_manifest = new XmlParser(false, false).parseText(new File(project.projectDir, 'AndroidManifest.xml').getText())
-    }
-    catch (e) {
-        android_manifest = new XmlParser(false, false).parseText(new File(project.projectDir, 'src/main/AndroidManifest.xml').getText())
-    }
-    def versionName = android_manifest.'@android:versionName'
-    def package_name = android_manifest.'@package'
-    def artifact_id = project.projectDir.getName().toLowerCase()
-    project.version = versionName
-    project.group = package_name
-
-    uploadArchives {
-        repositories {
-            mavenDeployer {
-
-                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-                pom.groupId = package_name
-                pom.artifactId = artifact_id
-                pom.version = versionName
-
-                repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                    authentication(userName: sonatypeUsername, password: sonatypePassword)
-                }
-
-                pom.project {
-                    name repo
-                    packaging 'jar'
-                    description repoInfo.description
-                    url repoInfo.html_url
-
-                    scm {
-                        url repoInfo.git_url
-                        connection repoInfo.git_url
-                        developerConnection repoInfo.ssh_url
-                    }
-
-                    licenses {
-                        license {
-                            name 'The Apache Software License, Version 2.0'
-                            url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                            distribution 'repo'
-                        }
-                    }
-
-                    developers {
-                        developer {
-                            id user
-                            name user
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    signing {
-        sign configurations.archives
-    }
-
-    task androidJavadocs(type: Javadoc) {
-        source = android.sourceSets.main.java.srcDirs
-    }
-
-    task androidJavadocsJar(type: Jar) {
-        classifier = 'javadoc'
-        baseName = artifact_id
-        from androidJavadocs.destinationDir
-    }
-
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        baseName = artifact_id
-        from android.sourceSets.main.java.srcDirs
-    }
-
-    artifacts {
-        // archives packageReleaseJar
-        archives androidSourcesJar
-        archives androidJavadocsJar
-    }
-}

From ed723ac3135ec303414fa1941874e5ea4676832c Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 2 Oct 2019 10:20:54 -0700
Subject: [PATCH 367/399] Create README.md

---
 AndroidAsync-Kotlin/README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 AndroidAsync-Kotlin/README.md

diff --git a/AndroidAsync-Kotlin/README.md b/AndroidAsync-Kotlin/README.md
new file mode 100644
index 000000000..09cee13d5
--- /dev/null
+++ b/AndroidAsync-Kotlin/README.md
@@ -0,0 +1,11 @@
+# Kotlin Coroutines
+
+Adds coroutines support to AndroidAsync and Ion.
+
+Since AndroidAsync and Ion operations all returned futures, you can simply call await() on them within a Kotlin suspend function.
+
+```kotlin
+val data = Ion.with(context).load("https://google.com/robots.txt").asString().await()
+```
+
+That's it!

From 3edb34d82f3648d8e646fa930df201fca74a363c Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 2 Oct 2019 10:21:27 -0700
Subject: [PATCH 368/399] Update README.md

---
 AndroidAsync-Kotlin/README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync-Kotlin/README.md b/AndroidAsync-Kotlin/README.md
index 09cee13d5..794869589 100644
--- a/AndroidAsync-Kotlin/README.md
+++ b/AndroidAsync-Kotlin/README.md
@@ -5,7 +5,10 @@ Adds coroutines support to AndroidAsync and Ion.
 Since AndroidAsync and Ion operations all returned futures, you can simply call await() on them within a Kotlin suspend function.
 
 ```kotlin
-val data = Ion.with(context).load("https://google.com/robots.txt").asString().await()
+val robotsTxt = Ion.with(context)
+.load("https://google.com/robots.txt")
+.asString()
+.await()
 ```
 
 That's it!

From 7efdbb738e43c6d82d9c5a527a20eb31f76cfdc6 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 2 Oct 2019 10:22:14 -0700
Subject: [PATCH 369/399] Update README.md

---
 AndroidAsync-Kotlin/README.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync-Kotlin/README.md b/AndroidAsync-Kotlin/README.md
index 794869589..275569cb4 100644
--- a/AndroidAsync-Kotlin/README.md
+++ b/AndroidAsync-Kotlin/README.md
@@ -5,10 +5,18 @@ Adds coroutines support to AndroidAsync and Ion.
 Since AndroidAsync and Ion operations all returned futures, you can simply call await() on them within a Kotlin suspend function.
 
 ```kotlin
-val robotsTxt = Ion.with(context)
+suspend fun getTheRobotsTxt() {
+val googleRobots = Ion.with(context)
 .load("https://google.com/robots.txt")
 .asString()
 .await()
+
+val githubRobots = Ion.with(context)
+.load("https://google.com/robots.txt")
+.asString()
+.await()
+
+return googleRobots + githubRobots
 ```
 
 That's it!

From b6cc058d0326bfdd86bdf7b408ed2a0ecfb01f64 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 2 Oct 2019 10:22:24 -0700
Subject: [PATCH 370/399] Update README.md

---
 AndroidAsync-Kotlin/README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/AndroidAsync-Kotlin/README.md b/AndroidAsync-Kotlin/README.md
index 275569cb4..3d1f26d05 100644
--- a/AndroidAsync-Kotlin/README.md
+++ b/AndroidAsync-Kotlin/README.md
@@ -6,15 +6,15 @@ Since AndroidAsync and Ion operations all returned futures, you can simply call
 
 ```kotlin
 suspend fun getTheRobotsTxt() {
-val googleRobots = Ion.with(context)
-.load("https://google.com/robots.txt")
-.asString()
-.await()
+  val googleRobots = Ion.with(context)
+  .load("https://google.com/robots.txt")
+  .asString()
+  .await()
 
-val githubRobots = Ion.with(context)
-.load("https://google.com/robots.txt")
-.asString()
-.await()
+  val githubRobots = Ion.with(context)
+  .load("https://google.com/robots.txt")
+  .asString()
+  .await()
 
 return googleRobots + githubRobots
 ```

From c3561dde1166dc0a41d806f3fe1e6e9d2e3dc71a Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 2 Oct 2019 10:23:32 -0700
Subject: [PATCH 371/399] Update README.md

---
 AndroidAsync-Kotlin/README.md | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync-Kotlin/README.md b/AndroidAsync-Kotlin/README.md
index 3d1f26d05..67657a189 100644
--- a/AndroidAsync-Kotlin/README.md
+++ b/AndroidAsync-Kotlin/README.md
@@ -12,7 +12,7 @@ suspend fun getTheRobotsTxt() {
   .await()
 
   val githubRobots = Ion.with(context)
-  .load("https://google.com/robots.txt")
+  .load("https://github.com/robots.txt")
   .asString()
   .await()
 
@@ -20,3 +20,19 @@ return googleRobots + githubRobots
 ```
 
 That's it!
+
+But remember that the await() suspends, so if you want to fetch both robots.txt at the same time:
+
+```kotlin
+suspend fun getTheRobotsTxt() {
+  val googleRobots = Ion.with(context)
+  .load("https://google.com/robots.txt")
+  .asString()
+
+  val githubRobots = Ion.with(context)
+  .load("https://github.com/robots.txt")
+  .asString()
+
+return googleRobots.await() + githubRobots.await()
+```
+

From f6af94ee8e7f0aff23bbf6c5d0e3f48df4f0cad7 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 2 Oct 2019 10:23:46 -0700
Subject: [PATCH 372/399] Update README.md

---
 AndroidAsync-Kotlin/README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/AndroidAsync-Kotlin/README.md b/AndroidAsync-Kotlin/README.md
index 67657a189..8291ef18a 100644
--- a/AndroidAsync-Kotlin/README.md
+++ b/AndroidAsync-Kotlin/README.md
@@ -16,7 +16,8 @@ suspend fun getTheRobotsTxt() {
   .asString()
   .await()
 
-return googleRobots + githubRobots
+  return googleRobots + githubRobots
+}
 ```
 
 That's it!
@@ -33,6 +34,7 @@ suspend fun getTheRobotsTxt() {
   .load("https://github.com/robots.txt")
   .asString()
 
-return googleRobots.await() + githubRobots.await()
+  return googleRobots.await() + githubRobots.await()
+}
 ```
 

From 5745afe04305f24fb0763a55daa16f0a24beb29a Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 2 Oct 2019 13:28:40 -0700
Subject: [PATCH 373/399] Update README.md

---
 AndroidAsync-Kotlin/README.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync-Kotlin/README.md b/AndroidAsync-Kotlin/README.md
index 8291ef18a..1ab63ff13 100644
--- a/AndroidAsync-Kotlin/README.md
+++ b/AndroidAsync-Kotlin/README.md
@@ -1,4 +1,19 @@
-# Kotlin Coroutines
+# Support for Kotlin Coroutines in AndroidAsync and Ion
+
+```xml
+<dependency>
+    <groupId>com.koushikdutta.async</groupId>
+    <artifactId>androidasync</artifactId>
+    <version>(insert latest version)</version>
+</dependency>
+```
+
+Gradle:
+```groovy
+dependencies {
+    compile 'com.koushikdutta.async:androidasync:2.+'
+}
+```
 
 Adds coroutines support to AndroidAsync and Ion.
 

From 88d56e29ea51eedeb01c623f285ce95b08021ca5 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 2 Oct 2019 13:28:52 -0700
Subject: [PATCH 374/399] Update README.md

---
 AndroidAsync-Kotlin/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AndroidAsync-Kotlin/README.md b/AndroidAsync-Kotlin/README.md
index 1ab63ff13..0daacd3b0 100644
--- a/AndroidAsync-Kotlin/README.md
+++ b/AndroidAsync-Kotlin/README.md
@@ -1,5 +1,6 @@
 # Support for Kotlin Coroutines in AndroidAsync and Ion
 
+Maven:
 ```xml
 <dependency>
     <groupId>com.koushikdutta.async</groupId>

From e1250f69ac061c68fc445c55f755b85626cb1c07 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 2 Oct 2019 13:29:46 -0700
Subject: [PATCH 375/399] Update README.md

---
 AndroidAsync-Kotlin/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndroidAsync-Kotlin/README.md b/AndroidAsync-Kotlin/README.md
index 0daacd3b0..d2599d73c 100644
--- a/AndroidAsync-Kotlin/README.md
+++ b/AndroidAsync-Kotlin/README.md
@@ -1,10 +1,12 @@
 # Support for Kotlin Coroutines in AndroidAsync and Ion
 
+Adds coroutines support to AndroidAsync and Ion.
+
 Maven:
 ```xml
 <dependency>
     <groupId>com.koushikdutta.async</groupId>
-    <artifactId>androidasync</artifactId>
+    <artifactId>androidasync-kotlin</artifactId>
     <version>(insert latest version)</version>
 </dependency>
 ```
@@ -12,12 +14,10 @@ Maven:
 Gradle:
 ```groovy
 dependencies {
-    compile 'com.koushikdutta.async:androidasync:2.+'
+    compile 'com.koushikdutta.async:androidasync-kotlin:<insert latest version>'
 }
 ```
 
-Adds coroutines support to AndroidAsync and Ion.
-
 Since AndroidAsync and Ion operations all returned futures, you can simply call await() on them within a Kotlin suspend function.
 
 ```kotlin

From 6523c5661c96a30aa5b7dc53073c33ff6e4c383e Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 2 Oct 2019 17:47:14 -0700
Subject: [PATCH 376/399] Update README.md

---
 AndroidAsync-Kotlin/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAsync-Kotlin/README.md b/AndroidAsync-Kotlin/README.md
index d2599d73c..46bdd3df2 100644
--- a/AndroidAsync-Kotlin/README.md
+++ b/AndroidAsync-Kotlin/README.md
@@ -1,6 +1,6 @@
 # Support for Kotlin Coroutines in AndroidAsync and Ion
 
-Adds coroutines support to AndroidAsync and Ion.
+Adds coroutines support to AndroidAsync and [Ion](https://github.com/koush/ion).
 
 Maven:
 ```xml

From 35f3e048b14e8bb350acaa7af4169f4c4eac47ed Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 2 Oct 2019 18:09:00 -0700
Subject: [PATCH 377/399] v3.0.8

---
 AndroidAsync-Kotlin/build.gradle               | 18 +++++++++++++++---
 .../async/kotlin/ExampleInstrumentedTest.kt    |  7 +++----
 .../src/main/AndroidManifest.xml               |  8 +++++---
 .../src/main/res/values/strings.xml            |  3 ---
 AndroidAsync/AndroidManifest.xml               |  4 ++--
 5 files changed, 25 insertions(+), 15 deletions(-)
 delete mode 100644 AndroidAsync-Kotlin/src/main/res/values/strings.xml

diff --git a/AndroidAsync-Kotlin/build.gradle b/AndroidAsync-Kotlin/build.gradle
index 4b1a4ac04..9415e66c8 100644
--- a/AndroidAsync-Kotlin/build.gradle
+++ b/AndroidAsync-Kotlin/build.gradle
@@ -1,10 +1,20 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-android'
+
 android {
     compileSdkVersion 29
     buildToolsVersion "29.0.1"
 
+    kotlinOptions {
+        apiVersion = "1.3"
+        languageVersion = "1.3"
+    }
+
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
 
     defaultConfig {
         minSdkVersion 14
@@ -25,11 +35,13 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    api project(':AndroidAsync:AndroidAsync')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
     testImplementation 'junit:junit:4.12'
+    testImplementation 'org.jetbrains.kotlin:kotlin-test-junit:1.0.6'
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-
-    api project(':AndroidAsync:AndroidAsync')
 }
 
 // upload to maven task
diff --git a/AndroidAsync-Kotlin/src/androidTest/java/com/koushikdutta/async/kotlin/ExampleInstrumentedTest.kt b/AndroidAsync-Kotlin/src/androidTest/java/com/koushikdutta/async/kotlin/ExampleInstrumentedTest.kt
index 5f061d834..3178e3ffd 100644
--- a/AndroidAsync-Kotlin/src/androidTest/java/com/koushikdutta/async/kotlin/ExampleInstrumentedTest.kt
+++ b/AndroidAsync-Kotlin/src/androidTest/java/com/koushikdutta/async/kotlin/ExampleInstrumentedTest.kt
@@ -1,13 +1,12 @@
 package com.koushikdutta.async.kotlin
 
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
 
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
diff --git a/AndroidAsync-Kotlin/src/main/AndroidManifest.xml b/AndroidAsync-Kotlin/src/main/AndroidManifest.xml
index 98c19fc9a..8abd989a9 100644
--- a/AndroidAsync-Kotlin/src/main/AndroidManifest.xml
+++ b/AndroidAsync-Kotlin/src/main/AndroidManifest.xml
@@ -1,7 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.koushikdutta.async"
-    android:versionCode="300"
-    android:versionName="3.0.0">
+    xmlns:maven="http://schemas.android.com/apk/res/android"
+    package="com.koushikdutta.async.kotlin"
+    maven:groupId="com.koushikdutta.async"
+    android:versionCode="309"
+    android:versionName="3.0.9">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/AndroidAsync-Kotlin/src/main/res/values/strings.xml b/AndroidAsync-Kotlin/src/main/res/values/strings.xml
deleted file mode 100644
index ed12b184b..000000000
--- a/AndroidAsync-Kotlin/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">AndroidAsyncKotlin</string>
-</resources>
diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 98c19fc9a..2e1207a66 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="300"
-    android:versionName="3.0.0">
+    android:versionCode="308"
+    android:versionName="3.0.8">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

From 8ac294df47c2914da883bd18c957b70fac53cf21 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 24 Oct 2019 17:29:15 -0700
Subject: [PATCH 378/399] remove spdy

---
 .../async/http/AsyncHttpClient.java           |   7 +-
 .../async/http/server/BoundaryEmitter.java    |  32 +-
 .../async/http/spdy/AsyncSpdyConnection.java  | 545 -------------
 .../async/http/spdy/BitArray.java             | 178 ----
 .../async/http/spdy/ByteString.java           | 286 -------
 .../async/http/spdy/ErrorCode.java            |  89 --
 .../async/http/spdy/FrameReader.java          | 141 ----
 .../async/http/spdy/FrameWriter.java          |  97 ---
 .../koushikdutta/async/http/spdy/Header.java  |  57 --
 .../async/http/spdy/HeaderReader.java         |  66 --
 .../async/http/spdy/HeadersMode.java          |  49 --
 .../async/http/spdy/HpackDraft08.java         | 506 ------------
 .../async/http/spdy/Http20Draft13.java        | 765 ------------------
 .../koushikdutta/async/http/spdy/Huffman.java | 225 ------
 .../koushikdutta/async/http/spdy/Ping.java    |  71 --
 .../async/http/spdy/Settings.java             | 223 -----
 .../koushikdutta/async/http/spdy/Spdy3.java   | 612 --------------
 .../async/http/spdy/SpdyMiddleware.java       | 440 ----------
 .../async/http/spdy/SpdyTransport.java        |  56 --
 .../koushikdutta/async/http/spdy/Util.java    |  41 -
 .../koushikdutta/async/http/spdy/Variant.java |  40 -
 21 files changed, 26 insertions(+), 4500 deletions(-)
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/BitArray.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteString.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/ErrorCode.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/FrameReader.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/FrameWriter.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/Header.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/HeaderReader.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/HeadersMode.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/HpackDraft08.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/Http20Draft13.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/Huffman.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/Ping.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/Settings.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/Util.java
 delete mode 100644 AndroidAsync/src/com/koushikdutta/async/http/spdy/Variant.java

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 3d395f916..6f7cdf4a2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -18,7 +18,6 @@
 import com.koushikdutta.async.future.SimpleFuture;
 import com.koushikdutta.async.http.callback.HttpConnectCallback;
 import com.koushikdutta.async.http.callback.RequestCallback;
-import com.koushikdutta.async.http.spdy.SpdyMiddleware;
 import com.koushikdutta.async.parser.AsyncParser;
 import com.koushikdutta.async.parser.ByteBufferListParser;
 import com.koushikdutta.async.parser.JSONArrayParser;
@@ -64,14 +63,14 @@ public void insertMiddleware(AsyncHttpClientMiddleware middleware) {
         mMiddleware.add(0, middleware);
     }
 
-    SpdyMiddleware sslSocketMiddleware;
+    AsyncSSLSocketMiddleware sslSocketMiddleware;
     AsyncSocketMiddleware socketMiddleware;
     HttpTransportMiddleware httpTransportMiddleware;
     AsyncServer mServer;
     public AsyncHttpClient(AsyncServer server) {
         mServer = server;
         insertMiddleware(socketMiddleware = new AsyncSocketMiddleware(this));
-        insertMiddleware(sslSocketMiddleware = new SpdyMiddleware(this));
+        insertMiddleware(sslSocketMiddleware = new AsyncSSLSocketMiddleware(this));
         insertMiddleware(httpTransportMiddleware = new HttpTransportMiddleware());
         sslSocketMiddleware.addEngineConfigurator(new SSLEngineSNIConfigurator());
     }
@@ -116,7 +115,7 @@ public AsyncSocketMiddleware getSocketMiddleware() {
         return socketMiddleware;
     }
 
-    public SpdyMiddleware getSSLSocketMiddleware() {
+    public AsyncSSLSocketMiddleware getSSLSocketMiddleware() {
         return sslSocketMiddleware;
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java
index e642ba448..fadfc0994 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java
@@ -43,15 +43,29 @@ protected void onBoundaryEnd() {
     // the state starts out having already matched \r\n
 
     /*
-        Content-Type: multipart/form-data; boundary=----------------------------bc3c801ac760
-        
-        ------------------------------bc3c801ac760
-        Content-Disposition: form-data; name="my-file"; filename="foo"
-        Content-Type: application/octet-stream
-        
-        foo         <---------------- the newline is NOT PART OF THE PAYLOAD
-        ------------------------------bc3c801ac760--
-     */
+    Mac:work$ curl -F person=anonymous -F secret=@test.kt  http://localhost:5555
+
+    POST / HTTP/1.1
+    Host: localhost:5555
+    User-Agent: curl/7.54.0
+    Content-Length: 372
+    Expect: 100-continue
+    Content-Type: multipart/form-data; boundary=------------------------17903558439eb6ff
+
+--------------------------17903558439eb6ff              <--- note! two dashes before boundary
+    Content-Disposition: form-data; name="person"
+
+    anonymous
+--------------------------17903558439eb6ff              <--- note! two dashes before boundary
+    Content-Disposition: form-data; name="secret"; filename="test.kt"
+    Content-Type: application/octet-stream
+
+    fun main(args: Array<String>) {
+        println("Hello JavaScript!")
+    }
+
+--------------------------17903558439eb6ff--            <--- note! two dashes before AND after boundary
+            */
     
     
     int state = 2;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
deleted file mode 100644
index 1926dc8d6..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/AsyncSpdyConnection.java
+++ /dev/null
@@ -1,545 +0,0 @@
-package com.koushikdutta.async.http.spdy;
-
-import com.koushikdutta.async.AsyncServer;
-import com.koushikdutta.async.AsyncSocket;
-import com.koushikdutta.async.BufferedDataSink;
-import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.Util;
-import com.koushikdutta.async.callback.CompletedCallback;
-import com.koushikdutta.async.callback.DataCallback;
-import com.koushikdutta.async.callback.WritableCallback;
-import com.koushikdutta.async.future.SimpleFuture;
-import com.koushikdutta.async.http.Protocol;
-
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import static com.koushikdutta.async.http.spdy.Settings.DEFAULT_INITIAL_WINDOW_SIZE;
-
-/**
- * Created by koush on 7/16/14.
- */
-public class AsyncSpdyConnection implements FrameReader.Handler {
-    AsyncSocket socket;
-    BufferedDataSink bufferedSocket;
-    FrameReader reader;
-    FrameWriter writer;
-    Variant variant;
-    Hashtable<Integer, SpdySocket> sockets = new Hashtable<Integer, SpdySocket>();
-    Protocol protocol;
-    boolean client = true;
-
-    /**
-     * Returns a new locally-initiated stream.
-     *
-     * @param out true to create an output stream that we can use to send data to the remote peer.
-     *     Corresponds to {@code FLAG_FIN}.
-     * @param in true to create an input stream that the remote peer can use to send data to us.
-     *     Corresponds to {@code FLAG_UNIDIRECTIONAL}.
-     */
-    public SpdySocket newStream(List<Header> requestHeaders, boolean out, boolean in) {
-        return newStream(0, requestHeaders, out, in);
-    }
-
-    private SpdySocket newStream(int associatedStreamId, List<Header> requestHeaders, boolean out,
-                                 boolean in) {
-        boolean outFinished = !out;
-        boolean inFinished = !in;
-        SpdySocket socket;
-        int streamId;
-
-        if (shutdown) {
-            return null;
-        }
-
-        streamId = nextStreamId;
-        nextStreamId += 2;
-        socket = new SpdySocket(streamId, outFinished, inFinished, requestHeaders);
-        if (socket.isOpen()) {
-            sockets.put(streamId, socket);
-//            setIdle(false);
-        }
-        try {
-            if (associatedStreamId == 0) {
-                writer.synStream(outFinished, inFinished, streamId, associatedStreamId,
-                requestHeaders);
-            } else if (client) {
-                throw new IllegalArgumentException("client streams shouldn't have associated stream IDs");
-            } else { // HTTP/2 has a PUSH_PROMISE frame.
-                writer.pushPromise(associatedStreamId, streamId, requestHeaders);
-            }
-
-            return socket;
-        }
-        catch (IOException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    int totalWindowRead;
-    void updateWindowRead(int length) {
-        totalWindowRead += length;
-        if (totalWindowRead >= okHttpSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE) / 2) {
-            try {
-                writer.windowUpdate(0, totalWindowRead);
-            }
-            catch (IOException e) {
-                throw new AssertionError(e);
-            }
-            totalWindowRead = 0;
-        }
-    }
-
-    public class SpdySocket implements AsyncSocket {
-        long bytesLeftInWriteWindow = AsyncSpdyConnection.this.peerSettings.getInitialWindowSize(Settings.DEFAULT_INITIAL_WINDOW_SIZE);
-        WritableCallback writable;
-        final int id;
-        CompletedCallback closedCallback;
-        CompletedCallback endCallback;
-        DataCallback dataCallback;
-        ByteBufferList pending = new ByteBufferList();
-        SimpleFuture<List<Header>> headers = new SimpleFuture<List<Header>>();
-        boolean isOpen = true;
-        int totalWindowRead;
-
-        public AsyncSpdyConnection getConnection() {
-            return AsyncSpdyConnection.this;
-        }
-
-        public SimpleFuture<List<Header>> headers() {
-            return headers;
-        }
-
-        void updateWindowRead(int length) {
-            totalWindowRead += length;
-            if (totalWindowRead >= okHttpSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE) / 2) {
-                try {
-                    writer.windowUpdate(id, totalWindowRead);
-                }
-                catch (IOException e) {
-                    throw new AssertionError(e);
-                }
-                totalWindowRead = 0;
-            }
-            AsyncSpdyConnection.this.updateWindowRead(length);
-        }
-
-        public SpdySocket(int id, boolean outFinished, boolean inFinished, List<Header> headerBlock) {
-            this.id = id;
-        }
-
-        public boolean isLocallyInitiated() {
-            boolean streamIsClient = ((id & 1) == 1);
-            return client == streamIsClient;
-        }
-
-        public void addBytesToWriteWindow(long delta) {
-            long prev = bytesLeftInWriteWindow;
-            bytesLeftInWriteWindow += delta;
-            if (bytesLeftInWriteWindow > 0 && prev <= 0)
-                Util.writable(writable);
-        }
-
-        @Override
-        public AsyncServer getServer() {
-            return socket.getServer();
-        }
-
-        @Override
-        public void setDataCallback(DataCallback callback) {
-            dataCallback = callback;
-        }
-
-        @Override
-        public DataCallback getDataCallback() {
-            return dataCallback;
-        }
-
-        @Override
-        public boolean isChunked() {
-            return false;
-        }
-
-        boolean paused;
-        @Override
-        public void pause() {
-            paused = true;
-        }
-
-        @Override
-        public void resume() {
-            paused = false;
-        }
-
-        @Override
-        public void close() {
-            isOpen = false;
-        }
-
-        @Override
-        public boolean isPaused() {
-            return paused;
-        }
-
-        @Override
-        public void setEndCallback(CompletedCallback callback) {
-            endCallback = callback;
-        }
-
-        @Override
-        public CompletedCallback getEndCallback() {
-            return endCallback;
-        }
-
-        @Override
-        public String charset() {
-            return null;
-        }
-
-        ByteBufferList writing = new ByteBufferList();
-        @Override
-        public void write(ByteBufferList bb) {
-            int canWrite = (int)Math.min(bytesLeftInWriteWindow, AsyncSpdyConnection.this.bytesLeftInWriteWindow);
-            canWrite = Math.min(bb.remaining(), canWrite);
-            if (canWrite == 0) {
-                return;
-            }
-            if (canWrite < bb.remaining()) {
-                if (writing.hasRemaining())
-                    throw new AssertionError("wtf");
-                bb.get(writing, canWrite);
-                bb = writing;
-            }
-
-            try {
-                writer.data(false, id, bb);
-                bytesLeftInWriteWindow -= canWrite;
-            }
-            catch (IOException e) {
-                throw new AssertionError(e);
-            }
-        }
-
-        @Override
-        public void setWriteableCallback(WritableCallback handler) {
-            writable = handler;
-        }
-
-        @Override
-        public WritableCallback getWriteableCallback() {
-            return writable;
-        }
-
-        @Override
-        public boolean isOpen() {
-            return isOpen;
-        }
-
-        @Override
-        public void end() {
-            try {
-                writer.data(true, id, writing);
-            }
-            catch (IOException e) {
-                throw new AssertionError(e);
-            }
-        }
-
-        @Override
-        public void setClosedCallback(CompletedCallback handler) {
-            closedCallback = handler;
-        }
-
-        @Override
-        public CompletedCallback getClosedCallback() {
-            return closedCallback;
-        }
-
-        public void receiveHeaders(List<Header> headers, HeadersMode headerMode) {
-            this.headers.setComplete(headers);
-        }
-    }
-
-    final Settings okHttpSettings = new Settings();
-    private int nextPingId;
-    private static final int OKHTTP_CLIENT_WINDOW_SIZE = 16 * 1024 * 1024;
-
-    public AsyncSpdyConnection(AsyncSocket socket, Protocol protocol) {
-        this.protocol = protocol;
-        this.socket = socket;
-        this.bufferedSocket = new BufferedDataSink(socket);
-
-        if (protocol == Protocol.SPDY_3) {
-            variant = new Spdy3();
-        }
-        else if (protocol == Protocol.HTTP_2) {
-            variant = new Http20Draft13();
-        }
-        reader = variant.newReader(socket, this, true);
-        writer = variant.newWriter(bufferedSocket, true);
-
-        boolean client = true;
-        nextStreamId = client ? 1 : 2;
-        if (client && protocol == Protocol.HTTP_2) {
-            nextStreamId += 2; // In HTTP/2, 1 on client is reserved for Upgrade.
-        }
-        nextPingId = client ? 1 : 2;
-        // Flow control was designed more for servers, or proxies than edge clients.
-        // If we are a client, set the flow control window to 16MiB.  This avoids
-        // thrashing window updates every 64KiB, yet small enough to avoid blowing
-        // up the heap.
-        if (client) {
-            okHttpSettings.set(Settings.INITIAL_WINDOW_SIZE, 0, OKHTTP_CLIENT_WINDOW_SIZE);
-        }
-    }
-
-    /**
-     * Sends a connection header if the current variant requires it. This should
-     * be called after {@link Builder#build} for all new connections.
-     */
-    public void sendConnectionPreface() throws IOException {
-        writer.connectionPreface();
-        writer.settings(okHttpSettings);
-        int windowSize = okHttpSettings.getInitialWindowSize(Settings.DEFAULT_INITIAL_WINDOW_SIZE);
-        if (windowSize != Settings.DEFAULT_INITIAL_WINDOW_SIZE) {
-            writer.windowUpdate(0, windowSize - Settings.DEFAULT_INITIAL_WINDOW_SIZE);
-        }
-    }
-
-    /** Even, positive numbered streams are pushed streams in HTTP/2. */
-    private boolean pushedStream(int streamId) {
-        return protocol == Protocol.HTTP_2 && streamId != 0 && (streamId & 1) == 0;
-    }
-
-    @Override
-    public void data(boolean inFinished, int streamId, ByteBufferList source) {
-        if (pushedStream(streamId)) {
-            throw new AssertionError("push");
-//            pushDataLater(streamId, source, length, inFinished);
-//            return;
-        }
-        SpdySocket socket = sockets.get(streamId);
-        if (socket == null) {
-            try {
-                writer.rstStream(streamId, ErrorCode.INVALID_STREAM);
-            }
-            catch (IOException e) {
-                throw new AssertionError(e);
-            }
-            source.recycle();
-            return;
-        }
-        int length = source.remaining();
-        source.get(socket.pending);
-        socket.updateWindowRead(length);
-        Util.emitAllData(socket, socket.pending);
-        if (inFinished) {
-            sockets.remove(streamId);
-            socket.close();
-            Util.end(socket, null);
-        }
-    }
-
-    private int lastGoodStreamId;
-    private int nextStreamId;
-    @Override
-    public void headers(boolean outFinished, boolean inFinished, int streamId, int associatedStreamId, List<Header> headerBlock, HeadersMode headersMode) {
-        if (pushedStream(streamId)) {
-            throw new AssertionError("push");
-//            pushHeadersLater(streamId, headerBlock, inFinished);
-//            return;
-        }
-
-        // If we're shutdown, don't bother with this stream.
-        if (shutdown) return;
-
-        SpdySocket socket = sockets.get(streamId);
-
-        if (socket == null) {
-            // The headers claim to be for an existing stream, but we don't have one.
-            if (headersMode.failIfStreamAbsent()) {
-                try {
-                    writer.rstStream(streamId, ErrorCode.INVALID_STREAM);
-                    return;
-                }
-                catch (IOException e) {
-                    throw new AssertionError(e);
-                }
-            }
-
-            // If the stream ID is less than the last created ID, assume it's already closed.
-            if (streamId <= lastGoodStreamId) return;
-
-            // If the stream ID is in the client's namespace, assume it's already closed.
-            if (streamId % 2 == nextStreamId % 2) return;
-
-            throw new AssertionError("unexpected receive stream");
-
-            // Create a stream.
-//            socket = new SpdySocket(streamId, outFinished, inFinished, headerBlock);
-//            lastGoodStreamId = streamId;
-//            sockets.put(streamId, socket);
-//            handler.receive(newStream);
-//            return;
-        }
-
-        // The headers claim to be for a new stream, but we already have one.
-        if (headersMode.failIfStreamPresent()) {
-            try {
-                writer.rstStream(streamId, ErrorCode.INVALID_STREAM);
-            }
-            catch (IOException e) {
-                throw new AssertionError(e);
-            }
-            sockets.remove(streamId);
-            return;
-        }
-
-        // Update an existing stream.
-        socket.receiveHeaders(headerBlock, headersMode);
-        if (inFinished) {
-            sockets.remove(streamId);
-            Util.end(socket, null);
-        }
-    }
-
-    @Override
-    public void rstStream(int streamId, ErrorCode errorCode) {
-        if (pushedStream(streamId)) {
-            throw new AssertionError("push");
-//            pushResetLater(streamId, errorCode);
-//            return;
-        }
-        SpdySocket rstStream = sockets.remove(streamId);
-        if (rstStream != null) {
-            Util.end(rstStream, new IOException(errorCode.toString()));
-        }
-    }
-
-    long bytesLeftInWriteWindow;
-    Settings peerSettings = new Settings();
-    private boolean receivedInitialPeerSettings = false;
-    @Override
-    public void settings(boolean clearPrevious, Settings settings) {
-        long delta = 0;
-        int priorWriteWindowSize = peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE);
-        if (clearPrevious)
-            peerSettings.clear();
-        peerSettings.merge(settings);
-        try {
-            writer.ackSettings();
-        } catch (IOException e) {
-            throw new AssertionError(e);
-        }
-        int peerInitialWindowSize = peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE);
-        if (peerInitialWindowSize != -1 && peerInitialWindowSize != priorWriteWindowSize) {
-            delta = peerInitialWindowSize - priorWriteWindowSize;
-            if (!receivedInitialPeerSettings) {
-                addBytesToWriteWindow(delta);
-                receivedInitialPeerSettings = true;
-            }
-        }
-        for (SpdySocket socket: sockets.values()) {
-            socket.addBytesToWriteWindow(delta);
-        }
-    }
-
-    void addBytesToWriteWindow(long delta) {
-        bytesLeftInWriteWindow += delta;
-        for (SpdySocket socket: sockets.values()) {
-            Util.writable(socket);
-        }
-    }
-
-    @Override
-    public void ackSettings() {
-        try {
-            writer.ackSettings();
-        }
-        catch (IOException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    private Map<Integer, Ping> pings;
-    private void writePing(boolean reply, int payload1, int payload2, Ping ping) throws IOException {
-        if (ping != null) ping.send();
-        writer.ping(reply, payload1, payload2);
-    }
-
-    private synchronized Ping removePing(int id) {
-        return pings != null ? pings.remove(id) : null;
-    }
-
-    @Override
-    public void ping(boolean ack, int payload1, int payload2) {
-        if (ack) {
-            Ping ping = removePing(payload1);
-            if (ping != null) {
-                ping.receive();
-            }
-        } else {
-            // Send a reply to a client ping if this is a server and vice versa.
-            try {
-                writePing(true, payload1, payload2, null);
-            }
-            catch (IOException e) {
-                throw new AssertionError(e);
-            }
-        }
-    }
-
-    boolean shutdown;
-    @Override
-    public void goAway(int lastGoodStreamId, ErrorCode errorCode, ByteString debugData) {
-        shutdown = true;
-
-        // Fail all streams created after the last good stream ID.
-        for (Iterator<Map.Entry<Integer, SpdySocket>> i = sockets.entrySet().iterator();
-             i.hasNext(); ) {
-            Map.Entry<Integer, SpdySocket> entry = i.next();
-            int streamId = entry.getKey();
-            if (streamId > lastGoodStreamId && entry.getValue().isLocallyInitiated()) {
-                Util.end(entry.getValue(), new IOException(ErrorCode.REFUSED_STREAM.toString()));
-                i.remove();
-            }
-        }
-    }
-
-    @Override
-    public void windowUpdate(int streamId, long windowSizeIncrement) {
-        if (streamId == 0) {
-            addBytesToWriteWindow(windowSizeIncrement);
-            return;
-        }
-        SpdySocket socket = sockets.get(streamId);
-        if (socket != null)
-            socket.addBytesToWriteWindow(windowSizeIncrement);
-    }
-
-    @Override
-    public void priority(int streamId, int streamDependency, int weight, boolean exclusive) {
-    }
-
-    @Override
-    public void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders) {
-        throw new AssertionError("pushPromise");
-    }
-
-    @Override
-    public void alternateService(int streamId, String origin, ByteString protocol, String host, int port, long maxAge) {
-    }
-
-    @Override
-    public void error(Exception e) {
-        socket.close();
-        for (Iterator<Map.Entry<Integer, SpdySocket>> i = sockets.entrySet().iterator(); i.hasNext();) {
-            Map.Entry<Integer, SpdySocket> entry = i.next();
-            Util.end(entry.getValue(), e);
-            i.remove();
-        }
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/BitArray.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/BitArray.java
deleted file mode 100644
index 5894ae371..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/BitArray.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright 2014 Square Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-
-import static java.lang.String.format;
-
-/** A simple bitset which supports left shifting. */
-interface BitArray {
-
-  void clear();
-
-  void set(int index);
-
-  void toggle(int index);
-
-  boolean get(int index);
-
-  void shiftLeft(int count);
-
-  /** Bit set that only supports settings bits 0 - 63. */
-  public final class FixedCapacity implements BitArray {
-    long data = 0x0000000000000000L;
-
-    @Override public void clear() {
-      data = 0x0000000000000000L;
-    }
-
-    @Override public void set(int index) {
-      data |= (1L << checkInput(index));
-    }
-
-    @Override public void toggle(int index) {
-      data ^= (1L << checkInput(index));
-    }
-
-    @Override public boolean get(int index) {
-      return ((data >> checkInput(index)) & 1L) == 1;
-    }
-
-    @Override public void shiftLeft(int count) {
-      data = data << checkInput(count);
-    }
-
-    @Override public String toString() {
-      return Long.toBinaryString(data);
-    }
-
-    public BitArray toVariableCapacity() {
-      return new VariableCapacity(this);
-    }
-
-    private static int checkInput(int index) {
-      if (index < 0 || index > 63) {
-        throw new IllegalArgumentException(format(Locale.ENGLISH, "input must be between 0 and 63: %s", index));
-      }
-      return index;
-    }
-  }
-
-  /** Bit set that grows as needed. */
-  public final class VariableCapacity implements BitArray {
-
-    long[] data;
-
-    // Start offset which allows for cheap shifting. Data is always kept on 64-bit bounds but we
-    // offset the outward facing index to support shifts without having to move the underlying bits.
-    private int start; // Valid values are [0..63]
-
-    public VariableCapacity() {
-      data = new long[1];
-    }
-
-    private VariableCapacity(FixedCapacity small) {
-      data = new long[] {small.data, 0};
-    }
-
-    private void growToSize(int size) {
-      long[] newData = new long[size];
-      if (data != null) {
-        System.arraycopy(data, 0, newData, 0, data.length);
-      }
-      data = newData;
-    }
-
-    private int offsetOf(int index) {
-      index += start;
-      int offset = index / 64;
-      if (offset > data.length - 1) {
-        growToSize(offset + 1);
-      }
-      return offset;
-    }
-
-    private int shiftOf(int index) {
-      return (index + start) % 64;
-    }
-
-    @Override public void clear() {
-      Arrays.fill(data, 0);
-    }
-
-    @Override public void set(int index) {
-      checkInput(index);
-      int offset = offsetOf(index);
-      data[offset] |= 1L << shiftOf(index);
-    }
-
-    @Override public void toggle(int index) {
-      checkInput(index);
-      int offset = offsetOf(index);
-      data[offset] ^= 1L << shiftOf(index);
-    }
-
-    @Override public boolean get(int index) {
-      checkInput(index);
-      int offset = offsetOf(index);
-      return (data[offset] & (1L << shiftOf(index))) != 0;
-    }
-
-    @Override public void shiftLeft(int count) {
-      start -= checkInput(count);
-      if (start < 0) {
-        int arrayShift = (start / -64) + 1;
-        long[] newData = new long[data.length + arrayShift];
-        System.arraycopy(data, 0, newData, arrayShift, data.length);
-        data = newData;
-        start = 64 + (start % 64);
-      }
-    }
-
-    @Override public String toString() {
-      StringBuilder builder = new StringBuilder("{");
-      List<Integer> ints = toIntegerList();
-      for (int i = 0, count = ints.size(); i < count; i++) {
-        if (i > 0) {
-          builder.append(',');
-        }
-        builder.append(ints.get(i));
-      }
-      return builder.append('}').toString();
-    }
-
-    List<Integer> toIntegerList() {
-      List<Integer> ints = new ArrayList<Integer>();
-      for (int i = 0, count = data.length * 64 - start; i < count; i++) {
-        if (get(i)) {
-          ints.add(i);
-        }
-      }
-      return ints;
-    }
-
-    private static int checkInput(int index) {
-      if (index < 0) {
-        throw new IllegalArgumentException(format(Locale.ENGLISH, "input must be a positive number: %s", index));
-      }
-      return index;
-    }
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteString.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteString.java
deleted file mode 100644
index ce7c6c832..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/ByteString.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright 2014 Square Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy;
-
-import android.util.Base64;
-
-import com.koushikdutta.async.util.Charsets;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-import java.util.Locale;
-
-/**
- * An immutable sequence of bytes.
- *
- * <p><strong>Full disclosure:</strong> this class provides untrusted input and
- * output streams with raw access to the underlying byte array. A hostile
- * stream implementation could keep a reference to the mutable byte string,
- * violating the immutable guarantee of this class. For this reason a byte
- * string's immutability guarantee cannot be relied upon for security in applets
- * and other environments that run both trusted and untrusted code in the same
- * process.
- */
-final class ByteString implements Serializable {
-  private static final char[] HEX_DIGITS =
-      { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-  private static final long serialVersionUID = 1L;
-
-  /** A singleton empty {@code ByteString}. */
-  public static final ByteString EMPTY = ByteString.of();
-
-  final byte[] data;
-  private transient int hashCode; // Lazily computed; 0 if unknown.
-  private transient String utf8; // Lazily computed.
-
-  ByteString(byte[] data) {
-    this.data = data; // Trusted internal constructor doesn't clone data.
-  }
-
-  /**
-   * Returns a new byte string containing a clone of the bytes of {@code data}.
-   */
-  public static ByteString of(byte... data) {
-    if (data == null) throw new IllegalArgumentException("data == null");
-    return new ByteString(data.clone());
-  }
-
-  /**
-   * Returns a new byte string containing a copy of {@code byteCount} bytes of {@code data} starting
-   * at {@code offset}.
-   */
-  public static ByteString of(byte[] data, int offset, int byteCount) {
-    if (data == null) throw new IllegalArgumentException("data == null");
-    Util.checkOffsetAndCount(data.length, offset, byteCount);
-
-    byte[] copy = new byte[byteCount];
-    System.arraycopy(data, offset, copy, 0, byteCount);
-    return new ByteString(copy);
-  }
-
-  /** Returns a new byte string containing the {@code UTF-8} bytes of {@code s}. */
-  public static ByteString encodeUtf8(String s) {
-    if (s == null) throw new IllegalArgumentException("s == null");
-    ByteString byteString = new ByteString(s.getBytes(Charsets.UTF_8));
-    byteString.utf8 = s;
-    return byteString;
-  }
-
-  /** Constructs a new {@code String} by decoding the bytes as {@code UTF-8}. */
-  public String utf8() {
-    String result = utf8;
-    // We don't care if we double-allocate in racy code.
-    return result != null ? result : (utf8 = new String(data, Charsets.UTF_8));
-  }
-
-  /**
-   * Returns this byte string encoded as <a
-   * href="http://www.ietf.org/rfc/rfc2045.txt">Base64</a>. In violation of the
-   * RFC, the returned string does not wrap lines at 76 columns.
-   */
-  public String base64() {
-    return Base64.encodeToString(data, Base64.DEFAULT);
-  }
-
-  /**
-   * Decodes the Base64-encoded bytes and returns their value as a byte string.
-   * Returns null if {@code base64} is not a Base64-encoded sequence of bytes.
-   */
-  public static ByteString decodeBase64(String base64) {
-    if (base64 == null) throw new IllegalArgumentException("base64 == null");
-    byte[] decoded = Base64.decode(base64, Base64.DEFAULT);
-    return decoded != null ? new ByteString(decoded) : null;
-  }
-
-  /** Returns this byte string encoded in hexadecimal. */
-  public String hex() {
-    char[] result = new char[data.length * 2];
-    int c = 0;
-    for (byte b : data) {
-      result[c++] = HEX_DIGITS[(b >> 4) & 0xf];
-      result[c++] = HEX_DIGITS[b & 0xf];
-    }
-    return new String(result);
-  }
-
-  /** Decodes the hex-encoded bytes and returns their value a byte string. */
-  public static ByteString decodeHex(String hex) {
-    if (hex == null) throw new IllegalArgumentException("hex == null");
-    if (hex.length() % 2 != 0) throw new IllegalArgumentException("Unexpected hex string: " + hex);
-
-    byte[] result = new byte[hex.length() / 2];
-    for (int i = 0; i < result.length; i++) {
-      int d1 = decodeHexDigit(hex.charAt(i * 2)) << 4;
-      int d2 = decodeHexDigit(hex.charAt(i * 2 + 1));
-      result[i] = (byte) (d1 + d2);
-    }
-    return of(result);
-  }
-
-  private static int decodeHexDigit(char c) {
-    if (c >= '0' && c <= '9') return c - '0';
-    if (c >= 'a' && c <= 'f') return c - 'a' + 10;
-    if (c >= 'A' && c <= 'F') return c - 'A' + 10;
-    throw new IllegalArgumentException("Unexpected hex digit: " + c);
-  }
-
-  /**
-   * Reads {@code count} bytes from {@code in} and returns the result.
-   *
-   * @throws java.io.EOFException if {@code in} has fewer than {@code count}
-   *     bytes to read.
-   */
-  public static ByteString read(InputStream in, int byteCount) throws IOException {
-    if (in == null) throw new IllegalArgumentException("in == null");
-    if (byteCount < 0) throw new IllegalArgumentException("byteCount < 0: " + byteCount);
-
-    byte[] result = new byte[byteCount];
-    for (int offset = 0, read; offset < byteCount; offset += read) {
-      read = in.read(result, offset, byteCount - offset);
-      if (read == -1) throw new EOFException();
-    }
-    return new ByteString(result);
-  }
-
-  /**
-   * Returns a byte string equal to this byte string, but with the bytes 'A'
-   * through 'Z' replaced with the corresponding byte in 'a' through 'z'.
-   * Returns this byte string if it contains no bytes in 'A' through 'Z'.
-   */
-  public ByteString toAsciiLowercase() {
-    // Search for an uppercase character. If we don't find one, return this.
-    for (int i = 0; i < data.length; i++) {
-      byte c = data[i];
-      if (c < 'A' || c > 'Z') continue;
-
-      // If we reach this point, this string is not not lowercase. Create and
-      // return a new byte string.
-      byte[] lowercase = data.clone();
-      lowercase[i++] = (byte) (c - ('A' - 'a'));
-      for (; i < lowercase.length; i++) {
-        c = lowercase[i];
-        if (c < 'A' || c > 'Z') continue;
-        lowercase[i] = (byte) (c - ('A' - 'a'));
-      }
-      return new ByteString(lowercase);
-    }
-    return this;
-  }
-
-  /**
-   * Returns a byte string equal to this byte string, but with the bytes 'a'
-   * through 'z' replaced with the corresponding byte in 'A' through 'Z'.
-   * Returns this byte string if it contains no bytes in 'a' through 'z'.
-   */
-  public ByteString toAsciiUppercase() {
-    // Search for an lowercase character. If we don't find one, return this.
-    for (int i = 0; i < data.length; i++) {
-      byte c = data[i];
-      if (c < 'a' || c > 'z') continue;
-
-      // If we reach this point, this string is not not uppercase. Create and
-      // return a new byte string.
-      byte[] lowercase = data.clone();
-      lowercase[i++] = (byte) (c - ('a' - 'A'));
-      for (; i < lowercase.length; i++) {
-        c = lowercase[i];
-        if (c < 'a' || c > 'z') continue;
-        lowercase[i] = (byte) (c - ('a' - 'A'));
-      }
-      return new ByteString(lowercase);
-    }
-    return this;
-  }
-
-  /** Returns the byte at {@code pos}. */
-  public byte getByte(int pos) {
-    return data[pos];
-  }
-
-  /**
-   * Returns the number of bytes in this ByteString.
-   */
-  public int size() {
-    return data.length;
-  }
-
-  /**
-   * Returns a byte array containing a copy of the bytes in this {@code ByteString}.
-   */
-  public byte[] toByteArray() {
-    return data.clone();
-  }
-
-  /** Writes the contents of this byte string to {@code out}. */
-  public void write(OutputStream out) throws IOException {
-    if (out == null) throw new IllegalArgumentException("out == null");
-    out.write(data);
-  }
-
-  @Override public boolean equals(Object o) {
-    return o == this || o instanceof ByteString && Arrays.equals(((ByteString) o).data, data);
-  }
-
-  @Override public int hashCode() {
-    int result = hashCode;
-    return result != 0 ? result : (hashCode = Arrays.hashCode(data));
-  }
-
-  @Override public String toString() {
-    if (data.length == 0) {
-      return "ByteString[size=0]";
-    }
-
-    if (data.length <= 16) {
-      return String.format(Locale.ENGLISH, "ByteString[size=%s data=%s]", data.length, hex());
-    }
-
-    try {
-      return String.format(Locale.ENGLISH, "ByteString[size=%s md5=%s]", data.length,
-          ByteString.of(MessageDigest.getInstance("MD5").digest(data)).hex());
-    } catch (NoSuchAlgorithmException e) {
-      throw new AssertionError();
-    }
-  }
-
-  private void readObject(ObjectInputStream in) throws IOException {
-    int dataLength = in.readInt();
-    ByteString byteString = ByteString.read(in, dataLength);
-    try {
-      Field field = ByteString.class.getDeclaredField("data");
-      field.setAccessible(true);
-      field.set(this, byteString.data);
-    } catch (NoSuchFieldException e) {
-      throw new AssertionError();
-    } catch (IllegalAccessException e) {
-      throw new AssertionError();
-    }
-  }
-
-  private void writeObject(ObjectOutputStream out) throws IOException {
-    out.writeInt(data.length);
-    out.write(data);
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/ErrorCode.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/ErrorCode.java
deleted file mode 100644
index 11ed9f255..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/ErrorCode.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2013 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy;
-
-// http://tools.ietf.org/html/draft-ietf-httpbis-http2-13#section-7
-enum ErrorCode {
-  /** Not an error! For SPDY stream resets, prefer null over NO_ERROR. */
-  NO_ERROR(0, -1, 0),
-
-  PROTOCOL_ERROR(1, 1, 1),
-
-  /** A subtype of PROTOCOL_ERROR used by SPDY. */
-  INVALID_STREAM(1, 2, -1),
-
-  /** A subtype of PROTOCOL_ERROR used by SPDY. */
-  UNSUPPORTED_VERSION(1, 4, -1),
-
-  /** A subtype of PROTOCOL_ERROR used by SPDY. */
-  STREAM_IN_USE(1, 8, -1),
-
-  /** A subtype of PROTOCOL_ERROR used by SPDY. */
-  STREAM_ALREADY_CLOSED(1, 9, -1),
-
-  INTERNAL_ERROR(2, 6, 2),
-
-  FLOW_CONTROL_ERROR(3, 7, -1),
-
-  STREAM_CLOSED(5, -1, -1),
-
-  FRAME_TOO_LARGE(6, 11, -1),
-
-  REFUSED_STREAM(7, 3, -1),
-
-  CANCEL(8, 5, -1),
-
-  COMPRESSION_ERROR(9, -1, -1),
-
-  CONNECT_ERROR(10, -1, -1),
-
-  ENHANCE_YOUR_CALM(11, -1, -1),
-
-  INADEQUATE_SECURITY(12, -1, -1),
-
-  INVALID_CREDENTIALS(-1, 10, -1);
-
-  public final int httpCode;
-  public final int spdyRstCode;
-  public final int spdyGoAwayCode;
-
-  private ErrorCode(int httpCode, int spdyRstCode, int spdyGoAwayCode) {
-    this.httpCode = httpCode;
-    this.spdyRstCode = spdyRstCode;
-    this.spdyGoAwayCode = spdyGoAwayCode;
-  }
-
-  public static ErrorCode fromSpdy3Rst(int code) {
-    for (ErrorCode errorCode : ErrorCode.values()) {
-      if (errorCode.spdyRstCode == code) return errorCode;
-    }
-    return null;
-  }
-
-  public static ErrorCode fromHttp2(int code) {
-    for (ErrorCode errorCode : ErrorCode.values()) {
-      if (errorCode.httpCode == code) return errorCode;
-    }
-    return null;
-  }
-
-  public static ErrorCode fromSpdyGoAway(int code) {
-    for (ErrorCode errorCode : ErrorCode.values()) {
-      if (errorCode.spdyGoAwayCode == code) return errorCode;
-    }
-    return null;
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/FrameReader.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/FrameReader.java
deleted file mode 100644
index 1cbf2bfdc..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/FrameReader.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.koushikdutta.async.http.spdy;
-
-import com.koushikdutta.async.ByteBufferList;
-
-import java.util.List;
-
-/**
- * Reads transport frames for SPDY/3 or HTTP/2.
- */
-interface FrameReader {
-//    void readConnectionPreface() throws IOException;
-//  boolean nextFrame(Handler handler) throws IOException;
-
-    public interface Handler {
-        void error(Exception e);
-
-        void data(boolean inFinished, int streamId, ByteBufferList bb);
-
-        /**
-         * Create or update incoming headers, creating the corresponding streams
-         * if necessary. Frames that trigger this are SPDY SYN_STREAM, HEADERS, and
-         * SYN_REPLY, and HTTP/2 HEADERS and PUSH_PROMISE.
-         *
-         * @param outFinished        true if the receiver should not send further frames.
-         * @param inFinished         true if the sender will not send further frames.
-         * @param streamId           the stream owning these headers.
-         * @param associatedStreamId the stream that triggered the sender to create
-         *                           this stream.
-         */
-        void headers(boolean outFinished, boolean inFinished, int streamId, int associatedStreamId,
-                     List<Header> headerBlock, HeadersMode headersMode);
-
-        void rstStream(int streamId, ErrorCode errorCode);
-
-        void settings(boolean clearPrevious, Settings settings);
-
-        /**
-         * HTTP/2 only.
-         */
-        void ackSettings();
-
-        /**
-         * Read a connection-level ping from the peer.  {@code ack} indicates this
-         * is a reply.  Payload parameters are different between SPDY/3 and HTTP/2.
-         * <p/>
-         * In SPDY/3, only the first {@code payload1} parameter is set.  If the
-         * reader is a client, it is an unsigned even number.  Likewise, a server
-         * will receive an odd number.
-         * <p/>
-         * In HTTP/2, both {@code payload1} and {@code payload2} parameters are
-         * set. The data is opaque binary, and there are no rules on the content.
-         */
-        void ping(boolean ack, int payload1, int payload2);
-
-        /**
-         * The peer tells us to stop creating streams.  It is safe to replay
-         * streams with {@code ID > lastGoodStreamId} on a new connection.  In-
-         * flight streams with {@code ID <= lastGoodStreamId} can only be replayed
-         * on a new connection if they are idempotent.
-         *
-         * @param lastGoodStreamId the last stream ID the peer processed before
-         *                         sending this message. If {@code lastGoodStreamId} is zero, the peer
-         *                         processed no frames.
-         * @param errorCode        reason for closing the connection.
-         * @param debugData        only valid for HTTP/2; opaque debug data to send.
-         */
-        void goAway(int lastGoodStreamId, ErrorCode errorCode, ByteString debugData);
-
-        /**
-         * Notifies that an additional {@code windowSizeIncrement} bytes can be
-         * sent on {@code streamId}, or the connection if {@code streamId} is zero.
-         */
-        void windowUpdate(int streamId, long windowSizeIncrement);
-
-        /**
-         * Called when reading a headers or priority frame. This may be used to
-         * change the stream's weight from the default (16) to a new value.
-         *
-         * @param streamId         stream which has a priority change.
-         * @param streamDependency the stream ID this stream is dependent on.
-         * @param weight           relative proportion of priority in [1..256].
-         * @param exclusive        inserts this stream ID as the sole child of
-         *                         {@code streamDependency}.
-         */
-        void priority(int streamId, int streamDependency, int weight, boolean exclusive);
-
-        /**
-         * HTTP/2 only. Receive a push promise header block.
-         * <p/>
-         * A push promise contains all the headers that pertain to a server-initiated
-         * request, and a {@code promisedStreamId} to which response frames will be
-         * delivered. Push promise frames are sent as a part of the response to
-         * {@code streamId}.
-         *
-         * @param streamId         client-initiated stream ID.  Must be an odd number.
-         * @param promisedStreamId server-initiated stream ID.  Must be an even
-         *                         number.
-         * @param requestHeaders   minimally includes {@code :method}, {@code :scheme},
-         *                         {@code :authority}, and (@code :path}.
-         */
-        void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders);
-
-        /**
-         * HTTP/2 only. Expresses that resources for the connection or a client-
-         * initiated stream are available from a different network location or
-         * protocol configuration.
-         * <p/>
-         * <p>See <a href="https://tools.ietf.org/html/draft-ietf-httpbis-alt-svc-01">alt-svc</a>
-         *
-         * @param streamId when a client-initiated stream ID (odd number), the
-         *                 origin of this alternate service is the origin of the stream. When
-         *                 zero, the origin is specified in the {@code origin} parameter.
-         * @param origin   when present, the
-         *                 <a href="http://tools.ietf.org/html/rfc6454">origin</a> is typically
-         *                 represented as a combination of scheme, host and port. When empty,
-         *                 the origin is that of the {@code streamId}.
-         * @param protocol an ALPN protocol, such as {@code h2}.
-         * @param host     an IP address or hostname.
-         * @param port     the IP port associated with the service.
-         * @param maxAge   time in seconds that this alternative is considered fresh.
-         */
-        void alternateService(int streamId, String origin, ByteString protocol, String host, int port,
-                              long maxAge);
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/FrameWriter.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/FrameWriter.java
deleted file mode 100644
index b82a794de..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/FrameWriter.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.koushikdutta.async.http.spdy;
-
-import com.koushikdutta.async.ByteBufferList;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.List;
-
-/** Writes transport frames for SPDY/3 or HTTP/2. */
-interface FrameWriter extends Closeable {
-  /** HTTP/2 only. */
-  void connectionPreface() throws IOException;
-  void ackSettings() throws IOException;
-
-  /**
-   * HTTP/2 only. Send a push promise header block.
-   * <p>
-   * A push promise contains all the headers that pertain to a server-initiated
-   * request, and a {@code promisedStreamId} to which response frames will be
-   * delivered. Push promise frames are sent as a part of the response to
-   * {@code streamId}.  The {@code promisedStreamId} has a priority of one
-   * greater than {@code streamId}.
-   *
-   * @param streamId client-initiated stream ID.  Must be an odd number.
-   * @param promisedStreamId server-initiated stream ID.  Must be an even
-   * number.
-   * @param requestHeaders minimally includes {@code :method}, {@code :scheme},
-   * {@code :authority}, and (@code :path}.
-   */
-  void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders)
-      throws IOException;
-
-  /** SPDY/3 only. */
-  void synStream(boolean outFinished, boolean inFinished, int streamId, int associatedStreamId,
-                 List<Header> headerBlock) throws IOException;
-  void synReply(boolean outFinished, int streamId, List<Header> headerBlock)
-      throws IOException;
-  void headers(int streamId, List<Header> headerBlock) throws IOException;
-  void rstStream(int streamId, ErrorCode errorCode) throws IOException;
-
-  /**
-   * {@code data.length} may be longer than the max length of the variant's data frame.
-   * Implementations must send multiple frames as necessary.
-   *
-   * @param source the buffer to draw bytes from. May be null if byteCount is 0.
-   */
-  void data(boolean outFinished, int streamId, ByteBufferList source) throws IOException;
-
-  /** Write okhttp's settings to the peer. */
-  void settings(Settings okHttpSettings) throws IOException;
-
-  /**
-   *  Send a connection-level ping to the peer.  {@code ack} indicates this is
-   *  a reply.  Payload parameters are different between SPDY/3 and HTTP/2.
-   *  <p>
-   *  In SPDY/3, only the first {@code payload1} parameter is sent.  If the
-   *  sender is a client, it is an unsigned odd number.  Likewise, a server
-   *  will send an even number.
-   *  <p>
-   *  In HTTP/2, both {@code payload1} and {@code payload2} parameters are
-   *  sent.  The data is opaque binary, and there are no rules on the content.
-   */
-  void ping(boolean ack, int payload1, int payload2) throws IOException;
-
-  /**
-   * Tell the peer to stop creating streams and that we last processed
-   * {@code lastGoodStreamId}, or zero if no streams were processed.
-   *
-   * @param lastGoodStreamId the last stream ID processed, or zero if no
-   * streams were processed.
-   * @param errorCode reason for closing the connection.
-   * @param debugData only valid for HTTP/2; opaque debug data to send.
-   */
-  void goAway(int lastGoodStreamId, ErrorCode errorCode, byte[] debugData) throws IOException;
-
-  /**
-   * Inform peer that an additional {@code windowSizeIncrement} bytes can be
-   * sent on {@code streamId}, or the connection if {@code streamId} is zero.
-   */
-  void windowUpdate(int streamId, long windowSizeIncrement) throws IOException;
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Header.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Header.java
deleted file mode 100644
index a5f4dd269..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Header.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.koushikdutta.async.http.spdy;
-
-
-import java.util.Locale;
-
-/** HTTP header: the name is an ASCII string, but the value can be UTF-8. */
-final class Header {
-  // Special header names defined in the SPDY and HTTP/2 specs.
-  public static final ByteString RESPONSE_STATUS = ByteString.encodeUtf8(":status");
-  public static final ByteString TARGET_METHOD = ByteString.encodeUtf8(":method");
-  public static final ByteString TARGET_PATH = ByteString.encodeUtf8(":path");
-  public static final ByteString TARGET_SCHEME = ByteString.encodeUtf8(":scheme");
-  public static final ByteString TARGET_AUTHORITY = ByteString.encodeUtf8(":authority"); // HTTP/2
-  public static final ByteString TARGET_HOST = ByteString.encodeUtf8(":host"); // spdy/3
-  public static final ByteString VERSION = ByteString.encodeUtf8(":version"); // spdy/3
-
-  /** Name in case-insensitive ASCII encoding. */
-  public final ByteString name;
-  /** Value in UTF-8 encoding. */
-  public final ByteString value;
-  final int hpackSize;
-
-  // TODO: search for toLowerCase and consider moving logic here.
-  public Header(String name, String value) {
-    this(ByteString.encodeUtf8(name), ByteString.encodeUtf8(value));
-  }
-
-  public Header(ByteString name, String value) {
-    this(name, ByteString.encodeUtf8(value));
-  }
-
-  public Header(ByteString name, ByteString value) {
-    this.name = name;
-    this.value = value;
-    this.hpackSize = 32 + name.size() + value.size();
-  }
-
-  @Override public boolean equals(Object other) {
-    if (other instanceof Header) {
-      Header that = (Header) other;
-      return this.name.equals(that.name)
-          && this.value.equals(that.value);
-    }
-    return false;
-  }
-
-  @Override public int hashCode() {
-    int result = 17;
-    result = 31 * result + name.hashCode();
-    result = 31 * result + value.hashCode();
-    return result;
-  }
-
-  @Override public String toString() {
-    return String.format(Locale.ENGLISH, "%s: %s", name.utf8(), value.utf8());
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/HeaderReader.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/HeaderReader.java
deleted file mode 100644
index f8dbbf435..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/HeaderReader.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.koushikdutta.async.http.spdy;
-
-import com.koushikdutta.async.ByteBufferList;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.zip.DataFormatException;
-import java.util.zip.Inflater;
-
-/**
- * Created by koush on 7/27/14.
- */
-class HeaderReader {
-    Inflater inflater;
-    public HeaderReader() {
-        inflater = new Inflater() {
-            @Override public int inflate(byte[] buffer, int offset, int count)
-            throws DataFormatException {
-                int result = super.inflate(buffer, offset, count);
-                if (result == 0 && needsDictionary()) {
-                    setDictionary(Spdy3.DICTIONARY);
-                    result = super.inflate(buffer, offset, count);
-                }
-                return result;
-            }
-        };
-    }
-
-    public List<Header> readHeader(ByteBufferList bb, int length) throws IOException {
-        byte[] bytes = new byte[length];
-        bb.get(bytes);
-
-        inflater.setInput(bytes);
-
-        ByteBufferList source = new ByteBufferList().order(ByteOrder.BIG_ENDIAN);
-        while (!inflater.needsInput()) {
-            ByteBuffer b = ByteBufferList.obtain(8192);
-            try {
-                int read = inflater.inflate(b.array());
-                b.limit(read);
-                source.add(b);
-            }
-            catch (DataFormatException e) {
-                throw new IOException(e);
-            }
-        }
-
-        int numberOfPairs = source.getInt();
-        List<Header> entries = new ArrayList<Header>(numberOfPairs);
-        for (int i = 0; i < numberOfPairs; i++) {
-            ByteString name = readByteString(source).toAsciiLowercase();
-            ByteString values = readByteString(source);
-            if (name.size() == 0) throw new IOException("name.size == 0");
-            entries.add(new Header(name, values));
-        }
-        return entries;
-    }
-
-    private static ByteString readByteString(ByteBufferList source) {
-        int length = source.getInt();
-        return ByteString.of(source.getBytes(length));
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/HeadersMode.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/HeadersMode.java
deleted file mode 100644
index ebb72330d..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/HeadersMode.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2013 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy;
-
-public enum HeadersMode {
-  SPDY_SYN_STREAM,
-  SPDY_REPLY,
-  SPDY_HEADERS,
-  HTTP_20_HEADERS;
-
-  /** Returns true if it is an error these headers to create a new stream. */
-  public boolean failIfStreamAbsent() {
-    return this == SPDY_REPLY || this == SPDY_HEADERS;
-  }
-
-  /** Returns true if it is an error these headers to update an existing stream. */
-  public boolean failIfStreamPresent() {
-    return this == SPDY_SYN_STREAM;
-  }
-
-  /**
-   * Returns true if it is an error these headers to be the initial headers of a
-   * response.
-   */
-  public boolean failIfHeadersAbsent() {
-    return this == SPDY_HEADERS;
-  }
-
-  /**
-   * Returns true if it is an error these headers to be update existing headers
-   * of a response.
-   */
-  public boolean failIfHeadersPresent() {
-    return this == SPDY_REPLY;
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/HpackDraft08.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/HpackDraft08.java
deleted file mode 100644
index a77fce4bf..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/HpackDraft08.java
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
- * Copyright (C) 2013 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy;
-
-import com.koushikdutta.async.ByteBufferList;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Read and write HPACK v08.
- * <p/>
- * http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08
- * <p/>
- * This implementation uses an array for the header table with a bitset for
- * references.  Dynamic entries are added to the array, starting in the last
- * position moving forward.  When the array fills, it is doubled.
- */
-final class HpackDraft08 {
-    private static final int PREFIX_4_BITS = 0x0f;
-    private static final int PREFIX_6_BITS = 0x3f;
-    private static final int PREFIX_7_BITS = 0x7f;
-
-    private static final Header[] STATIC_HEADER_TABLE = new Header[]{
-    new Header(Header.TARGET_AUTHORITY, ""),
-    new Header(Header.TARGET_METHOD, "GET"),
-    new Header(Header.TARGET_METHOD, "POST"),
-    new Header(Header.TARGET_PATH, "/"),
-    new Header(Header.TARGET_PATH, "/index.html"),
-    new Header(Header.TARGET_SCHEME, "http"),
-    new Header(Header.TARGET_SCHEME, "https"),
-    new Header(Header.RESPONSE_STATUS, "200"),
-    new Header(Header.RESPONSE_STATUS, "204"),
-    new Header(Header.RESPONSE_STATUS, "206"),
-    new Header(Header.RESPONSE_STATUS, "304"),
-    new Header(Header.RESPONSE_STATUS, "400"),
-    new Header(Header.RESPONSE_STATUS, "404"),
-    new Header(Header.RESPONSE_STATUS, "500"),
-    new Header("accept-charset", ""),
-    new Header("accept-encoding", "gzip, deflate"),
-    new Header("accept-language", ""),
-    new Header("accept-ranges", ""),
-    new Header("accept", ""),
-    new Header("access-control-allow-origin", ""),
-    new Header("age", ""),
-    new Header("allow", ""),
-    new Header("authorization", ""),
-    new Header("cache-control", ""),
-    new Header("content-disposition", ""),
-    new Header("content-encoding", ""),
-    new Header("content-language", ""),
-    new Header("content-length", ""),
-    new Header("content-location", ""),
-    new Header("content-range", ""),
-    new Header("content-type", ""),
-    new Header("cookie", ""),
-    new Header("date", ""),
-    new Header("etag", ""),
-    new Header("expect", ""),
-    new Header("expires", ""),
-    new Header("from", ""),
-    new Header("host", ""),
-    new Header("if-match", ""),
-    new Header("if-modified-since", ""),
-    new Header("if-none-match", ""),
-    new Header("if-range", ""),
-    new Header("if-unmodified-since", ""),
-    new Header("last-modified", ""),
-    new Header("link", ""),
-    new Header("location", ""),
-    new Header("max-forwards", ""),
-    new Header("proxy-authenticate", ""),
-    new Header("proxy-authorization", ""),
-    new Header("range", ""),
-    new Header("referer", ""),
-    new Header("refresh", ""),
-    new Header("retry-after", ""),
-    new Header("server", ""),
-    new Header("set-cookie", ""),
-    new Header("strict-transport-security", ""),
-    new Header("transfer-encoding", ""),
-    new Header("user-agent", ""),
-    new Header("vary", ""),
-    new Header("via", ""),
-    new Header("www-authenticate", "")
-    };
-
-    private HpackDraft08() {
-    }
-
-    // http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08#section-3.2
-    static final class Reader {
-
-        private final List<Header> emittedHeaders = new ArrayList<Header>();
-        private final ByteBufferList source = new ByteBufferList();
-
-        private int maxHeaderTableByteCountSetting;
-        private int maxHeaderTableByteCount;
-        // Visible for testing.
-        Header[] headerTable = new Header[8];
-        // Array is populated back to front, so new entries always have lowest index.
-        int nextHeaderIndex = headerTable.length - 1;
-        int headerCount = 0;
-
-        /**
-         * Set bit positions indicate {@code headerTable[pos]} should be emitted.
-         */
-        // Using a BitArray as it has left-shift operator.
-        BitArray referencedHeaders = new BitArray.FixedCapacity();
-
-        /**
-         * Set bit positions indicate {@code headerTable[pos]} was already emitted.
-         */
-        BitArray emittedReferencedHeaders = new BitArray.FixedCapacity();
-        int headerTableByteCount = 0;
-
-        Reader(int maxHeaderTableByteCountSetting) {
-            this.maxHeaderTableByteCountSetting = maxHeaderTableByteCountSetting;
-            this.maxHeaderTableByteCount = maxHeaderTableByteCountSetting;
-        }
-
-        public void refill(ByteBufferList bb) {
-            bb.get(source);
-        }
-
-        int maxHeaderTableByteCount() {
-            return maxHeaderTableByteCount;
-        }
-
-        /**
-         * Called by the reader when the peer sent a new header table size setting.
-         * While this establishes the maximum header table size, the
-         * {@link #maxHeaderTableByteCount} set during processing may limit the
-         * table size to a smaller amount.
-         * <p> Evicts entries or clears the table as needed.
-         */
-        void maxHeaderTableByteCountSetting(int newMaxHeaderTableByteCountSetting) {
-            this.maxHeaderTableByteCountSetting = newMaxHeaderTableByteCountSetting;
-            this.maxHeaderTableByteCount = maxHeaderTableByteCountSetting;
-            adjustHeaderTableByteCount();
-        }
-
-        private void adjustHeaderTableByteCount() {
-            if (maxHeaderTableByteCount < headerTableByteCount) {
-                if (maxHeaderTableByteCount == 0) {
-                    clearHeaderTable();
-                } else {
-                    evictToRecoverBytes(headerTableByteCount - maxHeaderTableByteCount);
-                }
-            }
-        }
-
-        private void clearHeaderTable() {
-            clearReferenceSet();
-            Arrays.fill(headerTable, null);
-            nextHeaderIndex = headerTable.length - 1;
-            headerCount = 0;
-            headerTableByteCount = 0;
-        }
-
-        /**
-         * Returns the count of entries evicted.
-         */
-        private int evictToRecoverBytes(int bytesToRecover) {
-            int entriesToEvict = 0;
-            if (bytesToRecover > 0) {
-                // determine how many headers need to be evicted.
-                for (int j = headerTable.length - 1; j >= nextHeaderIndex && bytesToRecover > 0; j--) {
-                    bytesToRecover -= headerTable[j].hpackSize;
-                    headerTableByteCount -= headerTable[j].hpackSize;
-                    headerCount--;
-                    entriesToEvict++;
-                }
-                referencedHeaders.shiftLeft(entriesToEvict);
-                emittedReferencedHeaders.shiftLeft(entriesToEvict);
-                System.arraycopy(headerTable, nextHeaderIndex + 1, headerTable,
-                nextHeaderIndex + 1 + entriesToEvict, headerCount);
-                nextHeaderIndex += entriesToEvict;
-            }
-            return entriesToEvict;
-        }
-
-        /**
-         * Read {@code byteCount} bytes of headers from the source stream into the
-         * set of emitted headers. This implementation does not propagate the never
-         * indexed flag of a header.
-         */
-        void readHeaders() throws IOException {
-            while (source.hasRemaining()) {
-                int b = source.get() & 0xff;
-                if (b == 0x80) { // 10000000
-                    throw new IOException("index == 0");
-                } else if ((b & 0x80) == 0x80) { // 1NNNNNNN
-                    int index = readInt(b, PREFIX_7_BITS);
-                    readIndexedHeader(index - 1);
-                } else if (b == 0x40) { // 01000000
-                    readLiteralHeaderWithIncrementalIndexingNewName();
-                } else if ((b & 0x40) == 0x40) {  // 01NNNNNN
-                    int index = readInt(b, PREFIX_6_BITS);
-                    readLiteralHeaderWithIncrementalIndexingIndexedName(index - 1);
-                } else if ((b & 0x20) == 0x20) {  // 001NNNNN
-                    if ((b & 0x10) == 0x10) { // 0011NNNN
-                        if ((b & 0x0f) != 0)
-                            throw new IOException("Invalid header table state change " + b);
-                        clearReferenceSet(); // 00110000
-                    } else { // 0010NNNN
-                        maxHeaderTableByteCount = readInt(b, PREFIX_4_BITS);
-                        if (maxHeaderTableByteCount < 0
-                        || maxHeaderTableByteCount > maxHeaderTableByteCountSetting) {
-                            throw new IOException("Invalid header table byte count " + maxHeaderTableByteCount);
-                        }
-                        adjustHeaderTableByteCount();
-                    }
-                } else if (b == 0x10 || b == 0) { // 000?0000 - Ignore never indexed bit.
-                    readLiteralHeaderWithoutIndexingNewName();
-                } else { // 000?NNNN - Ignore never indexed bit.
-                    int index = readInt(b, PREFIX_4_BITS);
-                    readLiteralHeaderWithoutIndexingIndexedName(index - 1);
-                }
-            }
-        }
-
-        private void clearReferenceSet() {
-            referencedHeaders.clear();
-            emittedReferencedHeaders.clear();
-        }
-
-        void emitReferenceSet() {
-            for (int i = headerTable.length - 1; i != nextHeaderIndex; --i) {
-                if (referencedHeaders.get(i) && !emittedReferencedHeaders.get(i)) {
-                    emittedHeaders.add(headerTable[i]);
-                }
-            }
-        }
-
-        /**
-         * Returns all headers emitted since they were last cleared, then clears the
-         * emitted headers.
-         */
-        List<Header> getAndReset() {
-            List<Header> result = new ArrayList<Header>(emittedHeaders);
-            emittedHeaders.clear();
-            emittedReferencedHeaders.clear();
-            return result;
-        }
-
-        private void readIndexedHeader(int index) throws IOException {
-            if (isStaticHeader(index)) {
-                index -= headerCount;
-                if (index > STATIC_HEADER_TABLE.length - 1) {
-                    throw new IOException("Header index too large " + (index + 1));
-                }
-                Header staticEntry = STATIC_HEADER_TABLE[index];
-                if (maxHeaderTableByteCount == 0) {
-                    emittedHeaders.add(staticEntry);
-                } else {
-                    insertIntoHeaderTable(-1, staticEntry);
-                }
-            } else {
-                int headerTableIndex = headerTableIndex(index);
-                if (!referencedHeaders.get(headerTableIndex)) { // When re-referencing, emit immediately.
-                    emittedHeaders.add(headerTable[headerTableIndex]);
-                    emittedReferencedHeaders.set(headerTableIndex);
-                }
-                referencedHeaders.toggle(headerTableIndex);
-            }
-        }
-
-        // referencedHeaders is relative to nextHeaderIndex + 1.
-        private int headerTableIndex(int index) {
-            return nextHeaderIndex + 1 + index;
-        }
-
-        private void readLiteralHeaderWithoutIndexingIndexedName(int index) throws IOException {
-            ByteString name = getName(index);
-            ByteString value = readByteString();
-            emittedHeaders.add(new Header(name, value));
-        }
-
-        private void readLiteralHeaderWithoutIndexingNewName() throws IOException {
-            ByteString name = checkLowercase(readByteString());
-            ByteString value = readByteString();
-            emittedHeaders.add(new Header(name, value));
-        }
-
-        private void readLiteralHeaderWithIncrementalIndexingIndexedName(int nameIndex)
-        throws IOException {
-            ByteString name = getName(nameIndex);
-            ByteString value = readByteString();
-            insertIntoHeaderTable(-1, new Header(name, value));
-        }
-
-        private void readLiteralHeaderWithIncrementalIndexingNewName() throws IOException {
-            ByteString name = checkLowercase(readByteString());
-            ByteString value = readByteString();
-            insertIntoHeaderTable(-1, new Header(name, value));
-        }
-
-        private ByteString getName(int index) {
-            if (isStaticHeader(index)) {
-                return STATIC_HEADER_TABLE[index - headerCount].name;
-            } else {
-                return headerTable[headerTableIndex(index)].name;
-            }
-        }
-
-        private boolean isStaticHeader(int index) {
-            return index >= headerCount;
-        }
-
-        /**
-         * index == -1 when new.
-         */
-        private void insertIntoHeaderTable(int index, Header entry) {
-            int delta = entry.hpackSize;
-            if (index != -1) { // Index -1 == new header.
-                delta -= headerTable[headerTableIndex(index)].hpackSize;
-            }
-
-            // if the new or replacement header is too big, drop all entries.
-            if (delta > maxHeaderTableByteCount) {
-                clearHeaderTable();
-                // emit the large header to the callback.
-                emittedHeaders.add(entry);
-                return;
-            }
-
-            // Evict headers to the required length.
-            int bytesToRecover = (headerTableByteCount + delta) - maxHeaderTableByteCount;
-            int entriesEvicted = evictToRecoverBytes(bytesToRecover);
-
-            if (index == -1) { // Adding a value to the header table.
-                if (headerCount + 1 > headerTable.length) { // Need to grow the header table.
-                    Header[] doubled = new Header[headerTable.length * 2];
-                    System.arraycopy(headerTable, 0, doubled, headerTable.length, headerTable.length);
-                    if (doubled.length == 64) {
-                        referencedHeaders = ((BitArray.FixedCapacity) referencedHeaders).toVariableCapacity();
-                        emittedReferencedHeaders =
-                        ((BitArray.FixedCapacity) emittedReferencedHeaders).toVariableCapacity();
-                    }
-                    referencedHeaders.shiftLeft(headerTable.length);
-                    emittedReferencedHeaders.shiftLeft(headerTable.length);
-                    nextHeaderIndex = headerTable.length - 1;
-                    headerTable = doubled;
-                }
-                index = nextHeaderIndex--;
-                referencedHeaders.set(index);
-                headerTable[index] = entry;
-                headerCount++;
-            } else { // Replace value at same position.
-                index += headerTableIndex(index) + entriesEvicted;
-                referencedHeaders.set(index);
-                headerTable[index] = entry;
-            }
-            headerTableByteCount += delta;
-        }
-
-        private int readByte() throws IOException {
-            return source.get() & 0xff;
-        }
-
-        int readInt(int firstByte, int prefixMask) throws IOException {
-            int prefix = firstByte & prefixMask;
-            if (prefix < prefixMask) {
-                return prefix; // This was a single byte value.
-            }
-
-            // This is a multibyte value. Read 7 bits at a time.
-            int result = prefixMask;
-            int shift = 0;
-            while (true) {
-                int b = readByte();
-                if ((b & 0x80) != 0) { // Equivalent to (b >= 128) since b is in [0..255].
-                    result += (b & 0x7f) << shift;
-                    shift += 7;
-                } else {
-                    result += b << shift; // Last byte.
-                    break;
-                }
-            }
-            return result;
-        }
-
-        /**
-         * Reads a potentially Huffman encoded byte string.
-         */
-        ByteString readByteString() throws IOException {
-            int firstByte = readByte();
-            boolean huffmanDecode = (firstByte & 0x80) == 0x80; // 1NNNNNNN
-            int length = readInt(firstByte, PREFIX_7_BITS);
-
-            if (huffmanDecode) {
-                return ByteString.of(Huffman.get().decode(source.getBytes(length)));
-            } else {
-                return ByteString.of(source.getBytes(length));
-            }
-        }
-    }
-
-    private static final Map<ByteString, Integer> NAME_TO_FIRST_INDEX = nameToFirstIndex();
-
-    private static Map<ByteString, Integer> nameToFirstIndex() {
-        Map<ByteString, Integer> result = new LinkedHashMap<ByteString, Integer>(STATIC_HEADER_TABLE.length);
-        for (int i = 0; i < STATIC_HEADER_TABLE.length; i++) {
-            if (!result.containsKey(STATIC_HEADER_TABLE[i].name)) {
-                result.put(STATIC_HEADER_TABLE[i].name, i);
-            }
-        }
-        return Collections.unmodifiableMap(result);
-    }
-
-    static final class Writer {
-        Writer() {
-        }
-
-        /**
-         * This does not use "never indexed" semantics for sensitive headers.
-         */
-        // https://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08#section-4.3.3
-        ByteBufferList writeHeaders(List<Header> headerBlock) throws IOException {
-            ByteBufferList out = new ByteBufferList();
-            // TODO: implement index tracking
-            ByteBuffer current = ByteBufferList.obtain(8192);
-            for (int i = 0, size = headerBlock.size(); i < size; i++) {
-                if (current.remaining() < current.capacity() / 2) {
-                    current.flip();
-                    out.add(current);
-                    current = ByteBufferList.obtain(current.capacity() * 2);
-                }
-                ByteString name = headerBlock.get(i).name.toAsciiLowercase();
-                Integer staticIndex = NAME_TO_FIRST_INDEX.get(name);
-                if (staticIndex != null) {
-                    // Literal Header Field without Indexing - Indexed Name.
-                    writeInt(current, staticIndex + 1, PREFIX_4_BITS, 0);
-                    writeByteString(current, headerBlock.get(i).value);
-                } else {
-                    current.put((byte) 0x00); // Literal Header without Indexing - New Name.
-                    writeByteString(current, name);
-                    writeByteString(current, headerBlock.get(i).value);
-                }
-            }
-
-            out.add(current);
-            return out;
-        }
-
-        // http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08#section-4.1.1
-        void writeInt(ByteBuffer out, int value, int prefixMask, int bits) throws IOException {
-            // Write the raw value for a single byte value.
-            if (value < prefixMask) {
-                out.put((byte) (bits | value));
-                return;
-            }
-
-            // Write the mask to start a multibyte value.
-            out.put((byte)(bits | prefixMask));
-            value -= prefixMask;
-
-            // Write 7 bits at a time 'til we're done.
-            while (value >= 0x80) {
-                int b = value & 0x7f;
-                out.put((byte) (b | 0x80));
-                value >>>= 7;
-            }
-            out.put((byte) value);
-        }
-
-        void writeByteString(ByteBuffer out, ByteString data) throws IOException {
-            writeInt(out, data.size(), PREFIX_7_BITS, 0);
-            out.put(data.toByteArray());
-        }
-    }
-
-    /**
-     * An HTTP/2 response cannot contain uppercase header characters and must
-     * be treated as malformed.
-     */
-    private static ByteString checkLowercase(ByteString name) throws IOException {
-        for (int i = 0, length = name.size(); i < length; i++) {
-            byte c = name.getByte(i);
-            if (c >= 'A' && c <= 'Z') {
-                throw new IOException("PROTOCOL_ERROR response malformed: mixed case name: " + name.utf8());
-            }
-        }
-        return name;
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Http20Draft13.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Http20Draft13.java
deleted file mode 100644
index ebd04cd58..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Http20Draft13.java
+++ /dev/null
@@ -1,765 +0,0 @@
-/*
- * Copyright (C) 2013 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy;
-
-import com.koushikdutta.async.BufferedDataSink;
-import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.DataEmitter;
-import com.koushikdutta.async.DataEmitterReader;
-import com.koushikdutta.async.callback.DataCallback;
-import com.koushikdutta.async.http.Protocol;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.List;
-import java.util.Locale;
-import java.util.logging.Logger;
-
-import static com.koushikdutta.async.http.spdy.Http20Draft13.FrameLogger.formatHeader;
-import static java.lang.String.format;
-import static java.util.logging.Level.FINE;
-
-/**
- * Read and write HTTP/2 v13 frames.
- * <p>http://tools.ietf.org/html/draft-ietf-httpbis-http2-13
- */
-
-final class Http20Draft13 implements Variant {
-    private static final Logger logger = Logger.getLogger(Http20Draft13.class.getName());
-
-    @Override
-    public Protocol getProtocol() {
-        return Protocol.HTTP_2;
-    }
-
-    private static final ByteString CONNECTION_PREFACE
-    = ByteString.encodeUtf8("PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n");
-
-    static final int MAX_FRAME_SIZE = 0x3fff; // 16383
-
-    static final byte TYPE_DATA = 0x0;
-    static final byte TYPE_HEADERS = 0x1;
-    static final byte TYPE_PRIORITY = 0x2;
-    static final byte TYPE_RST_STREAM = 0x3;
-    static final byte TYPE_SETTINGS = 0x4;
-    static final byte TYPE_PUSH_PROMISE = 0x5;
-    static final byte TYPE_PING = 0x6;
-    static final byte TYPE_GOAWAY = 0x7;
-    static final byte TYPE_WINDOW_UPDATE = 0x8;
-    static final byte TYPE_CONTINUATION = 0x9;
-
-    static final byte FLAG_NONE = 0x0;
-    static final byte FLAG_ACK = 0x1; // Used for settings and ping.
-    static final byte FLAG_END_STREAM = 0x1; // Used for headers and data.
-    static final byte FLAG_END_SEGMENT = 0x2;
-    static final byte FLAG_END_HEADERS = 0x4; // Used for headers and continuation.
-    static final byte FLAG_END_PUSH_PROMISE = 0x4;
-    static final byte FLAG_PADDED = 0x8; // Used for headers and data.
-    static final byte FLAG_PRIORITY = 0x20; // Used for headers.
-    static final byte FLAG_COMPRESSED = 0x20; // Used for data.
-
-    /**
-     * Creates a frame reader with max header table size of 4096 and data frame
-     * compression disabled.
-     */
-    @Override
-    public FrameReader newReader(DataEmitter source, FrameReader.Handler handler, boolean client) {
-        return new Reader(source, handler, 4096, client);
-    }
-
-    @Override
-    public FrameWriter newWriter(BufferedDataSink sink, boolean client) {
-        return new Writer(sink, client);
-    }
-
-    @Override
-    public int maxFrameSize() {
-        return MAX_FRAME_SIZE;
-    }
-
-    static final class Reader implements FrameReader {
-        private final DataEmitter emitter;
-        private final boolean client;
-        private final Handler handler;
-        private final DataEmitterReader reader;
-
-        // Visible for testing.
-        final HpackDraft08.Reader hpackReader;
-
-        Reader(DataEmitter emitter, Handler handler, int headerTableSize, boolean client) {
-            this.emitter = emitter;
-            this.client = client;
-            this.hpackReader = new HpackDraft08.Reader(headerTableSize);
-            this.handler = handler;
-            reader = new DataEmitterReader();
-
-            parseFrameHeader();
-        }
-
-        private void parseFrameHeader() {
-            emitter.setDataCallback(reader);
-            reader.read(8, onFrame);
-        }
-
-        int w1;
-        int w2;
-        byte flags;
-        byte type;
-        short length;
-        int streamId;
-        private final DataCallback onFrame = new DataCallback() {
-            @Override
-            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-                bb.order(ByteOrder.BIG_ENDIAN);
-                w1 = bb.getInt();
-                w2 = bb.getInt();
-
-                // boolean r = (w1 & 0xc0000000) != 0; // Reserved: Ignore first 2 bits.
-                length = (short) ((w1 & 0x3fff0000) >> 16); // 14-bit unsigned == MAX_FRAME_SIZE
-                type = (byte) ((w1 & 0xff00) >> 8);
-                flags = (byte) (w1 & 0xff);
-                // boolean r = (w2 & 0x80000000) != 0; // Reserved: Ignore first bit.
-                streamId = (w2 & 0x7fffffff); // 31-bit opaque identifier.
-                if (logger.isLoggable(FINE))
-                    logger.fine(formatHeader(true, streamId, length, type, flags));
-
-                reader.read(length, onFullFrame);
-            }
-        };
-
-        private final DataCallback onFullFrame = new DataCallback() {
-            @Override
-            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-                try {
-                    switch (type) {
-                        case TYPE_DATA:
-                            readData(bb, length, flags, streamId);
-                            break;
-
-                        case TYPE_HEADERS:
-                            readHeaders(bb, length, flags, streamId);
-                            break;
-
-                        case TYPE_PRIORITY:
-                            readPriority(bb, length, flags, streamId);
-                            break;
-
-                        case TYPE_RST_STREAM:
-                            readRstStream(bb, length, flags, streamId);
-                            break;
-
-                        case TYPE_SETTINGS:
-                            readSettings(bb, length, flags, streamId);
-                            break;
-
-                        case TYPE_PUSH_PROMISE:
-                            readPushPromise(bb, length, flags, streamId);
-                            break;
-
-                        case TYPE_PING:
-                            readPing(bb, length, flags, streamId);
-                            break;
-
-                        case TYPE_GOAWAY:
-                            readGoAway(bb, length, flags, streamId);
-                            break;
-
-                        case TYPE_WINDOW_UPDATE:
-                            readWindowUpdate(bb, length, flags, streamId);
-                            break;
-
-                        case TYPE_CONTINUATION:
-                            readContinuation(bb, length, flags, streamId);
-                            break;
-
-                        default:
-                            // Implementations MUST discard frames that have unknown or unsupported types.
-                            bb.recycle();
-                    }
-                    parseFrameHeader();
-                }
-                catch (IOException e) {
-                    handler.error(e);
-                }
-            }
-        };
-
-        /*
-        @Override
-        public void readConnectionPreface() throws IOException {
-            if (client) return; // Nothing to read; servers doesn't send a connection preface!
-            ByteString connectionPreface = source.readByteString(CONNECTION_PREFACE.size());
-            if (logger.isLoggable(FINE))
-                logger.fine(format("<< CONNECTION %s", connectionPreface.hex()));
-            if (!CONNECTION_PREFACE.equals(connectionPreface)) {
-                throw ioException("Expected a connection header but was %s", connectionPreface.utf8());
-            }
-        }
-        */
-
-        byte pendingHeaderType;
-        private void readHeaders(ByteBufferList source, short length, byte flags, int streamId)
-        throws IOException {
-            if (streamId == 0) throw ioException("PROTOCOL_ERROR: TYPE_HEADERS streamId == 0");
-
-
-            short padding = (flags & FLAG_PADDED) != 0 ? (short) (source.get() & 0xff) : 0;
-
-            if ((flags & FLAG_PRIORITY) != 0) {
-                readPriority(source, streamId);
-                length -= 5; // account for above read.
-            }
-
-            length = lengthWithoutPadding(length, flags, padding);
-
-            pendingHeaderType = type;
-            readHeaderBlock(source, length, padding, flags, streamId);
-
-//            handler.headers(false, endStream, streamId, -1, headerBlock, HeadersMode.HTTP_20_HEADERS);
-        }
-
-        private void readContinuation(ByteBufferList source, short length, byte flags, int streamId)
-        throws IOException {
-            if (streamId != continuingStreamId)
-                throw new IOException("continuation stream id mismatch");
-            readHeaderBlock(source, length, (short)0, flags, streamId);
-        }
-
-        int continuingStreamId;
-        private void readHeaderBlock(ByteBufferList source, short length, short padding, byte flags, int streamId)
-        throws IOException {
-            source.skip(padding);
-            hpackReader.refill(source);
-            hpackReader.readHeaders();
-            hpackReader.emitReferenceSet();
-            // TODO: Concat multi-value headers with 0x0, except COOKIE, which uses 0x3B, 0x20.
-            // http://tools.ietf.org/html/draft-ietf-httpbis-http2-09#section-8.1.3
-            if ((flags & FLAG_END_HEADERS) != 0) {
-                if (pendingHeaderType == TYPE_HEADERS) {
-                    boolean endStream = (flags & FLAG_END_STREAM) != 0;
-                    handler.headers(false, endStream, streamId, -1, hpackReader.getAndReset(), HeadersMode.HTTP_20_HEADERS);
-                }
-                else if (pendingHeaderType == TYPE_PUSH_PROMISE) {
-                    handler.pushPromise(streamId, promisedStreamId, hpackReader.getAndReset());
-                }
-                else {
-                    throw new AssertionError("unknown header type");
-                }
-            }
-            else {
-                continuingStreamId = streamId;
-            }
-        }
-
-        private void readData(ByteBufferList source, short length, byte flags, int streamId)
-        throws IOException {
-            // TODO: checkState open or half-closed (local) or raise STREAM_CLOSED
-            boolean inFinished = (flags & FLAG_END_STREAM) != 0;
-            boolean gzipped = (flags & FLAG_COMPRESSED) != 0;
-            if (gzipped) {
-                throw ioException("PROTOCOL_ERROR: FLAG_COMPRESSED without SETTINGS_COMPRESS_DATA");
-            }
-
-            short padding = (flags & FLAG_PADDED) != 0 ? (short) (source.get() & 0xff) : 0;
-            length = lengthWithoutPadding(length, flags, padding);
-
-            handler.data(inFinished, streamId, source);
-            source.skip(padding);
-        }
-
-        private void readPriority(ByteBufferList source, short length, byte flags, int streamId)
-        throws IOException {
-            if (length != 5) throw ioException("TYPE_PRIORITY length: %d != 5", length);
-            if (streamId == 0) throw ioException("TYPE_PRIORITY streamId == 0");
-            readPriority(source, streamId);
-        }
-
-        private void readPriority(ByteBufferList source, int streamId) throws IOException {
-            int w1 = source.getInt();
-            boolean exclusive = (w1 & 0x80000000) != 0;
-            int streamDependency = (w1 & 0x7fffffff);
-            int weight = (source.get() & 0xff) + 1;
-            handler.priority(streamId, streamDependency, weight, exclusive);
-        }
-
-        private void readRstStream(ByteBufferList source, short length, byte flags, int streamId)
-        throws IOException {
-            if (length != 4) throw ioException("TYPE_RST_STREAM length: %d != 4", length);
-            if (streamId == 0) throw ioException("TYPE_RST_STREAM streamId == 0");
-            int errorCodeInt = source.getInt();
-            ErrorCode errorCode = ErrorCode.fromHttp2(errorCodeInt);
-            if (errorCode == null) {
-                throw ioException("TYPE_RST_STREAM unexpected error code: %d", errorCodeInt);
-            }
-            handler.rstStream(streamId, errorCode);
-        }
-
-        private void readSettings(ByteBufferList source, short length, byte flags, int streamId)
-        throws IOException {
-            if (streamId != 0) throw ioException("TYPE_SETTINGS streamId != 0");
-            if ((flags & FLAG_ACK) != 0) {
-                if (length != 0) throw ioException("FRAME_SIZE_ERROR ack frame should be empty!");
-                handler.ackSettings();
-                return;
-            }
-
-            if (length % 6 != 0) throw ioException("TYPE_SETTINGS length %% 6 != 0: %s", length);
-            Settings settings = new Settings();
-            for (int i = 0; i < length; i += 6) {
-                short id = source.getShort();
-                int value = source.getInt();
-
-                switch (id) {
-                    case 1: // SETTINGS_HEADER_TABLE_SIZE
-                        break;
-                    case 2: // SETTINGS_ENABLE_PUSH
-                        if (value != 0 && value != 1) {
-                            throw ioException("PROTOCOL_ERROR SETTINGS_ENABLE_PUSH != 0 or 1");
-                        }
-                        break;
-                    case 3: // SETTINGS_MAX_CONCURRENT_STREAMS
-                        id = 4; // Renumbered in draft 10.
-                        break;
-                    case 4: // SETTINGS_INITIAL_WINDOW_SIZE
-                        id = 7; // Renumbered in draft 10.
-                        if (value < 0) {
-                            throw ioException("PROTOCOL_ERROR SETTINGS_INITIAL_WINDOW_SIZE > 2^31 - 1");
-                        }
-                        break;
-                    case 5: // SETTINGS_COMPRESS_DATA
-                        break;
-                    default:
-                        throw ioException("PROTOCOL_ERROR invalid settings id: %s", id);
-                }
-                settings.set(id, 0, value);
-            }
-            handler.settings(false, settings);
-            if (settings.getHeaderTableSize() >= 0) {
-                hpackReader.maxHeaderTableByteCountSetting(settings.getHeaderTableSize());
-            }
-        }
-
-        int promisedStreamId;
-        private void readPushPromise(ByteBufferList source, short length, byte flags, int streamId)
-        throws IOException {
-            if (streamId == 0) {
-                throw ioException("PROTOCOL_ERROR: TYPE_PUSH_PROMISE streamId == 0");
-            }
-            short padding = (flags & FLAG_PADDED) != 0 ? (short) (source.get() & 0xff) : 0;
-            promisedStreamId = source.getInt() & 0x7fffffff;
-            length -= 4; // account for above read.
-            length = lengthWithoutPadding(length, flags, padding);
-            pendingHeaderType = TYPE_PUSH_PROMISE;
-            readHeaderBlock(source, length, padding, flags, streamId);
-        }
-
-        private void readPing(ByteBufferList source, short length, byte flags, int streamId)
-        throws IOException {
-            if (length != 8) throw ioException("TYPE_PING length != 8: %s", length);
-            if (streamId != 0) throw ioException("TYPE_PING streamId != 0");
-            int payload1 = source.getInt();
-            int payload2 = source.getInt();
-            boolean ack = (flags & FLAG_ACK) != 0;
-            handler.ping(ack, payload1, payload2);
-        }
-
-        private void readGoAway(ByteBufferList source, short length, byte flags, int streamId)
-        throws IOException {
-            if (length < 8) throw ioException("TYPE_GOAWAY length < 8: %s", length);
-            if (streamId != 0) throw ioException("TYPE_GOAWAY streamId != 0");
-            int lastStreamId = source.getInt();
-            int errorCodeInt = source.getInt();
-            int opaqueDataLength = length - 8;
-            ErrorCode errorCode = ErrorCode.fromHttp2(errorCodeInt);
-            if (errorCode == null) {
-                throw ioException("TYPE_GOAWAY unexpected error code: %d", errorCodeInt);
-            }
-            ByteString debugData = ByteString.EMPTY;
-            if (opaqueDataLength > 0) { // Must read debug data in order to not corrupt the connection.
-                debugData = ByteString.of(source.getBytes(opaqueDataLength));
-            }
-            handler.goAway(lastStreamId, errorCode, debugData);
-        }
-
-        private void readWindowUpdate(ByteBufferList source, short length, byte flags, int streamId)
-        throws IOException {
-            if (length != 4) throw ioException("TYPE_WINDOW_UPDATE length !=4: %s", length);
-            long increment = (source.getInt() & 0x7fffffffL);
-            if (increment == 0) throw ioException("windowSizeIncrement was 0", increment);
-            handler.windowUpdate(streamId, increment);
-        }
-    }
-
-    static final class Writer implements FrameWriter {
-        private final BufferedDataSink sink;
-        private final boolean client;
-        private final HpackDraft08.Writer hpackWriter;
-        private boolean closed;
-        private final ByteBufferList frameHeader = new ByteBufferList();
-
-        Writer(BufferedDataSink sink, boolean client) {
-            this.sink = sink;
-            this.client = client;
-            this.hpackWriter = new HpackDraft08.Writer();
-        }
-
-        @Override
-        public synchronized void ackSettings() throws IOException {
-            if (closed) throw new IOException("closed");
-            int length = 0;
-            byte type = TYPE_SETTINGS;
-            byte flags = FLAG_ACK;
-            int streamId = 0;
-            frameHeader(streamId, length, type, flags);
-        }
-
-        @Override
-        public synchronized void connectionPreface() throws IOException {
-            if (closed) throw new IOException("closed");
-            if (!client) return; // Nothing to write; servers don't send connection headers!
-            if (logger.isLoggable(FINE)) {
-                logger.fine(format(Locale.ENGLISH, ">> CONNECTION %s", CONNECTION_PREFACE.hex()));
-            }
-            sink.write(new ByteBufferList(CONNECTION_PREFACE.toByteArray()));
-        }
-
-        @Override
-        public synchronized void synStream(boolean outFinished, boolean inFinished,
-                                           int streamId, int associatedStreamId, List<Header> headerBlock)
-        throws IOException {
-            if (inFinished) throw new UnsupportedOperationException();
-            if (closed) throw new IOException("closed");
-            headers(outFinished, streamId, headerBlock);
-        }
-
-        @Override
-        public synchronized void synReply(boolean outFinished, int streamId,
-                                          List<Header> headerBlock) throws IOException {
-            if (closed) throw new IOException("closed");
-            headers(outFinished, streamId, headerBlock);
-        }
-
-        @Override
-        public synchronized void headers(int streamId, List<Header> headerBlock)
-        throws IOException {
-            if (closed) throw new IOException("closed");
-            headers(false, streamId, headerBlock);
-        }
-
-        @Override
-        public synchronized void pushPromise(int streamId, int promisedStreamId,
-                                             List<Header> requestHeaders) throws IOException {
-            if (closed) throw new IOException("closed");
-            ByteBufferList hpackBuffer = hpackWriter.writeHeaders(requestHeaders);
-
-            long byteCount = hpackBuffer.remaining();
-            int length = (int) Math.min(MAX_FRAME_SIZE - 4, byteCount);
-            byte type = TYPE_PUSH_PROMISE;
-            byte flags = byteCount == length ? FLAG_END_HEADERS : 0;
-            frameHeader(streamId, length + 4, type, flags);
-            ByteBuffer sink = ByteBufferList.obtain(8192).order(ByteOrder.BIG_ENDIAN);
-            sink.putInt(promisedStreamId & 0x7fffffff);
-            sink.flip();
-            frameHeader.add(sink);
-            hpackBuffer.get(frameHeader, length);
-            this.sink.write(frameHeader);
-
-            if (byteCount > length) writeContinuationFrames(hpackBuffer, streamId);
-        }
-
-        void headers(boolean outFinished, int streamId, List<Header> headerBlock) throws IOException {
-            if (closed) throw new IOException("closed");
-            ByteBufferList hpackBuffer = hpackWriter.writeHeaders(headerBlock);
-
-            long byteCount = hpackBuffer.remaining();
-            int length = (int) Math.min(MAX_FRAME_SIZE, byteCount);
-            byte type = TYPE_HEADERS;
-            byte flags = byteCount == length ? FLAG_END_HEADERS : 0;
-            if (outFinished) flags |= FLAG_END_STREAM;
-            frameHeader(streamId, length, type, flags);
-            hpackBuffer.get(frameHeader, length);
-            this.sink.write(frameHeader);
-
-            if (byteCount > length) writeContinuationFrames(hpackBuffer, streamId);
-        }
-
-        private void writeContinuationFrames(ByteBufferList hpackBuffer, int streamId) throws IOException {
-            while (hpackBuffer.hasRemaining()) {
-                int length = (int) Math.min(MAX_FRAME_SIZE, hpackBuffer.remaining());
-                int newRemaining = hpackBuffer.remaining() - length;
-                frameHeader(streamId, length, TYPE_CONTINUATION, newRemaining == 0 ? FLAG_END_HEADERS : 0);
-                hpackBuffer.get(frameHeader, length);
-                sink.write(frameHeader);
-            }
-        }
-
-        @Override
-        public synchronized void rstStream(int streamId, ErrorCode errorCode)
-        throws IOException {
-            if (closed) throw new IOException("closed");
-            if (errorCode.spdyRstCode == -1) throw new IllegalArgumentException();
-
-            int length = 4;
-            byte type = TYPE_RST_STREAM;
-            byte flags = FLAG_NONE;
-            frameHeader(streamId, length, type, flags);
-            ByteBuffer sink = ByteBufferList.obtain(8192).order(ByteOrder.BIG_ENDIAN);
-            sink.putInt(errorCode.httpCode);
-            sink.flip();
-            this.sink.write(frameHeader.add(sink));
-        }
-
-        @Override
-        public synchronized void data(boolean outFinished, int streamId, ByteBufferList source)
-        throws IOException {
-            if (closed) throw new IOException("closed");
-            byte flags = FLAG_NONE;
-            if (outFinished) flags |= FLAG_END_STREAM;
-            dataFrame(streamId, flags, source);
-        }
-
-        void dataFrame(int streamId, byte flags, ByteBufferList buffer) throws IOException {
-            byte type = TYPE_DATA;
-            frameHeader(streamId, buffer.remaining(), type, flags);
-            sink.write(buffer);
-        }
-
-        @Override
-        public synchronized void settings(Settings settings) throws IOException {
-            if (closed) throw new IOException("closed");
-            int length = settings.size() * 6;
-            byte type = TYPE_SETTINGS;
-            byte flags = FLAG_NONE;
-            int streamId = 0;
-            frameHeader(streamId, length, type, flags);
-            ByteBuffer sink = ByteBufferList.obtain(8192).order(ByteOrder.BIG_ENDIAN);
-            for (int i = 0; i < Settings.COUNT; i++) {
-                if (!settings.isSet(i)) continue;
-                int id = i;
-                if (id == 4) id = 3; // SETTINGS_MAX_CONCURRENT_STREAMS renumbered.
-                else if (id == 7) id = 4; // SETTINGS_INITIAL_WINDOW_SIZE renumbered.
-                sink.putShort((short) id);
-                sink.putInt(settings.get(i));
-            }
-            sink.flip();
-            this.sink.write(frameHeader.add(sink));
-        }
-
-        @Override
-        public synchronized void ping(boolean ack, int payload1, int payload2)
-        throws IOException {
-            if (closed) throw new IOException("closed");
-            int length = 8;
-            byte type = TYPE_PING;
-            byte flags = ack ? FLAG_ACK : FLAG_NONE;
-            int streamId = 0;
-            frameHeader(streamId, length, type, flags);
-            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
-            sink.putInt(payload1);
-            sink.putInt(payload2);
-            sink.flip();
-            this.sink.write(frameHeader.add(sink));
-        }
-
-        @Override
-        public synchronized void goAway(int lastGoodStreamId, ErrorCode errorCode,
-                                        byte[] debugData) throws IOException {
-            if (closed) throw new IOException("closed");
-            if (errorCode.httpCode == -1) throw illegalArgument("errorCode.httpCode == -1");
-            int length = 8 + debugData.length;
-            byte type = TYPE_GOAWAY;
-            byte flags = FLAG_NONE;
-            int streamId = 0;
-            frameHeader(streamId, length, type, flags);
-            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
-            sink.putInt(lastGoodStreamId);
-            sink.putInt(errorCode.httpCode);
-            sink.put(debugData);
-            sink.flip();
-            this.sink.write(frameHeader.add(sink));
-        }
-
-        @Override
-        public synchronized void windowUpdate(int streamId, long windowSizeIncrement)
-        throws IOException {
-            if (closed) throw new IOException("closed");
-            if (windowSizeIncrement == 0 || windowSizeIncrement > 0x7fffffffL) {
-                throw illegalArgument("windowSizeIncrement == 0 || windowSizeIncrement > 0x7fffffffL: %s",
-                windowSizeIncrement);
-            }
-            int length = 4;
-            byte type = TYPE_WINDOW_UPDATE;
-            byte flags = FLAG_NONE;
-            frameHeader(streamId, length, type, flags);
-            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
-            sink.putInt((int) windowSizeIncrement);
-            sink.flip();
-            this.sink.write(frameHeader.add(sink));
-        }
-
-        @Override
-        public synchronized void close() throws IOException {
-            closed = true;
-        }
-
-        void frameHeader(int streamId, int length, byte type, byte flags) throws IOException {
-            if (logger.isLoggable(FINE))
-                logger.fine(formatHeader(false, streamId, length, type, flags));
-            if (length > MAX_FRAME_SIZE) {
-                throw illegalArgument("FRAME_SIZE_ERROR length > %d: %d", MAX_FRAME_SIZE, length);
-            }
-            if ((streamId & 0x80000000) != 0)
-                throw illegalArgument("reserved bit set: %s", streamId);
-            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
-            sink.putInt((length & 0x3fff) << 16 | (type & 0xff) << 8 | (flags & 0xff));
-            sink.putInt(streamId & 0x7fffffff);
-            sink.flip();
-            this.sink.write(frameHeader.add(sink));
-        }
-    }
-
-    private static IllegalArgumentException illegalArgument(String message, Object... args) {
-        throw new IllegalArgumentException(format(Locale.ENGLISH, message, args));
-    }
-
-    private static IOException ioException(String message, Object... args) throws IOException {
-        throw new IOException(format(Locale.ENGLISH, message, args));
-    }
-
-    private static short lengthWithoutPadding(short length, byte flags, short padding)
-    throws IOException {
-        if ((flags & FLAG_PADDED) != 0) length--; // Account for reading the padding length.
-        if (padding > length) {
-            throw ioException("PROTOCOL_ERROR padding %s > remaining length %s", padding, length);
-        }
-        return (short) (length - padding);
-    }
-
-    /**
-     * Logs a human-readable representation of HTTP/2 frame headers.
-     * <p/>
-     * <p>The format is:
-     * <p/>
-     * <pre>
-     *   direction streamID length type flags
-     * </pre>
-     * Where direction is {@code <<} for inbound and {@code >>} for outbound.
-     * <p/>
-     * <p> For example, the following would indicate a HEAD request sent from
-     * the client.
-     * <pre>
-     * {@code
-     *   << 0x0000000f    12 HEADERS       END_HEADERS|END_STREAM
-     * }
-     * </pre>
-     */
-    static final class FrameLogger {
-
-        static String formatHeader(boolean inbound, int streamId, int length, byte type, byte flags) {
-            String formattedType = type < TYPES.length ? TYPES[type] : format(Locale.ENGLISH, "0x%02x", type);
-            String formattedFlags = formatFlags(type, flags);
-            return format(Locale.ENGLISH, "%s 0x%08x %5d %-13s %s", inbound ? "<<" : ">>", streamId, length,
-            formattedType, formattedFlags);
-        }
-
-        /**
-         * Looks up valid string representing flags from the table. Invalid
-         * combinations are represented in binary.
-         */
-        // Visible for testing.
-        static String formatFlags(byte type, byte flags) {
-            if (flags == 0) return "";
-            switch (type) { // Special case types that have 0 or 1 flag.
-                case TYPE_SETTINGS:
-                case TYPE_PING:
-                    return flags == FLAG_ACK ? "ACK" : BINARY[flags];
-                case TYPE_PRIORITY:
-                case TYPE_RST_STREAM:
-                case TYPE_GOAWAY:
-                case TYPE_WINDOW_UPDATE:
-                    return BINARY[flags];
-            }
-            String result = flags < FLAGS.length ? FLAGS[flags] : BINARY[flags];
-            // Special case types that have overlap flag values.
-            if (type == TYPE_PUSH_PROMISE && (flags & FLAG_END_PUSH_PROMISE) != 0) {
-                return result.replace("HEADERS", "PUSH_PROMISE"); // TODO: Avoid allocation.
-            } else if (type == TYPE_DATA && (flags & FLAG_COMPRESSED) != 0) {
-                return result.replace("PRIORITY", "COMPRESSED"); // TODO: Avoid allocation.
-            }
-            return result;
-        }
-
-        /**
-         * Lookup table for valid frame types.
-         */
-        private static final String[] TYPES = new String[]{
-        "DATA",
-        "HEADERS",
-        "PRIORITY",
-        "RST_STREAM",
-        "SETTINGS",
-        "PUSH_PROMISE",
-        "PING",
-        "GOAWAY",
-        "WINDOW_UPDATE",
-        "CONTINUATION"
-        };
-
-        /**
-         * Lookup table for valid flags for DATA, HEADERS, CONTINUATION. Invalid
-         * combinations are represented in binary.
-         */
-        private static final String[] FLAGS = new String[0x40]; // Highest bit flag is 0x20.
-        private static final String[] BINARY = new String[256];
-
-        static {
-            for (int i = 0; i < BINARY.length; i++) {
-                BINARY[i] = format(Locale.ENGLISH, "%8s", Integer.toBinaryString(i)).replace(' ', '0');
-            }
-
-            FLAGS[FLAG_NONE] = "";
-            FLAGS[FLAG_END_STREAM] = "END_STREAM";
-            FLAGS[FLAG_END_SEGMENT] = "END_SEGMENT";
-            FLAGS[FLAG_END_STREAM | FLAG_END_SEGMENT] = "END_STREAM|END_SEGMENT";
-            int[] prefixFlags =
-            new int[]{FLAG_END_STREAM, FLAG_END_SEGMENT, FLAG_END_SEGMENT | FLAG_END_STREAM};
-
-            FLAGS[FLAG_PADDED] = "PADDED";
-            for (int prefixFlag : prefixFlags) {
-                FLAGS[prefixFlag | FLAG_PADDED] = FLAGS[prefixFlag] + "|PADDED";
-            }
-
-            FLAGS[FLAG_END_HEADERS] = "END_HEADERS"; // Same as END_PUSH_PROMISE.
-            FLAGS[FLAG_PRIORITY] = "PRIORITY"; // Same as FLAG_COMPRESSED.
-            FLAGS[FLAG_END_HEADERS | FLAG_PRIORITY] = "END_HEADERS|PRIORITY"; // Only valid on HEADERS.
-            int[] frameFlags =
-            new int[]{FLAG_END_HEADERS, FLAG_PRIORITY, FLAG_END_HEADERS | FLAG_PRIORITY};
-
-            for (int frameFlag : frameFlags) {
-                for (int prefixFlag : prefixFlags) {
-                    FLAGS[prefixFlag | frameFlag] = FLAGS[prefixFlag] + '|' + FLAGS[frameFlag];
-                    FLAGS[prefixFlag | frameFlag | FLAG_PADDED] =
-                    FLAGS[prefixFlag] + '|' + FLAGS[frameFlag] + "|PADDED";
-                }
-            }
-
-            for (int i = 0; i < FLAGS.length; i++) { // Fill in holes with binary representation.
-                if (FLAGS[i] == null) FLAGS[i] = BINARY[i];
-            }
-        }
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Huffman.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Huffman.java
deleted file mode 100644
index 2472a03b3..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Huffman.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * This class was originally composed from the following classes in
- * <a href="https://github.com/twitter/hpack">Twitter Hpack</a>.
- * <ul>
- * <li>{@code com.twitter.hpack.HuffmanEncoder}</li>
- * <li>{@code com.twitter.hpack.HuffmanDecoder}</li>
- * <li>{@code com.twitter.hpack.HpackUtil}</li>
- * </ul>
- */
-class Huffman {
-
-  // Appendix C: Huffman Codes
-  // http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08#appendix-C
-  private static final int[] CODES = {
-      0x1ff8, 0x7fffd8, 0xfffffe2, 0xfffffe3, 0xfffffe4, 0xfffffe5, 0xfffffe6, 0xfffffe7, 0xfffffe8,
-      0xffffea, 0x3ffffffc, 0xfffffe9, 0xfffffea, 0x3ffffffd, 0xfffffeb, 0xfffffec, 0xfffffed,
-      0xfffffee, 0xfffffef, 0xffffff0, 0xffffff1, 0xffffff2, 0x3ffffffe, 0xffffff3, 0xffffff4,
-      0xffffff5, 0xffffff6, 0xffffff7, 0xffffff8, 0xffffff9, 0xffffffa, 0xffffffb, 0x14, 0x3f8,
-      0x3f9, 0xffa, 0x1ff9, 0x15, 0xf8, 0x7fa, 0x3fa, 0x3fb, 0xf9, 0x7fb, 0xfa, 0x16, 0x17, 0x18,
-      0x0, 0x1, 0x2, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x5c, 0xfb, 0x7ffc, 0x20, 0xffb,
-      0x3fc, 0x1ffa, 0x21, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
-      0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0xfc, 0x73, 0xfd, 0x1ffb, 0x7fff0,
-      0x1ffc, 0x3ffc, 0x22, 0x7ffd, 0x3, 0x23, 0x4, 0x24, 0x5, 0x25, 0x26, 0x27, 0x6, 0x74, 0x75,
-      0x28, 0x29, 0x2a, 0x7, 0x2b, 0x76, 0x2c, 0x8, 0x9, 0x2d, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7ffe,
-      0x7fc, 0x3ffd, 0x1ffd, 0xffffffc, 0xfffe6, 0x3fffd2, 0xfffe7, 0xfffe8, 0x3fffd3, 0x3fffd4,
-      0x3fffd5, 0x7fffd9, 0x3fffd6, 0x7fffda, 0x7fffdb, 0x7fffdc, 0x7fffdd, 0x7fffde, 0xffffeb,
-      0x7fffdf, 0xffffec, 0xffffed, 0x3fffd7, 0x7fffe0, 0xffffee, 0x7fffe1, 0x7fffe2, 0x7fffe3,
-      0x7fffe4, 0x1fffdc, 0x3fffd8, 0x7fffe5, 0x3fffd9, 0x7fffe6, 0x7fffe7, 0xffffef, 0x3fffda,
-      0x1fffdd, 0xfffe9, 0x3fffdb, 0x3fffdc, 0x7fffe8, 0x7fffe9, 0x1fffde, 0x7fffea, 0x3fffdd,
-      0x3fffde, 0xfffff0, 0x1fffdf, 0x3fffdf, 0x7fffeb, 0x7fffec, 0x1fffe0, 0x1fffe1, 0x3fffe0,
-      0x1fffe2, 0x7fffed, 0x3fffe1, 0x7fffee, 0x7fffef, 0xfffea, 0x3fffe2, 0x3fffe3, 0x3fffe4,
-      0x7ffff0, 0x3fffe5, 0x3fffe6, 0x7ffff1, 0x3ffffe0, 0x3ffffe1, 0xfffeb, 0x7fff1, 0x3fffe7,
-      0x7ffff2, 0x3fffe8, 0x1ffffec, 0x3ffffe2, 0x3ffffe3, 0x3ffffe4, 0x7ffffde, 0x7ffffdf,
-      0x3ffffe5, 0xfffff1, 0x1ffffed, 0x7fff2, 0x1fffe3, 0x3ffffe6, 0x7ffffe0, 0x7ffffe1, 0x3ffffe7,
-      0x7ffffe2, 0xfffff2, 0x1fffe4, 0x1fffe5, 0x3ffffe8, 0x3ffffe9, 0xffffffd, 0x7ffffe3,
-      0x7ffffe4, 0x7ffffe5, 0xfffec, 0xfffff3, 0xfffed, 0x1fffe6, 0x3fffe9, 0x1fffe7, 0x1fffe8,
-      0x7ffff3, 0x3fffea, 0x3fffeb, 0x1ffffee, 0x1ffffef, 0xfffff4, 0xfffff5, 0x3ffffea, 0x7ffff4,
-      0x3ffffeb, 0x7ffffe6, 0x3ffffec, 0x3ffffed, 0x7ffffe7, 0x7ffffe8, 0x7ffffe9, 0x7ffffea,
-      0x7ffffeb, 0xffffffe, 0x7ffffec, 0x7ffffed, 0x7ffffee, 0x7ffffef, 0x7fffff0, 0x3ffffee
-  };
-
-  private static final byte[] CODE_LENGTHS = {
-      13, 23, 28, 28, 28, 28, 28, 28, 28, 24, 30, 28, 28, 30, 28, 28, 28, 28, 28, 28, 28, 28, 30,
-      28, 28, 28, 28, 28, 28, 28, 28, 28, 6, 10, 10, 12, 13, 6, 8, 11, 10, 10, 8, 11, 8, 6, 6, 6, 5,
-      5, 5, 6, 6, 6, 6, 6, 6, 6, 7, 8, 15, 6, 12, 10, 13, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 13, 19, 13, 14, 6, 15, 5, 6, 5, 6, 5, 6, 6, 6, 5, 7, 7, 6,
-      6, 6, 5, 6, 7, 6, 5, 5, 6, 7, 7, 7, 7, 7, 15, 11, 14, 13, 28, 20, 22, 20, 20, 22, 22, 22, 23,
-      22, 23, 23, 23, 23, 23, 24, 23, 24, 24, 22, 23, 24, 23, 23, 23, 23, 21, 22, 23, 22, 23, 23,
-      24, 22, 21, 20, 22, 22, 23, 23, 21, 23, 22, 22, 24, 21, 22, 23, 23, 21, 21, 22, 21, 23, 22,
-      23, 23, 20, 22, 22, 22, 23, 22, 22, 23, 26, 26, 20, 19, 22, 23, 22, 25, 26, 26, 26, 27, 27,
-      26, 24, 25, 19, 21, 26, 27, 27, 26, 27, 24, 21, 21, 26, 26, 28, 27, 27, 27, 20, 24, 20, 21,
-      22, 21, 21, 23, 22, 22, 25, 25, 24, 24, 26, 23, 26, 27, 26, 26, 27, 27, 27, 27, 27, 28, 27,
-      27, 27, 27, 27, 26
-  };
-
-  private static final Huffman INSTANCE = new Huffman();
-
-  public static Huffman get() {
-    return INSTANCE;
-  }
-
-  private final Node root = new Node();
-
-  private Huffman() {
-    buildTree();
-  }
-
-  void encode(byte[] data, OutputStream out) throws IOException {
-    long current = 0;
-    int n = 0;
-
-    for (int i = 0; i < data.length; i++) {
-      int b = data[i] & 0xFF;
-      int code = CODES[b];
-      int nbits = CODE_LENGTHS[b];
-
-      current <<= nbits;
-      current |= code;
-      n += nbits;
-
-      while (n >= 8) {
-        n -= 8;
-        out.write(((int) (current >> n)));
-      }
-    }
-
-    if (n > 0) {
-      current <<= (8 - n);
-      current |= (0xFF >>> n);
-      out.write((int) current);
-    }
-  }
-
-  int encodedLength(byte[] bytes) {
-    long len = 0;
-
-    for (int i = 0; i < bytes.length; i++) {
-      int b = bytes[i] & 0xFF;
-      len += CODE_LENGTHS[b];
-    }
-
-    return (int) ((len + 7) >> 3);
-  }
-
-  byte[] decode(byte[] buf) throws IOException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    Node node = root;
-    int current = 0;
-    int nbits = 0;
-    for (int i = 0; i < buf.length; i++) {
-      int b = buf[i] & 0xFF;
-      current = (current << 8) | b;
-      nbits += 8;
-      while (nbits >= 8) {
-        int c = (current >>> (nbits - 8)) & 0xFF;
-        node = node.children[c];
-        if (node.children == null) {
-          // terminal node
-          baos.write(node.symbol);
-          nbits -= node.terminalBits;
-          node = root;
-        } else {
-          // non-terminal node
-          nbits -= 8;
-        }
-      }
-    }
-
-    while (nbits > 0) {
-      int c = (current << (8 - nbits)) & 0xFF;
-      node = node.children[c];
-      if (node.children != null || node.terminalBits > nbits) {
-        break;
-      }
-      baos.write(node.symbol);
-      nbits -= node.terminalBits;
-      node = root;
-    }
-
-    return baos.toByteArray();
-  }
-
-  private void buildTree() {
-    for (int i = 0; i < CODE_LENGTHS.length; i++) {
-      addCode(i, CODES[i], CODE_LENGTHS[i]);
-    }
-  }
-
-  private void addCode(int sym, int code, byte len) {
-    Node terminal = new Node(sym, len);
-
-    Node current = root;
-    while (len > 8) {
-      len -= 8;
-      int i = ((code >>> len) & 0xFF);
-      if (current.children == null) {
-        throw new IllegalStateException("invalid dictionary: prefix not unique");
-      }
-      if (current.children[i] == null) {
-        current.children[i] = new Node();
-      }
-      current = current.children[i];
-    }
-
-    int shift = 8 - len;
-    int start = (code << shift) & 0xFF;
-    int end = 1 << shift;
-    for (int i = start; i < start + end; i++) {
-      current.children[i] = terminal;
-    }
-  }
-
-  private static final class Node {
-
-    // Null if terminal.
-    private final Node[] children;
-
-    // Terminal nodes have a symbol.
-    private final int symbol;
-
-    // Number of bits represented in the terminal node.
-    private final int terminalBits;
-
-    /** Construct an internal node. */
-    Node() {
-      this.children = new Node[256];
-      this.symbol = 0; // Not read.
-      this.terminalBits = 0; // Not read.
-    }
-
-    /**
-     * Construct a terminal node.
-     *
-     * @param symbol symbol the node represents
-     * @param bits length of Huffman code in bits
-     */
-    Node(int symbol, int bits) {
-      this.children = null;
-      this.symbol = symbol;
-      int b = bits & 0x07;
-      this.terminalBits = b == 0 ? 8 : b;
-    }
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Ping.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Ping.java
deleted file mode 100644
index 9f5ae8f5d..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Ping.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2012 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-/**
- * A locally-originated ping.
- */
-final class Ping {
-  private final CountDownLatch latch = new CountDownLatch(1);
-  private long sent = -1;
-  private long received = -1;
-
-  Ping() {
-  }
-
-  public void send() {
-    if (sent != -1) throw new IllegalStateException();
-    sent = System.nanoTime();
-  }
-
-  public void receive() {
-    if (received != -1 || sent == -1) throw new IllegalStateException();
-    received = System.nanoTime();
-    latch.countDown();
-  }
-
-  void cancel() {
-    if (received != -1 || sent == -1) throw new IllegalStateException();
-    received = sent - 1;
-    latch.countDown();
-  }
-
-  /**
-   * Returns the round trip time for this ping in nanoseconds, waiting for the
-   * response to arrive if necessary. Returns -1 if the response was
-   * canceled.
-   */
-  public long roundTripTime() throws InterruptedException {
-    latch.await();
-    return received - sent;
-  }
-
-  /**
-   * Returns the round trip time for this ping in nanoseconds, or -1 if the
-   * response was canceled, or -2 if the timeout elapsed before the round
-   * trip completed.
-   */
-  public long roundTripTime(long timeout, TimeUnit unit) throws InterruptedException {
-    if (latch.await(timeout, unit)) {
-      return received - sent;
-    } else {
-      return -2;
-    }
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Settings.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Settings.java
deleted file mode 100644
index 726816f11..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Settings.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (C) 2012 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy;
-
-import java.util.Arrays;
-
-/**
- * Settings describe characteristics of the sending peer, which are used by the receiving peer.
- * Settings are {@link com.koushikdutta.async.http.spdy.okhttp.internal.spdy.SpdyConnection connection} scoped.
- */
-final class Settings {
-  /**
-   * From the SPDY/3 and HTTP/2 specs, the default initial window size for all
-   * streams is 64 KiB. (Chrome 25 uses 10 MiB).
-   */
-  public static final int DEFAULT_INITIAL_WINDOW_SIZE = 64 * 1024;
-
-  /** Peer request to clear durable settings. */
-  static final int FLAG_CLEAR_PREVIOUSLY_PERSISTED_SETTINGS = 0x1;
-
-  /** Sent by servers only. The peer requests this setting persisted for future connections. */
-  static final int PERSIST_VALUE = 0x1;
-  /** Sent by clients only. The client is reminding the server of a persisted value. */
-  static final int PERSISTED = 0x2;
-
-  /** spdy/3: Sender's estimate of max incoming kbps. */
-  static final int UPLOAD_BANDWIDTH = 1;
-  /** HTTP/2: Size in bytes of the table used to decode the sender's header blocks. */
-  static final int HEADER_TABLE_SIZE = 1;
-  /** spdy/3: Sender's estimate of max outgoing kbps. */
-  static final int DOWNLOAD_BANDWIDTH = 2;
-  /** HTTP/2: The peer must not send a PUSH_PROMISE frame when this is 0. */
-  static final int ENABLE_PUSH = 2;
-  /** spdy/3: Sender's estimate of millis between sending a request and receiving a response. */
-  static final int ROUND_TRIP_TIME = 3;
-  /** Sender's maximum number of concurrent streams. */
-  static final int MAX_CONCURRENT_STREAMS = 4;
-  /** spdy/3: Current CWND in Packets. */
-  static final int CURRENT_CWND = 5;
-  /** spdy/3: Retransmission rate. Percentage */
-  static final int DOWNLOAD_RETRANS_RATE = 6;
-  /** Window size in bytes. */
-  public static final int INITIAL_WINDOW_SIZE = 7;
-  /** spdy/3: Window size in bytes. */
-  static final int CLIENT_CERTIFICATE_VECTOR_SIZE = 8;
-  /** Flow control options. */
-  static final int FLOW_CONTROL_OPTIONS = 10;
-
-  /** Total number of settings. */
-  static final int COUNT = 10;
-
-  /** If set, flow control is disabled for streams directed to the sender of these settings. */
-  static final int FLOW_CONTROL_OPTIONS_DISABLED = 0x1;
-
-  /** Bitfield of which flags that values. */
-  private int set;
-
-  /** Bitfield of flags that have {@link #PERSIST_VALUE}. */
-  private int persistValue;
-
-  /** Bitfield of flags that have {@link #PERSISTED}. */
-  private int persisted;
-
-  /** Flag values. */
-  private final int[] values = new int[COUNT];
-
-  public void clear() {
-    set = persistValue = persisted = 0;
-    Arrays.fill(values, 0);
-  }
-
-  public Settings set(int id, int idFlags, int value) {
-    if (id >= values.length) {
-      return this; // Discard unknown settings.
-    }
-
-    int bit = 1 << id;
-    set |= bit;
-    if ((idFlags & PERSIST_VALUE) != 0) {
-      persistValue |= bit;
-    } else {
-      persistValue &= ~bit;
-    }
-    if ((idFlags & PERSISTED) != 0) {
-      persisted |= bit;
-    } else {
-      persisted &= ~bit;
-    }
-
-    values[id] = value;
-    return this;
-  }
-
-  /** Returns true if a value has been assigned for the setting {@code id}. */
-  boolean isSet(int id) {
-    int bit = 1 << id;
-    return (set & bit) != 0;
-  }
-
-  /** Returns the value for the setting {@code id}, or 0 if unset. */
-  int get(int id) {
-    return values[id];
-  }
-
-  /** Returns the flags for the setting {@code id}, or 0 if unset. */
-  int flags(int id) {
-    int result = 0;
-    if (isPersisted(id)) result |= Settings.PERSISTED;
-    if (persistValue(id)) result |= Settings.PERSIST_VALUE;
-    return result;
-  }
-
-  /** Returns the number of settings that have values assigned. */
-  int size() {
-    return Integer.bitCount(set);
-  }
-
-  /** spdy/3 only. */
-  int getUploadBandwidth(int defaultValue) {
-    int bit = 1 << UPLOAD_BANDWIDTH;
-    return (bit & set) != 0 ? values[UPLOAD_BANDWIDTH] : defaultValue;
-  }
-
-  /** HTTP/2 only. Returns -1 if unset. */
-  int getHeaderTableSize() {
-    int bit = 1 << HEADER_TABLE_SIZE;
-    return (bit & set) != 0 ? values[HEADER_TABLE_SIZE] : -1;
-  }
-
-  /** spdy/3 only. */
-  int getDownloadBandwidth(int defaultValue) {
-    int bit = 1 << DOWNLOAD_BANDWIDTH;
-    return (bit & set) != 0 ? values[DOWNLOAD_BANDWIDTH] : defaultValue;
-  }
-
-  /** HTTP/2 only. */
-  // TODO: honor this setting in HTTP/2.
-  boolean getEnablePush(boolean defaultValue) {
-    int bit = 1 << ENABLE_PUSH;
-    return ((bit & set) != 0 ? values[ENABLE_PUSH] : defaultValue ? 1 : 0) == 1;
-  }
-
-  /** spdy/3 only. */
-  int getRoundTripTime(int defaultValue) {
-    int bit = 1 << ROUND_TRIP_TIME;
-    return (bit & set) != 0 ? values[ROUND_TRIP_TIME] : defaultValue;
-  }
-
-  // TODO: honor this setting in spdy/3 and HTTP/2.
-  int getMaxConcurrentStreams(int defaultValue) {
-    int bit = 1 << MAX_CONCURRENT_STREAMS;
-    return (bit & set) != 0 ? values[MAX_CONCURRENT_STREAMS] : defaultValue;
-  }
-
-  /** spdy/3 only. */
-  int getCurrentCwnd(int defaultValue) {
-    int bit = 1 << CURRENT_CWND;
-    return (bit & set) != 0 ? values[CURRENT_CWND] : defaultValue;
-  }
-
-  /** spdy/3 only. */
-  int getDownloadRetransRate(int defaultValue) {
-    int bit = 1 << DOWNLOAD_RETRANS_RATE;
-    return (bit & set) != 0 ? values[DOWNLOAD_RETRANS_RATE] : defaultValue;
-  }
-
-  public int getInitialWindowSize(int defaultValue) {
-    int bit = 1 << INITIAL_WINDOW_SIZE;
-    return (bit & set) != 0 ? values[INITIAL_WINDOW_SIZE] : defaultValue;
-  }
-
-  /** spdy/3 only. */
-  int getClientCertificateVectorSize(int defaultValue) {
-    int bit = 1 << CLIENT_CERTIFICATE_VECTOR_SIZE;
-    return (bit & set) != 0 ? values[CLIENT_CERTIFICATE_VECTOR_SIZE] : defaultValue;
-  }
-
-  // TODO: honor this setting in spdy/3 and HTTP/2.
-  boolean isFlowControlDisabled() {
-    int bit = 1 << FLOW_CONTROL_OPTIONS;
-    int value = (bit & set) != 0 ? values[FLOW_CONTROL_OPTIONS] : 0;
-    return (value & FLOW_CONTROL_OPTIONS_DISABLED) != 0;
-  }
-
-  /**
-   * Returns true if this user agent should use this setting in future spdy/3
-   * connections to the same host.
-   */
-  boolean persistValue(int id) {
-    int bit = 1 << id;
-    return (persistValue & bit) != 0;
-  }
-
-  /** Returns true if this setting was persisted. */
-  boolean isPersisted(int id) {
-    int bit = 1 << id;
-    return (persisted & bit) != 0;
-  }
-
-  /**
-   * Writes {@code other} into this. If any setting is populated by this and
-   * {@code other}, the value and flags from {@code other} will be kept.
-   */
-  public void merge(Settings other) {
-    for (int i = 0; i < COUNT; i++) {
-      if (!other.isSet(i)) continue;
-      set(i, other.flags(i), other.get(i));
-    }
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
deleted file mode 100644
index 13914541e..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Spdy3.java
+++ /dev/null
@@ -1,612 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy;
-
-import android.os.Build;
-
-import com.koushikdutta.async.BufferedDataSink;
-import com.koushikdutta.async.BuildConfig;
-import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.DataEmitter;
-import com.koushikdutta.async.DataEmitterReader;
-import com.koushikdutta.async.callback.CompletedCallback;
-import com.koushikdutta.async.callback.DataCallback;
-import com.koushikdutta.async.http.Protocol;
-import com.koushikdutta.async.util.Charsets;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.ProtocolException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.List;
-import java.util.Locale;
-import java.util.zip.Deflater;
-
-
-/**
- * Read and write spdy/3.1 frames.
- * http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3-1
- */
-final class Spdy3 implements Variant {
-
-    @Override
-    public Protocol getProtocol() {
-        return Protocol.SPDY_3;
-    }
-
-    static final int TYPE_DATA = 0x0;
-    static final int TYPE_SYN_STREAM = 0x1;
-    static final int TYPE_SYN_REPLY = 0x2;
-    static final int TYPE_RST_STREAM = 0x3;
-    static final int TYPE_SETTINGS = 0x4;
-    static final int TYPE_PING = 0x6;
-    static final int TYPE_GOAWAY = 0x7;
-    static final int TYPE_HEADERS = 0x8;
-    static final int TYPE_WINDOW_UPDATE = 0x9;
-
-    static final int FLAG_FIN = 0x1;
-    static final int FLAG_UNIDIRECTIONAL = 0x2;
-
-    static final int VERSION = 3;
-
-    static final byte[] DICTIONARY;
-
-    static {
-        try {
-            DICTIONARY = ("\u0000\u0000\u0000\u0007options\u0000\u0000\u0000\u0004hea"
-            + "d\u0000\u0000\u0000\u0004post\u0000\u0000\u0000\u0003put\u0000\u0000\u0000\u0006dele"
-            + "te\u0000\u0000\u0000\u0005trace\u0000\u0000\u0000\u0006accept\u0000\u0000\u0000"
-            + "\u000Eaccept-charset\u0000\u0000\u0000\u000Faccept-encoding\u0000\u0000\u0000\u000Fa"
-            + "ccept-language\u0000\u0000\u0000\raccept-ranges\u0000\u0000\u0000\u0003age\u0000"
-            + "\u0000\u0000\u0005allow\u0000\u0000\u0000\rauthorization\u0000\u0000\u0000\rcache-co"
-            + "ntrol\u0000\u0000\u0000\nconnection\u0000\u0000\u0000\fcontent-base\u0000\u0000"
-            + "\u0000\u0010content-encoding\u0000\u0000\u0000\u0010content-language\u0000\u0000"
-            + "\u0000\u000Econtent-length\u0000\u0000\u0000\u0010content-location\u0000\u0000\u0000"
-            + "\u000Bcontent-md5\u0000\u0000\u0000\rcontent-range\u0000\u0000\u0000\fcontent-type"
-            + "\u0000\u0000\u0000\u0004date\u0000\u0000\u0000\u0004etag\u0000\u0000\u0000\u0006expe"
-            + "ct\u0000\u0000\u0000\u0007expires\u0000\u0000\u0000\u0004from\u0000\u0000\u0000"
-            + "\u0004host\u0000\u0000\u0000\bif-match\u0000\u0000\u0000\u0011if-modified-since"
-            + "\u0000\u0000\u0000\rif-none-match\u0000\u0000\u0000\bif-range\u0000\u0000\u0000"
-            + "\u0013if-unmodified-since\u0000\u0000\u0000\rlast-modified\u0000\u0000\u0000\blocati"
-            + "on\u0000\u0000\u0000\fmax-forwards\u0000\u0000\u0000\u0006pragma\u0000\u0000\u0000"
-            + "\u0012proxy-authenticate\u0000\u0000\u0000\u0013proxy-authorization\u0000\u0000"
-            + "\u0000\u0005range\u0000\u0000\u0000\u0007referer\u0000\u0000\u0000\u000Bretry-after"
-            + "\u0000\u0000\u0000\u0006server\u0000\u0000\u0000\u0002te\u0000\u0000\u0000\u0007trai"
-            + "ler\u0000\u0000\u0000\u0011transfer-encoding\u0000\u0000\u0000\u0007upgrade\u0000"
-            + "\u0000\u0000\nuser-agent\u0000\u0000\u0000\u0004vary\u0000\u0000\u0000\u0003via"
-            + "\u0000\u0000\u0000\u0007warning\u0000\u0000\u0000\u0010www-authenticate\u0000\u0000"
-            + "\u0000\u0006method\u0000\u0000\u0000\u0003get\u0000\u0000\u0000\u0006status\u0000"
-            + "\u0000\u0000\u0006200 OK\u0000\u0000\u0000\u0007version\u0000\u0000\u0000\bHTTP/1.1"
-            + "\u0000\u0000\u0000\u0003url\u0000\u0000\u0000\u0006public\u0000\u0000\u0000\nset-coo"
-            + "kie\u0000\u0000\u0000\nkeep-alive\u0000\u0000\u0000\u0006origin100101201202205206300"
-            + "302303304305306307402405406407408409410411412413414415416417502504505203 Non-Authori"
-            + "tative Information204 No Content301 Moved Permanently400 Bad Request401 Unauthorized"
-            + "403 Forbidden404 Not Found500 Internal Server Error501 Not Implemented503 Service Un"
-            + "availableJan Feb Mar Apr May Jun Jul Aug Sept Oct Nov Dec 00:00:00 Mon, Tue, Wed, Th"
-            + "u, Fri, Sat, Sun, GMTchunked,text/html,image/png,image/jpg,image/gif,application/xml"
-            + ",application/xhtml+xml,text/plain,text/javascript,publicprivatemax-age=gzip,deflate,"
-            + "sdchcharset=utf-8charset=iso-8859-1,utf-,*,enq=0.").getBytes(Charsets.UTF_8.name());
-        } catch (UnsupportedEncodingException e) {
-            throw new AssertionError();
-        }
-    }
-
-    @Override
-    public FrameReader newReader(DataEmitter source, FrameReader.Handler handler, boolean client) {
-        return new Reader(source, handler, client);
-    }
-
-    @Override
-    public FrameWriter newWriter(BufferedDataSink sink, boolean client) {
-        return new Writer(sink, client);
-    }
-
-    @Override
-    public int maxFrameSize() {
-        return 16383;
-    }
-
-    /**
-     * Read spdy/3 frames.
-     */
-    static final class Reader implements FrameReader {
-        private final HeaderReader headerReader = new HeaderReader();
-        private final DataEmitter emitter;
-        private final boolean client;
-        private final Handler handler;
-        private final DataEmitterReader reader;
-
-        Reader(DataEmitter emitter, Handler handler, boolean client) {
-            this.emitter = emitter;
-            this.handler = handler;
-            this.client = client;
-
-            emitter.setEndCallback(new CompletedCallback() {
-                @Override
-                public void onCompleted(Exception ex) {
-                    // TODO: handle termination
-                }
-            });
-
-            reader = new DataEmitterReader();
-            parseFrameHeader();
-        }
-
-        private void parseFrameHeader() {
-            emitter.setDataCallback(reader);
-            reader.read(8, onFrame);
-        }
-
-        int w1;
-        int w2;
-        int flags;
-        int length;
-        int streamId;
-        boolean inFinished;
-        private final ByteBufferList emptyList = new ByteBufferList();
-        private final DataCallback onFrame = new DataCallback() {
-            @Override
-            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-                bb.order(ByteOrder.BIG_ENDIAN);
-                w1 = bb.getInt();
-                w2 = bb.getInt();
-
-                boolean control = (w1 & 0x80000000) != 0;
-                flags = (w2 & 0xff000000) >>> 24;
-                length = (w2 & 0xffffff);
-
-                if (!control) {
-                    streamId = w1 & 0x7fffffff;
-                    inFinished = (flags & FLAG_FIN) != 0;
-                    emitter.setDataCallback(onDataFrame);
-
-                    if (length == 0) {
-                        // zero length packet, immediately trigger the data parsing
-                        // fixes the hanging response portion of https://github.com/koush/ion/issues/443#issuecomment-67729152
-                        onDataFrame.onDataAvailable(emitter, emptyList);
-                    }
-                }
-                else {
-                    reader.read(length, onFullFrame);
-                }
-            }
-        };
-
-        ByteBufferList partial = new ByteBufferList();
-        private final DataCallback onDataFrame = new DataCallback() {
-            @Override
-            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-                int toRead = Math.min(bb.remaining(), length);
-                if (toRead < bb.remaining()) {
-                    bb.get(partial, toRead);
-                    bb = partial;
-                }
-
-                length -= toRead;
-                handler.data(length == 0 && inFinished, streamId, bb);
-
-                if (length == 0)
-                    parseFrameHeader();
-            }
-        };
-
-        private final DataCallback onFullFrame = new DataCallback() {
-            @Override
-            public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-                // queue up the next frame read
-                bb.order(ByteOrder.BIG_ENDIAN);
-
-                int version = (w1 & 0x7fff0000) >>> 16;
-                int type = (w1 & 0xffff);
-
-                try {
-                    if (version != 3) {
-                        throw new ProtocolException("version != 3: " + version);
-                    }
-
-                    switch (type) {
-                        case TYPE_SYN_STREAM:
-                            readSynStream(bb, flags, length);
-                            break;
-
-                        case TYPE_SYN_REPLY:
-                            readSynReply(bb, flags, length);
-                            break;
-
-                        case TYPE_RST_STREAM:
-                            readRstStream(bb, flags, length);
-                            break;
-
-                        case TYPE_SETTINGS:
-                            readSettings(bb, flags, length);
-                            break;
-
-                        case TYPE_PING:
-                            readPing(bb, flags, length);
-                            break;
-
-                        case TYPE_GOAWAY:
-                            readGoAway(bb, flags, length);
-                            break;
-
-                        case TYPE_HEADERS:
-                            readHeaders(bb, flags, length);
-                            break;
-
-                        case TYPE_WINDOW_UPDATE:
-                            readWindowUpdate(bb, flags, length);
-                            break;
-
-                        default:
-                            bb.recycle();
-                            break;
-                    }
-                    parseFrameHeader();
-                }
-                catch (IOException e) {
-                    handler.error(e);
-                }
-            }
-        };
-
-        /*
-        @Override
-        public void readConnectionPreface() {
-        }
-        */
-
-        private void readSynStream(ByteBufferList source, int flags, int length) throws IOException {
-            int w1 = source.getInt();
-            int w2 = source.getInt();
-            int streamId = w1 & 0x7fffffff;
-            int associatedStreamId = w2 & 0x7fffffff;
-            source.getShort(); // int priority = (s3 & 0xe000) >>> 13; int slot = s3 & 0xff;
-            List<Header> headerBlock = headerReader.readHeader(source, length - 10);
-
-            boolean inFinished = (flags & FLAG_FIN) != 0;
-            boolean outFinished = (flags & FLAG_UNIDIRECTIONAL) != 0;
-            handler.headers(outFinished, inFinished, streamId, associatedStreamId, headerBlock,
-            HeadersMode.SPDY_SYN_STREAM);
-        }
-
-        private void readSynReply(ByteBufferList source, int flags, int length) throws IOException {
-            int w1 = source.getInt();
-            int streamId = w1 & 0x7fffffff;
-            List<Header> headerBlock = headerReader.readHeader(source, length - 4);
-            boolean inFinished = (flags & FLAG_FIN) != 0;
-            handler.headers(false, inFinished, streamId, -1, headerBlock, HeadersMode.SPDY_REPLY);
-        }
-
-        private void readRstStream(ByteBufferList source, int flags, int length) throws IOException {
-            if (length != 8) throw ioException("TYPE_RST_STREAM length: %d != 8", length);
-            int streamId = source.getInt() & 0x7fffffff;
-            int errorCodeInt = source.getInt();
-            ErrorCode errorCode = ErrorCode.fromSpdy3Rst(errorCodeInt);
-            if (errorCode == null) {
-                throw ioException("TYPE_RST_STREAM unexpected error code: %d", errorCodeInt);
-            }
-            handler.rstStream(streamId, errorCode);
-        }
-
-        private void readHeaders(ByteBufferList source, int flags, int length) throws IOException {
-            int w1 = source.getInt();
-            int streamId = w1 & 0x7fffffff;
-            List<Header> headerBlock = headerReader.readHeader(source, length - 4);
-            handler.headers(false, false, streamId, -1, headerBlock, HeadersMode.SPDY_HEADERS);
-        }
-
-        private void readWindowUpdate(ByteBufferList source, int flags, int length) throws IOException {
-            if (length != 8) throw ioException("TYPE_WINDOW_UPDATE length: %d != 8", length);
-            int w1 = source.getInt();
-            int w2 = source.getInt();
-            int streamId = w1 & 0x7fffffff;
-            long increment = w2 & 0x7fffffff;
-            if (increment == 0) throw ioException("windowSizeIncrement was 0", increment);
-            handler.windowUpdate(streamId, increment);
-        }
-
-        private void readPing(ByteBufferList source, int flags, int length) throws IOException {
-            if (length != 4) throw ioException("TYPE_PING length: %d != 4", length);
-            int id = source.getInt();
-            boolean ack = client == ((id & 1) == 1);
-            handler.ping(ack, id, 0);
-        }
-
-        private void readGoAway(ByteBufferList source, int flags, int length) throws IOException {
-            if (length != 8) throw ioException("TYPE_GOAWAY length: %d != 8", length);
-            int lastGoodStreamId = source.getInt() & 0x7fffffff;
-            int errorCodeInt = source.getInt();
-            ErrorCode errorCode = ErrorCode.fromSpdyGoAway(errorCodeInt);
-            if (errorCode == null) {
-                throw ioException("TYPE_GOAWAY unexpected error code: %d", errorCodeInt);
-            }
-            handler.goAway(lastGoodStreamId, errorCode, ByteString.EMPTY);
-        }
-
-        private void readSettings(ByteBufferList source, int flags, int length) throws IOException {
-            int numberOfEntries = source.getInt();
-            if (length != 4 + 8 * numberOfEntries) {
-                throw ioException("TYPE_SETTINGS length: %d != 4 + 8 * %d", length, numberOfEntries);
-            }
-            Settings settings = new Settings();
-            for (int i = 0; i < numberOfEntries; i++) {
-                int w1 = source.getInt();
-                int value = source.getInt();
-                int idFlags = (w1 & 0xff000000) >>> 24;
-                int id = w1 & 0xffffff;
-                settings.set(id, idFlags, value);
-            }
-            boolean clearPrevious = (flags & Settings.FLAG_CLEAR_PREVIOUSLY_PERSISTED_SETTINGS) != 0;
-            handler.settings(clearPrevious, settings);
-        }
-
-        private static IOException ioException(String message, Object... args) throws IOException {
-            throw new IOException(String.format(Locale.ENGLISH, message, args));
-        }
-    }
-
-    /**
-     * Write spdy/3 frames.
-     */
-    static final class Writer implements FrameWriter {
-        private final BufferedDataSink sink;
-        private final boolean client;
-        private boolean closed;
-        private ByteBufferList frameHeader = new ByteBufferList();
-        private final Deflater deflater = new Deflater();
-
-        Writer(BufferedDataSink sink, boolean client) {
-            this.sink = sink;
-            this.client = client;
-
-            deflater.setDictionary(DICTIONARY);
-        }
-
-        @Override
-        public void ackSettings() {
-            // Do nothing: no ACK for SPDY/3 settings.
-        }
-
-        @Override
-        public void pushPromise(int streamId, int promisedStreamId, List<Header> requestHeaders)
-        throws IOException {
-            // Do nothing: no push promise for SPDY/3.
-        }
-
-        @Override
-        public synchronized void connectionPreface() {
-            // Do nothing: no connection preface for SPDY/3.
-        }
-
-        @Override
-        public synchronized void synStream(boolean outFinished, boolean inFinished,
-                                           int streamId, int associatedStreamId, List<Header> headerBlock)
-        throws IOException {
-            if (closed) throw new IOException("closed");
-            ByteBufferList headerBlockBuffer = writeNameValueBlockToBuffer(headerBlock);
-            int length = (int) (10 + headerBlockBuffer.remaining());
-            int type = TYPE_SYN_STREAM;
-            int flags = (outFinished ? FLAG_FIN : 0) | (inFinished ? FLAG_UNIDIRECTIONAL : 0);
-
-            int unused = 0;
-            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
-            sink.putInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-            sink.putInt((flags & 0xff) << 24 | length & 0xffffff);
-            sink.putInt(streamId & 0x7fffffff);
-            sink.putInt(associatedStreamId & 0x7fffffff);
-            sink.putShort((short) ((unused & 0x7) << 13 | (unused & 0x1f) << 8 | (unused & 0xff)));
-            sink.flip();
-            this.sink.write(frameHeader.add(sink).add(headerBlockBuffer));
-        }
-
-        @Override
-        public synchronized void synReply(boolean outFinished, int streamId,
-                                          List<Header> headerBlock) throws IOException {
-            if (closed) throw new IOException("closed");
-            ByteBufferList headerBlockBuffer = writeNameValueBlockToBuffer(headerBlock);
-            int type = TYPE_SYN_REPLY;
-            int flags = (outFinished ? FLAG_FIN : 0);
-            int length = (int) (headerBlockBuffer.remaining() + 4);
-
-            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
-            sink.putInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-            sink.putInt((flags & 0xff) << 24 | length & 0xffffff);
-            sink.putInt(streamId & 0x7fffffff);
-            sink.flip();
-            this.sink.write(frameHeader.add(sink).add(headerBlockBuffer));
-        }
-
-        @Override
-        public synchronized void headers(int streamId, List<Header> headerBlock)
-        throws IOException {
-            if (closed) throw new IOException("closed");
-            ByteBufferList headerBlockBuffer = writeNameValueBlockToBuffer(headerBlock);
-            int flags = 0;
-            int type = TYPE_HEADERS;
-            int length = (int) (headerBlockBuffer.remaining() + 4);
-
-            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
-            sink.putInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-            sink.putInt((flags & 0xff) << 24 | length & 0xffffff);
-            sink.putInt(streamId & 0x7fffffff);
-            sink.flip();
-            this.sink.write(frameHeader.add(sink).add(headerBlockBuffer));
-        }
-
-        @Override
-        public synchronized void rstStream(int streamId, ErrorCode errorCode)
-        throws IOException {
-            if (closed) throw new IOException("closed");
-            if (errorCode.spdyRstCode == -1) throw new IllegalArgumentException();
-            int flags = 0;
-            int type = TYPE_RST_STREAM;
-            int length = 8;
-            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
-            sink.putInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-            sink.putInt((flags & 0xff) << 24 | length & 0xffffff);
-            sink.putInt(streamId & 0x7fffffff);
-            sink.putInt(errorCode.spdyRstCode);
-            sink.flip();
-            this.sink.write(frameHeader.addAll(sink));
-        }
-
-        @Override
-        public synchronized void data(boolean outFinished, int streamId, ByteBufferList source) throws IOException {
-            int flags = (outFinished ? FLAG_FIN : 0);
-            sendDataFrame(streamId, flags, source);
-        }
-
-        ByteBufferList dataList = new ByteBufferList();
-        void sendDataFrame(int streamId, int flags, ByteBufferList buffer)
-        throws IOException {
-            if (closed) throw new IOException("closed");
-            int byteCount = buffer.remaining();
-            if (byteCount > 0xffffffL) {
-                throw new IllegalArgumentException("FRAME_TOO_LARGE max size is 16Mib: " + byteCount);
-            }
-            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
-            sink.putInt(streamId & 0x7fffffff);
-            sink.putInt((flags & 0xff) << 24 | byteCount & 0xffffff);
-            sink.flip();
-            dataList.add(sink).add(buffer);
-            this.sink.write(dataList);
-        }
-
-        ByteBufferList headerBlockList = new ByteBufferList();
-        private ByteBufferList writeNameValueBlockToBuffer(List<Header> headerBlock) throws IOException {
-            if (headerBlockList.hasRemaining()) throw new IllegalStateException();
-            ByteBuffer headerBlockOut = ByteBufferList.obtain(8192).order(ByteOrder.BIG_ENDIAN);
-            headerBlockOut.putInt(headerBlock.size());
-            for (int i = 0, size = headerBlock.size(); i < size; i++) {
-                ByteString name = headerBlock.get(i).name;
-                headerBlockOut.putInt(name.size());
-                headerBlockOut.put(name.toByteArray());
-                ByteString value = headerBlock.get(i).value;
-                headerBlockOut.putInt(value.size());
-                headerBlockOut.put(value.toByteArray());
-                if (headerBlockOut.remaining() < headerBlockOut.capacity() / 2) {
-                    ByteBuffer newOut = ByteBufferList.obtain(headerBlockOut.capacity() * 2).order(ByteOrder.BIG_ENDIAN);
-                    headerBlockOut.flip();
-                    newOut.put(headerBlockOut);
-                    ByteBufferList.reclaim(headerBlockOut);
-                    headerBlockOut = newOut;
-                }
-            }
-
-            headerBlockOut.flip();
-            deflater.setInput(headerBlockOut.array(), 0, headerBlockOut.remaining());
-            while (!deflater.needsInput()) {
-                ByteBuffer deflated = ByteBufferList.obtain(headerBlockOut.capacity()).order(ByteOrder.BIG_ENDIAN);
-                final int read;
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                    read = deflater.deflate(deflated.array(), 0, deflated.capacity(), Deflater.SYNC_FLUSH);
-                } else {
-                    read = deflater.deflate(deflated.array(), 0, deflated.capacity());
-                }
-
-                deflated.limit(read);
-                headerBlockList.add(deflated);
-            }
-            ByteBufferList.reclaim(headerBlockOut);
-
-            return headerBlockList;
-        }
-
-        @Override
-        public synchronized void settings(Settings settings) throws IOException {
-            if (closed) throw new IOException("closed");
-            int type = TYPE_SETTINGS;
-            int flags = 0;
-            int size = settings.size();
-            int length = 4 + size * 8;
-            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
-            sink.putInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-            sink.putInt((flags & 0xff) << 24 | length & 0xffffff);
-            sink.putInt(size);
-            for (int i = 0; i <= Settings.COUNT; i++) {
-                if (!settings.isSet(i)) continue;
-                int settingsFlags = settings.flags(i);
-                sink.putInt((settingsFlags & 0xff) << 24 | (i & 0xffffff));
-                sink.putInt(settings.get(i));
-            }
-            sink.flip();
-            this.sink.write(frameHeader.addAll(sink));
-        }
-
-        @Override
-        public synchronized void ping(boolean reply, int payload1, int payload2)
-        throws IOException {
-            if (closed) throw new IOException("closed");
-            boolean payloadIsReply = client != ((payload1 & 1) == 1);
-            if (reply != payloadIsReply) throw new IllegalArgumentException("payload != reply");
-            int type = TYPE_PING;
-            int flags = 0;
-            int length = 4;
-            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
-            sink.putInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-            sink.putInt((flags & 0xff) << 24 | length & 0xffffff);
-            sink.putInt(payload1);
-            sink.flip();
-            this.sink.write(frameHeader.addAll(sink));
-        }
-
-        @Override
-        public synchronized void goAway(int lastGoodStreamId, ErrorCode errorCode,
-                                        byte[] ignored) throws IOException {
-            if (closed) throw new IOException("closed");
-            if (errorCode.spdyGoAwayCode == -1) {
-                throw new IllegalArgumentException("errorCode.spdyGoAwayCode == -1");
-            }
-            int type = TYPE_GOAWAY;
-            int flags = 0;
-            int length = 8;
-            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
-            sink.putInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-            sink.putInt((flags & 0xff) << 24 | length & 0xffffff);
-            sink.putInt(lastGoodStreamId);
-            sink.putInt(errorCode.spdyGoAwayCode);
-            sink.flip();
-            this.sink.write(frameHeader.addAll(sink));
-        }
-
-        @Override
-        public synchronized void windowUpdate(int streamId, long increment)
-        throws IOException {
-            if (closed) throw new IOException("closed");
-            if (increment == 0 || increment > 0x7fffffffL) {
-                throw new IllegalArgumentException(
-                "windowSizeIncrement must be between 1 and 0x7fffffff: " + increment);
-            }
-            int type = TYPE_WINDOW_UPDATE;
-            int flags = 0;
-            int length = 8;
-            ByteBuffer sink = ByteBufferList.obtain(256).order(ByteOrder.BIG_ENDIAN);
-            sink.putInt(0x80000000 | (VERSION & 0x7fff) << 16 | type & 0xffff);
-            sink.putInt((flags & 0xff) << 24 | length & 0xffffff);
-            sink.putInt(streamId);
-            sink.putInt((int) increment);
-            sink.flip();
-            this.sink.write(frameHeader.addAll(sink));
-        }
-
-        @Override
-        public synchronized void close() throws IOException {
-            closed = true;
-        }
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
deleted file mode 100644
index 26dec047d..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyMiddleware.java
+++ /dev/null
@@ -1,440 +0,0 @@
-package com.koushikdutta.async.http.spdy;
-
-import android.net.Uri;
-import android.text.TextUtils;
-
-import com.koushikdutta.async.AsyncSSLSocket;
-import com.koushikdutta.async.AsyncSSLSocketWrapper;
-import com.koushikdutta.async.AsyncSocket;
-import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.DataEmitter;
-import com.koushikdutta.async.callback.ConnectCallback;
-import com.koushikdutta.async.future.Cancellable;
-import com.koushikdutta.async.future.FutureCallback;
-import com.koushikdutta.async.future.MultiFuture;
-import com.koushikdutta.async.future.SimpleCancellable;
-import com.koushikdutta.async.http.AsyncHttpClient;
-import com.koushikdutta.async.http.AsyncHttpRequest;
-import com.koushikdutta.async.http.AsyncSSLEngineConfigurator;
-import com.koushikdutta.async.http.AsyncSSLSocketMiddleware;
-import com.koushikdutta.async.http.Headers;
-import com.koushikdutta.async.http.HttpUtil;
-import com.koushikdutta.async.http.Multimap;
-import com.koushikdutta.async.http.Protocol;
-import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
-import com.koushikdutta.async.util.Charsets;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Locale;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLEngine;
-
-public class SpdyMiddleware extends AsyncSSLSocketMiddleware {
-    public SpdyMiddleware(AsyncHttpClient client) {
-        super(client);
-        addEngineConfigurator(new AsyncSSLEngineConfigurator() {
-            @Override
-            public SSLEngine createEngine(SSLContext sslContext, String peerHost, int peerPort) {
-                return null;
-            }
-
-            @Override
-            public void configureEngine(SSLEngine engine, GetSocketData data, String host, int port) {
-                configure(engine, data, host, port);
-            }
-        });
-    }
-
-    private void configure(SSLEngine engine, GetSocketData data, String host, int port) {
-        if (!initialized && spdyEnabled) {
-            initialized = true;
-            try {
-                peerHost = engine.getClass().getSuperclass().getDeclaredField("peerHost");
-                peerPort = engine.getClass().getSuperclass().getDeclaredField("peerPort");
-                sslParameters = engine.getClass().getDeclaredField("sslParameters");
-                npnProtocols = sslParameters.getType().getDeclaredField("npnProtocols");
-                alpnProtocols = sslParameters.getType().getDeclaredField("alpnProtocols");
-                useSni = sslParameters.getType().getDeclaredField("useSni");
-                sslNativePointer = engine.getClass().getDeclaredField("sslNativePointer");
-                String nativeCryptoName = sslParameters.getType().getPackage().getName() + ".NativeCrypto";
-                nativeGetNpnNegotiatedProtocol = Class.forName(nativeCryptoName, true, sslParameters.getType().getClassLoader())
-                .getDeclaredMethod("SSL_get_npn_negotiated_protocol", long.class);
-                nativeGetAlpnNegotiatedProtocol = Class.forName(nativeCryptoName, true, sslParameters.getType().getClassLoader())
-                .getDeclaredMethod("SSL_get0_alpn_selected", long.class);
-
-                peerHost.setAccessible(true);
-                peerPort.setAccessible(true);
-                sslParameters.setAccessible(true);
-                npnProtocols.setAccessible(true);
-                alpnProtocols.setAccessible(true);
-                useSni.setAccessible(true);
-                sslNativePointer.setAccessible(true);
-                nativeGetNpnNegotiatedProtocol.setAccessible(true);
-                nativeGetAlpnNegotiatedProtocol.setAccessible(true);
-            }
-            catch (Exception e) {
-                sslParameters = null;
-                npnProtocols = null;
-                alpnProtocols = null;
-                useSni = null;
-                sslNativePointer = null;
-                nativeGetNpnNegotiatedProtocol = null;
-                nativeGetAlpnNegotiatedProtocol = null;
-            }
-        }
-
-        // TODO: figure out why POST does not work if sending content-length header
-        // see above regarding app engine comment as to why: drive requires content-length
-        // but app engine sends a GO_AWAY if it sees a content-length...
-        if (!canSpdyRequest(data))
-            return;
-
-        if (sslParameters != null) {
-            try {
-                byte[] protocols = concatLengthPrefixed(
-                Protocol.SPDY_3
-                );
-
-                peerHost.set(engine, host);
-                peerPort.set(engine, port);
-                Object sslp = sslParameters.get(engine);
-//                npnProtocols.set(sslp, protocols);
-                alpnProtocols.set(sslp, protocols);
-                useSni.set(sslp, true);
-            }
-            catch (Exception e ) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    boolean initialized;
-    Field peerHost;
-    Field peerPort;
-    Field sslParameters;
-    Field npnProtocols;
-    Field alpnProtocols;
-    Field sslNativePointer;
-    Field useSni;
-    Method nativeGetNpnNegotiatedProtocol;
-    Method nativeGetAlpnNegotiatedProtocol;
-    Hashtable<String, SpdyConnectionWaiter> connections = new Hashtable<String, SpdyConnectionWaiter>();
-    boolean spdyEnabled;
-
-    private static class SpdyConnectionWaiter extends MultiFuture<AsyncSpdyConnection> {
-        SimpleCancellable originalCancellable = new SimpleCancellable();
-    }
-
-    public boolean getSpdyEnabled() {
-        return spdyEnabled;
-    }
-
-    public void setSpdyEnabled(boolean enabled) {
-        spdyEnabled = enabled;
-    }
-
-    @Override
-    public void setSSLContext(SSLContext sslContext) {
-        super.setSSLContext(sslContext);
-        initialized = false;
-    }
-
-    static byte[] concatLengthPrefixed(Protocol... protocols) {
-        ByteBuffer result = ByteBuffer.allocate(8192);
-        for (Protocol protocol: protocols) {
-            if (protocol == Protocol.HTTP_1_0) continue; // No HTTP/1.0 for NPN.
-            result.put((byte) protocol.toString().length());
-            result.put(protocol.toString().getBytes(Charsets.UTF_8));
-        }
-        result.flip();
-        byte[] ret = new ByteBufferList(result).getAllByteArray();
-        return ret;
-    }
-
-    private static String requestPath(Uri uri) {
-        String pathAndQuery = uri.getEncodedPath();
-        if (pathAndQuery == null)
-            pathAndQuery = "/";
-        else if (!pathAndQuery.startsWith("/"))
-            pathAndQuery = "/" + pathAndQuery;
-        if (!TextUtils.isEmpty(uri.getEncodedQuery()))
-            pathAndQuery += "?" + uri.getEncodedQuery();
-        return pathAndQuery;
-    }
-
-    private static class NoSpdyException extends Exception {
-    }
-    private static final NoSpdyException NO_SPDY = new NoSpdyException();
-
-    private void noSpdy(String key) {
-        SpdyConnectionWaiter conn = connections.remove(key);
-        if (conn != null)
-            conn.setComplete(NO_SPDY);
-    }
-
-    private void invokeConnect(String key, final ConnectCallback callback, Exception e, AsyncSSLSocket socket) {
-        SpdyConnectionWaiter waiter = connections.get(key);
-        if (waiter == null || waiter.originalCancellable.setComplete())
-            callback.onConnectCompleted(e, socket);
-    }
-
-    @Override
-    protected AsyncSSLSocketWrapper.HandshakeCallback createHandshakeCallback(final GetSocketData data, final ConnectCallback callback) {
-        final String key = data.state.get("spdykey");
-        if (key == null)
-            return super.createHandshakeCallback(data, callback);
-
-        return new AsyncSSLSocketWrapper.HandshakeCallback() {
-            @Override
-            public void onHandshakeCompleted(Exception e, AsyncSSLSocket socket) {
-                data.request.logv("checking spdy handshake");
-                if (e != null || nativeGetAlpnNegotiatedProtocol == null) {
-                    invokeConnect(key, callback, e, socket);
-                    noSpdy(key);
-                    return;
-                }
-                String protoString;
-                try {
-                    long ptr = (Long)sslNativePointer.get(socket.getSSLEngine());
-                    byte[] proto = (byte[])nativeGetAlpnNegotiatedProtocol.invoke(null, ptr);
-                    if (proto == null) {
-                        invokeConnect(key, callback, null, socket);
-                        noSpdy(key);
-                        return;
-                    }
-                    protoString = new String(proto);
-                    Protocol p = Protocol.get(protoString);
-                    if (p == null || !p.needsSpdyConnection()) {
-                        invokeConnect(key, callback, null, socket);
-                        noSpdy(key);
-                        return;
-                    }
-                }
-                catch (Exception ex) {
-                    throw new AssertionError(ex);
-                }
-
-                final AsyncSpdyConnection connection = new AsyncSpdyConnection(socket, Protocol.get(protoString)) {
-                    boolean hasReceivedSettings;
-                    @Override
-                    public void settings(boolean clearPrevious, Settings settings) {
-                        super.settings(clearPrevious, settings);
-                        if (!hasReceivedSettings) {
-                            hasReceivedSettings = true;
-
-                            SpdyConnectionWaiter waiter = connections.get(key);
-
-                            if (waiter.originalCancellable.setComplete()) {
-                                data.request.logv("using new spdy connection for host: " + data.request.getUri().getHost());
-                                newSocket(data, this, callback);
-                            }
-
-                            waiter.setComplete(this);
-                        }
-                    }
-                };
-
-                try {
-                    connection.sendConnectionPreface();
-                } catch (IOException e1) {
-                    e1.printStackTrace();
-                }
-            }
-        };
-    }
-
-    private void newSocket(GetSocketData data, final AsyncSpdyConnection connection, final ConnectCallback callback) {
-        final AsyncHttpRequest request = data.request;
-
-        data.protocol = connection.protocol.toString();
-
-        final AsyncHttpRequestBody requestBody = data.request.getBody();
-
-        // this causes app engine to shit a brick, but if it is missing,
-        // drive shits the bed
-//        if (requestBody != null) {
-//            if (requestBody.length() >= 0) {
-//                request.getHeaders().set("Content-Length", String.valueOf(requestBody.length()));
-//            }
-//        }
-
-        final ArrayList<Header> headers = new ArrayList<Header>();
-        headers.add(new Header(Header.TARGET_METHOD, request.getMethod()));
-        headers.add(new Header(Header.TARGET_PATH, requestPath(request.getUri())));
-        String host = request.getHeaders().get("Host");
-        if (Protocol.SPDY_3 == connection.protocol) {
-            headers.add(new Header(Header.VERSION, "HTTP/1.1"));
-            headers.add(new Header(Header.TARGET_HOST, host));
-        } else if (Protocol.HTTP_2 == connection.protocol) {
-            headers.add(new Header(Header.TARGET_AUTHORITY, host)); // Optional in HTTP/2
-        } else {
-            throw new AssertionError();
-        }
-        headers.add(new Header(Header.TARGET_SCHEME, request.getUri().getScheme()));
-
-        final Multimap mm = request.getHeaders().getMultiMap();
-        for (String key: mm.keySet()) {
-            if (SpdyTransport.isProhibitedHeader(connection.protocol, key))
-                continue;
-            for (String value: mm.get(key)) {
-                headers.add(new Header(key.toLowerCase(Locale.US), value));
-            }
-        }
-
-        request.logv("\n" + request);
-        final AsyncSpdyConnection.SpdySocket spdy = connection.newStream(headers, requestBody != null, true);
-        callback.onConnectCompleted(null, spdy);
-    }
-
-    private boolean canSpdyRequest(GetSocketData data) {
-        // TODO: figure out why POST does not work if sending content-length header
-        // see above regarding app engine comment as to why: drive requires content-length
-        // but app engine sends a GO_AWAY if it sees a content-length...
-        return data.request.getBody() == null;
-    }
-
-    @Override
-    protected ConnectCallback wrapCallback(final GetSocketData data, final Uri uri, final int port, final boolean proxied, ConnectCallback callback) {
-        final ConnectCallback superCallback = super.wrapCallback(data, uri, port, proxied, callback);
-        final String key = data.state.get("spdykey");
-        if (key == null)
-            return superCallback;
-
-        // new outgoing connection, try to make this a spdy connection
-        return new ConnectCallback() {
-            @Override
-            public void onConnectCompleted(Exception ex, AsyncSocket socket) {
-                // an exception here is an ssl or network exception... don't rule spdy out yet, but
-                // trigger the waiters
-                if (ex != null) {
-                    final SpdyConnectionWaiter conn = connections.remove(key);
-                    if (conn != null)
-                        conn.setComplete(ex);
-                }
-                superCallback.onConnectCompleted(ex, socket);
-            }
-        };
-    }
-
-    @Override
-    public Cancellable getSocket(final GetSocketData data) {
-        final Uri uri = data.request.getUri();
-        final int port = getSchemePort(data.request.getUri());
-        if (port == -1) {
-            return null;
-        }
-
-        if (!spdyEnabled)
-            return super.getSocket(data);
-
-        // TODO: figure out why POST does not work if sending content-length header
-        // see above regarding app engine comment as to why: drive requires content-length
-        // but app engine sends a GO_AWAY if it sees a content-length...
-        if (!canSpdyRequest(data))
-            return super.getSocket(data);
-
-        // can we use an existing connection to satisfy this, or do we need a new one?
-        String key = uri.getHost() + port;
-        SpdyConnectionWaiter conn = connections.get(key);
-        if (conn != null) {
-            if (conn.tryGetException() instanceof NoSpdyException)
-                return super.getSocket(data);
-
-            // dead connection check
-            if (conn.tryGet() != null && !conn.tryGet().socket.isOpen()) {
-                // old spdy connection is derped, kill it with fire.
-                connections.remove(key);
-                conn = null;
-            }
-        }
-
-        if (conn == null) {
-            // no connection has ever been attempted (or previous one had a network death), so attempt one
-            data.state.put("spdykey", key);
-            // if we got something back synchronously, it's a keep alive socket
-            Cancellable ret = super.getSocket(data);
-            if (ret.isDone() || ret.isCancelled())
-                return ret;
-            conn = new SpdyConnectionWaiter();
-            connections.put(key, conn);
-            return conn.originalCancellable;
-        }
-
-        data.request.logv("waiting for potential spdy connection for host: " + data.request.getUri().getHost());
-        final SimpleCancellable ret = new SimpleCancellable();
-        conn.setCallback(new FutureCallback<AsyncSpdyConnection>() {
-            @Override
-            public void onCompleted(Exception e, AsyncSpdyConnection conn) {
-                if (e instanceof NoSpdyException) {
-                    data.request.logv("spdy not available");
-                    ret.setParent(SpdyMiddleware.super.getSocket(data));
-                    return;
-                }
-                if (e != null) {
-                    if (ret.setComplete())
-                        data.connectCallback.onConnectCompleted(e, null);
-                    return;
-                }
-                data.request.logv("using existing spdy connection for host: " + data.request.getUri().getHost());
-                if (ret.setComplete())
-                    newSocket(data, conn, data.connectCallback);
-            }
-        });
-
-        return ret;
-    }
-
-    @Override
-    public boolean exchangeHeaders(final OnExchangeHeaderData data) {
-        if (!(data.socket instanceof AsyncSpdyConnection.SpdySocket))
-            return super.exchangeHeaders(data);
-
-        AsyncHttpRequestBody requestBody = data.request.getBody();
-        if (requestBody != null) {
-            data.response.sink(data.socket);
-        }
-
-        // headers were already sent as part of the socket being opened.
-        data.sendHeadersCallback.onCompleted(null);
-
-        final AsyncSpdyConnection.SpdySocket spdySocket = (AsyncSpdyConnection.SpdySocket)data.socket;
-        spdySocket.headers()
-        .thenConvert(from -> {
-            Headers headers = new Headers();
-            for (Header header: from) {
-                String key = header.name.utf8();
-                String value = header.value.utf8();
-                headers.add(key, value);
-            }
-            String status = headers.remove(Header.RESPONSE_STATUS.utf8());
-            String[] statusParts = status.split(" ", 2);
-            data.response.code(Integer.parseInt(statusParts[0]));
-            if (statusParts.length == 2)
-                data.response.message(statusParts[1]);
-            data.response.protocol(headers.remove(Header.VERSION.utf8()));
-            data.response.headers(headers);
-            return headers;
-        })
-        .setCallback((e, result) -> {
-            data.receiveHeadersCallback.onCompleted(e);
-            DataEmitter emitter = HttpUtil.getBodyDecoder(spdySocket, spdySocket.getConnection().protocol, result, false);
-            data.response.emitter(emitter);
-        });
-        return true;
-    }
-
-    @Override
-    public void onRequestSent(OnRequestSentData data) {
-        if (!(data.socket instanceof AsyncSpdyConnection.SpdySocket))
-            return;
-
-        if (data.request.getBody() != null)
-            data.response.sink().end();
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
deleted file mode 100644
index ce18555de..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/SpdyTransport.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License";
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.koushikdutta.async.http.spdy;
-
-
-import com.koushikdutta.async.http.Protocol;
-
-import java.util.List;
-import java.util.Locale;
-
-
-final class SpdyTransport {
-  /** See http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3-1#TOC-3.2.1-Request. */
-  private static final List<String> SPDY_3_PROHIBITED_HEADERS = Util.immutableList(
-  "connection",
-  "host",
-  "keep-alive",
-  "proxy-connection",
-  "transfer-encoding");
-
-  /** See http://tools.ietf.org/html/draft-ietf-httpbis-http2-09#section-8.1.3. */
-  private static final List<String> HTTP_2_PROHIBITED_HEADERS = Util.immutableList(
-      "connection",
-      "host",
-      "keep-alive",
-      "proxy-connection",
-      "te",
-      "transfer-encoding",
-      "encoding",
-      "upgrade");
-
-  /** When true, this header should not be emitted or consumed. */
-  static boolean isProhibitedHeader(Protocol protocol, String name) {
-    if (protocol == Protocol.SPDY_3) {
-      return SPDY_3_PROHIBITED_HEADERS.contains(name.toLowerCase(Locale.US));
-    } else if (protocol == Protocol.HTTP_2) {
-      return HTTP_2_PROHIBITED_HEADERS.contains(name.toLowerCase(Locale.US));
-    } else {
-      throw new AssertionError(protocol);
-    }
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Util.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Util.java
deleted file mode 100644
index 288ba2640..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Util.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.koushikdutta.async.http.spdy;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/** Junk drawer of utility methods. */
-final class Util {
-  public static void checkOffsetAndCount(long arrayLength, long offset, long count) {
-    if ((offset | count) < 0 || offset > arrayLength || arrayLength - offset < count) {
-      throw new ArrayIndexOutOfBoundsException();
-    }
-  }
-
-  /** Returns an immutable copy of {@code list}. */
-  public static <T> List<T> immutableList(List<T> list) {
-    return Collections.unmodifiableList(new ArrayList<T>(list));
-  }
-
-  /** Returns an immutable list containing {@code elements}. */
-  public static <T> List<T> immutableList(T... elements) {
-    return Collections.unmodifiableList(Arrays.asList(elements.clone()));
-  }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Variant.java b/AndroidAsync/src/com/koushikdutta/async/http/spdy/Variant.java
deleted file mode 100644
index d54a48470..000000000
--- a/AndroidAsync/src/com/koushikdutta/async/http/spdy/Variant.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2013 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.koushikdutta.async.http.spdy;
-
-
-import com.koushikdutta.async.BufferedDataSink;
-import com.koushikdutta.async.DataEmitter;
-import com.koushikdutta.async.http.Protocol;
-
-/** A version and dialect of the framed socket protocol. */
-interface Variant {
-
-  /** The protocol as selected using NPN or ALPN. */
-  Protocol getProtocol();
-
-  /**
-   * @param client true if this is the HTTP client's reader, reading frames from a server.
-   */
-  FrameReader newReader(DataEmitter source, FrameReader.Handler handler, boolean client);
-
-  /**
-   * @param client true if this is the HTTP client's writer, writing frames to a server.
-   */
-  FrameWriter newWriter(BufferedDataSink sink, boolean client);
-
-  int maxFrameSize();
-}

From 14bd5b8b05063d7e0454087c3379868f79bd6677 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 14 Nov 2019 09:41:30 -0800
Subject: [PATCH 379/399] dead files

---
 .classpath                                    |  8 --
 .project                                      |  2 +-
 AndroidAsync/.classpath                       |  9 +-
 AndroidAsync/.project                         |  8 +-
 AndroidAsync/build.gradle                     |  6 +-
 AndroidAsync/build.xml                        | 92 -------------------
 .../async/future/SimpleFuture.java            |  8 ++
 AndroidAsyncSample/.classpath                 |  9 --
 AndroidAsyncSample/build.xml                  | 92 -------------------
 9 files changed, 19 insertions(+), 215 deletions(-)
 delete mode 100644 .classpath
 delete mode 100644 AndroidAsync/build.xml
 delete mode 100644 AndroidAsyncSample/.classpath
 delete mode 100644 AndroidAsyncSample/build.xml

diff --git a/.classpath b/.classpath
deleted file mode 100644
index a4763d1ee..000000000
--- a/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/.project b/.project
index 4e6d9d160..d5efd1010 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>AndroidAsync</name>
+	<name>Scrypted-AndroidAsync</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/AndroidAsync/.classpath b/AndroidAsync/.classpath
index 51769745b..eb19361b5 100644
--- a/AndroidAsync/.classpath
+++ b/AndroidAsync/.classpath
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin/classes"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
 </classpath>
diff --git a/AndroidAsync/.project b/AndroidAsync/.project
index 4e6d9d160..e1f900d2f 100644
--- a/AndroidAsync/.project
+++ b/AndroidAsync/.project
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>AndroidAsync</name>
+	<name>AndroidAsync-AndroidAsync</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 2ceb51187..3b44d56c1 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -51,6 +51,6 @@ android {
 }
 
 // upload to maven task
-if (System.getenv().I_AM_KOUSH == 'true') {
-    apply from: '/Users/koush/cfg/maven.gradle'
-}
+//if (System.getenv().I_AM_KOUSH == 'true') {
+//    apply from: '/Users/koush/cfg/maven.gradle'
+//}
diff --git a/AndroidAsync/build.xml b/AndroidAsync/build.xml
deleted file mode 100644
index 3150bac95..000000000
--- a/AndroidAsync/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="TestActivity" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
index 4826fa55d..45457f263 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -169,10 +169,14 @@ AsyncSemaphore ensureWaiterLocked() {
     public boolean setComplete(Exception e) {
         return setComplete(e, null, null);
     }
+    public boolean setCompleteException(Exception e) { return setComplete(e, null, null); }
 
     public boolean setComplete(T value) {
         return setComplete(null, value, null);
     }
+    public boolean setCompleteValue(T value) {
+        return setComplete(null, value, null);
+    }
 
     public boolean setComplete(Exception e, T value) {
         return setComplete(e, value, null);
@@ -238,6 +242,10 @@ public Future<T> setComplete(Future<T> future) {
         return setComplete(future, null);
     }
 
+    public Future<T> setCompleteFuture(Future<T> future) {
+        return setComplete(future, null);
+    }
+
 
     /**
      * THIS METHOD IS FOR TEST USE ONLY
diff --git a/AndroidAsyncSample/.classpath b/AndroidAsyncSample/.classpath
deleted file mode 100644
index 0b0840834..000000000
--- a/AndroidAsyncSample/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/AndroidAsyncSample/build.xml b/AndroidAsyncSample/build.xml
deleted file mode 100644
index a10a91491..000000000
--- a/AndroidAsyncSample/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="MainActivity" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>

From b59daa80d0138e9a01fac689386d17af53e41153 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 16 Nov 2019 11:08:21 -0800
Subject: [PATCH 380/399] fixup empty url parameter bug

---
 AndroidAsync-Kotlin/build.gradle               | 18 ++++++++++++++----
 .../com/koushikdutta/async/http/Multimap.java  |  4 ++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/AndroidAsync-Kotlin/build.gradle b/AndroidAsync-Kotlin/build.gradle
index 9415e66c8..d5360c72f 100644
--- a/AndroidAsync-Kotlin/build.gradle
+++ b/AndroidAsync-Kotlin/build.gradle
@@ -1,6 +1,16 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+buildscript {
+    ext.kotlin_version = '1.3.50'
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
 
 android {
     compileSdkVersion 29
@@ -39,9 +49,9 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.jetbrains.kotlin:kotlin-test-junit:1.0.6'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    testImplementation 'org.jetbrains.kotlin:kotlin-test-junit:1.3.50'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
 
 // upload to maven task
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
index 1f2503265..a871b75f2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Multimap.java
@@ -97,9 +97,9 @@ public static Multimap parse(String value, String delimiter, String assigner, bo
             String v = null;
             if (pair.length > 1)
                 v = pair[1];
-            if (unquote && v != null && v.endsWith("\"") && v.startsWith("\""))
+            if (v != null && unquote && v.endsWith("\"") && v.startsWith("\""))
                 v = v.substring(1, v.length() - 1);
-            if (decoder != null) {
+            if (v != null && decoder != null) {
                 key = decoder.decode(key);
                 v = decoder.decode(v);
             }

From acf7297ed44b35d1e834998754b954edd7b46f50 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 30 Nov 2019 22:13:20 -0800
Subject: [PATCH 381/399] merge

---
 AndroidAsync/build.gradle                         | 7 +++----
 AndroidAsync/src/com/koushikdutta/async/Util.java | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 3b44d56c1..7c9e3dafa 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -50,7 +50,6 @@ android {
     }
 }
 
-// upload to maven task
-//if (System.getenv().I_AM_KOUSH == 'true') {
-//    apply from: '/Users/koush/cfg/maven.gradle'
-//}
+if (false && System.getenv().I_AM_KOUSH == 'true') {
+  apply from: 'https://raw.githubusercontent.com/koush/mvn-repo/master/maven.gradle'
+}
diff --git a/AndroidAsync/src/com/koushikdutta/async/Util.java b/AndroidAsync/src/com/koushikdutta/async/Util.java
index 90610522b..4a347a439 100644
--- a/AndroidAsync/src/com/koushikdutta/async/Util.java
+++ b/AndroidAsync/src/com/koushikdutta/async/Util.java
@@ -50,8 +50,8 @@ public static void emitAllData(DataEmitter emitter, ByteBufferList list) {
             list.recycle();
             if (SUPRESS_DEBUG_EXCEPTIONS)
                 return;
-            assert false;
-            throw new AssertionError("Not all data was consumed by Util.emitAllData");
+//            assert false;
+//            throw new AssertionError("Not all data was consumed by Util.emitAllData");
         }
     }
 

From 9ac1aa3341cd12ed60c403c3746bffa2e336a268 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koush@koushikdutta.com>
Date: Mon, 2 Dec 2019 11:39:02 -0800
Subject: [PATCH 382/399] Update README.md

---
 README.md | 48 +++++-------------------------------------------
 1 file changed, 5 insertions(+), 43 deletions(-)

diff --git a/README.md b/README.md
index 322c97d45..27e998572 100644
--- a/README.md
+++ b/README.md
@@ -164,39 +164,6 @@ AsyncHttpClient.getDefaultInstance().websocket(get, "my-protocol", new WebSocket
 ```
 
 
-### AndroidAsync also supports socket.io (version 0.9.x)
-
-```java
-SocketIOClient.connect(AsyncHttpClient.getDefaultInstance(), "http://192.168.1.2:3000", new ConnectCallback() {
-    @Override
-    public void onConnectCompleted(Exception ex, SocketIOClient client) {
-        if (ex != null) {
-            ex.printStackTrace();
-            return;
-        }
-        client.setStringCallback(new StringCallback() {
-            @Override
-            public void onString(String string) {
-                System.out.println(string);
-            }
-        });
-        client.on("someEvent", new EventCallback() {
-            @Override
-            public void onEvent(JSONArray argument, Acknowledge acknowledge) {
-                System.out.println("args: " + arguments.toString());
-            }
-        });
-        client.setJSONCallback(new JSONCallback() {
-            @Override
-            public void onJSON(JSONObject json) {
-                System.out.println("json: " + json.toString());
-            }
-        });
-    }
-});
-```
-
-
 ### AndroidAsync also let's you create simple HTTP servers:
 
 ```java
@@ -221,17 +188,12 @@ server.listen(5000);
 
 ```java
 AsyncHttpServer httpServer = new AsyncHttpServer();
-httpServer.setErrorCallback(new CompletedCallback() {
-            @Override
-            public void onCompleted(Exception ex) {
-                Log.e("WebSocket", "An error occurred", ex);
-            }
-        });
-        httpServer.listen(AsyncServer.getDefault(), port);
 
-        httpServer.websocket("/live", new AsyncHttpServer.WebSocketRequestCallback() {
-            @Override
-            public void onConnected(final WebSocket webSocket, AsyncHttpServerRequest request) {
+httpServer.listen(AsyncServer.getDefault(), port);
+
+httpServer.websocket("/live", new AsyncHttpServer.WebSocketRequestCallback() {
+    @Override
+    public void onConnected(final WebSocket webSocket, AsyncHttpServerRequest request) {
         _sockets.add(webSocket);
         
         //Use this to clean up any references to your websocket

From c84c4738a1f373b521e56cec27d94aa185b0ea5c Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koush@koushikdutta.com>
Date: Mon, 2 Dec 2019 11:39:10 -0800
Subject: [PATCH 383/399] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 27e998572..c4e86b327 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,6 @@ is it.
  * Socket client + socket server
  * HTTP client + server
  * WebSocket client + server
- * Socket.IO client
 
 ### Download
 

From c7da839bda0af49cfa8bb60e59a0fb15d0c3d16d Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koush@koushikdutta.com>
Date: Mon, 2 Dec 2019 11:39:54 -0800
Subject: [PATCH 384/399] Update README.md

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index c4e86b327..3988bc602 100644
--- a/README.md
+++ b/README.md
@@ -257,7 +257,3 @@ client.getString("http://foo.com/hello.txt")
     }
 });
 ```
-
-### Note on SSLv3
-
-https://github.com/koush/AndroidAsync/issues/174

From 20e88978d394b2a64fd8d6db7794fe977369e4a1 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koush@koushikdutta.com>
Date: Mon, 2 Dec 2019 11:40:09 -0800
Subject: [PATCH 385/399] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3988bc602..3c72362a1 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ But if you're looking for a raw Socket, HTTP(s) client/server, and WebSocket lib
 is it.
 
 #### Features
- * Based on NIO. One thread, driven by callbacks. Highly efficient.
+ * Based on NIO. Single threaded and callback driven.
  * All operations return a Future that can be cancelled
  * Socket client + socket server
  * HTTP client + server

From 69baf973a1f3b9714793da4d7626c0cb299c9bf7 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koush@koushikdutta.com>
Date: Mon, 2 Dec 2019 11:40:35 -0800
Subject: [PATCH 386/399] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3c72362a1..83829d9f3 100644
--- a/README.md
+++ b/README.md
@@ -106,7 +106,8 @@ AsyncHttpClient.getDefaultInstance().getFile(url, filename, new AsyncHttpClient.
 ### Caching is supported too
 
 ```java
-// arguments are the http client, the directory to store cache files, and the size of the cache in bytes
+// arguments are the http client, the directory to store cache files,
+// and the size of the cache in bytes
 ResponseCacheMiddleware.addCache(AsyncHttpClient.getDefaultInstance(),
                                   getFileStreamPath("asynccache"),
                                   1024 * 1024 * 10);

From 5adb6e0e2caeb6991fec7faed265a39dadd0f7ab Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 18 Jan 2020 16:06:49 -0800
Subject: [PATCH 387/399] fixup server stop to not wait by default fixup
 potential selector issue trustmanager doesnt need to be used, sslcontext does
 it automatically

---
 AndroidAsync-Kotlin/build.gradle              |   2 +-
 .../async/AsyncSSLSocketWrapper.java          |  54 +++------
 .../com/koushikdutta/async/AsyncServer.java   | 110 ++++++++++--------
 .../koushikdutta/async/SelectorWrapper.java   |  49 ++++----
 4 files changed, 104 insertions(+), 111 deletions(-)

diff --git a/AndroidAsync-Kotlin/build.gradle b/AndroidAsync-Kotlin/build.gradle
index d5360c72f..31e4450a8 100644
--- a/AndroidAsync-Kotlin/build.gradle
+++ b/AndroidAsync-Kotlin/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.3.61'
     repositories {
         mavenCentral()
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 367a592a5..52c539d70 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -385,40 +385,28 @@ private void handleHandshakeStatus(HandshakeStatus status) {
         try {
             if (!finishedHandshake && (engine.getHandshakeStatus() == HandshakeStatus.NOT_HANDSHAKING || engine.getHandshakeStatus() == HandshakeStatus.FINISHED)) {
                 if (clientMode) {
-                    TrustManager[] trustManagers = this.trustManagers;
-                    if (trustManagers == null) {
-                        TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-                        tmf.init((KeyStore) null);
-                        trustManagers = tmf.getTrustManagers();
-                    }
-                    boolean trusted = false;
                     Exception peerUnverifiedCause = null;
-                    for (TrustManager tm : trustManagers) {
-                        try {
-                            X509TrustManager xtm = (X509TrustManager) tm;
-                            peerCertificates = (X509Certificate[]) engine.getSession().getPeerCertificates();
-                            xtm.checkServerTrusted(peerCertificates, "SSL");
-                            if (mHost != null) {
-                                if (hostnameVerifier == null) {
-                                    StrictHostnameVerifier verifier = new StrictHostnameVerifier();
-                                    verifier.verify(mHost, StrictHostnameVerifier.getCNs(peerCertificates[0]), StrictHostnameVerifier.getDNSSubjectAlts(peerCertificates[0]));
-                                }
-                                else {
-                                    if (!hostnameVerifier.verify(mHost, engine.getSession())) {
-                                        throw new SSLException("hostname <" + mHost + "> has been denied");
-                                    }
+                    boolean trusted = false;
+                    try {
+                        peerCertificates = (X509Certificate[]) engine.getSession().getPeerCertificates();
+                        if (mHost != null) {
+                            if (hostnameVerifier == null) {
+                                StrictHostnameVerifier verifier = new StrictHostnameVerifier();
+                                verifier.verify(mHost, StrictHostnameVerifier.getCNs(peerCertificates[0]), StrictHostnameVerifier.getDNSSubjectAlts(peerCertificates[0]));
+                            }
+                            else {
+                                if (!hostnameVerifier.verify(mHost, engine.getSession())) {
+                                    throw new SSLException("hostname <" + mHost + "> has been denied");
                                 }
                             }
-                            trusted = true;
-                            break;
-                        }
-                        catch (GeneralSecurityException ex) {
-                            peerUnverifiedCause = ex;
-                        }
-                        catch (SSLException ex) {
-                            peerUnverifiedCause = ex;
                         }
+
+                        trusted = true;
+                    }
+                    catch (SSLException ex) {
+                        peerUnverifiedCause = ex;
                     }
+
                     finishedHandshake = true;
                     if (!trusted) {
                         AsyncSSLException e = new AsyncSSLException(peerUnverifiedCause);
@@ -446,13 +434,7 @@ public void run() {
                 onDataAvailable();
             }
         }
-        catch (NoSuchAlgorithmException ex) {
-            throw new RuntimeException(ex);
-        }
-        catch (GeneralSecurityException ex) {
-            report(ex);
-        }
-        catch (AsyncSSLException ex) {
+        catch (Exception ex) {
             report(ex);
         }
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 250ff1661..6e8a0c5eb 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -122,15 +122,11 @@ public AsyncServer(String name) {
 
     private static ExecutorService synchronousWorkers = newSynchronousWorkers("AsyncServer-worker-");
     private static void wakeup(final SelectorWrapper selector) {
-        synchronousWorkers.execute(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    selector.wakeupOnce();
-                }
-                catch (Exception e) {
-                    Log.i(LOGTAG, "Selector Exception? L Preview?");
-                }
+        synchronousWorkers.execute(() -> {
+            try {
+                selector.wakeupOnce();
+            }
+            catch (Exception e) {
             }
         });
     }
@@ -275,7 +271,7 @@ public int compare(Scheduled s1, Scheduled s2) {
 
 
     public void stop() {
-        stop(true);
+        stop(false);
     }
 
     public void stop(boolean wait) {
@@ -298,7 +294,13 @@ public void run() {
                     semaphore.release();
                 }
             }, 0));
-            currentSelector.wakeupOnce();
+            synchronousWorkers.execute(() -> {
+                try {
+                    currentSelector.wakeupOnce();
+                }
+                catch (Exception e) {
+                }
+            });
 
             // force any existing connections to die
             shutdownKeys(currentSelector);
@@ -589,58 +591,66 @@ public AsyncDatagramSocket openDatagram(final InetAddress host, final int port,
         // ugh.. this should really be post to make it nonblocking...
         // but i want datagrams to be immediately writable.
         // they're not really used anyways.
-        run(new Runnable() {
-            @Override
-            public void run() {
-                final DatagramChannel socket;
-                try {
-                    socket = DatagramChannel.open();
-                }
-                catch (Exception e) {
-                    return;
-                }
-                try {
-                    handler.attach(socket);
+        Runnable runnable = () -> {
+            final DatagramChannel socket;
+            try {
+                socket = DatagramChannel.open();
+            }
+            catch (Exception e) {
+                return;
+            }
+            try {
+                handler.attach(socket);
 
-                    InetSocketAddress address;
-                    if (host == null)
-                        address = new InetSocketAddress(port);
-                    else
-                        address = new InetSocketAddress(host, port);
+                InetSocketAddress address;
+                if (host == null)
+                    address = new InetSocketAddress(port);
+                else
+                    address = new InetSocketAddress(host, port);
 
-                    if (reuseAddress)
-                        socket.socket().setReuseAddress(reuseAddress);
-                    socket.socket().bind(address);
-                    handleSocket(handler);
-                }
-                catch (IOException e) {
-                    Log.e(LOGTAG, "Datagram error", e);
-                    StreamUtility.closeQuietly(socket);
-                }
+                if (reuseAddress)
+                    socket.socket().setReuseAddress(reuseAddress);
+                socket.socket().bind(address);
+                handleSocket(handler);
             }
-        });
+            catch (IOException e) {
+                Log.e(LOGTAG, "Datagram error", e);
+                StreamUtility.closeQuietly(socket);
+            }
+        };
+
+        if (getAffinity() != Thread.currentThread()) {
+            run(runnable);
+            return handler;
+        }
+
+        runnable.run();
         return handler;
     }
 
     public AsyncDatagramSocket connectDatagram(final SocketAddress remote) throws IOException {
-        final DatagramChannel socket = DatagramChannel.open();
         final AsyncDatagramSocket handler = new AsyncDatagramSocket();
+        final DatagramChannel socket = DatagramChannel.open();
         handler.attach(socket);
         // ugh.. this should really be post to make it nonblocking...
         // but i want datagrams to be immediately writable.
         // they're not really used anyways.
-        run(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    handleSocket(handler);
-                    socket.connect(remote);
-                }
-                catch (IOException e) {
-                    StreamUtility.closeQuietly(socket);
-                }
+        Runnable runnable = () -> {
+            try {
+                handleSocket(handler);
+                socket.connect(remote);
             }
-        });
+            catch (IOException e) {
+                StreamUtility.closeQuietly(socket);
+            }
+        };
+
+        if (getAffinity() != Thread.currentThread()) {
+            run(runnable);
+            return handler;
+        }
+
+        runnable.run();
         return handler;
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/SelectorWrapper.java b/AndroidAsync/src/com/koushikdutta/async/SelectorWrapper.java
index 1318e4a11..eca63d18e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/SelectorWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/SelectorWrapper.java
@@ -7,13 +7,14 @@
 import java.util.Set;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Created by koush on 2/13/14.
  */
 class SelectorWrapper implements Closeable {
     private Selector selector;
-    boolean isWaking;
+    public AtomicBoolean isWaking = new AtomicBoolean(false);
     Semaphore semaphore = new Semaphore(0);
     public Selector getSelector() {
         return selector;
@@ -67,34 +68,34 @@ public void wakeupOnce() {
             return;
 
         // now, we NEED to wait for the select to start to forcibly wake it.
-        synchronized (this) {
-            // check if another thread is already waiting
-            if (isWaking) {
-//                System.out.println("race wakeup already progressing");
-                return;
-            }
-            isWaking = true;
+        if (isWaking.getAndSet(true)) {
+            selector.wakeup();
+            return;
         }
 
         try {
-//            System.out.println("performing race wakup");
-            // try to wake up 10 times
-            for (int i = 0; i < 100; i++) {
-                try {
-                    if (semaphore.tryAcquire(10, TimeUnit.MILLISECONDS)) {
-//                        System.out.println("race wakeup success");
-                        return;
-                    }
-                }
-                catch (InterruptedException e) {
-                }
-                selector.wakeup();
-            }
+            waitForSelect();
+            selector.wakeup();
+        } finally {
+            isWaking.set(false);
         }
-        finally {
-            synchronized (this) {
-                isWaking = false;
+    }
+
+    public boolean waitForSelect() {
+        // try to wake up 10 times
+        for (int i = 0; i < 100; i++) {
+            try {
+                if (semaphore.tryAcquire(10, TimeUnit.MILLISECONDS)) {
+                    // successfully acquiring means the selector is NOT selecting, since select
+                    // will drain all permits.
+                    continue;
+                }
+            } catch (InterruptedException e) {
+                // an InterruptedException means the acquire failed a select is in progress,
+                // since it holds all permits
+                return true;
             }
         }
+        return false;
     }
 }

From ba2667fe5c7e336a74e28f6f491a686e7c3d2887 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 20 Jan 2020 20:34:01 -0800
Subject: [PATCH 388/399] fixup websocket server bug

---
 .project                                                  | 8 +++++++-
 AndroidAsync/.project                                     | 6 ++++++
 .../koushikdutta/async/http/server/AsyncHttpServer.java   | 3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.project b/.project
index d5efd1010..a30e65e74 100644
--- a/.project
+++ b/.project
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Scrypted-AndroidAsync</name>
+	<name>Gradle-AndroidAsync</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
 			<arguments>
@@ -29,5 +34,6 @@
 	<natures>
 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>
diff --git a/AndroidAsync/.project b/AndroidAsync/.project
index e1f900d2f..ae65abdc9 100644
--- a/AndroidAsync/.project
+++ b/AndroidAsync/.project
@@ -10,6 +10,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
 			<arguments>
@@ -29,5 +34,6 @@
 	<natures>
 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index de6ad6df2..707102c78 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -192,6 +192,9 @@ protected void onEnd() {
 
                 @Override
                 public void onCompleted(Exception e) {
+                    if (isSwitchingProtocols(res))
+                        return;
+
                     requestComplete = true;
                     super.onCompleted(e);
                     // no http pipelining, gc trashing if the socket dies

From a459a334e8b8d04a0ae533065745c918552f25fd Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 10 Feb 2020 23:22:07 -0800
Subject: [PATCH 389/399] fixup dns lookup for multicast to use affinity
 thread. filedatasink should mkdirs

---
 AndroidAsync/src/com/koushikdutta/async/dns/Dns.java         | 5 +++++
 .../src/com/koushikdutta/async/stream/FileDataSink.java      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/dns/Dns.java b/AndroidAsync/src/com/koushikdutta/async/dns/Dns.java
index 2e27de1a5..c6f198601 100644
--- a/AndroidAsync/src/com/koushikdutta/async/dns/Dns.java
+++ b/AndroidAsync/src/com/koushikdutta/async/dns/Dns.java
@@ -61,6 +61,11 @@ public static Cancellable multicastLookup(String host, FutureCallback<DnsRespons
     }
 
     public static Future<DnsResponse> lookup(AsyncServer server, String host, final boolean multicast, final FutureCallback<DnsResponse> callback) {
+        if (!server.isAffinityThread()) {
+            SimpleFuture<DnsResponse> ret = new SimpleFuture<>();
+            server.post(() -> ret.setComplete(lookup(server, host, multicast, callback)));
+            return ret;
+        }
         ByteBuffer packet = ByteBufferList.obtain(1024).order(ByteOrder.BIG_ENDIAN);
         short id = (short)new Random().nextInt();
         short flags = (short)setQuery(0);
diff --git a/AndroidAsync/src/com/koushikdutta/async/stream/FileDataSink.java b/AndroidAsync/src/com/koushikdutta/async/stream/FileDataSink.java
index c0858a58a..1e8aa7d54 100644
--- a/AndroidAsync/src/com/koushikdutta/async/stream/FileDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/stream/FileDataSink.java
@@ -21,6 +21,7 @@ public FileDataSink(AsyncServer server, File file) {
     public OutputStream getOutputStream() throws IOException {
         OutputStream ret = super.getOutputStream();
         if (ret == null) {
+            file.getParentFile().mkdirs();
             ret = new FileOutputStream(file);
             setOutputStream(ret);
         }

From 02ce44df5c415ca52e68a1840ed397353998fa19 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 16 May 2020 12:49:19 -0700
Subject: [PATCH 390/399] 309

---
 AndroidAsync-Kotlin/build.gradle                         | 5 +++--
 AndroidAsync/AndroidManifest.xml                         | 2 +-
 AndroidAsync/build.gradle                                | 2 +-
 AndroidAsync/src/com/koushikdutta/async/AsyncServer.java | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/AndroidAsync-Kotlin/build.gradle b/AndroidAsync-Kotlin/build.gradle
index 31e4450a8..ffd86e36f 100644
--- a/AndroidAsync-Kotlin/build.gradle
+++ b/AndroidAsync-Kotlin/build.gradle
@@ -48,13 +48,14 @@ dependencies {
     api project(':AndroidAsync:AndroidAsync')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
+
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.jetbrains.kotlin:kotlin-test-junit:1.3.50'
+    testImplementation 'org.jetbrains.kotlin:kotlin-test-junit:1.3.61'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
 
 // upload to maven task
-if (System.getenv().I_AM_KOUSH == 'true') {
+if (false && System.getenv().I_AM_KOUSH == 'true') {
     apply from: '/Users/koush/cfg/maven.gradle'
 }
diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 2e1207a66..f017987a5 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
     android:versionCode="308"
-    android:versionName="3.0.8">
+    android:versionName="3.0.9">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 7c9e3dafa..c165681b4 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -50,6 +50,6 @@ android {
     }
 }
 
-if (false && System.getenv().I_AM_KOUSH == 'true') {
+if (System.getenv().I_AM_KOUSH == 'true') {
   apply from: 'https://raw.githubusercontent.com/koush/mvn-repo/master/maven.gradle'
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 6e8a0c5eb..14858346b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -458,7 +458,7 @@ public Cancellable connectSocket(final String host, final int port, final Connec
 
     private static ExecutorService newSynchronousWorkers(String prefix) {
         ThreadFactory tf = new NamedThreadFactory(prefix);
-        ThreadPoolExecutor tpe = new ThreadPoolExecutor(1, 4, 10L,
+        ThreadPoolExecutor tpe = new ThreadPoolExecutor(0, 4, 10L,
             TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), tf);
         return tpe;
     }

From 62f9ee9bd4beaa2cb94bacbddd202691ec6794dc Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koush@koushikdutta.com>
Date: Sun, 17 May 2020 19:29:00 -0700
Subject: [PATCH 391/399] Create FUNDING.yml

---
 .github/FUNDING.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..8c311adce
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: koush
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

From 389e804b7acfe6f0c811b879120165d36cede8d6 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 8 Nov 2020 00:24:11 -0800
Subject: [PATCH 392/399] asserts

---
 AndroidAsync/AndroidManifest.xml                         | 4 ++--
 .../src/com/koushikdutta/async/AsyncNetworkSocket.java   | 3 ---
 .../com/koushikdutta/async/AsyncSSLSocketWrapper.java    | 1 -
 AndroidAsync/src/com/koushikdutta/async/AsyncServer.java | 1 -
 .../src/com/koushikdutta/async/BufferedDataSink.java     | 1 -
 .../src/com/koushikdutta/async/ByteBufferList.java       | 9 ---------
 .../src/com/koushikdutta/async/DataEmitterReader.java    | 4 ----
 AndroidAsync/src/com/koushikdutta/async/LineEmitter.java | 1 -
 .../koushikdutta/async/ServerSocketChannelWrapper.java   | 6 ------
 AndroidAsync/src/com/koushikdutta/async/Util.java        | 2 --
 .../src/com/koushikdutta/async/future/Continuation.java  | 1 -
 .../src/com/koushikdutta/async/http/AsyncHttpClient.java | 5 -----
 .../com/koushikdutta/async/http/AsyncHttpRequest.java    | 1 -
 .../koushikdutta/async/http/AsyncHttpResponseImpl.java   | 2 --
 .../src/com/koushikdutta/async/http/HybiParser.java      | 1 -
 .../async/http/body/MultipartFormDataBody.java           | 2 --
 .../src/com/koushikdutta/async/http/body/Part.java       | 1 -
 .../async/http/cache/ResponseCacheMiddleware.java        | 1 -
 .../async/http/filter/ChunkedInputFilter.java            | 1 -
 .../async/http/filter/ContentLengthFilter.java           | 2 --
 .../async/http/filter/InflaterInputFilter.java           | 1 -
 .../async/http/server/AsyncHttpServerResponseImpl.java   | 1 -
 .../async/http/server/AsyncHttpServerRouter.java         | 1 -
 .../koushikdutta/async/http/server/BoundaryEmitter.java  | 3 ---
 .../src/com/koushikdutta/async/util/ArrayDeque.java      | 6 ------
 25 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index f017987a5..c1fcbaa26 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="308"
-    android:versionName="3.0.9">
+    android:versionCode="310"
+    android:versionName="3.1.0">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
index e13860aae..4eae55187 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
@@ -49,7 +49,6 @@ ChannelWrapper getChannel() {
     }
     
     public void onDataWritable() {
-//        assert mWriteableHandler != null;
         if (!mChannel.isChunked()) {
             // turn write off
             mKey.interestOps(~SelectionKey.OP_WRITE & mKey.interestOps());
@@ -79,7 +78,6 @@ public void run() {
             return;
         }
         if (!mChannel.isConnected()) {
-            assert !mChannel.isChunked();
             return;
         }
 
@@ -103,7 +101,6 @@ private void handleRemaining(int remaining) throws IOException {
             throw new IOException(new CancelledKeyException());
         if (remaining > 0) {
             // chunked channels should not fail
-            assert !mChannel.isChunked();
             // register for a write notification if a write fails
             // turn write on
             mKey.interestOps(SelectionKey.OP_WRITE | mKey.interestOps());
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index 52c539d70..ecfaf67c5 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -471,7 +471,6 @@ public void write(ByteBufferList bb) {
                 bb.addAll(arr);
                 writeBuf.flip();
                 writeList.add(writeBuf);
-                assert !writeList.hasRemaining();
                 if (writeList.remaining() > 0)
                     mSink.write(writeList);
                 int previousCapacity = writeBuf.capacity();
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 14858346b..94b50fbdf 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -396,7 +396,6 @@ public Cancellable connectResolvedInetSocketAddress(final InetSocketAddress addr
 
     public ConnectFuture connectResolvedInetSocketAddress(final InetSocketAddress address, final ConnectCallback callback, final SocketCreateCallback createCallback) {
         final ConnectFuture cancel = new ConnectFuture();
-        assert !address.isUnresolved();
 
         post(new Runnable() {
             @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
index 7c510bd61..0224a58da 100644
--- a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
@@ -104,7 +104,6 @@ public int getMaxBuffer() {
     }
 
     public void setMaxBuffer(int maxBuffer) {
-        assert maxBuffer >= 0;
         mMaxBuffer = maxBuffer;
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index 956ea1415..ef6abeb62 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -166,7 +166,6 @@ public void get(byte[] bytes, int offset, int length) {
             offset += read;
             if (b.remaining() == 0) {
                 ByteBuffer removed = mBuffers.remove();
-                assert b == removed;
                 reclaim(b);
             }
         }
@@ -196,8 +195,6 @@ public void get(ByteBufferList into, int length) {
                 b.get(subset.array(), 0, need);
                 into.add(subset);
                 mBuffers.addFirst(b);
-                assert subset.capacity() >= need;
-                assert subset.position() == 0;
                 break;
             }
             else {
@@ -338,7 +335,6 @@ public void recycle() {
         while (mBuffers.size() > 0) {
             reclaim(mBuffers.remove());
         }
-        assert mBuffers.size() == 0;
         remaining = 0;
     }
     
@@ -465,14 +461,11 @@ public static void reclaim(ByteBuffer b) {
                 return;
             }
 
-            assert !reclaimedContains(b);
-
             b.position(0);
             b.limit(b.capacity());
             currentSize += b.capacity();
 
             r.add(b);
-            assert r.size() != 0 ^ currentSize == 0;
 
             maxItem = Math.max(maxItem, b.capacity());
         }
@@ -490,7 +483,6 @@ public static ByteBuffer obtain(int size) {
                         if (r.size() == 0)
                             maxItem = 0;
                         currentSize -= ret.capacity();
-                        assert r.size() != 0 ^ currentSize == 0;
                         if (ret.capacity() >= size) {
 //                            System.out.println("using " + ret.capacity());
                             return ret;
@@ -516,7 +508,6 @@ public static void obtainArray(ByteBuffer[] arr, int size) {
                 while (r.size() > 0 && total < size && index < arr.length - 1) {
                     ByteBuffer b = r.remove();
                     currentSize -= b.capacity();
-                    assert r.size() != 0 ^ currentSize == 0;
                     int needed = Math.min(size - total, b.capacity());
                     total += needed;
                     arr[index++] = b;
diff --git a/AndroidAsync/src/com/koushikdutta/async/DataEmitterReader.java b/AndroidAsync/src/com/koushikdutta/async/DataEmitterReader.java
index bf03a51c3..62b14ebec 100644
--- a/AndroidAsync/src/com/koushikdutta/async/DataEmitterReader.java
+++ b/AndroidAsync/src/com/koushikdutta/async/DataEmitterReader.java
@@ -8,10 +8,8 @@ public class DataEmitterReader implements com.koushikdutta.async.callback.DataCa
     ByteBufferList mPendingData = new ByteBufferList();
 
     public void read(int count, DataCallback callback) {
-        assert mPendingRead == null;
         mPendingReadLength = count;
         mPendingRead = callback;
-        assert !mPendingData.hasRemaining();
         mPendingData.recycle();
     }
 
@@ -22,7 +20,6 @@ private boolean handlePendingData(DataEmitter emitter) {
         DataCallback pendingRead = mPendingRead;
         mPendingRead = null;
         pendingRead.onDataAvailable(emitter, mPendingData);
-        assert !mPendingData.hasRemaining();
 
         return true;
     }
@@ -32,7 +29,6 @@ public DataEmitterReader() {
     @Override
     public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
         // if we're registered for data, we must be waiting for a read
-        assert mPendingRead != null;
         do {
             int need = Math.min(bb.remaining(), mPendingReadLength - mPendingData.remaining());
             bb.get(mPendingData, need);
diff --git a/AndroidAsync/src/com/koushikdutta/async/LineEmitter.java b/AndroidAsync/src/com/koushikdutta/async/LineEmitter.java
index 4242d99b1..1e3da129e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/LineEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/LineEmitter.java
@@ -37,7 +37,6 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
         while (bb.remaining() > 0) {
             byte b = bb.get();
             if (b == '\n') {
-                assert mLineCallback != null;
                 buffer.flip();
                 data.add(buffer);
                 mLineCallback.onStringAvailable(data.readString(charset));
diff --git a/AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java b/AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java
index ac1e7c66b..493236861 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java
@@ -37,20 +37,17 @@ public int getLocalPort() {
     @Override
     public int read(ByteBuffer buffer) throws IOException {
         final String msg = "Can't read ServerSocketChannel";
-        assert false;
         throw new IOException(msg);
     }
 
     @Override
     public boolean isConnected() {
-        assert false;
         return false;
     }
 
     @Override
     public int write(ByteBuffer src) throws IOException {
         final String msg = "Can't write ServerSocketChannel";
-        assert false;
         throw new IOException(msg);
     }
 
@@ -62,21 +59,18 @@ public SelectionKey register(Selector sel) throws ClosedChannelException {
     @Override
     public int write(ByteBuffer[] src) throws IOException {
         final String msg = "Can't write ServerSocketChannel";
-        assert false;
         throw new IOException(msg);
     }
 
     @Override
     public long read(ByteBuffer[] byteBuffers) throws IOException {
         final String msg = "Can't read ServerSocketChannel";
-        assert false;
         throw new IOException(msg);
     }
 
     @Override
     public long read(ByteBuffer[] byteBuffers, int i, int i2) throws IOException {
         final String msg = "Can't read ServerSocketChannel";
-        assert false;
         throw new IOException(msg);
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/Util.java b/AndroidAsync/src/com/koushikdutta/async/Util.java
index 4a347a439..b58de2dbf 100644
--- a/AndroidAsync/src/com/koushikdutta/async/Util.java
+++ b/AndroidAsync/src/com/koushikdutta/async/Util.java
@@ -36,7 +36,6 @@ public static void emitAllData(DataEmitter emitter, ByteBufferList list) {
                 list.recycle();
                 if (SUPRESS_DEBUG_EXCEPTIONS)
                     return;
-                assert false;
                 throw new RuntimeException("mDataHandler failed to consume data, yet remains the mDataHandler.");
             }
         }
@@ -50,7 +49,6 @@ public static void emitAllData(DataEmitter emitter, ByteBufferList list) {
             list.recycle();
             if (SUPRESS_DEBUG_EXCEPTIONS)
                 return;
-//            assert false;
 //            throw new AssertionError("Not all data was consumed by Util.emitAllData");
         }
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Continuation.java b/AndroidAsync/src/com/koushikdutta/async/future/Continuation.java
index 5059a393a..f27bf17ad 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/Continuation.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/Continuation.java
@@ -56,7 +56,6 @@ public void onCompleted(Exception ex) {
                 if (mThisCompleted)
                     return;
                 mThisCompleted = true;
-                assert waiting;
                 waiting = false;
                 if (ex == null) {
                     next();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index 6f7cdf4a2..862f29d75 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -153,7 +153,6 @@ public boolean cancel() {
     }
 
     private void reportConnectedCompleted(FutureAsyncHttpResponse cancel, Exception ex, AsyncHttpResponseImpl response, AsyncHttpRequest request, final HttpConnectCallback callback) {
-        assert callback != null;
         cancel.scheduled.cancel();
         boolean complete;
         if (ex != null) {
@@ -166,7 +165,6 @@ private void reportConnectedCompleted(FutureAsyncHttpResponse cancel, Exception
         }
         if (complete) {
             callback.onConnectCompleted(ex, response);
-            assert ex != null || response.socket() == null || response.getDataCallback() != null || response.isPaused();
             return;
         }
 
@@ -204,7 +202,6 @@ private static void copyHeader(AsyncHttpRequest from, AsyncHttpRequest to, Strin
     }
 
     private void executeAffinity(final AsyncHttpRequest request, final int redirectCount, final FutureAsyncHttpResponse cancel, final HttpConnectCallback callback) {
-        assert mServer.isAffinityThread();
         if (redirectCount > 15) {
             reportConnectedCompleted(cancel, new RedirectLimitExceededException("too many redirects"), null, request, callback);
             return;
@@ -704,13 +701,11 @@ public Future<WebSocket> websocket(final AsyncHttpRequest req, String[] protocol
     }
 
     public Future<WebSocket> websocket(String uri, String protocol, final WebSocketConnectCallback callback) {
-//        assert callback != null;
         final AsyncHttpGet get = new AsyncHttpGet(uri.replace("ws://", "http://").replace("wss://", "https://"));
         return websocket(get, protocol, callback);
     }
 
     public Future<WebSocket> websocket(String uri, String[] protocols, final WebSocketConnectCallback callback) {
-//        assert callback != null;
         final AsyncHttpGet get = new AsyncHttpGet(uri.replace("ws://", "http://").replace("wss://", "https://"));
         return websocket(get, protocols, callback);
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
index fd800fab4..763ef8f65 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
@@ -97,7 +97,6 @@ public static void setDefaultHeaders(Headers ret, Uri uri) {
     public static final String HEADER_ACCEPT_ALL = "*/*";
 
     public AsyncHttpRequest(Uri uri, String method, Headers headers) {
-        assert uri != null;
         mMethod = method;
         this.uri = uri;
         if (headers == null)
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index 3ec57e7c8..2e5a14048 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -175,8 +175,6 @@ private void assertContent() {
         if (!mFirstWrite)
             return;
         mFirstWrite = false;
-        assert null != mRequest.getHeaders().get("Content-Type");
-        assert mRequest.getHeaders().get("Transfer-Encoding") != null || HttpUtil.contentLength(mRequest.getHeaders()) != -1;
     }
 
     DataSink mSink;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java b/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
index f8b2e0910..d54ec13a1 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java
@@ -192,7 +192,6 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
     DataCallback mStage4 = new DataCallback() {
         @Override
         public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-            assert bb.remaining() == mLength;
             mPayload = new byte[mLength];
             bb.get(mPayload);
             try {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
index 52deafe25..e2019709c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java
@@ -178,8 +178,6 @@ public void onContinue(Continuation continuation, CompletedCallback next) throws
                 byte[] bytes = (getBoundaryEnd()).getBytes();
                 com.koushikdutta.async.Util.writeAll(sink, bytes, next);
                 written += bytes.length;
-                
-                assert written == totalToWrite;
             }
         });
         c.start();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java b/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java
index 7efe5b65c..32b97a29d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/Part.java
@@ -66,6 +66,5 @@ public long length() {
     }
     
     public void write(DataSink sink, CompletedCallback callback) {
-        assert false;
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
index 80c8908f3..fa46568a6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java
@@ -439,7 +439,6 @@ void sendCachedDataOnNetworkThread() {
             // fill pending
             try {
                 ByteBuffer buffer = allocator.allocate();
-                assert buffer.position() == 0;
                 FileInputStream din = cacheResponse.getBody();
                 int read = din.read(buffer.array(), buffer.arrayOffset(), buffer.capacity());
                 if (read == -1) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedInputFilter.java b/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedInputFilter.java
index 75edbf95a..f7960c13e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedInputFilter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedInputFilter.java
@@ -112,7 +112,6 @@ else if (c >= 'A' && c <= 'F')
                     mChunkLength = 0;
                     break;
                 case COMPLETE:
-                    assert false;
 //                    Exception fail = new Exception("Continued receiving data after chunk complete");
 //                    report(fail);
                     return;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/filter/ContentLengthFilter.java b/AndroidAsync/src/com/koushikdutta/async/http/filter/ContentLengthFilter.java
index 41aa217b3..81f3dba41 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/filter/ContentLengthFilter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/filter/ContentLengthFilter.java
@@ -21,8 +21,6 @@ protected void report(Exception e) {
     ByteBufferList transformed = new ByteBufferList();
     @Override
     public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-        assert totalRead < contentLength;
-
         int remaining = bb.remaining();
         long toRead = Math.min(contentLength - totalRead, remaining);
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/filter/InflaterInputFilter.java b/AndroidAsync/src/com/koushikdutta/async/http/filter/InflaterInputFilter.java
index 3ae1363a8..da18d5391 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/filter/InflaterInputFilter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/filter/InflaterInputFilter.java
@@ -38,7 +38,6 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                         if (!output.hasRemaining()) {
                             output.flip();
                             transformed.add(output);
-                            assert totalRead != 0;
                             int newSize = output.capacity() * 2;
                             output = ByteBufferList.obtain(newSize);
                         }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index 95a80fe30..3305345ff 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -66,7 +66,6 @@ public AsyncHttpServerRequest getRequest() {
     @Override
     public void write(ByteBufferList bb) {
         // order is important here...
-        assert !mEnded;
         // do the header write... this will call onWritable, which may be reentrant
         if (!headWritten)
             initFirstWrite();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
index cff7d4da8..c2f9c1d9e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
@@ -281,7 +281,6 @@ public void directory(String regex, final File directory) {
     }
 
     public void directory(String regex, final File directory, final boolean list) {
-        assert directory.isDirectory();
         addAction(AsyncHttpGet.METHOD, regex, new HttpServerRequestCallback() {
             @Override
             public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java
index fadfc0994..7e17a9ac3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java
@@ -19,12 +19,10 @@ public String getBoundary() {
     }
     
     public String getBoundaryStart() {
-        assert boundary != null;
         return new String(boundary, 2, boundary.length - 2);
     }
     
     public String getBoundaryEnd() {
-        assert boundary != null;
         return getBoundaryStart() + "--\r\n";
     }
     
@@ -160,7 +158,6 @@ else if (state == -4) {
                 }
             }
             else {
-                assert false;
                 report(new MimeEncodingException("Invalid multipart/form-data. Unknown state?"));
             }
         }
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/ArrayDeque.java b/AndroidAsync/src/com/koushikdutta/async/util/ArrayDeque.java
index a628e88e4..a5675d9c7 100644
--- a/AndroidAsync/src/com/koushikdutta/async/util/ArrayDeque.java
+++ b/AndroidAsync/src/com/koushikdutta/async/util/ArrayDeque.java
@@ -121,7 +121,6 @@ private void allocateElements(int numElements) {
      * when head and tail have wrapped around to become equal.
      */
     private void doubleCapacity() {
-        assert head == tail;
         int p = head;
         int n = elements.length;
         int r = n - p; // number of elements to the right of p
@@ -490,11 +489,6 @@ public E pop() {
     }
 
     private void checkInvariants() {
-        assert elements[tail] == null;
-        assert head == tail ? elements[head] == null :
-            (elements[head] != null &&
-             elements[(tail - 1) & (elements.length - 1)] != null);
-        assert elements[(head - 1) & (elements.length - 1)] == null;
     }
 
     /**

From b29c67f87e953ec42b008d0e61c20ef331e52061 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 12 Nov 2020 16:15:15 -0800
Subject: [PATCH 393/399] publishing

---
 AndroidAsync/build.gradle |   4 +-
 AndroidAsync/maven.gradle | 119 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+), 3 deletions(-)
 create mode 100644 AndroidAsync/maven.gradle

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index c165681b4..029039741 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -50,6 +50,4 @@ android {
     }
 }
 
-if (System.getenv().I_AM_KOUSH == 'true') {
-  apply from: 'https://raw.githubusercontent.com/koush/mvn-repo/master/maven.gradle'
-}
+apply from: 'maven.gradle'
diff --git a/AndroidAsync/maven.gradle b/AndroidAsync/maven.gradle
new file mode 100644
index 000000000..5830e9039
--- /dev/null
+++ b/AndroidAsync/maven.gradle
@@ -0,0 +1,119 @@
+// Setup
+
+// 0) Setup your sonatype credentials by editing/creating ~/.gradle/gradle.properties and enter:
+// signing.keyId=<HEXADECIMCAL KEY ID RETRIVABLE VIA gpg --list-keys>
+// signing.password=<KEY PASSWORD>
+// signing.secretKeyRingFile=<PATH TO KEY RING, USUALLY ~/.gnupg/secring.gpg>
+// sonatypeUsername=<SONATYPE USERNAME OR WHATEVER YOU USE>
+// sonatypePassword=<CORRESPONDING PASSWORD>
+
+// 1) Setup your build.gradle for your android project and add this one line of code which imports this gist:
+// apply from: 'https://raw.github.com/koush/mvn-repo/master/maven.gradle'
+
+// 2) gradle clean && gradle build && gradle uploadArchives
+
+// 3) That's it!
+
+
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+
+afterEvaluate { project ->
+  String user = null
+  String repo = null
+  'git remote -v'.execute(null, project.projectDir).getText().find('.*?git@github.com/(.*?)/(.*?) .*?') {
+      match ->
+          user = match[1]
+          repo = match[2]
+  }
+
+  String githubUrl = 'https://api.github.com/repos/' + user + '/' + repo;
+  if (System.getenv().GITHUB_TOKEN)
+    githubUrl += '?access_token=' + System.getenv().GITHUB_TOKEN
+  def repoInfo = new groovy.json.JsonSlurper().parseText(new URL(githubUrl).getText())
+
+  def android_manifest
+  try {
+      android_manifest = new XmlParser(false, false).parseText(new File(project.projectDir, 'AndroidManifest.xml').getText())
+  }
+  catch (e) {
+      android_manifest = new XmlParser(false, false).parseText(new File(project.projectDir, 'src/main/AndroidManifest.xml').getText())
+  }  
+  def versionName = android_manifest.'@android:versionName'
+  def package_name = android_manifest.'@package'
+  def artifact_id = project.projectDir.getName().toLowerCase()
+  project.version = versionName
+  project.group = package_name
+
+  uploadArchives {
+      repositories {
+          mavenDeployer {
+
+              beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+              pom.groupId = package_name
+              pom.artifactId = artifact_id
+              pom.version = versionName
+
+              repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+                authentication(userName: sonatypeUsername, password: sonatypePassword)
+              }
+
+              pom.project {
+                 name repo
+                 packaging 'jar'
+                 description repoInfo.description
+                 url repoInfo.html_url
+
+                 scm {
+                     url repoInfo.git_url
+                     connection repoInfo.git_url
+                     developerConnection repoInfo.ssh_url
+                 }
+
+                 licenses {
+                     license {
+                         name 'The Apache Software License, Version 2.0'
+                         url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                         distribution 'repo'
+                     }
+                 }
+
+                 developers {
+                     developer {
+                         id user
+                         name user
+                     }
+                 }
+             }
+          }
+      }
+  }
+
+  signing {
+      sign configurations.archives
+  }
+
+  task androidJavadocs(type: Javadoc) {
+     source = android.sourceSets.main.java.srcDirs
+  }
+
+  task androidJavadocsJar(type: Jar) {
+    classifier = 'javadoc'
+    baseName = artifact_id
+    from androidJavadocs.destinationDir
+  }
+
+  task androidSourcesJar(type: Jar) {
+    classifier = 'sources'
+    baseName = artifact_id
+    from android.sourceSets.main.java.srcDirs 
+  } 
+
+  artifacts {
+    // archives packageReleaseJar
+    archives androidSourcesJar
+    archives androidJavadocsJar
+  }
+}
+

From fa0eec4e1ea291f8bcd40462036b56c2bdc43a39 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koush@KOUSHIK-WIN.localdomain>
Date: Tue, 24 Nov 2020 02:34:45 -0800
Subject: [PATCH 394/399] update

---
 AndroidAsync-Kotlin/build.gradle |  2 +-
 AndroidAsync/build.gradle        | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/AndroidAsync-Kotlin/build.gradle b/AndroidAsync-Kotlin/build.gradle
index ffd86e36f..0ad3329d4 100644
--- a/AndroidAsync-Kotlin/build.gradle
+++ b/AndroidAsync-Kotlin/build.gradle
@@ -14,7 +14,7 @@ buildscript {
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.1"
+    buildToolsVersion "29.0.2"
 
     kotlinOptions {
         apiVersion = "1.3"
diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index c165681b4..b7fee0615 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -22,8 +22,8 @@ android {
     }
 
     defaultConfig {
-        targetSdkVersion 28
-        minSdkVersion 14
+        targetSdkVersion 30
+        minSdkVersion 21
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -33,8 +33,8 @@ android {
         targetCompatibility 1.8
     }
 
-    compileSdkVersion project.hasProperty('global_compileSdkVersion') ? global_compileSdkVersion : 28
-    buildToolsVersion project.hasProperty('global_buildToolsVersion') ? global_buildToolsVersion : '28.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.2'
 
     dependencies {
         // this is only necessary to get compilation working for self signed certificates. dependency isn't added.
@@ -50,6 +50,6 @@ android {
     }
 }
 
-if (System.getenv().I_AM_KOUSH == 'true') {
+if (false && System.getenv().I_AM_KOUSH == 'true') {
   apply from: 'https://raw.githubusercontent.com/koush/mvn-repo/master/maven.gradle'
 }

From fff5910dc89b38b1b21896299d940a3a7cb029ff Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 25 Nov 2020 01:14:47 -0800
Subject: [PATCH 395/399] update

---
 AndroidAsync/maven.gradle | 198 +++++++++++++++++++-------------------
 1 file changed, 100 insertions(+), 98 deletions(-)

diff --git a/AndroidAsync/maven.gradle b/AndroidAsync/maven.gradle
index 5830e9039..fae2f5c8b 100644
--- a/AndroidAsync/maven.gradle
+++ b/AndroidAsync/maven.gradle
@@ -19,101 +19,103 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 
-afterEvaluate { project ->
-  String user = null
-  String repo = null
-  'git remote -v'.execute(null, project.projectDir).getText().find('.*?git@github.com/(.*?)/(.*?) .*?') {
-      match ->
-          user = match[1]
-          repo = match[2]
-  }
-
-  String githubUrl = 'https://api.github.com/repos/' + user + '/' + repo;
-  if (System.getenv().GITHUB_TOKEN)
-    githubUrl += '?access_token=' + System.getenv().GITHUB_TOKEN
-  def repoInfo = new groovy.json.JsonSlurper().parseText(new URL(githubUrl).getText())
-
-  def android_manifest
-  try {
-      android_manifest = new XmlParser(false, false).parseText(new File(project.projectDir, 'AndroidManifest.xml').getText())
-  }
-  catch (e) {
-      android_manifest = new XmlParser(false, false).parseText(new File(project.projectDir, 'src/main/AndroidManifest.xml').getText())
-  }  
-  def versionName = android_manifest.'@android:versionName'
-  def package_name = android_manifest.'@package'
-  def artifact_id = project.projectDir.getName().toLowerCase()
-  project.version = versionName
-  project.group = package_name
-
-  uploadArchives {
-      repositories {
-          mavenDeployer {
-
-              beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-              pom.groupId = package_name
-              pom.artifactId = artifact_id
-              pom.version = versionName
-
-              repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                authentication(userName: sonatypeUsername, password: sonatypePassword)
-              }
-
-              pom.project {
-                 name repo
-                 packaging 'jar'
-                 description repoInfo.description
-                 url repoInfo.html_url
-
-                 scm {
-                     url repoInfo.git_url
-                     connection repoInfo.git_url
-                     developerConnection repoInfo.ssh_url
-                 }
-
-                 licenses {
-                     license {
-                         name 'The Apache Software License, Version 2.0'
-                         url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                         distribution 'repo'
-                     }
-                 }
-
-                 developers {
-                     developer {
-                         id user
-                         name user
-                     }
-                 }
-             }
-          }
-      }
-  }
-
-  signing {
-      sign configurations.archives
-  }
-
-  task androidJavadocs(type: Javadoc) {
-     source = android.sourceSets.main.java.srcDirs
-  }
-
-  task androidJavadocsJar(type: Jar) {
-    classifier = 'javadoc'
-    baseName = artifact_id
-    from androidJavadocs.destinationDir
-  }
-
-  task androidSourcesJar(type: Jar) {
-    classifier = 'sources'
-    baseName = artifact_id
-    from android.sourceSets.main.java.srcDirs 
-  } 
-
-  artifacts {
-    // archives packageReleaseJar
-    archives androidSourcesJar
-    archives androidJavadocsJar
-  }
-}
-
+if (hasProperty('sonatypeUsername') && hasProperty('sonatypePassword') && hasProperty('githubToken')) {
+
+    afterEvaluate { project ->
+        String user = null
+        String repo = null
+        'git remote -v'.execute(null, project.projectDir).getText().find('.*?git@github.com/(.*?)/(.*?) .*?') {
+            match ->
+                user = match[1]
+                repo = match[2]
+        }
+
+        String githubUrl = 'https://api.github.com/repos/' + user + '/' + repo
+        if (System.getenv().GITHUB_TOKEN)
+            githubUrl += '?access_token=' + System.getenv().GITHUB_TOKEN
+        def repoInfo = new groovy.json.JsonSlurper().parseText(new URL(githubUrl).getText())
+
+        def android_manifest
+        try {
+            android_manifest = new XmlParser(false, false).parseText(new File(project.projectDir, 'AndroidManifest.xml').getText())
+        }
+        catch (e) {
+            android_manifest = new XmlParser(false, false).parseText(new File(project.projectDir, 'src/main/AndroidManifest.xml').getText())
+        }
+        def versionName = android_manifest.'@android:versionName'
+        def package_name = android_manifest.'@package'
+        def artifact_id = project.projectDir.getName().toLowerCase()
+        project.version = versionName
+        project.group = package_name
+
+        uploadArchives {
+            repositories {
+                mavenDeployer {
+
+                    beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+                    pom.groupId = package_name
+                    pom.artifactId = artifact_id
+                    pom.version = versionName
+
+                    repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+                        authentication(userName: sonatypeUsername, password: sonatypePassword)
+                    }
+
+                    pom.project {
+                        name repo
+                        packaging 'jar'
+                        description repoInfo.description
+                        url repoInfo.html_url
+
+                        scm {
+                            url repoInfo.git_url
+                            connection repoInfo.git_url
+                            developerConnection repoInfo.ssh_url
+                        }
+
+                        licenses {
+                            license {
+                                name 'The Apache Software License, Version 2.0'
+                                url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                                distribution 'repo'
+                            }
+                        }
+
+                        developers {
+                            developer {
+                                id user
+                                name user
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        signing {
+            sign configurations.archives
+        }
+
+        task androidJavadocs(type: Javadoc) {
+            source = android.sourceSets.main.java.srcDirs
+        }
+
+        task androidJavadocsJar(type: Jar) {
+            classifier = 'javadoc'
+            baseName = artifact_id
+            from androidJavadocs.destinationDir
+        }
+
+        task androidSourcesJar(type: Jar) {
+            classifier = 'sources'
+            baseName = artifact_id
+            from android.sourceSets.main.java.srcDirs
+        }
+
+        artifacts {
+            // archives packageReleaseJar
+            archives androidSourcesJar
+            archives androidJavadocsJar
+        }
+    }
+}
\ No newline at end of file

From c4fa8e00f06856dc1f76bae537d12849983d562d Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 29 Nov 2020 10:03:58 -0800
Subject: [PATCH 396/399] cruft

---
 .project                    | 39 -------------------------------------
 AndroidAsync/.project       | 39 -------------------------------------
 AndroidAsyncSample/.project | 33 -------------------------------
 3 files changed, 111 deletions(-)
 delete mode 100644 .project
 delete mode 100644 AndroidAsync/.project
 delete mode 100644 AndroidAsyncSample/.project

diff --git a/.project b/.project
deleted file mode 100644
index a30e65e74..000000000
--- a/.project
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Gradle-AndroidAsync</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>
diff --git a/AndroidAsync/.project b/AndroidAsync/.project
deleted file mode 100644
index ae65abdc9..000000000
--- a/AndroidAsync/.project
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>AndroidAsync-AndroidAsync</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>
diff --git a/AndroidAsyncSample/.project b/AndroidAsyncSample/.project
deleted file mode 100644
index 14bc45617..000000000
--- a/AndroidAsyncSample/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>AndroidAsyncSample</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

From d0042f720c557a27a963553dae1e0ea58d00400f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 5 Dec 2020 23:43:43 -0800
Subject: [PATCH 397/399] fixup static constructor

---
 .../koushikdutta/async/http/server/AsyncHttpServerRouter.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
index c2f9c1d9e..c6f70b894 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
@@ -149,7 +149,9 @@ public static Asset getAssetStream(AssetManager am, String asset) {
         }
     }
 
-    static Hashtable<String, String> mContentTypes = new Hashtable<String, String>();
+    static Hashtable<String, String> mContentTypes = new Hashtable<>();
+
+    static
     {
         mContentTypes.put("js", "application/javascript");
         mContentTypes.put("json", "application/json");

From 9c19a278d54721fc0bbdace942c4db4134b363d1 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 20 Dec 2020 12:01:46 -0800
Subject: [PATCH 398/399] update

---
 .../koushikdutta/async/http/server/AsyncHttpServerRouter.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
index c6f70b894..a1653e225 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java
@@ -167,10 +167,6 @@ public static Asset getAssetStream(AssetManager am, String asset) {
     }
 
     public static String getContentType(String path) {
-        return tryGetContentType(path);
-    }
-
-    public static String tryGetContentType(String path) {
         int index = path.lastIndexOf(".");
         if (index != -1) {
             String e = path.substring(index + 1);

From 7cb0120d854d4cd1ae656c53c2dc47ca965414a9 Mon Sep 17 00:00:00 2001
From: Dimitar Buckoff <kaha6uc@gmail.com>
Date: Wed, 23 Nov 2022 16:30:25 +0200
Subject: [PATCH 399/399] Add 401 and method to add more

---
 .../com/koushikdutta/async/http/server/AsyncHttpServer.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 707102c78..04a157e5e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -330,6 +330,7 @@ public CompletedCallback getErrorCallback() {
         mCodes.put(302, "Found");
         mCodes.put(304, "Not Modified");
         mCodes.put(400, "Bad Request");
+        mCodes.put(401, "Unauthorized");
         mCodes.put(404, "Not Found");
         mCodes.put(500, "Internal Server Error");
     }
@@ -341,6 +342,10 @@ public static String getResponseCodeDescription(int code) {
         return d;
     }
 
+    public static void addResponseCodeDescription( int code, String description ) {
+        mCodes.put(code, description);
+    }
+
     public static interface WebSocketRequestCallback {
         void onConnected(WebSocket webSocket, AsyncHttpServerRequest request);
     }