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
..
d29b511
100644
(file)
--- a/
jcc.c
+++ b/
jcc.c
@@
-587,10
+587,8
@@
static jb_err get_request_destination_elsewhere(struct client_state *csp, struct
}
else if (JB_ERR_OK == get_destination_from_headers(headers, csp->http))
{
}
else if (JB_ERR_OK == get_destination_from_headers(headers, csp->http))
{
-#ifndef FEATURE_EXTENDED_HOST_PATTERNS
/* Split the domain we just got for pattern matching */
init_domain_components(csp->http);
/* Split the domain we just got for pattern matching */
init_domain_components(csp->http);
-#endif
return JB_ERR_OK;
}
return JB_ERR_OK;
}
@@
-2220,7
+2218,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);
@@
-2356,10
+2355,8
@@
static jb_err process_encrypted_request(struct client_state *csp)
return JB_ERR_PARSE;
}
return JB_ERR_PARSE;
}
-#ifndef FEATURE_EXTENDED_HOST_PATTERNS
/* Split the domain we just got for pattern matching */
init_domain_components(csp->http);
/* Split the domain we just got for pattern matching */
init_domain_components(csp->http);
-#endif
#ifdef FEATURE_TOGGLE
if ((csp->flags & CSP_FLAG_TOGGLED_ON) != 0)
#ifdef FEATURE_TOGGLE
if ((csp->flags & CSP_FLAG_TOGGLED_ON) != 0)