-const char jcc_rcs[] = "$Id: jcc.c,v 1.325 2010/07/21 14:39:20 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.329 2010/09/14 07:14:15 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
const struct forward_spec *fwd;
struct http_request *http;
long len = 0; /* for buffer sizes (and negative error codes) */
-
- /* Function that does the content filtering for the current request */
- filter_function_ptr content_filter = NULL;
+ int buffer_and_filter_content = 0;
/* Skeleton for HTTP response, if we should intercept the request */
struct http_response *rsp;
* now is the time to apply content modification
* and send the result to the client.
*/
- if (content_filter)
+ if (buffer_and_filter_content)
{
- p = execute_content_filter(csp, content_filter);
+ p = execute_content_filters(csp);
/*
- * If the content filter fails, use the original
+ * If content filtering fails, use the original
* buffer and length.
* (see p != NULL ? p : csp->iob->cur below)
*/
*/
if (server_body || http->ssl)
{
- if (content_filter)
+ if (buffer_and_filter_content)
{
/*
* If there is no memory left for buffering the content, or the buffer limit
*/
byte_count = (unsigned long long)flushed;
freez(hdr);
- content_filter = NULL;
+ buffer_and_filter_content = 0;
server_body = 1;
}
}
if (!http->ssl) /* We talk plaintext */
{
- content_filter = get_filter_function(csp);
+ buffer_and_filter_content = content_requires_filtering(csp);
}
/*
* Only write if we're not buffering for content modification
*/
- if (!content_filter)
+ if (!buffer_and_filter_content)
{
/*
* Write the server's (modified) header to
}
else
{
- log_error(LOG_LEVEL_CONNECT, "accepted connection from %s", csp->ip_addr_str);
+ log_error(LOG_LEVEL_CONNECT,
+ "accepted connection from %s on socket %d",
+ csp->ip_addr_str, csp->cfd);
}
#ifdef FEATURE_TOGGLE