X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=parsers.c;h=f2364d479307172d07c357fac306d7b94894fa85;hb=f5d6e754e859b3ca0345ed124249a2e482ea29ac;hp=ca65df34e306d78b5dfc2d5710a8b240c214c16a;hpb=34fc68ad1f19d0ed17f8ecd47d197fcf3f6f9d05;p=privoxy.git diff --git a/parsers.c b/parsers.c index ca65df34..f2364d47 100644 --- a/parsers.c +++ b/parsers.c @@ -1,4 +1,4 @@ -const char parsers_rcs[] = "$Id: parsers.c,v 1.15 2001/06/03 11:03:48 oes Exp $"; +const char parsers_rcs[] = "$Id: parsers.c,v 1.29 2001/09/24 21:09:24 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/parsers.c,v $ @@ -41,60 +41,68 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.15 2001/06/03 11:03:48 oes Exp $" * * Revisions : * $Log: parsers.c,v $ - * Revision 1.15 2001/06/03 11:03:48 oes - * Makefile/in + * Revision 1.29 2001/09/24 21:09:24 jongfoster + * Fixing 2 memory leaks that Guy spotted, where the paramater to + * enlist() was not being free()d. * - * introduced cgi.c + * Revision 1.28 2001/09/22 16:32:28 jongfoster + * Removing unused #includes. * - * actions.c: + * Revision 1.27 2001/09/20 15:45:25 steudten * - * adapted to new enlist_unique arg format + * add casting from size_t to int for printf() + * remove local variable shadow s2 * - * conf loadcfg.c + * Revision 1.26 2001/09/16 17:05:14 jongfoster + * Removing unused #include showarg.h * - * introduced confdir option + * Revision 1.25 2001/09/16 13:21:27 jongfoster + * Changes to use new list functions. * - * filters.c filtrers.h + * Revision 1.24 2001/09/13 23:05:50 jongfoster + * Changing the string paramater to the header parsers a "const". * - * extracted-CGI relevant stuff + * Revision 1.23 2001/09/12 18:08:19 steudten * - * jbsockets.c + * In parse_http_request() header rewriting miss the host value, so + * from http://www.mydomain.com the result was just " / " not + * http://www.mydomain.com/ in case we forward. * - * filled comment + * Revision 1.22 2001/09/10 10:58:53 oes + * Silenced compiler warnings * - * jcc.c + * Revision 1.21 2001/07/31 14:46:00 oes + * - Persistant connections now suppressed + * - sed() no longer appends empty header to csp->headers * - * support for new cgi mechansim + * Revision 1.20 2001/07/30 22:08:36 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS * - * list.c list.h + * Revision 1.19 2001/07/25 17:21:54 oes + * client_uagent now saves copy of User-Agent: header value * - * functions for new list type: "map" - * extended enlist_unique + * Revision 1.18 2001/07/13 14:02:46 oes + * - Included fix to repair broken HTTP requests that + * don't contain a path, not even '/'. + * - Removed all #ifdef PCRS + * - content_type now always inspected and classified as + * text, gif or other. + * - formatting / comments * - * miscutil.c .h - * introduced bindup() + * Revision 1.17 2001/06/29 21:45:41 oes + * Indentation, CRLF->LF, Tab-> Space * - * parsers.c parsers.h + * Revision 1.16 2001/06/29 13:32:42 oes + * - Fixed a comment + * - Adapted free_http_request + * - Removed logentry from cancelled commit * + * Revision 1.15 2001/06/03 19:12:38 oes * deleted const struct interceptors * - * pcrs.c - * added FIXME - * - * project.h - * - * added struct map - * added struct http_response - * changes struct interceptors to struct cgi_dispatcher - * moved HTML stuff to cgi.h - * - * re_filterfile: - * - * changed - * - * showargs.c - * NO TIME LEFT - * * Revision 1.14 2001/06/01 18:49:17 jongfoster * Replaced "list_share" with "list" - the tiny memory gain was not * worth the extra complexity. @@ -109,7 +117,7 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.15 2001/06/03 11:03:48 oes Exp $" * CRLF -> LF * * Revision 1.11 2001/05/29 20:11:19 joergs - * '/* inside comment' warning removed. + * '/ * inside comment' warning removed. * * Revision 1.10 2001/05/29 09:50:24 jongfoster * Unified blocklist/imagelist/permissionslist. @@ -235,10 +243,13 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.15 2001/06/03 11:03:48 oes Exp $" #include "config.h" +#ifndef _WIN32 #include #include #include #include +#endif + #include #ifndef _WIN32 @@ -249,15 +260,10 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.15 2001/06/03 11:03:48 oes Exp $" #include "list.h" #include "parsers.h" #include "encode.h" -#include "filters.h" -#include "loaders.h" -#include "showargs.h" -#include "jcc.h" #include "ssplit.h" #include "errlog.h" #include "jbsockets.h" #include "miscutil.h" -#include "cgi.h" const char parsers_h_rcs[] = PARSERS_H_VERSION; @@ -282,30 +288,29 @@ const struct parsers client_patterns[] = { { "from:", 5, client_from }, { "cookie:", 7, client_send_cookie }, { "x-forwarded-for:", 16, client_x_forwarded }, - { "proxy-connection:", 17, crumble }, -#ifdef DENY_GZIP +#ifdef FEATURE_DENY_GZIP { "Accept-Encoding: gzip", 21, crumble }, -#endif /* def DENY_GZIP */ -#if defined(DETECT_MSIE_IMAGES) +#endif /* def FEATURE_DENY_GZIP */ +#if defined(FEATURE_IMAGE_DETECT_MSIE) { "Accept:", 7, client_accept }, -#endif /* defined(DETECT_MSIE_IMAGES) */ -#ifdef FORCE_LOAD +#endif /* defined(FEATURE_IMAGE_DETECT_MSIE) */ +#ifdef FEATURE_FORCE_LOAD { "Host:", 5, client_host }, -#endif /* def FORCE_LOAD */ +#endif /* def FEATURE_FORCE_LOAD */ /* { "if-modified-since:", 18, crumble }, */ + { "Keep-Alive:", 11, crumble }, + { "connection:", 11, crumble }, + { "proxy-connection:", 17, crumble }, { NULL, 0, NULL } }; const struct parsers server_patterns[] = { + { "HTTP/1.1 ", 9, server_http11 }, { "set-cookie:", 11, server_set_cookie }, { "connection:", 11, crumble }, -#if defined(PCRS) || defined(KILLPOPUPS) { "Content-Type:", 13, content_type }, -#endif /* defined(PCRS) || defined(KILLPOPUPS) */ -#ifdef PCRS { "Content-Length:", 15, content_length }, -#endif /* def PCRS */ { NULL, 0, NULL } }; @@ -314,11 +319,13 @@ void (* const add_client_headers[])(struct client_state *) = { client_cookie_adder, client_x_forwarded_adder, client_xtra_adder, + connection_close_adder, NULL }; void (* const add_server_headers[])(struct client_state *) = { + connection_close_adder, NULL }; @@ -502,14 +509,14 @@ char *get_header(struct client_state *csp) *********************************************************************/ char *sed(const struct parsers pats[], void (* const more_headers[])(struct client_state *), struct client_state *csp) { - struct list *p; + struct list_entry *p; const struct parsers *v; char *hdr; void (* const *f)(); for (v = pats; v->str ; v++) { - for (p = csp->headers->next; p ; p = p->next) + for (p = csp->headers->first; p ; p = p->next) { /* Header crunch()ed in previous run? -> ignore */ if (p->str == NULL) continue; @@ -519,7 +526,7 @@ char *sed(const struct parsers pats[], void (* const more_headers[])(struct clie if (strncmpic(p->str, v->str, v->len) == 0) { hdr = v->parser(v, p->str, csp); - freez(p->str); + freez((char *)p->str); /* FIXME: Yuck! patching a list...*/ p->str = hdr; } } @@ -531,14 +538,6 @@ char *sed(const struct parsers pats[], void (* const more_headers[])(struct clie (*f)(csp); } - /* add the blank line at the end of the header, if necessary */ - if ( (csp->headers->last == NULL) - || (csp->headers->last->str == NULL) - || (*csp->headers->last->str != '\0') ) - { - enlist(csp->headers, ""); - } - hdr = list_to_text(csp->headers); return(hdr); @@ -566,6 +565,8 @@ void free_http_request(struct http_request *http) freez(http->hostport); freez(http->path); freez(http->ver); + freez(http->host_ip_addr_str); + freez(http->user_agent); } @@ -587,7 +588,7 @@ void free_http_request(struct http_request *http) *********************************************************************/ void parse_http_request(char *req, struct http_request *http, struct client_state *csp) { - char *buf, *v[10], *url, *p; + char *buf, *v[10], *url, *p, *save_url; int n; memset(http, '\0', sizeof(*http)); @@ -595,7 +596,6 @@ void parse_http_request(char *req, struct http_request *http, struct client_stat http->cmd = strdup(req); buf = strdup(req); - n = ssplit(buf, " \r\n", v, SZ(v), 1, 1); if (n == 3) @@ -609,41 +609,41 @@ void parse_http_request(char *req, struct http_request *http, struct client_stat http->ver = strdup(v[2]); } -#ifdef WEBDAV - -/* This next line is a little ugly, but it simplifies the if statement below. */ -/* Basically if using webDAV, we want the OR condition to use these too. */ - -/* - * by haroon - * These are the headers as defined in RFC2518 to add webDAV support - */ - -#define OR_WEBDAV || \ - (0 == strcmpic(v[0], "propfind")) || \ - (0 == strcmpic(v[0], "proppatch")) || \ - (0 == strcmpic(v[0], "move")) || \ - (0 == strcmpic(v[0], "copy")) || \ - (0 == strcmpic(v[0], "mkcol")) || \ - (0 == strcmpic(v[0], "lock")) || \ - (0 == strcmpic(v[0], "unlock")) - -#else /* No webDAV support is enabled. Provide an empty OR_WEBDAV macro. */ - -#define OR_WEBDAV - -#endif - /* or it could be a GET or a POST (possibly webDAV too) */ - if ((strcmpic(v[0], "get") == 0) || - (strcmpic(v[0], "head") == 0) OR_WEBDAV || - (strcmpic(v[0], "post") == 0)) + if ((0 == strcmpic(v[0], "get")) + || (0 == strcmpic(v[0], "head")) + || (0 == strcmpic(v[0], "post")) + /* These are the headers as defined in RFC2518 to add webDAV support: */ + || (0 == strcmpic(v[0], "propfind")) + || (0 == strcmpic(v[0], "proppatch")) + || (0 == strcmpic(v[0], "move")) + || (0 == strcmpic(v[0], "copy")) + || (0 == strcmpic(v[0], "mkcol")) + || (0 == strcmpic(v[0], "lock")) + || (0 == strcmpic(v[0], "unlock")) + ) { - http->ssl = 0; - http->gpc = strdup(v[0]); - url = v[1]; - http->ver = strdup(v[2]); + http->ssl = 0; + http->gpc = strdup(v[0]); + url = v[1]; + /* since we don't support HTTP/1.1 we must not send it */ + if (!strcmpic(v[2], "HTTP/1.1")) + { + http->ver = strdup("HTTP/1.0"); + /* change cmd too (forwaring) */ + freez(http->cmd); + http->cmd = strsav(http->cmd, http->gpc); + http->cmd = strsav(http->cmd, " "); + http->cmd = strsav(http->cmd, url); + http->cmd = strsav(http->cmd, " "); + http->cmd = strsav(http->cmd, http->ver); + } + else + { + http->ver = strdup(v[2]); + } + save_url = url; if (strncmpic(url, "http://", 7) == 0) { url += 7; @@ -657,11 +657,31 @@ void parse_http_request(char *req, struct http_request *http, struct client_stat url = NULL; } - if (url && (p = strchr(url, '/'))) + if (url) { - http->path = strdup(p); - *p = '\0'; - http->hostport = strdup(url); + if ((p = strchr(url, '/'))) + { + http->path = strdup(p); + *p = '\0'; + http->hostport = strdup(url); + } + /* + * Repair broken HTTP requests that don't contain a path + */ + else + { + /* Repair hostport & path */ + http->path = strdup("/"); + http->hostport = strdup(url); + + /* Even repair cmd in case we're just forwarding. Boy are we nice ;-) */ + freez(http->cmd); + http->cmd = strsav(http->cmd, http->gpc); + http->cmd = strsav(http->cmd, " "); + http->cmd = strsav(http->cmd, save_url); + http->cmd = strsav(http->cmd, "/ "); + http->cmd = strsav(http->cmd, http->ver); + } } } } @@ -735,7 +755,7 @@ void parse_http_request(char *req, struct http_request *http, struct client_stat * Returns : Always NULL. * *********************************************************************/ -char *crumble(const struct parsers *v, char *s, struct client_state *csp) +char *crumble(const struct parsers *v, const char *s, struct client_state *csp) { log_error(LOG_LEVEL_HEADER, "crunch!"); return(NULL); @@ -743,8 +763,6 @@ char *crumble(const struct parsers *v, char *s, struct client_state *csp) } -#if defined(PCRS) || defined(KILLPOPUPS) - /********************************************************************* * * Function : content_type @@ -759,26 +777,26 @@ char *crumble(const struct parsers *v, char *s, struct client_state *csp) * Returns : A duplicate string pointer to this header (ie. pass thru) * *********************************************************************/ -char *content_type(const struct parsers *v, char *s, struct client_state *csp) +char *content_type(const struct parsers *v, const char *s, struct client_state *csp) { - if (strstr (s, " text/") || strstr (s, "application/x-javascript")) - csp->is_text = 1; + if (strstr(s, " text/") || strstr(s, "application/x-javascript")) + csp->content_type = CT_TEXT; + else if (strstr(s, " image/gif")) + csp->content_type = CT_GIF; else - csp->is_text = 0; + csp->content_type = 0; return(strdup(s)); } -#endif /* defined(PCRS) || defined(KILLPOPUPS) */ -#ifdef PCRS /********************************************************************* * * Function : content_length * - * Description : Crunch Content-Length header if & only if we are - * filtering this page through PCRS. + * Description : Adjust Content-Length header if we modified + * the body. * * Parameters : * 1 : v = ignored @@ -788,22 +806,22 @@ char *content_type(const struct parsers *v, char *s, struct client_state *csp) * Returns : A duplicate string pointer to this header (ie. pass thru) * *********************************************************************/ -char *content_length(const struct parsers *v, char *s, struct client_state *csp) +char *content_length(const struct parsers *v, const char *s, struct client_state *csp) { if (csp->content_length != 0) /* Content has been modified */ - { - s = (char *) zalloc(100); - sprintf(s, "Content-Length: %d", csp->content_length); - log_error(LOG_LEVEL_HEADER, "Adjust Content-Length to %d", csp->content_length); - return(s); - } + { + char * s2 = (char *) zalloc(100); + sprintf(s2, "Content-Length: %d", (int) csp->content_length); + + log_error(LOG_LEVEL_HEADER, "Adjust Content-Length to %d", (int) csp->content_length); + return(s2); + } else { return(strdup(s)); } -} -#endif /* def PCRS */ +} /********************************************************************* @@ -822,20 +840,21 @@ char *content_length(const struct parsers *v, char *s, struct client_state *csp) * or modified header * *********************************************************************/ -char *client_referrer(const struct parsers *v, char *s, struct client_state *csp) +char *client_referrer(const struct parsers *v, const char *s, struct client_state *csp) { const char * newval; -#ifdef FORCE_LOAD + char * s2; +#ifdef FEATURE_FORCE_LOAD /* Since the referrer can include the prefix even * even if the request itself is non-forced, we must * clean it unconditionally */ strclean(s, FORCE_PREFIX); -#endif /* def FORCE_LOAD */ +#endif /* def FEATURE_FORCE_LOAD */ -#ifdef TRUST_FILES +#ifdef FEATURE_TRUST csp->referrer = strdup(s); -#endif /* def TRUST_FILES */ +#endif /* def FEATURE_TRUST */ /* * Are we sending referer? @@ -866,11 +885,11 @@ char *client_referrer(const struct parsers *v, char *s, struct client_state *csp * to fool stupid checks for in-site links */ log_error(LOG_LEVEL_HEADER, "crunch+forge!"); - s = strsav(NULL, "Referer: "); - s = strsav(s, "http://"); - s = strsav(s, csp->http->hostport); - s = strsav(s, "/"); - return(s); + s2 = strsav(NULL, "Referer: "); + s2 = strsav(s2, "http://"); + s2 = strsav(s2, csp->http->hostport); + s2 = strsav(s2, "/"); + return(s2); } /* @@ -881,12 +900,13 @@ char *client_referrer(const struct parsers *v, char *s, struct client_state *csp /* * We have a specific (fixed) referer we want to send. */ + char * s3; log_error(LOG_LEVEL_HEADER, "modified"); - s = strsav( NULL, "Referer: " ); - s = strsav( s, newval ); - return(s); + s3 = strsav( NULL, "Referer: " ); + s3 = strsav( s3, newval ); + return(s3); } /* Should never get here! */ @@ -899,11 +919,11 @@ char *client_referrer(const struct parsers *v, char *s, struct client_state *csp * to fool stupid checks for in-site links */ log_error(LOG_LEVEL_HEADER, "crunch+forge!"); - s = strsav(NULL, "Referer: "); - s = strsav(s, "http://"); - s = strsav(s, csp->http->hostport); - s = strsav(s, "/"); - return(s); + s2 = strsav(NULL, "Referer: "); + s2 = strsav(s2, "http://"); + s2 = strsav(s2, csp->http->hostport); + s2 = strsav(s2, "/"); + return(s2); } @@ -911,8 +931,9 @@ char *client_referrer(const struct parsers *v, char *s, struct client_state *csp * * Function : client_uagent * - * Description : Handle the "user-agent" config setting properly. - * Called from `sed'. + * Description : Handle the "user-agent" config setting properly + * and remember its original value to enable browser + * bug workarounds. Called from `sed'. * * Parameters : * 1 : v = ignored @@ -923,11 +944,18 @@ char *client_referrer(const struct parsers *v, char *s, struct client_state *csp * a malloc'ed string pointer to this header (ie. pass thru). * *********************************************************************/ -char *client_uagent(const struct parsers *v, char *s, struct client_state *csp) +char *client_uagent(const struct parsers *v, const char *s, struct client_state *csp) { const char * newval; + char * s2; -#ifdef DETECT_MSIE_IMAGES + /* Save the client's User-Agent: value */ + if (strlen(s) >= 12) + { + csp->http->user_agent = strdup(s + 12); + } + +#ifdef FEATURE_IMAGE_DETECT_MSIE if (strstr (s, "MSIE ")) { /* This is Microsoft Internet Explorer. @@ -935,7 +963,7 @@ char *client_uagent(const struct parsers *v, char *s, struct client_state *csp) */ csp->accept_types |= ACCEPT_TYPE_IS_MSIE; } -#endif /* def DETECT_MSIE_IMAGES */ +#endif /* def FEATURE_IMAGE_DETECT_MSIE */ if ((csp->action->flags & ACTION_HIDE_USER_AGENT) == 0) { @@ -950,9 +978,9 @@ char *client_uagent(const struct parsers *v, char *s, struct client_state *csp) log_error(LOG_LEVEL_HEADER, "modified"); - s = strsav( NULL, "User-Agent: " ); - s = strsav( s, newval ); - return(s); + s2 = strsav( NULL, "User-Agent: " ); + s2 = strsav( s2, newval ); + return(s2); } @@ -971,7 +999,7 @@ char *client_uagent(const struct parsers *v, char *s, struct client_state *csp) * Returns : NULL if crunched, or a malloc'ed string to original header * *********************************************************************/ -char *client_ua(const struct parsers *v, char *s, struct client_state *csp) +char *client_ua(const struct parsers *v, const char *s, struct client_state *csp) { if ((csp->action->flags & ACTION_HIDE_USER_AGENT) == 0) { @@ -1001,9 +1029,10 @@ char *client_ua(const struct parsers *v, char *s, struct client_state *csp) * modified/original header. * *********************************************************************/ -char *client_from(const struct parsers *v, char *s, struct client_state *csp) +char *client_from(const struct parsers *v, const char *s, struct client_state *csp) { const char * newval; + char * s2; if ((csp->action->flags & ACTION_HIDE_FROM) == 0) { @@ -1023,9 +1052,9 @@ char *client_from(const struct parsers *v, char *s, struct client_state *csp) log_error(LOG_LEVEL_HEADER, " modified"); - s = strsav( NULL, "From: " ); - s = strsav( s, newval ); - return(s); + s2 = strsav( NULL, "From: " ); + s2 = strsav( s2, newval ); + return(s2); } @@ -1046,7 +1075,7 @@ char *client_from(const struct parsers *v, char *s, struct client_state *csp) * Returns : Always NULL. * *********************************************************************/ -char *client_send_cookie(const struct parsers *v, char *s, struct client_state *csp) +char *client_send_cookie(const struct parsers *v, const char *s, struct client_state *csp) { if ((csp->action->flags & ACTION_NO_COOKIE_READ) == 0) { @@ -1081,7 +1110,7 @@ char *client_send_cookie(const struct parsers *v, char *s, struct client_state * * Returns : Always NULL. * *********************************************************************/ -char *client_x_forwarded(const struct parsers *v, char *s, struct client_state *csp) +char *client_x_forwarded(const struct parsers *v, const char *s, struct client_state *csp) { if ((csp->action->flags & ACTION_HIDE_FORWARDED) == 0) { @@ -1098,7 +1127,7 @@ char *client_x_forwarded(const struct parsers *v, char *s, struct client_state * } -#if defined(DETECT_MSIE_IMAGES) +#if defined(FEATURE_IMAGE_DETECT_MSIE) /********************************************************************* * * Function : client_accept @@ -1116,9 +1145,9 @@ char *client_x_forwarded(const struct parsers *v, char *s, struct client_state * * Returns : Duplicate of argument s. * *********************************************************************/ -char *client_accept(const struct parsers *v, char *s, struct client_state *csp) +char *client_accept(const struct parsers *v, const char *s, struct client_state *csp) { -#ifdef DETECT_MSIE_IMAGES +#ifdef FEATURE_IMAGE_DETECT_MSIE if (strstr (s, "image/gif")) { /* Client will accept HTML. If this seems counterintuitive, @@ -1130,12 +1159,12 @@ char *client_accept(const struct parsers *v, char *s, struct client_state *csp) { csp->accept_types |= ACCEPT_TYPE_MSIE_IMAGE; } -#endif /* def DETECT_MSIE_IMAGES */ +#endif /* def FEATURE_IMAGE_DETECT_MSIE */ return(strdup(s)); } -#endif /* defined(DETECT_MSIE_IMAGES) */ +#endif /* defined(FEATURE_IMAGE_DETECT_MSIE) */ @@ -1156,11 +1185,11 @@ char *client_accept(const struct parsers *v, char *s, struct client_state *csp) *********************************************************************/ void client_cookie_adder(struct client_state *csp) { - struct list *lst; + struct list_entry *lst; char *tmp = NULL; char *e; - for (lst = csp->cookie_list->next; lst ; lst = lst->next) + for (lst = csp->cookie_list->first; lst ; lst = lst->next) { if (tmp) { @@ -1169,7 +1198,7 @@ void client_cookie_adder(struct client_state *csp) tmp = strsav(tmp, lst->str); } - for (lst = csp->action->multi[ACTION_MULTI_WAFER]->next; lst ; lst = lst->next) + for (lst = csp->action->multi[ACTION_MULTI_WAFER]->first; lst ; lst = lst->next) { if (tmp) { @@ -1212,9 +1241,10 @@ void client_cookie_adder(struct client_state *csp) *********************************************************************/ void client_xtra_adder(struct client_state *csp) { - struct list *lst = csp->action->multi[ACTION_MULTI_ADD_HEADER]; + struct list_entry *lst; - for (lst = lst->next; lst ; lst = lst->next) + for (lst = csp->action->multi[ACTION_MULTI_ADD_HEADER]->first; + lst ; lst = lst->next) { log_error(LOG_LEVEL_HEADER, "addh: %s", lst->str); enlist(csp->headers, lst->str); @@ -1259,6 +1289,54 @@ void client_x_forwarded_adder(struct client_state *csp) log_error(LOG_LEVEL_HEADER, "addh: %s", p); enlist(csp->headers, p); + freez(p); +} + + +/********************************************************************* + * + * Function : connection_close_adder + * + * Description : Adds a "Connection: close" header to csp->headers + * as a temporary fix for the needed but missing HTTP/1.1 + * support. Called from `sed'. + * FIXME: This whole function shouldn't be neccessary! + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * + * Returns : N/A + * + *********************************************************************/ +void connection_close_adder(struct client_state *csp) +{ + enlist(csp->headers, "Connection: close"); +} + + +/********************************************************************* + * + * Function : server_http11 + * + * Description : Rewrite HTTP/1.1 answers to HTTP/1.0 until we add + * HTTP/1.1 support. Called from `sed'. + * + * Parameters : + * 1 : v = parser pattern that matched this header + * 2 : s = header that matched this pattern + * 3 : csp = Current client state (buffers, headers, etc...) + * + * Returns : "HTTP/1.0" answer. + * + *********************************************************************/ +char *server_http11(const struct parsers *v, const char *s, struct client_state *csp) +{ + char *ret; + + ret = strdup(s); + ret[7] = '0'; /* "HTTP/1.1 ..." -> "HTTP/1.0 ..." */ + + return ret; } @@ -1278,14 +1356,14 @@ void client_x_forwarded_adder(struct client_state *csp) * Returns : `crumble' or a newly malloc'ed string. * *********************************************************************/ -char *server_set_cookie(const struct parsers *v, char *s, struct client_state *csp) +char *server_set_cookie(const struct parsers *v, const char *s, struct client_state *csp) { -#ifdef JAR_FILES +#ifdef FEATURE_COOKIE_JAR if (csp->config->jar) { fprintf(csp->config->jar, "%s\t%s\n", csp->http->host, (s + v->len + 1)); } -#endif /* def JAR_FILES */ +#endif /* def FEATURE_COOKIE_JAR */ if ((csp->action->flags & ACTION_NO_COOKIE_SET) != 0) { @@ -1297,7 +1375,7 @@ char *server_set_cookie(const struct parsers *v, char *s, struct client_state *c } -#ifdef FORCE_LOAD +#ifdef FEATURE_FORCE_LOAD /********************************************************************* * * Function : client_host @@ -1313,19 +1391,21 @@ char *server_set_cookie(const struct parsers *v, char *s, struct client_state *c * Returns : A malloc'ed pointer to the cleaned host header * *********************************************************************/ -char *client_host(const struct parsers *v, char *s, struct client_state *csp) +char *client_host(const struct parsers *v, const char *s, struct client_state *csp) { char *cleanhost = strdup(s); if(csp->force) + { strclean(cleanhost, FORCE_PREFIX); + } return(cleanhost); } -#endif /* def FORCE_LOAD */ +#endif /* def FEATURE_FORCE_LOAD */ -#ifdef FORCE_LOAD +#ifdef FEATURE_FORCE_LOAD /********************************************************************* * * Function : strclean @@ -1359,7 +1439,7 @@ int strclean(const char *string, const char *substring) return(hits); } -#endif /* def FORCE_LOAD */ +#endif /* def FEATURE_FORCE_LOAD */ /*