Upgraded HttpCore to version 5.3.4

Author: ok2c

httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientBuilder.java

@@ -848,7 +848,8 @@ public CloseableHttpAsyncClient build() {
                 HttpProcessorBuilder.create().build(),
                 (request, context) -> pushConsumerRegistry.get(request),
                 h2Config != null ? h2Config : H2Config.DEFAULT,
-                charCodingConfig != null ? charCodingConfig : CharCodingConfig.DEFAULT);
+                charCodingConfig != null ? charCodingConfig : CharCodingConfig.DEFAULT,
+                ioReactorExceptionCallback != null ? ioReactorExceptionCallback : LoggingExceptionCallback.INSTANCE);
         final DefaultConnectingIOReactor ioReactor = new DefaultConnectingIOReactor(
                 ioEventHandlerFactory,
                 ioReactorConfig != null ? ioReactorConfig : IOReactorConfig.DEFAULT,

httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientProtocolStarter.java

@@ -30,6 +30,7 @@
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.hc.core5.function.Callback;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpConnection;
 import org.apache.hc.core5.http.config.CharCodingConfig;
@@ -60,16 +61,19 @@ class H2AsyncClientProtocolStarter implements IOEventHandlerFactory {
     private final HandlerFactory<AsyncPushConsumer> exchangeHandlerFactory;
     private final H2Config h2Config;
     private final CharCodingConfig charCodingConfig;
+    private final Callback<Exception> exceptionCallback;
 
     H2AsyncClientProtocolStarter(
             final HttpProcessor httpProcessor,
             final HandlerFactory<AsyncPushConsumer> exchangeHandlerFactory,
             final H2Config h2Config,
-            final CharCodingConfig charCodingConfig) {
+            final CharCodingConfig charCodingConfig,
+            final Callback<Exception> exceptionCallback) {
         this.httpProcessor = Args.notNull(httpProcessor, "HTTP processor");
         this.exchangeHandlerFactory = exchangeHandlerFactory;
         this.h2Config = h2Config != null ? h2Config : H2Config.DEFAULT;
         this.charCodingConfig = charCodingConfig != null ? charCodingConfig : CharCodingConfig.DEFAULT;
+        this.exceptionCallback = exceptionCallback;
     }
 
     @Override
@@ -163,15 +167,15 @@ public void onOutputFlowControl(final HttpConnection connection, final int strea
                         }
 
                     });
-            return new ClientH2PrefaceHandler(ioSession, http2StreamHandlerFactory, false);
+            return new ClientH2PrefaceHandler(ioSession, http2StreamHandlerFactory, false, exceptionCallback);
         }
         final ClientH2StreamMultiplexerFactory http2StreamHandlerFactory = new ClientH2StreamMultiplexerFactory(
                 httpProcessor,
                 exchangeHandlerFactory,
                 h2Config,
                 charCodingConfig,
                 null);
-        return new ClientH2PrefaceHandler(ioSession, http2StreamHandlerFactory, false);
+        return new ClientH2PrefaceHandler(ioSession, http2StreamHandlerFactory, false, exceptionCallback);
    }
 
 }

httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java

