Merge branch 'main' into fix-hardware-checksums

awslabs · Jan 22, 2024 · 7dd344e · 7dd344e
2 parents 7fcafcc + 21498e0
commit 7dd344e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Source/AwsCommonRuntimeKit/http/HTTP2StreamManagerOptions.swift b/Source/AwsCommonRuntimeKit/http/HTTP2StreamManagerOptions.swift
@@ -21,7 +21,8 @@ public struct HTTP2StreamManagerOptions: CStructWithShutdownOptions {
     public var proxyEnvSettings: HTTPProxyEnvSettings?
     /// The socket options to use for connections in the connection pool
     public var socketOptions: SocketOptions
-    /// The tls options to use for connections in the connection pool
+    /// The TLS options for creating secure (HTTPS) connections.
+    /// Leave as NULL to create cleartext (HTTP) connections. For H2, `http2_prior_knowledge` must also be set (see RFC-7540 3.4).
     public var tlsOptions: TLSConnectionOptions?
 
     /// HTTP/2 Stream window control.

diff --git a/Source/AwsCommonRuntimeKit/http/HTTPClientConnectionOptions.swift b/Source/AwsCommonRuntimeKit/http/HTTPClientConnectionOptions.swift
@@ -18,7 +18,8 @@ public struct HTTPClientConnectionOptions: CStructWithShutdownOptions {
     public var proxyEnvSettings: HTTPProxyEnvSettings?
     /// The socket options to use for connections in the connection pool
     public var socketOptions: SocketOptions
-    /// The tls options to use for connections in the connection pool
+    /// The TLS options for creating secure (HTTPS) connections.
+    /// Leave as NULL to create cleartext (HTTP) connections. 
     public var tlsOptions: TLSConnectionOptions?
 
     /// If set to true, then the TCP read back pressure mechanism will be enabled. You should