Skip to content
Snippets Groups Projects
01-ignore-npn.patch 1.91 KiB
Newer Older
Description: Disable the NPN/ALPN support since it relies on jetty npn-api and alpn-api which aren't available in Debian
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/pom.xml
+++ b/pom.xml
@@ -882,6 +882,7 @@
         </configuration>
       </plugin>
       <!-- Download the npn-boot.jar in advance to add it to the boot classpath. -->
+<!--
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
@@ -899,6 +900,7 @@
           </execution>
         </executions>
       </plugin>
+-->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
--- a/handler/pom.xml
+++ b/handler/pom.xml
@@ -87,5 +87,21 @@
       <artifactId>mockito-core</artifactId>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/*Alpn*.java</exclude>
+            <exclude>**/*Npn*.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
 
--- a/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java
+++ b/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java
@@ -383,6 +383,7 @@
         switch(config.protocol()) {
         case NONE:
             return JdkDefaultApplicationProtocolNegotiator.INSTANCE;
+/*
         case ALPN:
             if (isServer) {
                 switch(config.selectorFailureBehavior()) {
@@ -427,6 +428,7 @@
                     .append(config.selectorFailureBehavior()).append(" failure behavior").toString());
                 }
             }
+*/
         default:
             throw new UnsupportedOperationException(new StringBuilder("JDK provider does not support ")
             .append(config.protocol()).append(" protocol").toString());