Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg
--- a/VERSION.txt
+++ b/VERSION.txt
+jetty-9.2.24.v20180105 - 05 January 2018
+ + 2065 Backport #347 to Jetty 9.2.x
+
 jetty-9.2.23.v20171218 - 18 December 2017
 + 1556 Remove a timing channel in Password matching
 + 1685 Update ALPN support for Java 8u141

--- a/aggregates/jetty-all/pom.xml
+++ b/aggregates/jetty-all/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-project</artifactId>
-    <version>9.2.23.v20171218</version>
+    <version>9.2.24.v20180105</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>

--- a/apache-jsp/pom.xml
+++ b/apache-jsp/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-project</artifactId>
-    <version>9.2.23.v20171218</version>
+    <version>9.2.24.v20180105</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>apache-jsp</artifactId>

--- a/apache-jstl/pom.xml
+++ b/apache-jstl/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-project</artifactId>
-    <version>9.2.23.v20171218</version>
+    <version>9.2.24.v20180105</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>apache-jstl</artifactId>

--- a/debian/changelog
+++ b/debian/changelog
+jetty9 (9.2.24-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+  * Standards-Version updated to 4.1.4
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 18 May 2018 00:14:54 +0200
+
 jetty9 (9.2.23-1) unstable; urgency=medium

  * Team upload.

--- a/debian/compat
+++ b/debian/compat
-10
+11
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg@apache.org>
 Build-Depends: ant-optional,
-               debhelper (>= 10),
+               debhelper (>= 11),
               default-jdk,
               dh-exec,
               javahelper,
@@ -24,9 +24,9 @@ Build-Depends: ant-optional,
               libtomcat8-java (>= 8.5),
               maven-debian-helper (>= 2.2.8~),
               maven-repo-helper
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jetty9.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jetty9.git
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/jetty9.git
+Vcs-Browser: https://salsa.debian.org/java-team/jetty9
 Homepage: http://www.eclipse.org/jetty/

 Package: libjetty9-java

--- a/examples/async-rest/async-rest-jar/pom.xml
+++ b/examples/async-rest/async-rest-jar/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>example-async-rest</artifactId>
-    <version>9.2.23.v20171218</version>
+    <version>9.2.24.v20180105</version>
  </parent>  
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.eclipse.jetty.example-async-rest</groupId>

--- a/examples/async-rest/async-rest-webapp/pom.xml
+++ b/examples/async-rest/async-rest-webapp/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>example-async-rest</artifactId>
-    <version>9.2.23.v20171218</version>
+    <version>9.2.24.v20180105</version>
  </parent>  
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.eclipse.jetty.example-async-rest</groupId>

--- a/examples/async-rest/pom.xml
+++ b/examples/async-rest/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty.examples</groupId>
    <artifactId>examples-parent</artifactId>
-    <version>9.2.23.v20171218</version>
+    <version>9.2.24.v20180105</version>
    <relativePath>../pom.xml</relativePath>
  </parent>  
  <modelVersion>4.0.0</modelVersion>

--- a/examples/embedded/pom.xml
+++ b/examples/embedded/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty.examples</groupId>
    <artifactId>examples-parent</artifactId>
-    <version>9.2.23.v20171218</version>
+    <version>9.2.24.v20180105</version>
    <relativePath>../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>

--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -21,7 +21,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-project</artifactId>
-    <version>9.2.23.v20171218</version>
+    <version>9.2.24.v20180105</version>
    <relativePath>../pom.xml</relativePath>
  </parent>
  <groupId>org.eclipse.jetty.examples</groupId>

--- a/jetty-alpn/jetty-alpn-client/pom.xml
+++ b/jetty-alpn/jetty-alpn-client/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-alpn-parent</artifactId>
-    <version>9.2.23.v20171218</version>
+    <version>9.2.24.v20180105</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jetty-alpn-client</artifactId>

--- a/jetty-alpn/jetty-alpn-server/pom.xml
+++ b/jetty-alpn/jetty-alpn-server/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-alpn-parent</artifactId>
-    <version>9.2.23.v20171218</version>
+    <version>9.2.24.v20180105</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jetty-alpn-server</artifactId>

--- a/jetty-alpn/pom.xml
+++ b/jetty-alpn/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-project</artifactId>
-    <version>9.2.23.v20171218</version>
+    <version>9.2.24.v20180105</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jetty-alpn-parent</artifactId>

--- a/jetty-annotations/pom.xml
+++ b/jetty-annotations/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-project</artifactId>
-    <version>9.2.23.v20171218</version>
+    <version>9.2.24.v20180105</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jetty-annotations</artifactId>

--- a/jetty-ant/pom.xml
+++ b/jetty-ant/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-project</artifactId>
-    <version>9.2.23.v20171218</version>
+    <version>9.2.24.v20180105</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jetty-ant</artifactId>

--- a/jetty-cdi/pom.xml
+++ b/jetty-cdi/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-project</artifactId>
-    <version>9.2.23.v20171218</version>
+    <version>9.2.24.v20180105</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jetty-cdi</artifactId>

--- a/jetty-client/pom.xml
+++ b/jetty-client/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-project</artifactId>
-    <version>9.2.23.v20171218</version>
+    <version>9.2.24.v20180105</version>
  </parent>

  <modelVersion>4.0.0</modelVersion>

--- a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpConnectionOverHTTP.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpConnectionOverHTTP.java
@@ -152,7 +152,7 @@ public class HttpConnectionOverHTTP extends AbstractConnection implements Connec
                    LOG.debug("Idle timeout {}/{}ms - {}", elapsed, idleTimeout, this);
                if (idle)
                {
-                    idleTimeoutStamp = -1;
+                    idleTimeoutGuard = -1;
                    close(new TimeoutException("Idle timeout expired: " + idleTimeout + "ms"));
                }
            }