Merge branch 'master' into dependabot/maven/log4j.version-2.25.2

Author: ok2c

.github/workflows/codeql-analysis.yml

@@ -60,7 +60,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/depsreview.yaml

@@ -26,6 +26,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v4

.github/workflows/maven.yml

@@ -36,15 +36,15 @@ jobs:
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}

README.md

@@ -40,10 +40,11 @@ Protocol conformance
 - 
 - [RFC 9110](https://datatracker.ietf.org/doc/html/rfc9110) - HTTP Semantics
 - [RFC 9112](https://datatracker.ietf.org/doc/html/rfc9112) - Hypertext Transfer Protocol Version 1.1 (HTTP/1.1)
-- [RFC 7540](https://datatracker.ietf.org/doc/html/rfc7540) - Hypertext Transfer Protocol Version 2 (HTTP/2)
+- [RFC 9113](https://datatracker.ietf.org/doc/html/rfc9113) - Hypertext Transfer Protocol Version 2 (HTTP/2)
 - [RFC 7541](https://datatracker.ietf.org/doc/html/rfc7541) - HPACK: Header Compression for HTTP/2
 - [RFC 1945](https://datatracker.ietf.org/doc/html/rfc1945) - Hypertext Transfer Protocol -- HTTP/1.0
 - [RFC 3986](https://datatracker.ietf.org/doc/html/rfc3986) - Uniform Resource Identifier (URI): Generic Syntax
+- [RFC 9218](https://datatracker.ietf.org/doc/html/rfc9218) - Extensible Prioritization Scheme for HTTP
 
 Licensing
 ---------

RELEASE_NOTES.txt

@@ -1,30 +1,209 @@
 Release 5.4-alpha1
 ------------------
 
-This is the first release in the 5.4 release series.
- 
+This is the first ALPHA release in the 5.4 release series that improves HTTP/2 protocol
+support by ensuring conformance to the latest HTTP specification (RFC 9113) and adds
+support for Unix domain sockets.
+
+This release also includes all the fixes from the stable 5.3 branch.
+
+Notable changes and features included in the 5.4 series:
+
+* Experimental OFFLOCK (lock-free) connection pool.
+
+* Conformance to RFC 9218 (Extensible Prioritization Scheme for HTTP).
+
+* Improved conformance to RFC 9113 (Hypertext Transfer Protocol Version 2).
+
+* Five-second TCP keep-alive enabled by default.
+
+* Unix domain socket support by the classic and async transports.
+
+* Redesign of classic over async API bridge.
+
+* Improved URI encoding per RFC 3986.
+
+* QUERY method support.
+
+
 
 Change Log
 -------------------
 
-* Add ContentType.APPLICATION_ZIP_COMPRESSED.
-  Contributed by Gary Gregory <ggregory at apache.org>
+* Experimental RouteSegmentedConnPool (OFFLOCK): lock-free, route-segmented, disposal off
+  critical path.
+  Contributed by Arturo Bernal <abernal at apache.org>
 
-* Bump io.reactivex.rxjava3:rxjava from 3.1.9 to 3.1.10 #509
-  Contributed by Gary Gregory <ggregory at apache.org>
+* Configurable AuthorityResolver for async server bootstraps.
+  Contributed by Christian de Waal <christian at de.waal.name>
 
-* Bump org.junit:junit-bom from 5.11.0 to 5.13.3 #501, #528, #533
-  Contributed by Gary Gregory <ggregory at apache.org>
+* RFC 9218 HTTP/2 Priority support (#552).
+  Contributed by Arturo Bernal <abernal at apache.org>
 
-* Bump testcontainers.version from 1.20.2 to 1.20.4 #505
-  Contributed by Gary Gregory <ggregory at apache.org>
+* Stale connection check for the async protocol handlers.
+  Contributed by Ryan Schmitt <rschmitt at apache.org>
+
+* Corrected JavaDoc for HttpConnection#close to reference correct CloseMode mode (#561).
+  Contributed by Arturo Bernal <abernal at apache.org>
+
+* HTTPCORE-785: Improved Javadocs of TlsStrategy implementations.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* HTTPCORE-785: Updated request execution example with Conscrypt as a security provider.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* Five-second TCP keep-alive enabled by default.
+  Contributed by Ryan Schmitt <rschmitt at apache.org>
+
+* RFC 9113 conformance: H2 stream can be cancelled (reset) locally from multiple threads.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* RFC 9113 conformance: Strict SETTINGS_MAX_CONCURRENT_STREAMS enforcement for inbound and
+  outbound streams.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* RFC 9113 conformance: Use command queue to activate streams reserved with a push promise.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* RFC 9113 conformance: Improved H2 stream creation and initialization, improved H2 stream
+  state tracking and tracking of total stream counts.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* RFC 9113 conformance: Corrected H2 stream ID generation and verification logic.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* RFC 9113 conformance: Refactoring of internal H2 stream APIs.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* RFC 9113 conformance: Merge multiple Cookie Header fields into a single field after
+  decompression.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* RFC 9113 conformance: Stricter validation of message fields.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* RFC 9113 conformance: RST_STREAM with NO_ERROR error code gracefully terminates the request
+  on the client if the server has sent the complete response (the stream has been closed
+  remotely).
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* Revised graceful / immediate H2 connection shutdown.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* RFC 9113 conformance: Ensure the ID of promised streams is valid (greater than the last seen).
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* RFC 9113 conformance: Treat ENABLE_PUSH set to 1 transmitted by the server endpoint as
+  a protocol error.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* RFC 9113 conformance: Treat attempts to send frames on a locally closed stream as a protocol
+  violation.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* HTTP/1.1 async protocol handler to read message data more greedily.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* Optimized release of resources associated with H2 streams. #releaseResources should be called
+  only once.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* H2 transport to enforce a max limit on the number of CONTINUATION frames.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* Socket keep-alive option support.
+  Contributed by Ryan Schmitt <rschmitt at apache.org>
+
+* Discontinue use of SocketSupport to set extended socket options.
+  Contributed by Ryan Schmitt <rschmitt at apache.org>
+
+* IOFunction functional interface.
+  Contributed by Arturo Bernal <abernal at apache.org>
+
+* Safeguard for infinite unproductive loop in non-blocking SSL session #527.
+  Contributed by Ali Farahani <ali.farahani at genesys.com>
+
+* Slightly better and efficient #toHexString method.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
 
-* Bump testcontainers.version from 1.21.1 to 1.21.3 #530, #534 
+* HTTP/2 protocol handler to allow configuring FrameFractory (#525).
+  Contributed by Marko <marco at sitar.dev>
+
+* ContentType.APPLICATION_ZIP_COMPRESSED (#524).
   Contributed by Gary Gregory <ggregory at apache.org>
 
-* Bump log4j.version from 2.24.3 to 2.25.0 #529 
+* I/O reactors to support Unix domain sockets.
+  Contributed by Ryan Schmitt <rschmitt at apache.org>
+
+* Redesign of classic over async bridge.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* Shared buffers to support timeout on blocking operations.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* Added a method to the async response channel to terminate the ongoing message exchange
+  due to an internal error.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* Avoid legacy Socket API in reactor code.
+  Contributed by Ryan Schmitt <rschmitt at apache.org>
+
+* Support for parsing of headers representing a list of complex elements.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* RFC 3986 conformant URI encoding policy (#517).
+  Contributed by Arturo Bernal <abernal at apache.org>
+
+* Protocol negotiation handlers to use exception callback to report unexpected exceptions
+  during the protocol negotiation handshake.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* Updated error message in ProtocolVersion.
+  Contributed by Mavelous <github at mavelo.us>
+
+* Handle overflow in Deadline calculation to ensure correct behavior for large time values
+  (#512).
+  Contributed by Arturo Bernal <abernal at apache.org>
+
+* HTTPCORE-774: Update window management improvements.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* Added more convenience methods to classic request / response builders.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* HTTPCORE-773: Introduced customizable strategy to select I/O dispatch worker for new I/O
+  channels.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* Optimize connection close logic to resolve timeout delay issue (#508).
+  Contributed by Noah <yuns994@gmail.com>
+
+* NoConnectionReuseStrategy
+  Contributed by Johnny Lim <izeye@naver.com>
+
+* Polish Javadoc for HttpResponseInterceptor.
+  Contributed by Johnny Lim <izeye@naver.com>
+
+* HTTP Method QUERY support (#499).
+  Contributed by Mario Daniel Ruiz Saavedra <desiderantes93 at gmail.com>
+
+* Ensure Date header is always present and replace invalid values. (#500).
+  Contributed by Arturo Bernal <abernal at apache.org>
+
+* HTTP/1.1 TE header interceptor and strict client/server option (#498).
+  Contributed by Arturo Bernal <abernal at apache.org>
+
+* HTTPCLIENT-2233: Metrics listener for IOReactor thread pool monitoring (#490).
+  Contributed by Arturo Bernal <abernal at apache.org>
+
+* A FutureContribution should not allow a null BasicFuture (#485).
   Contributed by Gary Gregory <ggregory at apache.org>
 
+* HTTPCORE-770: Introduced `plusAsBlank` parameter for dynamic configuration.
+  Contributed by Arturo Bernal <abernal at apache.org>
+
+
+
 Release 5.3
 ------------------
 

httpcore5-h2/pom.xml

@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.httpcomponents.core5</groupId>
     <artifactId>httpcore5-parent</artifactId>
-    <version>5.4-alpha1-SNAPSHOT</version>
+    <version>5.4-alpha2-SNAPSHOT</version>
   </parent>
   <artifactId>httpcore5-h2</artifactId>
   <name>Apache HttpComponents Core HTTP/2</name>

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/config/H2Param.java

@@ -38,7 +38,8 @@ public enum H2Param {
     MAX_CONCURRENT_STREAMS(0x3),
     INITIAL_WINDOW_SIZE(0x4),
     MAX_FRAME_SIZE(0x5),
-    MAX_HEADER_LIST_SIZE(0x6);
+    MAX_HEADER_LIST_SIZE(0x6),
+    SETTINGS_NO_RFC7540_PRIORITIES (0x9);
 
     int code;
 
@@ -50,25 +51,32 @@ public int getCode() {
         return code;
     }
 
-    private static final H2Param[] LOOKUP_TABLE = new H2Param[6];
+    private static final H2Param[] LOOKUP_TABLE;
     static {
-        for (final H2Param param: H2Param.values()) {
-            LOOKUP_TABLE[param.code - 1] = param;
+        int max = 0;
+        for (final H2Param p : H2Param.values()) {
+            if (p.code > max) {
+                max = p.code;
+            }
+        }
+        LOOKUP_TABLE = new H2Param[max + 1];
+        for (final H2Param p : H2Param.values()) {
+            LOOKUP_TABLE[p.code] = p;
         }
     }
 
     public static H2Param valueOf(final int code) {
-        if (code < 1 || code > LOOKUP_TABLE.length) {
+        if (code < 0 || code >= LOOKUP_TABLE.length) {
             return null;
         }
-        return LOOKUP_TABLE[code - 1];
+        return LOOKUP_TABLE[code];
     }
 
     public static String toString(final int code) {
-        if (code < 1 || code > LOOKUP_TABLE.length) {
+        if (code < 0 || code >= LOOKUP_TABLE.length || LOOKUP_TABLE[code] == null) {
             return Integer.toString(code);
         }
-        return LOOKUP_TABLE[code - 1].name();
+        return LOOKUP_TABLE[code].name();
     }
 
-}
+}

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/FrameFactory.java

@@ -111,4 +111,9 @@ public RawFrame createWindowUpdate(final int streamId, final int increment) {
         return new RawFrame(FrameType.WINDOW_UPDATE.getValue(), 0, streamId, payload);
     }
 
+    public RawFrame createPriorityUpdate(final ByteBuffer payload) {
+        // type 0x10, flags 0, streamId 0 (connection control stream)
+        return new RawFrame(FrameType.PRIORITY_UPDATE.getValue(), 0, 0, payload);
+    }
+
 }

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/FrameType.java

@@ -42,9 +42,10 @@ public enum FrameType {
     PING(0x06),
     GOAWAY(0x07),
     WINDOW_UPDATE(0x08),
-    CONTINUATION(0x09);
+    CONTINUATION(0x09),
+    PRIORITY_UPDATE(0x10); // 16
 
-    int value;
+    final int value;
 
     FrameType(final int value) {
         this.value = value;
@@ -54,25 +55,37 @@ public int getValue() {
         return value;
     }
 
-    private static final FrameType[] LOOKUP_TABLE = new FrameType[10];
+    private static final FrameType[] LOOKUP_TABLE;
     static {
-        for (final FrameType frameType: FrameType.values()) {
-            LOOKUP_TABLE[frameType.value] = frameType;
+        int max = -1;
+        for (final FrameType t : FrameType.values()) {
+            if (t.value > max) {
+                max = t.value;
+            }
+        }
+        LOOKUP_TABLE = new FrameType[max + 1];
+        for (final FrameType t : FrameType.values()) {
+            LOOKUP_TABLE[t.value] = t;
         }
     }
 
     public static FrameType valueOf(final int value) {
         if (value < 0 || value >= LOOKUP_TABLE.length) {
             return null;
         }
-        return LOOKUP_TABLE[value];
+        return LOOKUP_TABLE[value]; // may be null for gaps (e.g., 0x0A..0x0F)
     }
 
     public static String toString(final int value) {
         if (value < 0 || value >= LOOKUP_TABLE.length) {
             return Integer.toString(value);
         }
-        return LOOKUP_TABLE[value].name();
+        final FrameType t = LOOKUP_TABLE[value];
+        return t != null ? t.name() : Integer.toString(value);
     }
 
-}
+    /** Convenience: compare this enum to a raw frame type byte. */
+    public boolean same(final int rawType) {
+        return this.value == rawType;
+    }
+}