remove spdy

Author: koush

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;
     }
 

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 [email protected]  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;