protocolValues = connection.getHeaderFields().get(SELECTED_PROTOCOL);
assertEquals(Arrays.asList(protocol.toString()), protocolValues);
@@ -2786,12 +2786,12 @@ public final class URLConnectionTest {
}
@Test public void zeroLengthPost_SPDY_3() throws Exception {
- enableNpn(Protocol.SPDY_3);
+ enableProtocol(Protocol.SPDY_3);
zeroLengthPost();
}
@Test public void zeroLengthPost_HTTP_2() throws Exception {
- enableNpn(Protocol.HTTP_2);
+ enableProtocol(Protocol.HTTP_2);
zeroLengthPost();
}
@@ -2801,12 +2801,12 @@ public final class URLConnectionTest {
}
@Test public void zeroLengthPut_SPDY_3() throws Exception {
- enableNpn(Protocol.SPDY_3);
+ enableProtocol(Protocol.SPDY_3);
zeroLengthPut();
}
@Test public void zeroLengthPut_HTTP_2() throws Exception {
- enableNpn(Protocol.HTTP_2);
+ enableProtocol(Protocol.HTTP_2);
zeroLengthPut();
}
@@ -3113,9 +3113,9 @@ public final class URLConnectionTest {
/**
* Tests that use this will fail unless boot classpath is set. Ex. {@code
- * -Xbootclasspath/p:/tmp/npn-boot-1.1.7.v20140316.jar}
+ * -Xbootclasspath/p:/tmp/alpn-boot-8.0.0.v20140317}
*/
- private void enableNpn(Protocol protocol) {
+ private void enableProtocol(Protocol protocol) {
client.setSslSocketFactory(sslContext.getSocketFactory());
client.setHostnameVerifier(new RecordingHostnameVerifier());
client.setProtocols(Arrays.asList(protocol, Protocol.HTTP_1_1));
diff --git a/okhttp/src/main/java/com/squareup/okhttp/Connection.java b/okhttp/src/main/java/com/squareup/okhttp/Connection.java
index 5af99e989..e092c2c6e 100644
--- a/okhttp/src/main/java/com/squareup/okhttp/Connection.java
+++ b/okhttp/src/main/java/com/squareup/okhttp/Connection.java
@@ -51,8 +51,8 @@ import static java.net.HttpURLConnection.HTTP_PROXY_AUTH;
*
* - Server Name Indication (SNI) enables one IP address to negotiate secure
* connections for multiple domain names.
- *
- Next Protocol Negotiation (NPN) enables the HTTPS port (443) to be used
- * for both HTTP and SPDY protocols.
+ *
- Application Layer Protocol Negotiation (ALPN) enables the HTTPS port
+ * (443) to be used for different HTTP and SPDY protocols.
*
* Unfortunately, older HTTPS servers refuse to connect when such options are
* presented. Rather than avoiding these options entirely, this class allows a
diff --git a/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java b/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java
index 038af2edf..a619be3bb 100644
--- a/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java
+++ b/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java
@@ -321,19 +321,17 @@ public final class OkHttpClient implements URLStreamHandlerFactory, Cloneable {
*
*
* This is an evolving set. Future releases may drop
- * support for transitional protocols (like spdy/3.1), in favor of their
- * successors (spdy/4 or hTTP/2). The http/1.1 transport will never be
- * dropped.
+ * support for transitional protocols (like h2-10), in favor of their
+ * successors (h2). The http/1.1 transport will never be dropped.
*
*
If multiple protocols are specified, NPN will
- * be used to negotiate a transport. Future releases may use another mechanism
- * (such as ALPN)
- * to negotiate a transport.
+ * href="https://technotes.googlecode.com/git/nextprotoneg.html">NPN or
+ * ALPN
+ * will be used to negotiate a transport.
*
* @param protocols the protocols to use, in order of preference. The list
* must contain {@link Protocol#HTTP_1_1}. It must not contain null.
diff --git a/okhttp/src/main/java/com/squareup/okhttp/Protocol.java b/okhttp/src/main/java/com/squareup/okhttp/Protocol.java
index 10cf5f461..354d825f8 100644
--- a/okhttp/src/main/java/com/squareup/okhttp/Protocol.java
+++ b/okhttp/src/main/java/com/squareup/okhttp/Protocol.java
@@ -20,7 +20,8 @@ import java.io.IOException;
/**
* Protocols that OkHttp implements for NPN and
- * ALPN.
+ * ALPN
+ * selection.
*
*
Protocol vs Scheme
* Despite its name, {@link java.net.URL#getProtocol()} returns the
diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/Platform.java b/okhttp/src/main/java/com/squareup/okhttp/internal/Platform.java
index b411f6a21..c4518fa39 100644
--- a/okhttp/src/main/java/com/squareup/okhttp/internal/Platform.java
+++ b/okhttp/src/main/java/com/squareup/okhttp/internal/Platform.java
@@ -45,12 +45,13 @@ import okio.Buffer;
*
* NPN (Next Protocol Negotiation) was developed for SPDY. It is widely
* available and we support it on both Android (4.1+) and OpenJDK 7 (via the
- * Jetty NPN-boot library). NPN is not yet available on Java 8.
+ * Jetty Alpn-boot library). NPN is not yet available on OpenJDK 8.
*
*
ALPN (Application Layer Protocol Negotiation) is the successor to NPN. It
* has some technical advantages over NPN. ALPN first arrived in Android 4.4,
* but that release suffers a concurrency bug
- * so we don't use it. ALPN will be supported in the future.
+ * so we don't use it. ALPN is supported on OpenJDK 7 and 8 (via the Jetty
+ * ALPN-boot library).
*
*
On platforms that support both extensions, OkHttp will use both,
* preferring ALPN's result. Future versions of OkHttp will drop support for
@@ -148,21 +149,24 @@ public class Platform {
// This isn't Android 2.3 or better.
}
- // Attempt to find the Jetty's NPN extension for OpenJDK.
- try {
- String npnClassName = "org.eclipse.jetty.npn.NextProtoNego";
- Class nextProtoNegoClass = Class.forName(npnClassName);
- Class providerClass = Class.forName(npnClassName + "$Provider");
- Class clientProviderClass = Class.forName(npnClassName + "$ClientProvider");
- Class serverProviderClass = Class.forName(npnClassName + "$ServerProvider");
- Method putMethod = nextProtoNegoClass.getMethod("put", SSLSocket.class, providerClass);
- Method getMethod = nextProtoNegoClass.getMethod("get", SSLSocket.class);
- return new JdkWithJettyNpnPlatform(
+ try { // to find the Jetty's ALPN or NPN extension for OpenJDK.
+ String negoClassName = "org.eclipse.jetty.alpn.ALPN";
+ Class negoClass;
+ try {
+ negoClass = Class.forName(negoClassName);
+ } catch (ClassNotFoundException ignored) { // ALPN isn't on the classpath.
+ negoClassName = "org.eclipse.jetty.npn.NextProtoNego";
+ negoClass = Class.forName(negoClassName);
+ }
+ Class providerClass = Class.forName(negoClassName + "$Provider");
+ Class clientProviderClass = Class.forName(negoClassName + "$ClientProvider");
+ Class serverProviderClass = Class.forName(negoClassName + "$ServerProvider");
+ Method putMethod = negoClass.getMethod("put", SSLSocket.class, providerClass);
+ Method getMethod = negoClass.getMethod("get", SSLSocket.class);
+ return new JdkWithJettyBootPlatform(
putMethod, getMethod, clientProviderClass, serverProviderClass);
- } catch (ClassNotFoundException ignored) {
- // NPN isn't on the classpath.
- } catch (NoSuchMethodException ignored) {
- // The NPN version isn't what we expect.
+ } catch (ClassNotFoundException ignored) { // NPN isn't on the classpath.
+ } catch (NoSuchMethodException ignored) { // The ALPN or NPN version isn't what we expect.
}
return new Platform();
@@ -247,15 +251,18 @@ public class Platform {
}
}
- /** OpenJDK 7 plus {@code org.mortbay.jetty.npn/npn-boot} on the boot class path. */
- private static class JdkWithJettyNpnPlatform extends Platform {
+ /**
+ * OpenJDK 7+ with {@code org.mortbay.jetty.npn/npn-boot} or
+ * {@code org.mortbay.jetty.alpn/alpn-boot} in the boot class path.
+ */
+ private static class JdkWithJettyBootPlatform extends Platform {
private final Method getMethod;
private final Method putMethod;
private final Class clientProviderClass;
private final Class serverProviderClass;
- public JdkWithJettyNpnPlatform(Method putMethod, Method getMethod, Class clientProviderClass,
- Class serverProviderClass) {
+ public JdkWithJettyBootPlatform(Method putMethod, Method getMethod,
+ Class clientProviderClass, Class serverProviderClass) {
this.putMethod = putMethod;
this.getMethod = getMethod;
this.clientProviderClass = clientProviderClass;
@@ -267,11 +274,11 @@ public class Platform {
List names = new ArrayList(protocols.size());
for (int i = 0, size = protocols.size(); i < size; i++) {
Protocol protocol = protocols.get(i);
- if (protocol == Protocol.HTTP_1_0) continue; // No HTTP/1.0 for NPN.
+ if (protocol == Protocol.HTTP_1_0) continue; // No HTTP/1.0 for NPN or ALPN.
names.add(protocol.toString());
}
Object provider = Proxy.newProxyInstance(Platform.class.getClassLoader(),
- new Class[] { clientProviderClass, serverProviderClass }, new JettyNpnProvider(names));
+ new Class[] { clientProviderClass, serverProviderClass }, new JettyNegoProvider(names));
putMethod.invoke(null, socket, provider);
} catch (InvocationTargetException e) {
throw new AssertionError(e);
@@ -282,12 +289,12 @@ public class Platform {
@Override public String getSelectedProtocol(SSLSocket socket) {
try {
- JettyNpnProvider provider =
- (JettyNpnProvider) Proxy.getInvocationHandler(getMethod.invoke(null, socket));
+ JettyNegoProvider provider =
+ (JettyNegoProvider) Proxy.getInvocationHandler(getMethod.invoke(null, socket));
if (!provider.unsupported && provider.selected == null) {
Logger logger = Logger.getLogger("com.squareup.okhttp.OkHttpClient");
- logger.log(Level.INFO,
- "NPN callback dropped so SPDY is disabled. Is npn-boot on the boot class path?");
+ logger.log(Level.INFO, "NPN/ALPN callback dropped: SPDY and HTTP/2 are disabled. "
+ + "Is npn-boot or alpn-boot on the boot class path?");
return null;
}
return provider.unsupported ? null : provider.selected;
@@ -300,18 +307,18 @@ public class Platform {
}
/**
- * Handle the methods of NextProtoNego's ClientProvider and ServerProvider
+ * Handle the methods of NPN or ALPN's ClientProvider and ServerProvider
* without a compile-time dependency on those interfaces.
*/
- private static class JettyNpnProvider implements InvocationHandler {
+ private static class JettyNegoProvider implements InvocationHandler {
/** This peer's supported protocols. */
private final List protocols;
- /** Set when remote peer notifies NPN is unsupported. */
+ /** Set when remote peer notifies NPN or ALPN is unsupported. */
private boolean unsupported;
- /** The protocol the client selected. */
+ /** The protocol the client (NPN) or server (ALPN) selected. */
private String selected;
- public JettyNpnProvider(List protocols) {
+ public JettyNegoProvider(List protocols) {
this.protocols = protocols;
}
@@ -322,27 +329,25 @@ public class Platform {
args = Util.EMPTY_STRING_ARRAY;
}
if (methodName.equals("supports") && boolean.class == returnType) {
- return true; // Client supports NPN.
+ return true; // NPN or ALPN is supported.
} else if (methodName.equals("unsupported") && void.class == returnType) {
- this.unsupported = true; // Remote peer doesn't support NPN.
+ this.unsupported = true; // Peer doesn't support NPN or ALPN.
return null;
} else if (methodName.equals("protocols") && args.length == 0) {
- return protocols; // Server advertises these protocols.
- } else if (methodName.equals("selectProtocol") // Called when client.
- && String.class == returnType
- && args.length == 1
- && (args[0] == null || args[0] instanceof List)) {
- List serverProtocols = (List) args[0];
- // Pick the first protocol the server advertises and client knows.
- for (int i = 0, size = serverProtocols.size(); i < size; i++) {
- if (protocols.contains(serverProtocols.get(i))) {
- return selected = serverProtocols.get(i);
+ return protocols; // Server (NPN) or Client (ALPN) advertises these protocols.
+ } else if ((methodName.equals("selectProtocol") || methodName.equals("select"))
+ && String.class == returnType && args.length == 1 && args[0] instanceof List) {
+ List peerProtocols = (List) args[0];
+ // Pick the first known protocol the peer advertises.
+ for (int i = 0, size = peerProtocols.size(); i < size; i++) {
+ if (protocols.contains(peerProtocols.get(i))) {
+ return selected = peerProtocols.get(i);
}
}
- // On no intersection, try client's first protocol.
- return selected = protocols.get(0);
- } else if (methodName.equals("protocolSelected") && args.length == 1) {
- this.selected = (String) args[0]; // Client selected this protocol.
+ return selected = protocols.get(0); // On no intersection, try peer's first protocol.
+ } else if ((methodName.equals("protocolSelected") || methodName.equals("selected"))
+ && args.length == 1) {
+ this.selected = (String) args[0]; // Client (NPN) or Server (ALPN) selected this protocol.
return null;
} else {
return method.invoke(this, args);
diff --git a/pom.xml b/pom.xml
index 32c29ed0a..96155c9b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,8 @@
0.8.0
1.1.7.v20140316
+
+ 8.0.0.v20140317
1.48
2.2.3
4.2.2
@@ -72,15 +74,20 @@
okio
${okio.version}