-const char jcc_rcs[] = "$Id: jcc.c,v 1.320 2010/06/13 12:27:03 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.324 2010/07/21 14:35:09 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
const char project_h_rcs[] = PROJECT_H_VERSION;
int daemon_mode = 1;
-struct client_state clients[1];
+struct client_states clients[1];
struct file_list files[1];
#ifdef FEATURE_STATISTICS
"Connection: close\r\n\r\n"
"Bad response. The server or forwarder response doesn't look like HTTP.\r\n";
-#if 0
-/* XXX: should be a template */
-static const char NULL_BYTE_RESPONSE[] =
- "HTTP/1.0 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"
- "Bad request. Null byte(s) before end of request.\r\n";
-#endif
-
/* XXX: should be a template */
static const char MESSED_UP_REQUEST_RESPONSE[] =
"HTTP/1.0 400 Malformed request after rewriting\r\n"
}
-#if 0
-/*********************************************************************
- *
- * Function : request_contains_null_bytes
- *
- * Description : Checks for NULL bytes in the request and sends
- * an error message to the client if any were found.
- *
- * XXX: currently not used, see comment in chat().
- *
- * Parameters :
- * 1 : csp = Current client state (buffers, headers, etc...)
- * 2 : buf = Data from the client's request to check.
- * 3 : len = The data length.
- *
- * Returns : TRUE if the request contained one or more NULL bytes, or
- * FALSE otherwise.
- *
- *********************************************************************/
-static int request_contains_null_bytes(const struct client_state *csp, char *buf, int len)
-{
- size_t c_len; /* Request lenght when treated as C string */
-
- c_len = strlen(buf);
-
- if (c_len < len)
- {
- /*
- * Null byte(s) found. Log the request,
- * return an error response and hang up.
- */
- size_t tmp_len = c_len;
-
- do
- {
- /*
- * Replace NULL byte(s) with '°' characters
- * so the request can be logged as string.
- * XXX: Is there a better replacement character?
- */
- buf[tmp_len]='°';
- tmp_len += strlen(buf+tmp_len);
- } while (tmp_len < len);
-
- log_error(LOG_LEVEL_ERROR, "%s\'s request contains at least one NULL byte "
- "(length=%d, strlen=%u).", csp->ip_addr_str, len, c_len);
- log_error(LOG_LEVEL_HEADER,
- "Offending request data with NULL bytes turned into \'°\' characters: %s", buf);
-
- write_socket(csp->cfd, NULL_BYTE_RESPONSE, strlen(NULL_BYTE_RESPONSE));
-
- /* XXX: Log correct size */
- log_error(LOG_LEVEL_CLF, "%s - - [%T] \"Invalid request\" 400 0", csp->ip_addr_str);
-
- return TRUE;
- }
-
- return FALSE;
-}
-#endif
-
-
/*********************************************************************
*
* Function : crunch_response_triggered
if (crunch_response_triggered(csp, crunchers_all))
{
/*
- * Yes. The client got the crunch response
- * and we are done here after cleaning up.
+ * Yes. The client got the crunch response and we're done here.
*/
- /* XXX: why list_remove_all()? */
- list_remove_all(csp->headers);
-
return;
}
&& ((csp->iob->eod - csp->iob->cur) >= 5)
&& !memcmp(csp->iob->eod-5, "0\r\n\r\n", 5))
{
+ /*
+ * XXX: This check should be obsolete now,
+ * but let's wait a while to be sure.
+ */
log_error(LOG_LEVEL_CONNECT,
- "Looks like we read the last chunk together with "
- "the server headers. We better stop reading.");
+ "Looks like we got the last chunk together with "
+ "the server headers but didn't detect it earlier. "
+ "We better stop reading.");
byte_count = (unsigned long long)(csp->iob->eod - csp->iob->cur);
csp->expected_content_length = byte_count;
csp->flags |= CSP_FLAG_CONTENT_LENGTH_SET;
log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header");
}
+ if ((csp->flags & CSP_FLAG_CHUNKED)
+ && !(csp->flags & CSP_FLAG_CONTENT_LENGTH_SET)
+ && ((csp->iob->eod - csp->iob->cur) >= 5)
+ && !memcmp(csp->iob->eod-5, "0\r\n\r\n", 5))
+ {
+ log_error(LOG_LEVEL_CONNECT,
+ "Looks like we got the last chunk together with "
+ "the server headers. We better stop reading.");
+ byte_count = (unsigned long long)(csp->iob->eod - csp->iob->cur);
+ csp->expected_content_length = byte_count;
+ csp->flags |= CSP_FLAG_CONTENT_LENGTH_SET;
+ }
+
csp->server_connection.response_received = time(NULL);
if (crunch_response_triggered(csp, crunchers_light))
*********************************************************************/
static void listen_loop(void)
{
+ struct client_states *csp_list = NULL;
struct client_state *csp = NULL;
jb_socket bfd;
struct configuration_spec *config;
}
#endif
- if ( NULL == (csp = (struct client_state *) zalloc(sizeof(*csp))) )
+ csp_list = (struct client_states *)zalloc(sizeof(*csp_list));
+ if (NULL == csp_list)
{
- log_error(LOG_LEVEL_FATAL, "malloc(%d) for csp failed: %E", sizeof(*csp));
+ log_error(LOG_LEVEL_FATAL,
+ "malloc(%d) for csp_list failed: %E", sizeof(*csp_list));
continue;
}
+ csp = &csp_list->csp;
csp->flags |= CSP_FLAG_ACTIVE;
csp->server_connection.sfd = JB_INVALID_SOCKET;
}
/* add it to the list of clients */
- csp->next = clients->next;
- clients->next = csp;
+ csp_list->next = clients->next;
+ clients->next = csp_list;
if (config->multi_threaded)
{
projects / privoxy.git / blobdiff