Upgrade OkHttp for Android SNI / NPN fix

ejona86 · ejona86 · commit 4523059762bf · 2015-01-08T14:43:20.000-08:00
square/okhttp#1137 ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=82149209
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "lib/netty"]
 	path = lib/netty
 	url = https://github.com/netty/netty.git
+[submodule "lib/okhttp"]
+	path = lib/okhttp
+	url = https://github.com/square/okhttp.git
diff --git a/lib/okhttp b/lib/okhttp
@@ -0,0 +1 @@
+Subproject commit 09637b6d12fc02cbc969844695568feb5a8cb494
diff --git a/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransport.java b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransport.java
@@ -45,7 +45,7 @@
 import com.squareup.okhttp.internal.spdy.FrameReader;
 import com.squareup.okhttp.internal.spdy.Header;
 import com.squareup.okhttp.internal.spdy.HeadersMode;
-import com.squareup.okhttp.internal.spdy.Http20Draft14;
+import com.squareup.okhttp.internal.spdy.Http20Draft15;
 import com.squareup.okhttp.internal.spdy.Settings;
 import com.squareup.okhttp.internal.spdy.Variant;
 
@@ -195,7 +195,7 @@ protected void doStart() {
       } catch (IOException e) {
         throw new RuntimeException(e);
       }
-      Variant variant = new Http20Draft14();
+      Variant variant = new Http20Draft15();
       frameReader = variant.newReader(source, true);
       frameWriter = new AsyncFrameWriter(variant.newWriter(sink, true), this, executor);
       outboundFlow = new OutboundFlowController(this, frameWriter);
diff --git a/pom.xml b/pom.xml
@@ -137,7 +137,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <okhttp.version>2.1.0</okhttp.version>
+    <okhttp.version>2.2.0-SNAPSHOT</okhttp.version>
     <netty.version>5.0.0.Alpha2-SNAPSHOT</netty.version>
     <jetty.alpn.version>8.0.0.v20140317</jetty.alpn.version>
     <jetty.alpn.path>
