458354 - ALPNServerConnection.select negotiation.

Prefer the server protocols rather than the client protocols.

1 files changed, 7 insertions, 3 deletions

diff --git a/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnection.java b/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnection.java
index 2e130ef20c..88abfd3cb2 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnection.java
+++ b/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnection.java
@@ -50,14 +50,18 @@ public class ALPNServerConnection extends NegotiatingServerConnection implements
     {
         List<String> serverProtocols = getProtocols();
         String negotiated = null;
-        for (String clientProtocol : clientProtocols)
+
+        // RFC 7301 states that the server picks the protocol
+        // that it prefers that is also supported by the client.
+        for (String serverProtocol : serverProtocols)
         {
-            if (serverProtocols.contains(clientProtocol))
+            if (clientProtocols.contains(serverProtocol))
             {
-                negotiated = clientProtocol;
+                negotiated = serverProtocol;
                 break;
             }
         }
+
         if (negotiated == null)
         {
             negotiated = getDefaultProtocol();