projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prepare_csp_for_next_request(): Use the global toggle state for new requests
[privoxy.git]
/
jcc.c
diff --git
a/jcc.c
b/jcc.c
index
ad210ab
..
b199c47
100644
(file)
--- a/
jcc.c
+++ b/
jcc.c
@@
-1,4
+1,4
@@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.44
2 2016/03/17 10:40:53
fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.44
5 2016/05/25 10:51:10
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@
-2813,8
+2813,6
@@
static void chat(struct client_state *csp)
*********************************************************************/
static void prepare_csp_for_next_request(struct client_state *csp)
{
*********************************************************************/
static void prepare_csp_for_next_request(struct client_state *csp)
{
- unsigned int toggled_on_flag_set = (0 != (csp->flags & CSP_FLAG_TOGGLED_ON));
-
csp->content_type = 0;
csp->content_length = 0;
csp->expected_content_length = 0;
csp->content_type = 0;
csp->content_length = 0;
csp->expected_content_length = 0;
@@
-2837,7
+2835,9
@@
static void prepare_csp_for_next_request(struct client_state *csp)
}
/* XXX: Store per-connection flags someplace else. */
csp->flags = (CSP_FLAG_ACTIVE | CSP_FLAG_REUSED_CLIENT_CONNECTION);
}
/* XXX: Store per-connection flags someplace else. */
csp->flags = (CSP_FLAG_ACTIVE | CSP_FLAG_REUSED_CLIENT_CONNECTION);
- if (toggled_on_flag_set)
+#ifdef FEATURE_TOGGLE
+ if (global_toggle_state)
+#endif /* def FEATURE_TOGGLE */
{
csp->flags |= CSP_FLAG_TOGGLED_ON;
}
{
csp->flags |= CSP_FLAG_TOGGLED_ON;
}
@@
-3992,6
+3992,12
@@
static void listen_loop(void)
"Waiting for the next client connection. Currently active threads: %d",
active_threads);
"Waiting for the next client connection. Currently active threads: %d",
active_threads);
+ /*
+ * This config may be outdated, but for accept_connection()
+ * it's fresh enough.
+ */
+ csp->config = config;
+
if (!accept_connection(csp, bfds))
{
log_error(LOG_LEVEL_CONNECT, "accept failed: %E");
if (!accept_connection(csp, bfds))
{
log_error(LOG_LEVEL_CONNECT, "accept failed: %E");
@@
-4048,9
+4054,11
@@
static void listen_loop(void)
if (block_acl(NULL,csp))
{
log_error(LOG_LEVEL_CONNECT,
if (block_acl(NULL,csp))
{
log_error(LOG_LEVEL_CONNECT,
- "Connection from %s on socket %d dropped due to ACL", csp->ip_addr_str, csp->cfd);
+ "Connection from %s on %s (socket %d) dropped due to ACL",
+ csp->ip_addr_str, csp->listen_addr_str, csp->cfd);
close_socket(csp->cfd);
freez(csp->ip_addr_str);
close_socket(csp->cfd);
freez(csp->ip_addr_str);
+ freez(csp->listen_addr_str);
freez(csp_list);
continue;
}
freez(csp_list);
continue;
}
@@
-4066,6
+4074,7
@@
static void listen_loop(void)
strlen(TOO_MANY_CONNECTIONS_RESPONSE));
close_socket(csp->cfd);
freez(csp->ip_addr_str);
strlen(TOO_MANY_CONNECTIONS_RESPONSE));
close_socket(csp->cfd);
freez(csp->ip_addr_str);
+ freez(csp->listen_addr_str);
freez(csp_list);
continue;
}
freez(csp_list);
continue;
}