projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Completely highlight: Found reusable socket 8 for www.privoxy.org:80 in slot 2. Times...
[privoxy.git]
/
jcc.c
diff --git
a/jcc.c
b/jcc.c
index
c0d3cba
..
cb846ca
100644
(file)
--- a/
jcc.c
+++ b/
jcc.c
@@
-1,4
+1,4
@@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.
298 2009/10/04 15:34:17
fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.
300 2009/10/04 15:46:25
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@
-1265,8
+1265,9
@@
static char *get_request_line(struct client_state *csp)
{
if (!data_is_available(csp->cfd, csp->config->socket_timeout))
{
{
if (!data_is_available(csp->cfd, csp->config->socket_timeout))
{
- log_error(LOG_LEVEL_ERROR,
- "Stopped waiting for the request line.");
+ log_error(LOG_LEVEL_CONNECT,
+ "Stopped waiting for the request line. Timeout: %d.",
+ csp->config->socket_timeout);
write_socket(csp->cfd, CLIENT_CONNECTION_TIMEOUT_RESPONSE,
strlen(CLIENT_CONNECTION_TIMEOUT_RESPONSE));
return NULL;
write_socket(csp->cfd, CLIENT_CONNECTION_TIMEOUT_RESPONSE,
strlen(CLIENT_CONNECTION_TIMEOUT_RESPONSE));
return NULL;
@@
-2608,7
+2609,6
@@
static void serve(struct client_state *csp)
}
} while (continue_chatting);
}
} while (continue_chatting);
- mark_connection_closed(&csp->server_connection);
#else
chat(csp);
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
#else
chat(csp);
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
@@
-2621,6
+2621,10
@@
static void serve(struct client_state *csp)
close_socket(csp->server_connection.sfd);
}
close_socket(csp->server_connection.sfd);
}
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ mark_connection_closed(&csp->server_connection);
+#endif
+
if (csp->cfd != JB_INVALID_SOCKET)
{
close_socket(csp->cfd);
if (csp->cfd != JB_INVALID_SOCKET)
{
close_socket(csp->cfd);