@@ -1065,7 +1065,8 @@ public CloseableHttpAsyncClient build() {
                 h2Config != null ? h2Config : H2Config.DEFAULT,
                 h1Config != null ? h1Config : Http1Config.DEFAULT,
                 charCodingConfig != null ? charCodingConfig : CharCodingConfig.DEFAULT,
-                reuseStrategyCopy);
+                reuseStrategyCopy,
+                ioReactorExceptionCallback != null ? ioReactorExceptionCallback : LoggingExceptionCallback.INSTANCE);
         final DefaultConnectingIOReactor ioReactor = new DefaultConnectingIOReactor(
                 ioEventHandlerFactory,
                 ioReactorConfig != null ? ioReactorConfig : IOReactorConfig.DEFAULT,

httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientProtocolNegotiationStarter.java

@@ -32,6 +32,7 @@
 import java.util.List;
 
 import org.apache.hc.client5.http.impl.DefaultClientConnectionReuseStrategy;
+import org.apache.hc.core5.function.Callback;
 import org.apache.hc.core5.http.ConnectionReuseStrategy;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpConnection;
@@ -85,14 +86,16 @@ class HttpAsyncClientProtocolNegotiationStarter implements IOEventHandlerFactory
     private final ConnectionReuseStrategy http1ConnectionReuseStrategy;
     private final NHttpMessageParserFactory<HttpResponse> http1ResponseParserFactory;
     private final NHttpMessageWriterFactory<HttpRequest> http1RequestWriterFactory;
+    private final Callback<Exception> exceptionCallback;
 
     HttpAsyncClientProtocolNegotiationStarter(
             final HttpProcessor httpProcessor,
             final HandlerFactory<AsyncPushConsumer> exchangeHandlerFactory,
             final H2Config h2Config,
             final Http1Config h1Config,
             final CharCodingConfig charCodingConfig,
-            final ConnectionReuseStrategy connectionReuseStrategy) {
+            final ConnectionReuseStrategy connectionReuseStrategy,
+            final Callback<Exception> exceptionCallback) {
         this.httpProcessor = Args.notNull(httpProcessor, "HTTP processor");
         this.exchangeHandlerFactory = exchangeHandlerFactory;
         this.h2Config = h2Config != null ? h2Config : H2Config.DEFAULT;
@@ -101,6 +104,7 @@ class HttpAsyncClientProtocolNegotiationStarter implements IOEventHandlerFactory
         this.http1ConnectionReuseStrategy = connectionReuseStrategy != null ? connectionReuseStrategy : DefaultClientConnectionReuseStrategy.INSTANCE;
         this.http1ResponseParserFactory = new DefaultHttpResponseParserFactory(h1Config);
         this.http1RequestWriterFactory = DefaultHttpRequestWriterFactory.INSTANCE;
+        this.exceptionCallback = exceptionCallback;
     }
 
     @Override
@@ -257,12 +261,12 @@ public void onOutputFlowControl(final HttpConnection connection, final int strea
         }
 
         ioSession.registerProtocol(ApplicationProtocol.HTTP_1_1.id, new ClientHttp1UpgradeHandler(http1StreamHandlerFactory));
-        ioSession.registerProtocol(ApplicationProtocol.HTTP_2.id, new ClientH2UpgradeHandler(http2StreamHandlerFactory));
+        ioSession.registerProtocol(ApplicationProtocol.HTTP_2.id, new ClientH2UpgradeHandler(http2StreamHandlerFactory, exceptionCallback));
 
         final HttpVersionPolicy versionPolicy = attachment instanceof HttpVersionPolicy ? (HttpVersionPolicy) attachment : HttpVersionPolicy.NEGOTIATE;
         switch (versionPolicy) {
             case FORCE_HTTP_2:
-                return new ClientH2PrefaceHandler(ioSession, http2StreamHandlerFactory, false);
+                return new ClientH2PrefaceHandler(ioSession, http2StreamHandlerFactory, false, exceptionCallback);
             case FORCE_HTTP_1:
                 return new ClientHttp1IOEventHandler(http1StreamHandlerFactory.create(ioSession));
             default:

httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClients.java

@@ -168,7 +168,8 @@ public static MinimalHttpAsyncClient createMinimal(
                         h2Config,
                         h1Config,
                         CharCodingConfig.DEFAULT,
-                        DefaultClientConnectionReuseStrategy.INSTANCE),
+                        DefaultClientConnectionReuseStrategy.INSTANCE,
+                        LoggingExceptionCallback.INSTANCE),
                 pushConsumerRegistry,
                 ioReactorConfig,
                 connmgr,
@@ -196,7 +197,8 @@ public static MinimalHttpAsyncClient createMinimal(
                         h2Config,
                         h1Config,
                         CharCodingConfig.DEFAULT,
-                        DefaultClientConnectionReuseStrategy.INSTANCE),
+                        DefaultClientConnectionReuseStrategy.INSTANCE,
+                        LoggingExceptionCallback.INSTANCE),
                 pushConsumerRegistry,
                 ioReactorConfig,
                 connmgr,
@@ -297,7 +299,8 @@ public static MinimalH2AsyncClient createHttp2Minimal(
                         createMinimalProtocolProcessor(),
                         (request, context) -> pushConsumerRegistry.get(request),
                         h2Config,
-                        CharCodingConfig.DEFAULT),
+                        CharCodingConfig.DEFAULT,
+                        LoggingExceptionCallback.INSTANCE),
                 pushConsumerRegistry,
                 ioReactorConfig,
                 dnsResolver,

pom.xml

@@ -62,8 +62,8 @@
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <httpcore.version>5.3.3</httpcore.version>
-    <log4j.version>2.24.3</log4j.version>
+    <httpcore.version>5.3.4</httpcore.version>
+    <log4j.version>2.23.1</log4j.version>
     <brotli.version>0.1.2</brotli.version>
     <conscrypt.version>2.5.2</conscrypt.version>
     <ehcache.version>3.10.8</ehcache.version>
@@ -438,4 +438,4 @@
     </plugins>
   </reporting>
 
-</project>
+</project>