Review comments

Author: dagnir

http-clients/apache5-client/src/main/java/software/amazon/awssdk/http/apache5/Apache5HttpClient.java

@@ -132,13 +132,6 @@ public final class Apache5HttpClient implements SdkHttpClient {
 
     private static final String CLIENT_NAME = "Apache5Preview";
 
-    // The global SdkHttpConfigurationOption.DEFAULT_CONNECTION_TIME_TO_LIVE is defined as Duration.ZERO to indicate infinite
-    // TTL. However, Apache 5.x defines 0 as immediate expiry. Shadow this default to -1 instead so that we still default to
-    // infinite TTL when not explicitly configured.
-    private static final AttributeMap APACHE5_HTTP_DEFAULTS = AttributeMap.builder()
-        .put(SdkHttpConfigurationOption.CONNECTION_TIME_TO_LIVE, Duration.ofMillis(-1))
-        .build();
-
     private static final Logger log = Logger.loggerFor(Apache5HttpClient.class);
     private static final HostnameVerifier DEFAULT_HOSTNAME_VERIFIER = new DefaultHostnameVerifier();
     private final Apache5HttpRequestFactory apacheHttpRequestFactory = new Apache5HttpRequestFactory();
@@ -743,10 +736,8 @@ public void setAuthSchemeProviderRegistry(Registry<AuthSchemeFactory> authScheme
 
         @Override
         public SdkHttpClient buildWithDefaults(AttributeMap serviceDefaults) {
-            AttributeMap resolvedOptions = standardOptions.build()
-                                                          .merge(serviceDefaults)
-                                                          .merge(APACHE5_HTTP_DEFAULTS)
-                                                          .merge(SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS);
+            AttributeMap resolvedOptions = standardOptions.build().merge(serviceDefaults).merge(
+                SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS);
             return new Apache5HttpClient(this, resolvedOptions);
         }
     }
@@ -778,7 +769,11 @@ private static ConnectionConfig getConnectionConfig(AttributeMap standardOptions
                                 .setSocketTimeout(Timeout.ofMilliseconds(
                                     standardOptions.get(SdkHttpConfigurationOption.READ_TIMEOUT).toMillis()));
             Duration connectionTtl = standardOptions.get(SdkHttpConfigurationOption.CONNECTION_TIME_TO_LIVE);
-            connectionConfigBuilder.setTimeToLive(TimeValue.ofMilliseconds(connectionTtl.toMillis()));
+            // Only accept positive values.
+            // Note: TTL=0 is infinite in 4.x vs immediate expiration in 5.x
+            if (!connectionTtl.isNegative() && !connectionTtl.isZero()) {
+                connectionConfigBuilder.setTimeToLive(TimeValue.ofMilliseconds(connectionTtl.toMillis()));
+            }
             return connectionConfigBuilder.build();
         }
 

http-clients/apache5-client/src/test/java/software/amazon/awssdk/http/apache5/ConnectionTtlTest.java

@@ -110,7 +110,7 @@ public void execute_ttlNegative_connectionNotClosed() throws Exception {
     }
 
     @Test
-    public void execute_ttlIsZero_connectionClosed() throws Exception {
+    public void execute_ttlIsZero_connectionNotClosed() throws Exception {
         TestTlsSocketStrategy socketStrategy = TestTlsSocketStrategy.create();
 
         apache5 = Apache5HttpClient.builder()
@@ -123,7 +123,7 @@ public void execute_ttlIsZero_connectionClosed() throws Exception {
         doGetCall(apache5);
 
         List<SSLSocket> sockets = socketStrategy.getCreatedSockets();
-        assertThat(sockets).hasSize(2);
+        assertThat(sockets).hasSize(1);
     }
 
     @Test