From: <no...@so...> - 2007-09-28 16:39:29
|
Update of /cvsroot/ijbswa/current In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17007 Modified Files: jcc.c Log Message: Execute content filters through execute_content_filter(). Index: jcc.c =================================================================== RCS file: /cvsroot/ijbswa/current/jcc.c,v retrieving revision 1.149 retrieving revision 1.150 diff -u -d -r1.149 -r1.150 --- jcc.c 4 Sep 2007 15:08:48 -0000 1.149 +++ jcc.c 28 Sep 2007 16:39:29 -0000 1.150 @@ -33,6 +33,9 @@ * * Revisions : * $Log$ + * Revision 1.150 2007/09/28 16:39:29 fabiankeil + * Execute content filters through execute_content_filter(). + * * Revision 1.149 2007/09/04 15:08:48 fabiankeil * Initialize req to NULL to make sure it's defined if the * first read_socket() call fails. Reported by icmp30. @@ -1133,8 +1136,6 @@ /* A function to crunch a response */ typedef struct http_response *(*crunch_func_ptr)(struct client_state *); -typedef char *(*filter_function_ptr)(); - /* Crunch function flags */ #define CF_NO_FLAGS 0 /* Cruncher applies to forced requests as well */ @@ -2180,7 +2181,8 @@ /* Never get here - LOG_LEVEL_FATAL causes program exit */ } - /* build the http request to send to the server + /* + * build the http request to send to the server * we have to do one of the following: * * create = use the original HTTP request to create a new @@ -2538,12 +2540,13 @@ */ if (content_filter) { + p = execute_content_filter(csp, content_filter); /* * If the content filter fails, use the original * buffer and length. * (see p != NULL ? p : csp->iob->cur below) */ - if (NULL == (p = (*content_filter)(csp))) + if (NULL == p) { csp->content_length = (size_t)(csp->iob->eod - csp->iob->cur); } |