Merge branch 'jetty-12.0.x' into jetty-12.0.x

jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java

@@ -1149,5 +1149,19 @@ public int getMaxRequestHeadersSize() {
 
     public void setMaxRequestHeadersSize(int maxRequestHeadersSize) {
         this.maxRequestHeadersSize = maxRequestHeadersSize;
+
+    @Override
+    public void close() throws Exception
+    {
+        stop();
+    }
+
+    /**
+     * <p>Descendant beans of {@code HttpClient} that implement this interface
+     * are made aware of the {@code HttpClient} instance while it is starting.</p>
+     */
+    public interface Aware
+    {
+        void setHttpClient(HttpClient httpClient);
     }
 }

jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpSenderOverHTTP.java

@@ -156,6 +156,7 @@ protected Action process() throws Exception
         {
             HttpClient httpClient = getHttpChannel().getHttpDestination().getHttpClient();
             HttpExchange exchange = getHttpChannel().getHttpExchange();
+
             ByteBufferPool bufferPool = httpClient.getByteBufferPool();
             boolean useDirectByteBuffers = httpClient.isUseOutputDirectByteBuffers();
             while (true)