Merged branch 'jetty-9.4.x' into 'master'.

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_141.mod

@@ -1,6 +1,3 @@
-[name]
-protonego-boot
-
 [files]
 http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar
 

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_144.mod

@@ -0,0 +1,5 @@
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar

jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc

@@ -246,6 +246,7 @@ The ALPN implementation, relying on modifications of OpenJDK classes, updates ev
 |1.8.0u121 |8.1.11.v20170118
 |1.8.0u131 |8.1.11.v20170118
 |1.8.0u141 |8.1.11.v20170118
+|1.8.0u144 |8.1.11.v20170118
 |=============================
 
 [[alpn-build]]

jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java

@@ -100,7 +100,7 @@ public class DefaultFileLocatorHelper implements BundleFileLocatorHelper
             // some osgi frameworks do use the file protocol directly in some
             // situations. Do use the PathResource to transform the URL into a
             // File: URL#toURI is broken
-            return new PathResource(url).getFile().getParentFile().getParentFile();
+            return new PathResource(url).getFile().getParentFile().getParentFile().getCanonicalFile();
         }
         else if (url.getProtocol().equals("bundleentry"))
         {
@@ -131,7 +131,7 @@ public class DefaultFileLocatorHelper implements BundleFileLocatorHelper
                     FILE_FIELD.setAccessible(true);
                 }
                 File f = (File) FILE_FIELD.get(bundleEntry);
-                return f.getParentFile().getParentFile();
+                return f.getParentFile().getParentFile().getCanonicalFile();
             }
             else if (match(bundleEntry.getClass().getName(), ZIP_BUNDLE_ENTRY_CLASSES))
             {
@@ -173,7 +173,7 @@ public class DefaultFileLocatorHelper implements BundleFileLocatorHelper
             if (location.startsWith("file:/"))
             {
                 URI uri = new URI(URIUtil.encodePath(location));
-                return new File(uri);
+                return new File(uri).getCanonicalFile();
             }
             else if (location.startsWith("file:"))
             {
@@ -199,7 +199,7 @@ public class DefaultFileLocatorHelper implements BundleFileLocatorHelper
             else if (location.startsWith("reference:file:"))
             {
                 location = URLDecoder.decode(location.substring("reference:".length()), "UTF-8");
-                File file = new File(location.substring("file:".length()));
+                File file = new File(location.substring("file:".length())).getCanonicalFile();
                 return file;
             }
         }

jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java

@@ -794,14 +794,15 @@ public class HttpInput extends ServletInputStream implements Runnable
         {
             if (_state instanceof ErrorState)
             {
-                Throwable failure = new Throwable(_state.getError());
-                failure.addSuppressed(new Throwable(x));
+                IOException failure = new IOException(x);
                 LOG.warn(failure);
+                _state.getError().addSuppressed(failure);
             }
             else
             {
-                // Retain the current stack trace by wrapping the failure.
-                _state = new ErrorState(new Throwable(x));
+                // Add a suppressed throwable to capture this stack trace
+                x.addSuppressed(new IOException("HttpInput failed"));
+                _state = new ErrorState(x);
             }
 
             if (_listener == null)

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_131.mod

@@ -1,6 +1,3 @@
-[name]
-protonego-boot
-
 [files]
 http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar
 

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_141.mod

@@ -1,6 +1,3 @@
-[name]
-protonego-boot
-
 [files]
 http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar
 

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_144.mod

@@ -0,0 +1,5 @@
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar

pom.xml

@@ -1479,6 +1479,18 @@
         <alpn.version>8.1.11.v20170118</alpn.version>
       </properties>
     </profile>
+    <profile>
+      <id>8u144</id>
+      <activation>
+        <property>
+          <name>java.version</name>
+          <value>1.8.0_144</value>
+        </property>
+      </activation>
+      <properties>
+        <alpn.version>8.1.11.v20170118</alpn.version>
+      </properties>
+    </profile>
   </profiles>
 
   <issueManagement>