Merge branch 'main' into byte-buf-fix

azkrishpy · web-flow · commit 35a4ca54406a · 2026-04-01T11:35:17.000-07:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -202,7 +202,7 @@ jobs:
         python builder.pyz build -p ${{ env.PACKAGE_NAME }} downstream
 
   macos:
-    runs-on: macos-14 #latest
+    runs-on: macos-15 #latest
     steps:
     - uses: aws-actions/configure-aws-credentials@v4
       with:
@@ -220,7 +220,7 @@ jobs:
         python3 codebuild/macos_compatibility_check.py
 
   macos-x64:
-    runs-on: macos-14-large #latest
+    runs-on: macos-15-large #latest
     steps:
     - uses: aws-actions/configure-aws-credentials@v4
       with:
@@ -287,7 +287,7 @@ jobs:
 
 
   localhost-test-macos:
-    runs-on: macos-14 # latest
+    runs-on: macos-15 # latest
     steps:
     - uses: aws-actions/configure-aws-credentials@v4
       with:
diff --git a/crt/aws-c-auth b/crt/aws-c-auth
@@ -1 +1 @@
-Subproject commit 5aefd277cfbf049933df13b1ee8439edccbf0964
+Subproject commit fc4b87655e5cd3921f18d1859193c74af4102071
diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream
@@ -1 +1 @@
-Subproject commit c741f95e9050a1a4bed4b3aa7543bd3e024f6e56
+Subproject commit 66cafb1d8bb1bfeb62a7601ce03d1a6fcd4798ed
diff --git a/crt/aws-c-http b/crt/aws-c-http
@@ -1 +1 @@
-Subproject commit 0d8e1a933f46b8af984dfc8168ebcdf32748c184
+Subproject commit da535b1bf9c9334730eb78a26a1bbb3c069b38c9
diff --git a/crt/aws-c-io b/crt/aws-c-io
@@ -1 +1 @@
-Subproject commit bfb0819d3906502483611ce832a5ec6b897c8421
+Subproject commit 1ec8081f208ef8d51381889eda3bda9756fd5bb5
diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt
@@ -1 +1 @@
-Subproject commit 41b6a7d6d566a56eff69743df66c077d56a80c9d
+Subproject commit 3c2ceee52b66db42228053a4fb55210c8f8433a0
diff --git a/crt/aws-c-s3 b/crt/aws-c-s3
@@ -1 +1 @@
-Subproject commit e9d1bde139f88b08aaa3bf0507f443f31ccede93
+Subproject commit 7397f2fc077caf4d404c8708201fa52853a52847
diff --git a/crt/aws-lc b/crt/aws-lc
@@ -1 +1 @@
-Subproject commit e50a5f29ee416a7c99be4e72957e8f96aa51dbb9
+Subproject commit 83d85826595641bb2f23c6108f2e031fcd5cd505
diff --git a/src/main/java/software/amazon/awssdk/crt/http/Http2StreamManager.java b/src/main/java/software/amazon/awssdk/crt/http/Http2StreamManager.java
@@ -123,6 +123,7 @@ private Http2StreamManager(Http2StreamManagerOptions options) {
                 maxConnections,
                 idealConcurrentStreamsPerConnection,
                 maxConcurrentStreamsPerConnection,
+                options.getMaxConcurrentStreams(),
                 options.hasPriorKnowledge(),
                 options.shouldCloseConnectionOnServerError(),
                 options.getConnectionPingPeriodMs(),
@@ -265,6 +266,7 @@ private static native long http2StreamManagerNew(Http2StreamManager thisObj,
             int maxConns,
             int ideal_concurrent_streams_per_connection,
             int max_concurrent_streams_per_connection,
+            int max_concurrent_streams,
             boolean priorKnowledge,
             boolean closeConnectionOnServerError,
             int connectionPingPeriodMs,
diff --git a/src/main/java/software/amazon/awssdk/crt/http/Http2StreamManagerOptions.java b/src/main/java/software/amazon/awssdk/crt/http/Http2StreamManagerOptions.java
@@ -9,9 +9,7 @@
  * instance
  */
 public class Http2StreamManagerOptions {
-    public static final int DEFAULT_MAX_WINDOW_SIZE = Integer.MAX_VALUE;
     public static final int DEFAULT_MAX = Integer.MAX_VALUE;
-    public static final int DEFAULT_MAX_CONNECTIONS = 2;
     public static final int DEFAULT_CONNECTION_PING_TIMEOUT_MS = 3000;
     private static final String HTTPS = "https";
 
@@ -20,6 +18,7 @@ public class Http2StreamManagerOptions {
     private int idealConcurrentStreamsPerConnection = 100;
     private boolean connectionManualWindowManagement = false;
     private int maxConcurrentStreamsPerConnection = DEFAULT_MAX;
+    private int maxConcurrentStreams = 0;
 
     private boolean priorKnowledge = false;
     private boolean closeConnectionOnServerError = false;
@@ -108,6 +107,28 @@ public int getMaxConcurrentStreamsPerConnection() {
         return maxConcurrentStreamsPerConnection;
     }
 
+    /**
+     * The max number of concurrent streams that can be active across all connections
+     * at the same time. 0 means no limit (default). When this limit is reached, the
+     * stream manager will wait for existing streams to complete before creating new
+     * ones, even if connections have available capacity.
+     *
+     * @param maxConcurrentStreams The max number of concurrent streams across all connections
+     * @return this
+     */
+    public Http2StreamManagerOptions withMaxConcurrentStreams(int maxConcurrentStreams) {
+        this.maxConcurrentStreams = maxConcurrentStreams;
+        return this;
+    }
+
+    /**
+     * @return The max number of concurrent streams across all connections.
+     *         0 means no limit (default).
+     */
+    public int getMaxConcurrentStreams() {
+        return maxConcurrentStreams;
+    }
+
     /**
      * @return The connection level manual flow control enabled or not.
      */
diff --git a/src/main/java/software/amazon/awssdk/crt/http/HttpStreamBase.java b/src/main/java/software/amazon/awssdk/crt/http/HttpStreamBase.java
@@ -5,11 +5,7 @@
 
 package software.amazon.awssdk.crt.http;
 
-import software.amazon.awssdk.crt.CRT;
 import software.amazon.awssdk.crt.CrtResource;
-import software.amazon.awssdk.crt.CrtRuntimeException;
-
-import java.util.concurrent.CompletableFuture;
 
 /**
  * An base class represents a single Http Request/Response for both HTTP/1.1 and
@@ -100,6 +96,22 @@ public int getResponseStatusCode() {
         throw new IllegalStateException("Can't get Status Code on Closed Stream");
     }
 
+    /**
+     * Cancels the stream with the default error code (AWS_ERROR_HTTP_STREAM_CANCELLED).
+     * <p>
+     * For HTTP/1.1 streams, this is equivalent to closing the connection.
+     * For HTTP/2 streams, this sends a RST_STREAM frame with AWS_HTTP2_ERR_CANCEL.
+     * <p>
+     * The stream will complete with AWS_ERROR_HTTP_STREAM_CANCELLED, unless the stream is
+     * already completing for other reasons, or the stream is not activated,
+     * in which case this call will have no effect.
+     */
+    public void cancel() {
+        if (!isNull()) {
+            httpStreamBaseCancelDefaultError(getNativeHandle());
+        }
+    }
+
     /*******************************************************************************
      * Native methods
      ******************************************************************************/
@@ -111,4 +123,6 @@ public int getResponseStatusCode() {
     private static native void httpStreamBaseActivate(long http_stream, HttpStreamBase streamObj);
 
     private static native int httpStreamBaseGetResponseStatusCode(long http_stream);
+
+    private static native void httpStreamBaseCancelDefaultError(long http_stream);
 }
diff --git a/src/main/java/software/amazon/awssdk/crt/io/TlsCipherPreference.java b/src/main/java/software/amazon/awssdk/crt/io/TlsCipherPreference.java
@@ -76,7 +76,12 @@ public enum TlsCipherPreference {
      * This security policy was the system default before PQ was enabled by default, specifically
      * aws-c-io's AWS_IO_TLS_CIPHER_PREF_TLSV1_0_2023_06.
      */
-    TLS_CIPHER_PREF_TLSv1_0_2023(10);
+    TLS_CIPHER_PREF_TLSv1_0_2023(10),
+
+    /**
+     * The latest recommended non-Post-quantum enabled TLS Policy. This policy may change over time.
+     */
+    TLS_CIPHER_NON_PQ_DEFAULT(11);
 
     private int val;
 
diff --git a/src/native/http2_stream_manager.c b/src/native/http2_stream_manager.c
@@ -113,6 +113,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_http_Http2StreamManager_
     jint jni_max_conns,
     jint jni_ideal_concurrent_streams_per_connection,
     jint jni_max_concurrent_streams_per_connection,
+    jint jni_max_concurrent_streams,
     jboolean jni_prior_knowledge,
     jboolean jni_close_connection_on_server_error,
     jint jni_connection_ping_period_ms,
@@ -207,6 +208,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_http_Http2StreamManager_
         .ideal_concurrent_streams_per_connection = (size_t)jni_ideal_concurrent_streams_per_connection,
         .max_concurrent_streams_per_connection = (size_t)jni_max_concurrent_streams_per_connection,
         .max_connections = (size_t)jni_max_conns,
+        .max_concurrent_streams = (size_t)jni_max_concurrent_streams,
     };
 
     struct aws_http_connection_monitoring_options monitoring_options;
diff --git a/src/native/http_request_response.c b/src/native/http_request_response.c
@@ -706,6 +706,26 @@ JNIEXPORT void JNICALL Java_software_amazon_awssdk_crt_http_HttpStreamBase_httpS
     aws_http_stream_update_window(stream, window_update);
 }
 
+JNIEXPORT void JNICALL Java_software_amazon_awssdk_crt_http_HttpStreamBase_httpStreamBaseCancelDefaultError(
+    JNIEnv *env,
+    jclass jni_class,
+    jlong jni_binding) {
+
+    (void)jni_class;
+    aws_cache_jni_ids(env);
+
+    struct http_stream_binding *binding = (struct http_stream_binding *)jni_binding;
+    struct aws_http_stream *stream = binding->native_stream;
+
+    if (stream == NULL) {
+        aws_jni_throw_runtime_exception(env, "HttpStream is null.");
+        return;
+    }
+
+    AWS_LOGF_TRACE(AWS_LS_HTTP_STREAM, "Cancelling Stream with default error. stream: %p", (void *)stream);
+    aws_http_stream_cancel_default_error(stream);
+}
+
 JNIEXPORT void JNICALL Java_software_amazon_awssdk_crt_http_Http2Stream_http2StreamResetStream(
     JNIEnv *env,
     jclass jni_class,
diff --git a/src/test/java/software/amazon/awssdk/crt/test/Http2ClientLocalHostTest.java b/src/test/java/software/amazon/awssdk/crt/test/Http2ClientLocalHostTest.java
@@ -44,7 +44,8 @@
 import software.amazon.awssdk.crt.Log;
 
 public class Http2ClientLocalHostTest extends HttpClientTestFixture {
-    // crt/aws-c-http/tests/mock_server includes a readme on how the server can be run locally for testing.
+    // crt/aws-c-http/tests/mock_server includes a readme on how the server can be
+    // run locally for testing.
     private static final int LOCAL_HTTPS_PORT = 3443;
     private static final int LOCAL_HTTP_PORT = 3280;
 
@@ -208,7 +209,7 @@ public void onResponseHeaders(HttpStreamBase stream, int responseStatusCode, int
                     }
 
                     @Override
-                    public int onResponseBody(HttpStreamBase stream, byte[] bodyBytesIn){
+                    public int onResponseBody(HttpStreamBase stream, byte[] bodyBytesIn) {
                         String bodyString = new String(bodyBytesIn);
                         // Parse {"bytes": 123456} manually
                         int start = bodyString.indexOf("\"bytes\":") + 8;
@@ -255,33 +256,34 @@ public void testRequestsUploadStress() throws Exception {
 
             final CompletableFuture<Void> requestCompleteFuture = new CompletableFuture<Void>();
             final long expectedLength = bodyLength;
-            CompletableFuture<Http2Stream> acquireCompleteFuture  = streamManager.acquireStream(request, new HttpStreamBaseResponseHandler() {
-                @Override
-                public void onResponseHeaders(HttpStreamBase stream, int responseStatusCode, int blockType,
-                                              HttpHeader[] nextHeaders) {
+            CompletableFuture<Http2Stream> acquireCompleteFuture = streamManager.acquireStream(request,
+                    new HttpStreamBaseResponseHandler() {
+                        @Override
+                        public void onResponseHeaders(HttpStreamBase stream, int responseStatusCode, int blockType,
+                                HttpHeader[] nextHeaders) {
 
-                    Assert.assertTrue(responseStatusCode == 200);
-                }
+                            Assert.assertTrue(responseStatusCode == 200);
+                        }
 
-                @Override
-                public int onResponseBody(HttpStreamBase stream, byte[] bodyBytesIn){
-                    String bodyString = new String(bodyBytesIn);
-                    // Parse {"bytes": 123456} manually
-                    int start = bodyString.indexOf("\"bytes\":") + 8;
-                    int end = bodyString.indexOf("}", start);
-                    String bytesStr = bodyString.substring(start, end).trim();
-                    long receivedLength = Long.parseLong(bytesStr);
-                    Assert.assertTrue(receivedLength == expectedLength);
-                    return bodyString.length();
-                }
+                        @Override
+                        public int onResponseBody(HttpStreamBase stream, byte[] bodyBytesIn) {
+                            String bodyString = new String(bodyBytesIn);
+                            // Parse {"bytes": 123456} manually
+                            int start = bodyString.indexOf("\"bytes\":") + 8;
+                            int end = bodyString.indexOf("}", start);
+                            String bytesStr = bodyString.substring(start, end).trim();
+                            long receivedLength = Long.parseLong(bytesStr);
+                            Assert.assertTrue(receivedLength == expectedLength);
+                            return bodyString.length();
+                        }
 
-                @Override
-                public void onResponseComplete(HttpStreamBase stream, int errorCode) {
-                    Assert.assertTrue(errorCode == CRT.AWS_CRT_SUCCESS);
-                    stream.close();
-                    requestCompleteFuture.complete(null);
-                }
-            });
+                        @Override
+                        public void onResponseComplete(HttpStreamBase stream, int errorCode) {
+                            Assert.assertTrue(errorCode == CRT.AWS_CRT_SUCCESS);
+                            stream.close();
+                            requestCompleteFuture.complete(null);
+                        }
+                    });
 
             acquireCompleteFuture.get(30, TimeUnit.SECONDS);
             requestCompleteFuture.get(5, TimeUnit.MINUTES);
@@ -305,29 +307,30 @@ public void testRequestsDownloadStress() throws Exception {
 
             final CompletableFuture<Void> requestCompleteFuture = new CompletableFuture<Void>();
             final AtomicLong receivedLength = new AtomicLong(0);
-            CompletableFuture<Http2Stream> acquireCompleteFuture  = streamManager.acquireStream(request, new HttpStreamBaseResponseHandler() {
-                @Override
-                public void onResponseHeaders(HttpStreamBase stream, int responseStatusCode, int blockType,
-                                              HttpHeader[] nextHeaders) {
+            CompletableFuture<Http2Stream> acquireCompleteFuture = streamManager.acquireStream(request,
+                    new HttpStreamBaseResponseHandler() {
+                        @Override
+                        public void onResponseHeaders(HttpStreamBase stream, int responseStatusCode, int blockType,
+                                HttpHeader[] nextHeaders) {
 
-                    Assert.assertTrue(responseStatusCode == 200);
-                }
+                            Assert.assertTrue(responseStatusCode == 200);
+                        }
 
-                @Override
-                public int onResponseBody(HttpStreamBase stream, byte[] bodyBytesIn){
-                    receivedLength.addAndGet(bodyBytesIn.length);
+                        @Override
+                        public int onResponseBody(HttpStreamBase stream, byte[] bodyBytesIn) {
+                            receivedLength.addAndGet(bodyBytesIn.length);
 
-                    return bodyBytesIn.length;
-                }
+                            return bodyBytesIn.length;
+                        }
 
-                @Override
-                public void onResponseComplete(HttpStreamBase stream, int errorCode) {
+                        @Override
+                        public void onResponseComplete(HttpStreamBase stream, int errorCode) {
 
-                    Assert.assertTrue(errorCode == CRT.AWS_CRT_SUCCESS);
-                    stream.close();
-                    requestCompleteFuture.complete(null);
-                }
-            });
+                            Assert.assertTrue(errorCode == CRT.AWS_CRT_SUCCESS);
+                            stream.close();
+                            requestCompleteFuture.complete(null);
+                        }
+                    });
 
             acquireCompleteFuture.get(30, TimeUnit.SECONDS);
             requestCompleteFuture.get(5, TimeUnit.MINUTES);
@@ -337,4 +340,5 @@ public void onResponseComplete(HttpStreamBase stream, int errorCode) {
         CrtResource.logNativeResources();
         CrtResource.waitForNoResources();
     }
+
 }
diff --git a/src/test/java/software/amazon/awssdk/crt/test/Http2StreamManagerTest.java b/src/test/java/software/amazon/awssdk/crt/test/Http2StreamManagerTest.java
diff --git a/src/test/java/software/amazon/awssdk/crt/test/HttpClientConnectionTest.java b/src/test/java/software/amazon/awssdk/crt/test/HttpClientConnectionTest.java
diff --git a/src/test/java/software/amazon/awssdk/crt/test/HttpRequestResponseTest.java b/src/test/java/software/amazon/awssdk/crt/test/HttpRequestResponseTest.java
