diff options
author | Allan Wojciechowski <allanwoj@google.com> | 2013-05-28 18:04:39 +0100 |
---|---|---|
committer | Allan Wojciechowski <allanwoj@google.com> | 2013-05-28 18:04:39 +0100 |
commit | b1046528f80910a7540435f3a6abb38a391502c4 (patch) | |
tree | e3eda643af910f1b9ba879f66da1b1ce1aa1063c | |
parent | 2c1c92266ddee7b46d64033741a1201cec534f5f (diff) | |
download | okhttp-b1046528f80910a7540435f3a6abb38a391502c4.tar.gz |
Revert "Disable SPDY support"
This reverts commit 089e9c1f20b1f7811373d1f99513163a74e53cbe.
-rw-r--r-- | src/main/java/com/squareup/okhttp/Connection.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/squareup/okhttp/Connection.java b/src/main/java/com/squareup/okhttp/Connection.java index 2394b77..90424ff 100644 --- a/src/main/java/com/squareup/okhttp/Connection.java +++ b/src/main/java/com/squareup/okhttp/Connection.java @@ -145,8 +145,7 @@ public final class Connection implements Closeable { platform.supportTlsIntolerantServer(sslSocket); } - final boolean spdyEnabled = false; - if (modernTls && spdyEnabled) { + if (modernTls) { platform.setNpnProtocols(sslSocket, NPN_PROTOCOLS); } @@ -162,7 +161,7 @@ public final class Connection implements Closeable { in = sslSocket.getInputStream(); byte[] selectedProtocol; - if (modernTls && spdyEnabled && (selectedProtocol = platform.getNpnSelectedProtocol(sslSocket)) != null) { + if (modernTls && (selectedProtocol = platform.getNpnSelectedProtocol(sslSocket)) != null) { if (Arrays.equals(selectedProtocol, SPDY3)) { sslSocket.setSoTimeout(0); // SPDY timeouts are set per-stream. spdyConnection = new SpdyConnection.Builder(address.getUriHost(), true, in, out).build(); |