projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add changes in 3.0.14 BETA.
[privoxy.git]
/
jcc.c
diff --git
a/jcc.c
b/jcc.c
index
a9da886
..
d637017
100644
(file)
--- a/
jcc.c
+++ b/
jcc.c
@@
-1,4
+1,4
@@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.2
69 2009/07/13 17:08:41
fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.2
71 2009/07/14 17:50:34
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@
-1460,12
+1460,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
{
@@
-2350,6
+2354,14
@@
static void serve(struct client_state *csp)
{
chat(csp);
{
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)
continue_chatting = (csp->config->feature_flags
& RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE)
&& (csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE)