-const char jcc_rcs[] = "$Id: jcc.c,v 1.362 2011/07/17 13:38:05 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.374 2011/11/06 11:58:51 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
/* HTTP snipplets. */
static const char CSUCCEED[] =
- "HTTP/1.0 200 Connection established\r\n"
+ "HTTP/1.1 200 Connection established\r\n"
"Proxy-Agent: Privoxy/" VERSION "\r\n\r\n";
static const char CHEADER[] =
- "HTTP/1.0 400 Invalid header received from client\r\n"
+ "HTTP/1.1 400 Invalid header received from client\r\n"
"Proxy-Agent: Privoxy " VERSION "\r\n"
"Content-Type: text/plain\r\n"
"Connection: close\r\n\r\n"
"Invalid header received from client.\r\n";
static const char FTP_RESPONSE[] =
- "HTTP/1.0 400 Invalid request received from client\r\n"
+ "HTTP/1.1 400 Invalid request received from client\r\n"
"Content-Type: text/plain\r\n"
"Connection: close\r\n\r\n"
"Invalid request. Privoxy doesn't support FTP.\r\n";
static const char GOPHER_RESPONSE[] =
- "HTTP/1.0 400 Invalid request received from client\r\n"
+ "HTTP/1.1 400 Invalid request received from client\r\n"
"Content-Type: text/plain\r\n"
"Connection: close\r\n\r\n"
"Invalid request. Privoxy doesn't support gopher.\r\n";
/* XXX: should be a template */
static const char MISSING_DESTINATION_RESPONSE[] =
- "HTTP/1.0 400 Bad request received from client\r\n"
+ "HTTP/1.1 400 Bad request received from client\r\n"
"Proxy-Agent: Privoxy " VERSION "\r\n"
"Content-Type: text/plain\r\n"
"Connection: close\r\n\r\n"
/* XXX: should be a template */
static const char INVALID_SERVER_HEADERS_RESPONSE[] =
- "HTTP/1.0 502 Server or forwarder response invalid\r\n"
+ "HTTP/1.1 502 Server or forwarder response invalid\r\n"
"Proxy-Agent: Privoxy " VERSION "\r\n"
"Content-Type: text/plain\r\n"
"Connection: close\r\n\r\n"
/* XXX: should be a template */
static const char MESSED_UP_REQUEST_RESPONSE[] =
- "HTTP/1.0 400 Malformed request after rewriting\r\n"
+ "HTTP/1.1 400 Malformed request after rewriting\r\n"
"Proxy-Agent: Privoxy " VERSION "\r\n"
"Content-Type: text/plain\r\n"
"Connection: close\r\n\r\n"
"Bad request. Messed up with header filters.\r\n";
static const char TOO_MANY_CONNECTIONS_RESPONSE[] =
- "HTTP/1.0 503 Too many open connections\r\n"
+ "HTTP/1.1 503 Too many open connections\r\n"
"Proxy-Agent: Privoxy " VERSION "\r\n"
"Content-Type: text/plain\r\n"
"Connection: close\r\n\r\n"
"Maximum number of open connections reached.\r\n";
static const char CLIENT_CONNECTION_TIMEOUT_RESPONSE[] =
- "HTTP/1.0 504 Connection timeout\r\n"
+ "HTTP/1.1 504 Connection timeout\r\n"
"Proxy-Agent: Privoxy " VERSION "\r\n"
"Content-Type: text/plain\r\n"
"Connection: close\r\n\r\n"
#if !defined(_WIN32) && !defined(__OS2__) && !defined(AMIGA)
/*********************************************************************
*
- * Function : sig_handler
+ * Function : sig_handler
*
* Description : Signal handler for different signals.
* Exit gracefully on TERM and INT
* Parameters :
* 1 : the_signal = the signal cause this function to call
*
- * Returns : -
+ * Returns : -
*
*********************************************************************/
static void sig_handler(int the_signal)
#if defined(unix)
received_hup_signal = 1;
#endif
- break;
+ break;
default:
- /*
+ /*
* We shouldn't be here, unless we catch signals
* in main() that we can't handle here!
*/
log_error(LOG_LEVEL_HEADER, "Continue hack in da house.");
continue_hack_in_da_house = 1;
}
- else if (*header == '\0')
+ else if (*header == '\0')
{
/*
* If the header is empty, but the Continue hack
if (cgi_error_memory() != rsp)
{
free_http_response(rsp);
- }
+ }
return;
}
/*
* If CGI request crunching is disabled,
* check the CGI dispatcher out of order to
- * prevent unintentional blocks or redirects.
+ * prevent unintentional blocks or redirects.
*/
if (!(csp->config->feature_flags & RUNTIME_FEATURE_CGI_CRUNCHING)
&& (NULL != (rsp = dispatch_cgi(csp))))
* Description : Read the client's request (more precisely the
* client headers) and answer it if necessary.
*
- * Note that since we're not using select() we could get
- * blocked here if a client connected, then didn't say
- * anything!
- *
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
*
destroy_list(headers);
return JB_ERR_PARSE;
}
-
+
if (add_to_iob(csp, buf, len))
{
/*
get_url_actions(csp, http);
}
- /*
+ /*
* Save a copy of the original request for logging
*/
http->ocmd = strdup(http->cmd);
}
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
- hdr = list_to_text(csp->headers);
- if (hdr == NULL)
- {
- /* FIXME Should handle error properly */
- log_error(LOG_LEVEL_FATAL, "Out of memory parsing client header");
- }
- list_remove_all(csp->headers);
-
if (fwd->forward_host || (http->ssl == 0))
{
+ hdr = list_to_text(csp->headers);
+ if (hdr == NULL)
+ {
+ /* FIXME Should handle error properly */
+ log_error(LOG_LEVEL_FATAL, "Out of memory parsing client header");
+ }
+ list_remove_all(csp->headers);
+
/*
* Write the client's (modified) header to the server
* (along with anything else that may be in the buffer)
freez(hdr);
return;
}
+ freez(hdr);
}
else
{
/*
* We're running an SSL tunnel and we're not forwarding,
- * so just send the "connect succeeded" message to the
- * client, flush the rest, and get out of the way.
+ * so just ditch the client headers, send the "connect succeeded"
+ * message to the client, flush the rest, and get out of the way.
*/
+ list_remove_all(csp->headers);
if (write_socket(csp->cfd, CSUCCEED, strlen(CSUCCEED)))
{
- freez(hdr);
return;
}
IOB_RESET(csp);
csp->server_connection.request_sent = time(NULL);
- /* we're finished with the client's header */
- freez(hdr);
-
maxfd = (csp->cfd > csp->server_connection.sfd) ?
csp->cfd : csp->server_connection.sfd;
hdr = list_to_text(csp->headers);
if (hdr == NULL)
{
- /*
+ /*
* Memory is too tight to even generate the header.
* Send our static "Out-of-memory" page.
*/
{
log_error(LOG_LEVEL_ERROR, "Out of memory while looking for end of server headers.");
rsp = cgi_error_memory();
- send_crunch_response(csp, rsp);
+ send_crunch_response(csp, rsp);
mark_server_socket_tainted(csp);
return;
}
if ((csp->flags & CSP_FLAG_REUSED_CLIENT_CONNECTION))
{
log_error(LOG_LEVEL_ERROR,
- "Empty server or forwarder response received on socket %d. "
+ "No server or forwarder response received on socket %d. "
"Closing client socket %d without sending data.",
csp->server_connection.sfd, csp->cfd);
log_error(LOG_LEVEL_CLF,
else
{
log_error(LOG_LEVEL_ERROR,
- "Empty server or forwarder response received on socket %d.",
+ "No server or forwarder response received on socket %d.",
csp->server_connection.sfd);
send_crunch_response(csp, error_response(csp, "no-server-data"));
}
*********************************************************************/
static void prepare_csp_for_next_request(struct client_state *csp)
{
+ unsigned int toggled_on_flag_set = (0 != (csp->flags & CSP_FLAG_TOGGLED_ON));
+
csp->content_type = 0;
csp->content_length = 0;
csp->expected_content_length = 0;
csp->fwd = NULL;
}
/* XXX: Store per-connection flags someplace else. */
- csp->flags &= CSP_FLAG_TOGGLED_ON;
- csp->flags |= CSP_FLAG_ACTIVE;
- csp->flags |= CSP_FLAG_REUSED_CLIENT_CONNECTION;
+ csp->flags = (CSP_FLAG_ACTIVE | CSP_FLAG_REUSED_CLIENT_CONNECTION);
+ if (toggled_on_flag_set)
+ {
+ csp->flags |= CSP_FLAG_TOGGLED_ON;
+ }
}
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
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->flags & CSP_FLAG_CRUNCHED))
+ && !(csp->flags & CSP_FLAG_SERVER_SOCKET_TAINTED)
+ && ((csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE)
+ || (csp->flags & CSP_FLAG_CRUNCHED))
&& (csp->cfd != JB_INVALID_SOCKET)
- && (csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE);
+ && ((csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE)
+ || (csp->config->feature_flags &
+ RUNTIME_FEATURE_CONNECTION_SHARING));
if (continue_chatting && !(csp->flags & CSP_FLAG_CRUNCHED))
{
if (continue_chatting)
{
- unsigned int client_timeout;
+ unsigned int client_timeout = 1; /* XXX: Use something else here? */
- if (csp->server_connection.sfd != JB_INVALID_SOCKET)
- {
- client_timeout = (unsigned)csp->server_connection.keep_alive_timeout - latency;
- log_error(LOG_LEVEL_CONNECT,
- "Waiting for the next client request on socket %d. "
- "Keeping the server socket %d to %s open.",
- csp->cfd, csp->server_connection.sfd, csp->server_connection.host);
- }
- else
+ if (0 != (csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE))
{
- client_timeout = 1; /* XXX: Use something else here? */
- log_error(LOG_LEVEL_CONNECT,
- "Waiting for the next client request on socket %d. "
- "No server socket to keep open.", csp->cfd);
+ if (csp->server_connection.sfd != JB_INVALID_SOCKET)
+ {
+ client_timeout = (unsigned)csp->server_connection.keep_alive_timeout - latency;
+ log_error(LOG_LEVEL_CONNECT,
+ "Waiting for the next client request on socket %d. "
+ "Keeping the server socket %d to %s open.",
+ csp->cfd, csp->server_connection.sfd, csp->server_connection.host);
+ }
+ else
+ {
+ log_error(LOG_LEVEL_CONNECT,
+ "Waiting for the next client request on socket %d. "
+ "No server socket to keep open.", csp->cfd);
+ }
}
if ((csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE)
&& data_is_available(csp->cfd, (int)client_timeout)
}
else
{
- log_error(LOG_LEVEL_CONNECT,
- "No additional client request received in time on socket %d.",
- csp->cfd);
+ if (0 != (csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE))
+ {
+ log_error(LOG_LEVEL_CONNECT,
+ "No additional client request received in time on socket %d.",
+ csp->cfd);
+ }
#ifdef FEATURE_CONNECTION_SHARING
if ((csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_SHARING)
&& (socket_is_still_alive(csp->server_connection.sfd)))
#ifndef HAVE_RANDOM
privoxy_mutex_init(&rand_mutex);
#endif /* ndef HAVE_RANDOM */
+
#endif /* def MUTEX_LOCKS_AVAILABLE */
}
{
char cwd[BUFFER_SIZE];
char *abs_file;
- size_t abs_file_size;
+ size_t abs_file_size;
/* make config-filename absolute here */
if (NULL == getcwd(cwd, sizeof(cwd)))
#if !defined(_WIN32) && !defined(__OS2__) && !defined(AMIGA)
{
int idx;
- const int catched_signals[] = { SIGTERM, SIGINT, SIGHUP, 0 };
- const int ignored_signals[] = { SIGPIPE, 0 };
+ const int catched_signals[] = { SIGTERM, SIGINT, SIGHUP };
- for (idx = 0; catched_signals[idx] != 0; idx++)
+ for (idx = 0; idx < SZ(catched_signals); idx++)
{
-#ifdef sun /* FIXME: Is it safe to check for HAVE_SIGSET instead? */
+#ifdef sun /* FIXME: Is it safe to check for HAVE_SIGSET instead? */
if (sigset(catched_signals[idx], sig_handler) == SIG_ERR)
#else
if (signal(catched_signals[idx], sig_handler) == SIG_ERR)
}
}
- for (idx = 0; ignored_signals[idx] != 0; idx++)
+ if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
{
- if (signal(ignored_signals[idx], SIG_IGN) == SIG_ERR)
- {
- log_error(LOG_LEVEL_FATAL, "Can't set ignore-handler for signal %d: %E", ignored_signals[idx]);
- }
+ log_error(LOG_LEVEL_FATAL, "Can't set ignore-handler for SIGPIPE: %E");
}
}
if (putenv(putenv_dummy) != 0)
{
log_error(LOG_LEVEL_FATAL, "Cannot putenv(): HOME");
- }
+ }
snprintf(putenv_dummy, sizeof(putenv_dummy), "USER=%s", pw->pw_name);
if (putenv(putenv_dummy) != 0)
*/
if (bRunAsService)
{
- /* Yup, so now we must attempt to establish a connection
+ /* Yup, so now we must attempt to establish a connection
* with the service dispatcher. This will only work if this
* process was launched by the service control manager to
* actually run as a service. If this isn't the case, i've
#if defined(AMIGA) && !defined(SELECTED_ONE_OPTION)
#define SELECTED_ONE_OPTION
csp->cfd = ReleaseSocket(csp->cfd, -1);
-
+
#ifdef __amigaos4__
child_id = (int)CreateNewProcTags(NP_Entry, (ULONG)server_thread,
NP_Output, Output(),
serve(csp);
- /*
+ /*
* If we've been toggled or we've blocked the request, tell Mom
*/
}
#endif /* def FEATURE_TOGGLE */
-#ifdef FEATURE_STATISTICS
+#ifdef FEATURE_STATISTICS
if (csp->flags & CSP_FLAG_REJECTED)
{
rc |= RC_FLAG_BLOCKED;
wait( &child_status );
- /*
+ /*
* Evaluate child's return code: If the child has
* - been toggled, toggle ourselves
* - blocked its request, bump up the stats counter
{
urls_rejected++;
}
-#endif /* def FEATURE_STATISTICS */
+#endif /* def FEATURE_STATISTICS */
#endif /* !defined(_WIN32) && defined(__CYGWIN__) */
close_socket(csp->cfd);