Merge branch 'jetty-9.4.x' into jetty-9.4.x-5810-bespoke-pathspec-sup…

…port-alt

Signed-off-by: gregw <gregw@webtide.com>

aggregates/jetty-all-compact3/pom.xml

@@ -11,6 +11,7 @@
   <name>Jetty :: Aggregate :: All core Jetty suitable for Java 8 compact 3 profile</name>
   <properties>
     <bundle-symbolic-name>${project.groupId}.all.compact3</bundle-symbolic-name>
+    <pmd.skip>true</pmd.skip>
   </properties>
   <build>
     <sourceDirectory>${project.build.directory}/sources</sourceDirectory>

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

@@ -704,13 +704,12 @@ public boolean isFromExcludedJar(WebAppContext context, ServletContainerInitiali
         }
 
         //Check if it is excluded by an ordering
-        URI loadingJarURI = sciResource.getURI();
         boolean found = false;
         Iterator<Resource> itor = orderedJars.iterator();
         while (!found && itor.hasNext())
         {
             Resource r = itor.next();
-            found = r.getURI().equals(loadingJarURI);
+            found = r.equals(sciResource);
         }
 
         if (LOG.isDebugEnabled())

jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java

@@ -109,7 +109,7 @@ public HttpDestination(HttpClient client, Origin origin)
     protected void doStart() throws Exception
     {
         this.connectionPool = newConnectionPool(client);
-        addBean(connectionPool);
+        addBean(connectionPool, true);
         super.doStart();
         Sweeper sweeper = client.getBean(Sweeper.class);
         if (sweeper != null && connectionPool instanceof Sweeper.Sweepable)
@@ -311,17 +311,19 @@ public void send()
 
     private void send(boolean create)
     {
-        if (getHttpExchanges().isEmpty())
-            return;
-        process(create);
+        if (!getHttpExchanges().isEmpty())
+            process(create);
     }
 
     private void process(boolean create)
     {
         // The loop is necessary in case of a new multiplexed connection,
         // when a single thread notified of the connection opening must
         // process all queued exchanges.
-        // In other cases looping is a work-stealing optimization.
+        // It is also necessary when thread T1 cannot acquire a connection
+        // (for example, it has been stolen by thread T2 and the pool has
+        // enough pending reservations). T1 returns without doing anything
+        // and therefore it is T2 that must send both queued requests.
         while (true)
         {
             Connection connection;
@@ -331,14 +333,15 @@ private void process(boolean create)
                 connection = connectionPool.acquire();
             if (connection == null)
                 break;
-            ProcessResult result = process(connection);
-            if (result == ProcessResult.FINISH)
+            boolean proceed = process(connection);
+            if (proceed)
+                create = false;
+            else
                 break;
-            create = result == ProcessResult.RESTART;
         }
     }
 
-    private ProcessResult process(Connection connection)
+    private boolean process(Connection connection)
     {
         HttpClient client = getHttpClient();
         HttpExchange exchange = getHttpExchanges().poll();
@@ -354,7 +357,7 @@ private ProcessResult process(Connection connection)
                     LOG.debug("{} is stopping", client);
                 connection.close();
             }
-            return ProcessResult.FINISH;
+            return false;
         }
         else
         {
@@ -372,17 +375,15 @@ private ProcessResult process(Connection connection)
                 // is created. Aborting the exchange a second time will result in
                 // a no-operation, so we just abort here to cover that edge case.
                 exchange.abort(cause);
-                return getHttpExchanges().size() > 0
-                    ?  (released ? ProcessResult.CONTINUE : ProcessResult.RESTART)
-                    : ProcessResult.FINISH;
+                return getQueuedRequestCount() > 0;
             }
 
             SendFailure failure = send(connection, exchange);
             if (failure == null)
             {
                 // Aggressively send other queued requests
                 // in case connections are multiplexed.
-                return getQueuedRequestCount() > 0 ? ProcessResult.CONTINUE : ProcessResult.FINISH;
+                return getQueuedRequestCount() > 0;
             }
 
             if (LOG.isDebugEnabled())
@@ -392,10 +393,10 @@ private ProcessResult process(Connection connection)
                 // Resend this exchange, likely on another connection,
                 // and return false to avoid to re-enter this method.
                 send(exchange);
-                return ProcessResult.FINISH;
+                return false;
             }
             request.abort(failure.failure);
-            return getHttpExchanges().size() > 0 ? ProcessResult.RESTART : ProcessResult.FINISH;
+            return getQueuedRequestCount() > 0;
         }
     }
 
@@ -474,7 +475,7 @@ else if (removed)
             // Process queued requests that may be waiting.
             // We may create a connection that is not
             // needed, but it will eventually idle timeout.
-            process(true);
+            send(true);
         }
         return removed;
     }
@@ -541,8 +542,8 @@ public String toString()
             asString(),
             hashCode(),
             proxy == null ? "" : "(via " + proxy + ")",
-            exchanges.size(),
-            connectionPool);
+            getQueuedRequestCount(),
+            getConnectionPool());
     }
 
     /**
@@ -610,9 +611,4 @@ private void schedule(long expiresAt)
             }
         }
     }
-
-    private enum ProcessResult
-    {
-        RESTART, CONTINUE, FINISH
-    }
 }

jetty-client/src/main/java/org/eclipse/jetty/client/util/BasicAuthentication.java

@@ -19,6 +19,7 @@
 package org.eclipse.jetty.client.util;
 
 import java.net.URI;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 
@@ -63,7 +64,9 @@ public String getType()
     @Override
     public Result authenticate(Request request, ContentResponse response, HeaderInfo headerInfo, Attributes context)
     {
-        return new BasicResult(getURI(), headerInfo.getHeader(), user, password);
+        String charsetParam = headerInfo.getParameter("charset");
+        Charset charset = charsetParam == null ? null : Charset.forName(charsetParam);
+        return new BasicResult(getURI(), headerInfo.getHeader(), user, password, charset);
     }
 
     /**
@@ -88,10 +91,17 @@ public BasicResult(URI uri, String user, String password)
         }
 
         public BasicResult(URI uri, HttpHeader header, String user, String password)
+        {
+            this(uri, header, user, password, StandardCharsets.ISO_8859_1);
+        }
+
+        public BasicResult(URI uri, HttpHeader header, String user, String password, Charset charset)
         {
             this.uri = uri;
             this.header = header;
-            byte[] authBytes = (user + ":" + password).getBytes(StandardCharsets.ISO_8859_1);
+            if (charset == null)
+                charset = StandardCharsets.ISO_8859_1;
+            byte[] authBytes = (user + ":" + password).getBytes(charset);
             this.value = "Basic " + Base64.getEncoder().encodeToString(authBytes);
         }
 

jetty-client/src/test/java/org/eclipse/jetty/client/ConnectionPoolHelper.java

@@ -19,7 +19,6 @@
 package org.eclipse.jetty.client;
 
 import org.eclipse.jetty.client.api.Connection;
-import org.eclipse.jetty.client.api.Destination;
 
 public class ConnectionPoolHelper
 {
@@ -28,8 +27,8 @@ public static Connection acquire(AbstractConnectionPool connectionPool, boolean
         return connectionPool.acquire(create);
     }
 
-    public static void tryCreate(AbstractConnectionPool connectionPool, int pending)
+    public static void tryCreate(AbstractConnectionPool connectionPool)
     {
-        connectionPool.tryCreate(pending);
+        connectionPool.tryCreate(true);
     }
 }