X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.c;h=69c01808d841bdadfbbc825a9b8a8b0e8a6e1b1c;hp=6d91bd0755b5b6937de1f8a3cf6237e8fd1d2ede;hb=416fb84eaeaeaef12a88f4cc5885cf0ec7f74dd7;hpb=fe519b96424b1c7e6bcac4c74f5ef29c8009c361

diff --git a/jcc.c b/jcc.c
index 6d91bd07..69c01808 100644
--- a/jcc.c
+++ b/jcc.c
@@ -2220,7 +2220,8 @@ static jb_err receive_encrypted_request(struct client_state *csp)
    do
    {
       log_error(LOG_LEVEL_HEADER, "Reading encrypted headers");
-      if (!data_is_available(csp->cfd, (int)csp->config->keep_alive_timeout))
+      if (!is_ssl_pending(&(csp->mbedtls_client_attr.ssl)) &&
+          !data_is_available(csp->cfd, csp->config->socket_timeout))
       {
          log_error(LOG_LEVEL_CONNECT,
             "Socket %d timed out while waiting for client headers", csp->cfd);