From 8eb56edc8a3c5ce9d3019143d9a6cf69c7ccc563 Mon Sep 17 00:00:00 2001
From: Denis Bardadym <bardadymchik@gmail.com>
Date: Fri, 14 Oct 2016 06:18:16 +0300
Subject: [PATCH 1/5] Fix typo in DefaultServlet (#988)

Fixes #952

Signed-off-by: Denis Bardadym <bardadymchik@gmail.com>
---
 .../src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
index 2d41066e7eb..7e0ef42953e 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
@@ -767,7 +767,7 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory
                     if (ifnm!=null && etag!=null)
                     {
                         // Handle special case of exact match OR gzip exact match
-                        if (etag.equals(ifnm) || ifnm.endsWith(ETAG_GZIP_QUOTE) && ifnm.indexOf(',')<0 && etag.equals(removeGzipFromETag(etag)))
+                        if (etag.equals(ifnm) || ifnm.endsWith(ETAG_GZIP_QUOTE) && ifnm.indexOf(',')<0 && etag.equals(removeGzipFromETag(ifnm)))
                         {
                             response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
                             response.setHeader(HttpHeader.ETAG.asString(),ifnm);

From cb74cb8c1fcfd701fe6e9c4a76b6520e400b85a9 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Thu, 13 Oct 2016 22:15:03 +1100
Subject: [PATCH 2/5] fixed racew in unit test

---
 .../jetty/server/handler/ThreadLimitHandlerTest.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ThreadLimitHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ThreadLimitHandlerTest.java
index a1436a503f2..add47c71853 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ThreadLimitHandlerTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ThreadLimitHandlerTest.java
@@ -238,10 +238,13 @@ public class ThreadLimitHandlerTest
         latch.countDown();
 
         while(total.get()<10 && System.nanoTime()<wait) 
-            Thread.sleep(1);
-        
-        assertThat(count.get(),is(0));
+            Thread.sleep(10);
         assertThat(total.get(),is(10));
+
+        while(count.get()>0 && System.nanoTime()<wait) 
+            Thread.sleep(10);
+        assertThat(count.get(),is(0));
+        
     }
     
     

From 7a2548ea72efef1c144d603cab609e337e6b128b Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Fri, 14 Oct 2016 10:33:33 -0700
Subject: [PATCH 3/5] Fixing script

---
 scripts/release-jetty.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/release-jetty.sh b/scripts/release-jetty.sh
index 634481a59cf..c2002ba3dec 100755
--- a/scripts/release-jetty.sh
+++ b/scripts/release-jetty.sh
@@ -45,7 +45,7 @@ function gitFindRemoteByUrl() {
     return 0
 }
 
-GIT_REMOTE_URL="git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project.git"
+GIT_REMOTE_URL="github.com:eclipse/jetty.project.git"
 GIT_REMOTE_ID=$(gitFindRemoteByUrl "$GIT_REMOTE_URL")
 GIT_BRANCH_ID=$(git symbolic-ref -q --short HEAD || git describe --tags --exact-match)
 

From 6c3c24e7dd7a22ee7e029e85eeda6a2626d7e89b Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Fri, 14 Oct 2016 10:34:18 -0700
Subject: [PATCH 4/5] Updating jetty-version-maven-plugin declaration

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index db0a604c822..5c1dc8c4b48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -268,7 +268,7 @@
         <plugin>
           <groupId>org.eclipse.jetty.toolchain</groupId>
           <artifactId>jetty-version-maven-plugin</artifactId>
-          <version>2.1</version>
+          <version>2.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

From 6adfc324ad9acb4839592eaca872e16607d99d96 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Mon, 17 Oct 2016 11:43:58 +1100
Subject: [PATCH 5/5] remove blockfor #1009

---
 jetty-server/src/main/config/etc/jetty-threadlimit.xml | 1 -
 jetty-server/src/main/config/modules/threadlimit.mod   | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/jetty-server/src/main/config/etc/jetty-threadlimit.xml b/jetty-server/src/main/config/etc/jetty-threadlimit.xml
index 20faf163287..11376e0478e 100644
--- a/jetty-server/src/main/config/etc/jetty-threadlimit.xml
+++ b/jetty-server/src/main/config/etc/jetty-threadlimit.xml
@@ -11,7 +11,6 @@
       <New id="ThreadLimitHandler" class="org.eclipse.jetty.server.handler.ThreadLimitHandler">
         <Arg name="forwardedHeader"><Property name="jetty.threadlimit.forwardedHeader"/></Arg> 
         <Set name="enabled"><Property name="jetty.threadlimit.enabled" default="true"/></Set> 
-        <Set name="blockForMs"><Property name="jetty.threadlimit.blockForMs" default="0"/></Set> 
         <Set name="threadLimit"><Property name="jetty.threadlimit.threadLimit" default="10"/></Set> 
       </New>
     </Arg>
diff --git a/jetty-server/src/main/config/modules/threadlimit.mod b/jetty-server/src/main/config/modules/threadlimit.mod
index 1a2615bd9b9..da07292700e 100644
--- a/jetty-server/src/main/config/modules/threadlimit.mod
+++ b/jetty-server/src/main/config/modules/threadlimit.mod
@@ -17,9 +17,6 @@ etc/jetty-threadlimit.xml
 ## Enabled by default?
 #jetty.threadlimit.enabled=true
 
-## MS to block for waiting for available thread
-#jetty.threadlimit.blockForMs=0
-
 ## Thread limit per remote IP
 #jetty.threadlimit.threadLimit=10