Skip to content

Conversation

@carterkozak
Copy link
Contributor

SSLConnectionSocketFactory no longer overrides the socket timeout
with the connect timeout when an unlimited socket timeout is
configured. This matches behavior of HTTPCLIENT-2091.

Note that in scenarios where SocketConfig sets an infinite timeout
and the RequestConfig sets a bounded timeout, this change results
in the connect-timeout no longer applying to the TLS handshake.
This behavior can be retained by setting the expected timeout in
the SocketConfig.

SSLConnectionSocketFactory no longer overrides the socket timeout
with the connect timeout when an unlimited socket timeout is
configured. This matches behavior of HTTPCLIENT-2091.

Note that in scenarios where SocketConfig sets an infinite timeout
and the RequestConfig sets a bounded timeout, this change results
in the connect-timeout no longer applying to the TLS handshake.
This behavior can be retained by setting the expected timeout in
the SocketConfig.
@ok2c ok2c merged commit 5bdcb24 into apache:master Jul 11, 2020
@ok2c
Copy link
Member

ok2c commented Jul 11, 2020

@carterkozak Damn, the pull request was against master, not the 5.1.x branch. I will have to move it to the 5.1.x branch.

@carterkozak
Copy link
Contributor Author

oops, my fault, sorry about that. I can set up a revert pr and a second change if you like.

@ok2c
Copy link
Member

ok2c commented Jul 11, 2020

@carterkozak No, worries. I will fix it.

@ok2c
Copy link
Member

ok2c commented Jul 11, 2020

@carterkozak I apologize for causing such a confusion. I was just being old and stupid. HTTPCLIENT-2091 fix committed to master and not 5.1.x. So, we are all good.

@carterkozak
Copy link
Contributor Author

Not a problem, thanks again for your help!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants