Connect timeout is used instead of socket timeout after a tls upgrade

After a TLS upgrade, the connect timeout is used instead of the configured socket timeout. In some configurations this results in unexpected socket timeouts earlier than expected.

This impacts forward proxies using tunneling (CONNECT approach to pass tls bytes through a proxy server as opposed to individual plain http requests) which time out after the connect timeout is reached.

This is a regression from hc4 which does not exhibit this issue.

Some details here, where I thought the issues could be related: https://issues.apache.org/jira/browse/HTTPCLIENT-2090?focusedCommentId=17143321&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-17143321