grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Advertise h2-15 in ALPN negotiation. 

We continue to support h2-14 to prevent having a flag-day. Flag-day
is unnecessary since h2-15 is pretty much the same as h2-14.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=79369997
This commit is contained in:
ejona 2014-11-06 14:32:05 -08:00 committed by Eric Anderson
parent a71d887661
commit 1553aabb2f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
netty/src/main/java/com/google/net/stubby/transport/netty/Http2Negotiator.java
View File

@ -26,6 +26,8 @@ import io.netty.util.concurrent.GenericFutureListener;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@ -37,8 +39,10 @@ import javax.net.ssl.SSLEngine;
* endpoint.
*/
public class Http2Negotiator {
public static final String HTTP_VERSION_NAME =
Http2OrHttpChooser.SelectedProtocol.HTTP_2.protocolName();
private static final List<String> SUPPORTED_PROTOCOLS = Collections.unmodifiableList(
Arrays.asList(
Http2OrHttpChooser.SelectedProtocol.HTTP_2.protocolName(),
"h2-15"));
// Prefer ALPN to NPN so try it first.
private static final String[] JETTY_TLS_NEGOTIATION_IMPL =
@ -278,18 +282,19 @@ public class Http2Negotiator {
// all
removeMethod.invoke(null, engine);
protocolNegotiated.setException(new RuntimeException(
"ALPN/NPN protocol " + HTTP_VERSION_NAME + " not supported by endpoint"));
"Endpoint does not support any of " + SUPPORTED_PROTOCOLS
+ " in ALPN/NPN negotiation"));
return null;
}
if ("protocols".equals(methodName)) {
// ALPN client, NPN server
return ImmutableList.of(HTTP_VERSION_NAME);
return SUPPORTED_PROTOCOLS;
}
if ("selected".equals(methodName) || "protocolSelected".equals(methodName)) {
// ALPN client, NPN server
removeMethod.invoke(null, engine);
String protocol = (String) args[0];
if (!HTTP_VERSION_NAME.equals(protocol)) {
if (!SUPPORTED_PROTOCOLS.contains(protocol)) {
RuntimeException e = new RuntimeException(
"Unsupported protocol selected via ALPN/NPN: " + protocol);
protocolNegotiated.setException(e);
@ -310,7 +315,7 @@ public class Http2Negotiator {
@SuppressWarnings("unchecked")
List<String> names = (List<String>) args[0];
for (String name : names) {
if (name.startsWith(HTTP_VERSION_NAME)) {
if (SUPPORTED_PROTOCOLS.contains(name)) {
protocolNegotiated.set(null);
return name;
}