-const char jcc_rcs[] = "$Id: jcc.c,v 1.314 2010/04/03 13:21:53 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.319 2010/05/24 11:40:27 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
return "Internal error while searching for crunch reason";
}
- switch (rsp->reason)
+ switch (rsp->crunch_reason)
{
- case RSP_REASON_UNSUPPORTED:
+ case UNSUPPORTED:
reason = "Unsupported HTTP feature";
break;
- case RSP_REASON_BLOCKED:
+ case BLOCKED:
reason = "Blocked";
break;
- case RSP_REASON_UNTRUSTED:
+ case UNTRUSTED:
reason = "Untrusted";
break;
- case RSP_REASON_REDIRECTED:
+ case REDIRECTED:
reason = "Redirected";
break;
- case RSP_REASON_CGI_CALL:
+ case CGI_CALL:
reason = "CGI Call";
break;
- case RSP_REASON_NO_SUCH_DOMAIN:
+ case NO_SUCH_DOMAIN:
reason = "DNS failure";
break;
- case RSP_REASON_FORWARDING_FAILED:
+ case FORWARDING_FAILED:
reason = "Forwarding failed";
break;
- case RSP_REASON_CONNECT_FAILED:
+ case CONNECT_FAILED:
reason = "Connection failure";
break;
- case RSP_REASON_OUT_OF_MEMORY:
+ case OUT_OF_MEMORY:
reason = "Out of memory (may mask other reasons)";
break;
- case RSP_REASON_CONNECTION_TIMEOUT:
+ case CONNECTION_TIMEOUT:
reason = "Connection timeout";
break;
- case RSP_REASON_NO_SERVER_DATA:
+ case NO_SERVER_DATA:
reason = "No server data received";
break;
default:
if (rsp == NULL)
{
- /*
- * Not supposed to happen. If it does
- * anyway, treat it as an unknown error.
- */
- cgi_error_unknown(csp, rsp, RSP_REASON_INTERNAL_ERROR);
- /* return code doesn't matter */
- }
-
- if (rsp == NULL)
- {
- /* If rsp is still NULL, we have serious internal problems. */
- log_error(LOG_LEVEL_FATAL,
- "NULL response in send_crunch_response and cgi_error_unknown failed as well.");
+ log_error(LOG_LEVEL_FATAL, "NULL response in send_crunch_response.");
}
/*
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
if ((csp->server_connection.sfd != JB_INVALID_SOCKET)
- && socket_is_still_usable(csp->server_connection.sfd)
+ && socket_is_still_alive(csp->server_connection.sfd)
&& connection_destination_matches(&csp->server_connection, http, fwd))
{
log_error(LOG_LEVEL_CONNECT,
if (FD_ISSET(csp->server_connection.sfd, &rfds))
{
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
- if (!socket_is_still_usable(csp->cfd))
+ if (!socket_is_still_alive(csp->cfd))
{
#ifdef _WIN32
log_error(LOG_LEVEL_CONNECT,
}
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+/*********************************************************************
+ *
+ * Function : prepare_csp_for_next_request
+ *
+ * Description : Put the csp in a mostly vergin state.
+ *
+ * Parameters :
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ *
+ * Returns : N/A
+ *
+ *********************************************************************/
+static void prepare_csp_for_next_request(struct client_state *csp)
+{
+ csp->content_type = 0;
+ csp->content_length = 0;
+ csp->expected_content_length = 0;
+ csp->expected_client_content_length = 0;
+ list_remove_all(csp->headers);
+ freez(csp->iob->buf);
+ memset(csp->iob, 0, sizeof(csp->iob));
+ freez(csp->error_message);
+ free_http_request(csp->http);
+ destroy_list(csp->headers);
+ destroy_list(csp->tags);
+ free_current_action(csp->action);
+ if (NULL != csp->fwd)
+ {
+ unload_forward_spec(csp->fwd);
+ 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;
+}
+#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
+
+
/*********************************************************************
*
* Function : serve
if (continue_chatting && !(csp->flags & CSP_FLAG_CRUNCHED))
{
continue_chatting = (csp->server_connection.sfd != JB_INVALID_SOCKET)
- && socket_is_still_usable(csp->server_connection.sfd);
+ && socket_is_still_alive(csp->server_connection.sfd);
if (continue_chatting)
{
if (!(csp->flags & CSP_FLAG_SERVER_KEEP_ALIVE_TIMEOUT_SET))
}
if ((csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE)
&& data_is_available(csp->cfd, (int)client_timeout)
- && socket_is_still_usable(csp->cfd))
+ && socket_is_still_alive(csp->cfd))
{
log_error(LOG_LEVEL_CONNECT, "Client request arrived in "
"time or the client closed the connection on socket %d.",
csp->cfd);
- /*
- * Get the csp in a mostly vergin state again.
- * XXX: Should be done elsewhere.
- */
- csp->content_type = 0;
- csp->content_length = 0;
- csp->expected_content_length = 0;
- csp->expected_client_content_length = 0;
- list_remove_all(csp->headers);
- freez(csp->iob->buf);
- memset(csp->iob, 0, sizeof(csp->iob));
- freez(csp->error_message);
- free_http_request(csp->http);
- destroy_list(csp->headers);
- destroy_list(csp->tags);
- free_current_action(csp->action);
- if (NULL != csp->fwd)
- {
- unload_forward_spec(csp->fwd);
- csp->fwd = NULL;
- }
-
- /* XXX: Store per-connection flags someplace else. */
- csp->flags = CSP_FLAG_ACTIVE |
- (csp->flags & CSP_FLAG_TOGGLED_ON) | CSP_FLAG_REUSED_CLIENT_CONNECTION;
+ prepare_csp_for_next_request(csp);
}
else
{
csp->cfd);
#ifdef FEATURE_CONNECTION_SHARING
if ((csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_SHARING)
- && (socket_is_still_usable(csp->server_connection.sfd)))
+ && (socket_is_still_alive(csp->server_connection.sfd)))
{
time_t time_open = time(NULL) - csp->server_connection.timestamp;
*/
#if defined(unix)
{
- pid_t pid = 0;
-
if (daemon_mode)
{
int fd;
-
- pid = fork();
+ pid_t pid = fork();
if ( pid < 0 ) /* error */
{
projects / privoxy.git / blobdiff