X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=filters.c;h=9a079667562d8264a4973059dc3a2a97defd90c3;hp=c9448fd2290204135474c513ec9bcc9fa7e0ff83;hb=775d887bb8a6e1ba8dcfaa3d4221c0760d037819;hpb=536a88ebe11300228987eaa39ef4bbd63cd0e1ba diff --git a/filters.c b/filters.c index c9448fd2..9a079667 100644 --- a/filters.c +++ b/filters.c @@ -1,4 +1,4 @@ -const char filters_rcs[] = "$Id: filters.c,v 1.25 2001/07/26 10:09:46 oes Exp $"; +const char filters_rcs[] = "$Id: filters.c,v 1.27 2001/08/05 16:06:20 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.c,v $ @@ -38,6 +38,19 @@ const char filters_rcs[] = "$Id: filters.c,v 1.25 2001/07/26 10:09:46 oes Exp $" * * Revisions : * $Log: filters.c,v $ + * Revision 1.27 2001/08/05 16:06:20 jongfoster + * Modifiying "struct map" so that there are now separate header and + * "map_entry" structures. This means that functions which modify a + * map no longer need to return a pointer to the modified map. + * Also, it no longer reverses the order of the entries (which may be + * important with some advanced template substitutions). + * + * Revision 1.26 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 + * * Revision 1.25 2001/07/26 10:09:46 oes * Made browser detection a little less naive * @@ -444,7 +457,6 @@ struct http_response *block_url(struct client_state *csp) char *p; #endif /* def FEATURE_IMAGE_BLOCKING */ struct http_response *rsp; - struct map *exports = NULL; /* * If it's not blocked, don't block it ;-) @@ -501,18 +513,17 @@ struct http_response *block_url(struct client_state *csp) * Else, generate an HTML "blocked" message: */ { - - exports = default_exports(csp, NULL); + struct map * exports = default_exports(csp, NULL); #ifdef FEATURE_FORCE_LOAD - exports = map(exports, "force-prefix", 1, FORCE_PREFIX, 1); + map(exports, "force-prefix", 1, FORCE_PREFIX, 1); #else /* ifndef FEATURE_FORCE_LOAD */ - exports = map_block_killer(exports, "force-support"); + map_block_killer(exports, "force-support"); #endif /* ndef FEATURE_FORCE_LOAD */ - exports = map(exports, "hostport", 1, csp->http->hostport, 1); - exports = map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0); - exports = map(exports, "path", 1, csp->http->path, 1); - exports = map(exports, "path-html", 1, html_encode(csp->http->path), 0); + map(exports, "hostport", 1, csp->http->hostport, 1); + map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0); + map(exports, "path", 1, csp->http->path, 1); + map(exports, "path-html", 1, html_encode(csp->http->path), 0); rsp->body = fill_template(csp, "blocked", exports); free_map(exports); @@ -559,7 +570,7 @@ struct http_response *block_url(struct client_state *csp) struct http_response *trust_url(struct client_state *csp) { struct http_response *rsp; - struct map *exports = NULL; + struct map * exports; char buf[BUFFER_SIZE], *p = NULL; struct url_spec **tl, *t; @@ -578,25 +589,26 @@ struct http_response *trust_url(struct client_state *csp) { return NULL; } + exports = default_exports(csp, NULL); /* * Export the host, port, and referrer information */ - exports = map(exports, "hostport", 1, csp->http->hostport, 1); - exports = map(exports, "path", 1, csp->http->path, 1); - exports = map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0); - exports = map(exports, "path-html", 1, html_encode(csp->http->path), 0); + map(exports, "hostport", 1, csp->http->hostport, 1); + map(exports, "path", 1, csp->http->path, 1); + map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0); + map(exports, "path-html", 1, html_encode(csp->http->path), 0); if (csp->referrer && strlen(csp->referrer) > 9) { - exports = map(exports, "referrer", 1, csp->referrer + 9, 1); - exports = map(exports, "referrer-html", 1, html_encode(csp->referrer + 9), 0); + map(exports, "referrer", 1, csp->referrer + 9, 1); + map(exports, "referrer-html", 1, html_encode(csp->referrer + 9), 0); } else { - exports = map(exports, "referrer", 1, "unknown", 1); - exports = map(exports, "referrer-html", 1, "unknown", 1); + map(exports, "referrer", 1, "unknown", 1); + map(exports, "referrer-html", 1, "unknown", 1); } /* @@ -607,7 +619,7 @@ struct http_response *trust_url(struct client_state *csp) sprintf(buf, "