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
58fe9a0
..
d637017
100644
(file)
--- a/
jcc.c
+++ b/
jcc.c
@@
-1,4
+1,4
@@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.2
60 2009/07/05 12:00:09
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 $
@@
-1077,6
+1077,8
@@
void save_connection_destination(jb_socket sfd,
{
assert(sfd != JB_INVALID_SOCKET);
assert(NULL != http->host);
{
assert(sfd != JB_INVALID_SOCKET);
assert(NULL != http->host);
+
+ server_connection->sfd = sfd;
server_connection->host = strdup(http->host);
if (NULL == server_connection->host)
{
server_connection->host = strdup(http->host);
if (NULL == server_connection->host)
{
@@
-1142,7
+1144,7
@@
static void mark_server_socket_tainted(struct client_state *csp)
if ((csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE))
{
log_error(LOG_LEVEL_CONNECT,
if ((csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE))
{
log_error(LOG_LEVEL_CONNECT,
- "Marking the
connection to the server tainted."
);
+ "Marking the
server socket %d tainted.", csp->sfd
);
csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED;
}
}
csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED;
}
}
@@
-1415,6
+1417,15
@@
static jb_err parse_client_request(struct client_state *csp)
struct http_request *http = csp->http;
jb_err err;
struct http_request *http = csp->http;
jb_err err;
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ if ((!strcmpic(csp->http->ver, "HTTP/1.1"))
+ && (csp->http->ssl == 0))
+ {
+ /* Assume persistence until further notice */
+ csp->flags |= CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE;
+ }
+#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
+
err = sed(csp, FILTER_CLIENT_HEADERS);
if (JB_ERR_OK != err)
{
err = sed(csp, FILTER_CLIENT_HEADERS);
if (JB_ERR_OK != err)
{
@@
-1449,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
{
@@
-1632,7
+1647,6
@@
static void chat(struct client_state *csp)
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
if ((csp->sfd != JB_INVALID_SOCKET)
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
if ((csp->sfd != JB_INVALID_SOCKET)
- && !(csp->flags & CSP_FLAG_SERVER_SOCKET_TAINTED)
&& socket_is_still_usable(csp->sfd)
&& connection_destination_matches(&csp->server_connection, http, fwd))
{
&& socket_is_still_usable(csp->sfd)
&& connection_destination_matches(&csp->server_connection, http, fwd))
{
@@
-1740,6
+1754,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);
@@
-1859,6
+1875,16
@@
static void chat(struct client_state *csp)
*/
if (FD_ISSET(csp->sfd, &rfds))
{
*/
if (FD_ISSET(csp->sfd, &rfds))
{
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ if (!socket_is_still_usable(csp->cfd))
+ {
+ 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 FEATURE_CONNECTION_KEEP_ALIVE */
+
fflush(NULL);
len = read_socket(csp->sfd, buf, sizeof(buf) - 1);
fflush(NULL);
len = read_socket(csp->sfd, buf, sizeof(buf) - 1);
@@
-2136,7
+2162,8
@@
static void chat(struct client_state *csp)
/* Did we actually get anything? */
if (NULL == csp->headers->first)
{
/* Did we actually get anything? */
if (NULL == csp->headers->first)
{
- log_error(LOG_LEVEL_ERROR, "Empty server or forwarder response.");
+ log_error(LOG_LEVEL_ERROR,
+ "Empty server or forwarder response received on socket %d.", csp->sfd);
log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 502 0", csp->ip_addr_str, http->cmd);
send_crunch_response(csp, error_response(csp, "no-server-data"));
free_http_request(http);
log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 502 0", csp->ip_addr_str, http->cmd);
send_crunch_response(csp, error_response(csp, "no-server-data"));
free_http_request(http);
@@
-2184,6
+2211,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))
{
/*
@@
-2291,6
+2320,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);
}
}
@@
-2317,27
+2348,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 "
@@
-2370,11
+2413,10
@@
static void serve(struct client_state *csp)
{
log_error(LOG_LEVEL_CONNECT,
"No additional client request received in time.");
{
log_error(LOG_LEVEL_CONNECT,
"No additional client request received in time.");
- if ((csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_SHARING))
+ if ((csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_SHARING)
+ && (socket_is_still_usable(csp->sfd)))
{
{
- remember_connection(csp->sfd, csp->http,
- forward_url(csp, csp->http),
- csp->server_connection.keep_alive_timeout);
+ remember_connection(csp, forward_url(csp, csp->http));
csp->sfd = JB_INVALID_SOCKET;
close_socket(csp->cfd);
csp->cfd = JB_INVALID_SOCKET;
csp->sfd = JB_INVALID_SOCKET;
close_socket(csp->cfd);
csp->cfd = JB_INVALID_SOCKET;