projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
664904b
)
Unbreak compilation without FEATURE_CONNECTION_KEEP_ALIVE
author
Fabian Keil
<fk@fabiankeil.de>
Tue, 23 Oct 2012 10:20:14 +0000
(10:20 +0000)
committer
Fabian Keil
<fk@fabiankeil.de>
Tue, 23 Oct 2012 10:20:14 +0000
(10:20 +0000)
jcc.c
patch
|
blob
|
history
diff --git
a/jcc.c
b/jcc.c
index
5d4e777
..
93cca08
100644
(file)
--- a/
jcc.c
+++ b/
jcc.c
@@
-1,4
+1,4
@@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.40
5 2012/10/21 13:04:3
4 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.40
6 2012/10/21 14:40:4
4 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@
-1821,7
+1821,9
@@
static void chat(struct client_state *csp)
server_body = 0;
server_body = 0;
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
watch_client_socket = 0 == (csp->flags & CSP_FLAG_PIPELINED_REQUEST_WAITING);
watch_client_socket = 0 == (csp->flags & CSP_FLAG_PIPELINED_REQUEST_WAITING);
+#endif
for (;;)
{
for (;;)
{
@@
-2594,12
+2596,12
@@
void serve(struct client_state *csp)
static void serve(struct client_state *csp)
#endif /* def AMIGA */
{
static void serve(struct client_state *csp)
#endif /* def AMIGA */
{
+ int config_file_change_detected = 0; /* Only used for debugging */
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
#ifdef FEATURE_CONNECTION_SHARING
static int monitor_thread_running = 0;
#endif /* def FEATURE_CONNECTION_SHARING */
int continue_chatting = 0;
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
#ifdef FEATURE_CONNECTION_SHARING
static int monitor_thread_running = 0;
#endif /* def FEATURE_CONNECTION_SHARING */
int continue_chatting = 0;
- int config_file_change_detected = 0; /* Only used for debugging */
log_error(LOG_LEVEL_CONNECT, "Accepted connection from %s on socket %d",
csp->ip_addr_str, csp->cfd);
log_error(LOG_LEVEL_CONNECT, "Accepted connection from %s on socket %d",
csp->ip_addr_str, csp->cfd);