Upgrade Jetty 9.2.11.v20150529

Author: slandelle

api/src/test/java/org/asynchttpclient/AuthTimeoutTest.java

@@ -53,11 +53,11 @@ public void setUpGlobal() throws Exception {
         port2 = findFreePort();
 
         server = newJettyHttpServer(port1);
-        addBasicAuthHandler(server, false, configureHandler());
+        addBasicAuthHandler(server, configureHandler());
         server.start();
 
         server2 = newJettyHttpServer(port2);
-        addDigestAuthHandler(server2, true, configureHandler());
+        addDigestAuthHandler(server2, configureHandler());
         server2.start();
 
         logger.info("Local HTTP server started successfully");

api/src/test/java/org/asynchttpclient/BasicAuthTest.java

@@ -69,11 +69,11 @@ public void setUpGlobal() throws Exception {
         portNoAuth = findFreePort();
 
         server = newJettyHttpServer(port1);
-        addBasicAuthHandler(server, false, configureHandler());
+        addBasicAuthHandler(server, configureHandler());
         server.start();
 
         server2 = newJettyHttpServer(port2);
-        addDigestAuthHandler(server2, true, new RedirectHandler());
+        addDigestAuthHandler(server2, new RedirectHandler());
         server2.start();
 
         // need noAuth server to verify the preemptive auth mode (see basicAuthTetPreemtiveTest) 

api/src/test/java/org/asynchttpclient/DigestAuthTest.java

@@ -45,7 +45,7 @@ public void setUpGlobal() throws Exception {
         port1 = findFreePort();
 
         server = newJettyHttpServer(port1);
-        addDigestAuthHandler(server, false, configureHandler());
+        addDigestAuthHandler(server, configureHandler());
         server.start();
         logger.info("Local HTTP server started successfully");
     }

api/src/test/java/org/asynchttpclient/test/TestUtils.java

@@ -134,15 +134,15 @@ public static void addHttpsConnector(Server server, int port) throws URISyntaxEx
         server.addConnector(connector);
     }
 
-    public static void addBasicAuthHandler(Server server, boolean strict, Handler handler) {
-        addAuthHandler(server, Constraint.__BASIC_AUTH, new BasicAuthenticator(), strict, handler);
+    public static void addBasicAuthHandler(Server server, Handler handler) {
+        addAuthHandler(server, Constraint.__BASIC_AUTH, new BasicAuthenticator(), handler);
     }
 
-    public static void addDigestAuthHandler(Server server, boolean strict, Handler handler) {
-        addAuthHandler(server, Constraint.__DIGEST_AUTH, new DigestAuthenticator(), strict, handler);
+    public static void addDigestAuthHandler(Server server, Handler handler) {
+        addAuthHandler(server, Constraint.__DIGEST_AUTH, new DigestAuthenticator(), handler);
     }
 
-    private static void addAuthHandler(Server server, String auth, LoginAuthenticator authenticator, boolean strict, Handler handler) {
+    private static void addAuthHandler(Server server, String auth, LoginAuthenticator authenticator, Handler handler) {
 
         server.addBean(LOGIN_SERVICE);
 
@@ -166,7 +166,6 @@ private static void addAuthHandler(Server server, String auth, LoginAuthenticato
         security.setConstraintMappings(cm, knownRoles);
         security.setAuthenticator(authenticator);
         security.setLoginService(LOGIN_SERVICE);
-        security.setStrict(strict);
         security.setHandler(handler);
         server.setHandler(security);
     }

api/src/test/java/org/asynchttpclient/ws/EchoSocket.java

@@ -12,17 +12,11 @@ public class EchoSocket extends WebSocketAdapter {
     public void onWebSocketConnect(Session sess) {
         super.onWebSocketConnect(sess);
         sess.setIdleTimeout(10000);
-        sess.setMaximumMessageSize(1000);
     }
 
     @Override
     public void onWebSocketClose(int statusCode, String reason) {
-        try {
-            getSession().close();
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
+        getSession().close();
         super.onWebSocketClose(statusCode, reason);
     }
 

pom.xml

@@ -439,7 +439,7 @@
 		<logback.version>1.1.3</logback.version>
 		<log4j.version>1.2.17</log4j.version>
 		<testng.version>6.8.8</testng.version>
-		<jetty.version>9.0.5.v20130815</jetty.version>
+		<jetty.version>9.2.11.v20150529</jetty.version>
 		<tomcat.version>6.0.29</tomcat.version>
 		<commons-io.version>2.4</commons-io.version>
 		<commons-fileupload.version>1.3</commons-fileupload.version>