Skip to content

Commit 06695ec

Browse files
authored
Merge pull request #3111 from aws/salande/revert-tls-half
Revert "Add exception handling for TLS half-close in ApacheHTTPClient…
2 parents e88f57d + 6b95778 commit 06695ec

File tree

5 files changed

+1
-528
lines changed

5 files changed

+1
-528
lines changed

http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/SdkTlsSocketFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
2727
import org.apache.http.protocol.HttpContext;
2828
import software.amazon.awssdk.annotations.SdkInternalApi;
29-
import software.amazon.awssdk.http.apache.internal.net.InputShutdownCheckingSslSocket;
3029
import software.amazon.awssdk.http.apache.internal.net.SdkSocket;
3130
import software.amazon.awssdk.http.apache.internal.net.SdkSslSocket;
3231
import software.amazon.awssdk.utils.Logger;
@@ -63,7 +62,7 @@ public Socket connectSocket(int connectTimeout,
6362
Socket connectedSocket = super.connectSocket(connectTimeout, socket, host, remoteAddress, localAddress, context);
6463

6564
if (connectedSocket instanceof SSLSocket) {
66-
return new InputShutdownCheckingSslSocket(new SdkSslSocket((SSLSocket) connectedSocket));
65+
return new SdkSslSocket((SSLSocket) connectedSocket);
6766
}
6867

6968
return new SdkSocket(connectedSocket);

http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/InputShutdownCheckingSslSocket.java

Lines changed: 0 additions & 81 deletions
This file was deleted.

http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheClientTlsHalfCloseTest.java

Lines changed: 0 additions & 106 deletions
This file was deleted.

http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/InputShutdownCheckingSslSocketTest.java

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)