Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java

@@ -815,6 +815,7 @@ public class AnnotationParser
 
             MultiException me = new MultiException();
             // TODO do not force version 8 once ASM can scan 9
+            // TODO support a different target for quickstart generation
             MultiReleaseJarFile jarFile = new MultiReleaseJarFile(jarResource.getFile(),8,false);
             jarFile.stream().forEach(e->
             {

jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java

@@ -106,6 +106,7 @@ public class RequestTest
         _server.setHandler(_handler);
         
         ErrorHandler errors = new ErrorHandler();
+        errors.setServer(_server);
         errors.setShowStacks(true);
         _server.addBean(errors);
         _server.start();
@@ -1399,6 +1400,42 @@ public class RequestTest
         assertEquals("14316.133020.1.1.utr=gna.de|ucn=(real)|utd=reral|utct=/games/hen-one,gnt-50-ba-keys:key,2072262.html", cookies.get(0).getValue());
 
     }
+    
+    @Test
+    public void testBadCookies() throws Exception
+    {
+        final ArrayList<Cookie> cookies = new ArrayList<>();
+
+        _handler._checker = new RequestTester()
+        {
+            @Override
+            public boolean check(HttpServletRequest request,HttpServletResponse response) throws IOException
+            {
+                javax.servlet.http.Cookie[] ca = request.getCookies();
+                if (ca!=null)
+                    cookies.addAll(Arrays.asList(ca));
+                response.getOutputStream().println("Hello World");
+                return true;
+            }
+        };
+
+        String response;
+
+        cookies.clear();
+        response=_connector.getResponses(
+                    "GET / HTTP/1.1\n"+
+                    "Host: whatever\n"+
+                    "Cookie: path=value\n" +
+                    "Cookie: name=value\n" +
+                    "Connection: close\n"+
+                    "\n"
+        );
+        assertTrue(response.startsWith("HTTP/1.1 200 OK"));
+        assertEquals(1,cookies.size());
+        assertEquals("name", cookies.get(0).getName());
+        assertEquals("value", cookies.get(0).getValue());
+        
+    }
 
     @Ignore("No longer relevant")
     @Test

scripts/release-jetty.sh

@@ -141,9 +141,10 @@ if proceedyn "Are you sure you want to release using above? (y/N)" n; then
 
     # This is equivalent to 'mvn release:prepare'
     if proceedyn "Update project.versions for $VER_RELEASE? (Y/n)" y; then
-        mvn org.codehaus.mojo:versions-maven-plugin:2.1:set \
+        mvn org.codehaus.mojo:versions-maven-plugin:2.5:set \
             -DoldVersion="$VER_CURRENT" \
-            -DnewVersion="$VER_RELEASE"
+            -DnewVersion="$VER_RELEASE" \
+            -DprocessAllModules=true 
     fi
     if proceedyn "Commit $VER_RELEASE updates? (Y/n)" y; then
         git commit -a -m "Updating to version $VER_RELEASE"

tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/web.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app 
+<web-app
-   xmlns="http://java.sun.com/xml/ns/javaee" 
+  xmlns="http://java.sun.com/xml/ns/javaee"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-   metadata-complete="false"
+  metadata-complete="false"
-   version="3.0"> 
+  version="3.0">
 
   <display-name>Transparent Proxy WebApp</display-name>
 
@@ -20,12 +20,10 @@
     <load-on-startup>1</load-on-startup>
     <async-supported>true</async-supported>
   </servlet>
-  
+
   <servlet-mapping>
     <servlet-name>JavadocTransparentProxy</servlet-name>
     <url-pattern>/current/*</url-pattern>
   </servlet-mapping>
 
-</web-app>
+</web-app>
-
-