projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update the "Download recent releases" URL and fix the "Pictures of the Privoxy Team...
[privoxy.git]
/
jcc.c
diff --git
a/jcc.c
b/jcc.c
index
b850569
..
faf224f
100644
(file)
--- a/
jcc.c
+++ b/
jcc.c
@@
-1,4
+1,4
@@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.2
67 2009/07/11 14:49:09
fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.2
74 2009/07/19 11:19:50
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@
-1418,7
+1418,8
@@
static jb_err parse_client_request(struct client_state *csp)
jb_err err;
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
jb_err err;
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
- if ((!strcmpic(csp->http->ver, "HTTP/1.1"))
+ if ((csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE)
+ && (!strcmpic(csp->http->ver, "HTTP/1.1"))
&& (csp->http->ssl == 0))
{
/* Assume persistence until further notice */
&& (csp->http->ssl == 0))
{
/* Assume persistence until further notice */
@@
-1460,12
+1461,16
@@
static jb_err parse_client_request(struct client_state *csp)
if (csp->iob->cur[0] != '\0')
{
csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED;
if (csp->iob->cur[0] != '\0')
{
csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED;
- if (!strcmpic(csp->http->gpc, "POST"))
+ if (strcmpic(csp->http->gpc, "GET")
+ && strcmpic(csp->http->gpc, "HEAD")
+ && strcmpic(csp->http->gpc, "TRACE")
+ && strcmpic(csp->http->gpc, "OPTIONS")
+ && strcmpic(csp->http->gpc, "DELETE"))
{
/* XXX: this is an incomplete hack */
csp->flags &= ~CSP_FLAG_CLIENT_REQUEST_COMPLETELY_READ;
log_error(LOG_LEVEL_CONNECT,
{
/* XXX: this is an incomplete hack */
csp->flags &= ~CSP_FLAG_CLIENT_REQUEST_COMPLETELY_READ;
log_error(LOG_LEVEL_CONNECT,
- "
POST request detected
. The connection will not be kept alive.");
+ "
There might be a request body
. The connection will not be kept alive.");
}
else
{
}
else
{
@@
-1750,6
+1755,8
@@
static void chat(struct client_state *csp)
log_error(LOG_LEVEL_CONNECT, "to %s successful", http->hostport);
log_error(LOG_LEVEL_CONNECT, "to %s successful", http->hostport);
+ csp->server_connection.request_sent = time(NULL);
+
/* we're finished with the client's header */
freez(hdr);
/* we're finished with the client's header */
freez(hdr);
@@
-1872,10
+1879,15
@@
static void chat(struct client_state *csp)
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
if (!socket_is_still_usable(csp->cfd))
{
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
if (!socket_is_still_usable(csp->cfd))
{
+#ifdef _WIN32
+ log_error(LOG_LEVEL_CONNECT,
+ "The server still wants to talk, but the client may already have hung up on us.");
+#else
log_error(LOG_LEVEL_CONNECT,
"The server still wants to talk, but the client hung up on us.");
mark_server_socket_tainted(csp);
return;
log_error(LOG_LEVEL_CONNECT,
"The server still wants to talk, but the client hung up on us.");
mark_server_socket_tainted(csp);
return;
+#endif /* def _WIN32 */
}
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
}
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
@@
-2190,8
+2202,6
@@
static void chat(struct client_state *csp)
return;
}
return;
}
- csp->server_connection.timestamp = time(NULL);
-
/*
* We have now received the entire server header,
* filter it and send the result to the client
/*
* We have now received the entire server header,
* filter it and send the result to the client
@@
-2207,6
+2217,8
@@
static void chat(struct client_state *csp)
log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header");
}
log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header");
}
+ csp->server_connection.response_received = time(NULL);
+
if (crunch_response_triggered(csp, crunchers_light))
{
/*
if (crunch_response_triggered(csp, crunchers_light))
{
/*
@@
-2314,6
+2326,8
@@
static void chat(struct client_state *csp)
log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 %llu",
csp->ip_addr_str, http->ocmd, csp->content_length);
log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 %llu",
csp->ip_addr_str, http->ocmd, csp->content_length);
+
+ csp->server_connection.timestamp = time(NULL);
}
}
@@
-2340,27
+2354,39
@@
static void serve(struct client_state *csp)
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
static int monitor_thread_running = 0;
int continue_chatting = 0;
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
static int monitor_thread_running = 0;
int continue_chatting = 0;
+ unsigned int latency = 0;
+
do
{
chat(csp);
do
{
chat(csp);
+ if ((csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE)
+ && !(csp->flags & CSP_FLAG_SERVER_KEEP_ALIVE_TIMEOUT_SET))
+ {
+ log_error(LOG_LEVEL_CONNECT, "The server didn't specify how long "
+ "the connection will stay open. Assume it's only a second.");
+ csp->server_connection.keep_alive_timeout = 1;
+ }
+
continue_chatting = (csp->config->feature_flags
& RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE)
&& (csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE)
&& !(csp->flags & CSP_FLAG_SERVER_SOCKET_TAINTED)
&& (csp->cfd != JB_INVALID_SOCKET)
&& (csp->sfd != JB_INVALID_SOCKET)
continue_chatting = (csp->config->feature_flags
& RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE)
&& (csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE)
&& !(csp->flags & CSP_FLAG_SERVER_SOCKET_TAINTED)
&& (csp->cfd != JB_INVALID_SOCKET)
&& (csp->sfd != JB_INVALID_SOCKET)
- && socket_is_still_usable(csp->sfd);
+ && socket_is_still_usable(csp->sfd)
+ && (latency < csp->server_connection.keep_alive_timeout);
if (continue_chatting)
{
if (continue_chatting)
{
+ unsigned int client_timeout = (unsigned)csp->server_connection.keep_alive_timeout - latency;
log_error(LOG_LEVEL_CONNECT,
"Waiting for the next client request. "
"Keeping the server socket %d to %s open.",
csp->sfd, csp->server_connection.host);
if ((csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE)
log_error(LOG_LEVEL_CONNECT,
"Waiting for the next client request. "
"Keeping the server socket %d to %s open.",
csp->sfd, csp->server_connection.host);
if ((csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE)
- && data_is_available(csp->cfd, (int)c
sp->server_connection.keep_alive
_timeout)
+ && data_is_available(csp->cfd, (int)c
lient
_timeout)
&& socket_is_still_usable(csp->cfd))
{
log_error(LOG_LEVEL_CONNECT, "Client request arrived in "
&& socket_is_still_usable(csp->cfd))
{
log_error(LOG_LEVEL_CONNECT, "Client request arrived in "