projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy
[privoxy.git]
/
jcc.c
diff --git
a/jcc.c
b/jcc.c
index
6d91bd0
..
69c0180
100644
(file)
--- 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");
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);
{
log_error(LOG_LEVEL_CONNECT,
"Socket %d timed out while waiting for client headers", csp->cfd);