projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unbreak the build without FEATURE_HTTPS_FILTERING
[privoxy.git]
/
jcc.c
diff --git
a/jcc.c
b/jcc.c
index
132618b
..
20337fb
100644
(file)
--- a/
jcc.c
+++ b/
jcc.c
@@
-6,7
+6,7
@@
* the main connection-handling function.
*
* Copyright : Written by and Copyright (C) 2001-2019 the
* the main connection-handling function.
*
* Copyright : Written by and Copyright (C) 2001-2019 the
- * Privoxy team. http://www.privoxy.org/
+ * Privoxy team. http
s
://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
@@
-194,11
+194,11
@@
privoxy_mutex_t log_init_mutex;
privoxy_mutex_t connection_reuse_mutex;
#ifdef LIMIT_MUTEX_NUMBER
privoxy_mutex_t connection_reuse_mutex;
#ifdef LIMIT_MUTEX_NUMBER
-
privoxy_mutex_t certificates_mutexes[32];
+privoxy_mutex_t certificates_mutexes[32];
#else
#else
-
privoxy_mutex_t certificates_mutexes[65536];
+privoxy_mutex_t certificates_mutexes[65536];
#endif /* LIMIT_MUTEX_NUMBER */
#endif /* LIMIT_MUTEX_NUMBER */
-
privoxy_mutex_t rng_mutex;
+privoxy_mutex_t rng_mutex;
#ifdef FEATURE_EXTERNAL_FILTERS
privoxy_mutex_t external_filter_mutex;
#ifdef FEATURE_EXTERNAL_FILTERS
privoxy_mutex_t external_filter_mutex;
@@
-3611,9
+3611,16
@@
static void chat(struct client_state *csp)
build_request_line(csp, fwd, &csp->headers->first->str);
/*
build_request_line(csp, fwd, &csp->headers->first->str);
/*
- * We have a request. Check if one of the crunchers wants it.
+ * We have a request. Check if one of the crunchers wants it
+ * unless the client wants to use TLS/SSL in which case we
+ * haven't setup the TLS context yet and will send the crunch
+ * response later.
*/
*/
- if (crunch_response_triggered(csp, crunchers_all))
+ if (
+#ifdef FEATURE_HTTPS_FILTERING
+ !client_use_ssl(csp) &&
+#endif
+ crunch_response_triggered(csp, crunchers_all))
{
/*
* Yes. The client got the crunch response and we're done here.
{
/*
* Yes. The client got the crunch response and we're done here.