X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=acconfig.h;h=1d7da3366402ff47326ebbdba2d26b467c9ba1be;hp=edf5c08ae5d42ad93a2c3717c38b6df520e3108f;hb=c2d0fb986a4bd1b385ff7e18f164d52c4983fbde;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7 diff --git a/acconfig.h b/acconfig.h index edf5c08a..1d7da336 100644 --- a/acconfig.h +++ b/acconfig.h @@ -2,7 +2,7 @@ #define _CONFIG_H /********************************************************************* * - * File : $Source: /home/administrator/cvs/ijb/acconfig.h,v $ + * File : $Source: /cvsroot/ijbswa/current/acconfig.h,v $ * * Purpose : This file should be the first thing included in every * .c file. (Before even system headers). It contains @@ -37,6 +37,81 @@ * * Revisions : * $Log: acconfig.h,v $ + * Revision 1.4 2001/05/29 09:50:24 jongfoster + * Unified blocklist/imagelist/permissionslist. + * File format is still under discussion, but the internal changes + * are (mostly) done. + * + * Also modified interceptor behaviour: + * - We now intercept all URLs beginning with one of the following + * prefixes (and *only* these prefixes): + * * http://i.j.b/ + * * http://ijbswa.sf.net/config/ + * * http://ijbswa.sourceforge.net/config/ + * - New interceptors "home page" - go to http://i.j.b/ to see it. + * - Internal changes so that intercepted and fast redirect pages + * are not replaced with an image. + * - Interceptors now have the option to send a binary page direct + * to the client. (i.e. ijb-send-banner uses this) + * - Implemented show-url-info interceptor. (Which is why I needed + * the above interceptors changes - a typical URL is + * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif". + * The previous mechanism would not have intercepted that, and + * if it had been intercepted then it then it would have replaced + * it with an image.) + * + * Revision 1.3 2001/05/26 01:26:34 jongfoster + * New #define, WIN_GUI_EDIT, enables the (embryonic) Win32 GUI editor. + * This #define cannot be set from ./configure - there's no point, it + * doesn't work yet. See feature request # 425722 + * + * Revision 1.2 2001/05/22 17:43:35 oes + * + * - Enabled filtering banners by size rather than URL + * by adding patterns that replace all standard banner + * sizes with the "Junkbuster" gif to the re_filterfile + * + * - Enabled filtering WebBugs by providing a pattern + * which kills all 1x1 images + * + * - Added support for PCRE_UNGREEDY behaviour to pcrs, + * which is selected by the (nonstandard and therefore + * capital) letter 'U' in the option string. + * It causes the quantifiers to be ungreedy by default. + * Appending a ? turns back to greedy (!). + * + * - Added a new interceptor ijb-send-banner, which + * sends back the "Junkbuster" gif. Without imagelist or + * MSIE detection support, or if tinygif = 1, or the + * URL isn't recognized as an imageurl, a lame HTML + * explanation is sent instead. + * + * - Added new feature, which permits blocking remote + * script redirects and firing back a local redirect + * to the browser. + * The feature is conditionally compiled, i.e. it + * can be disabled with --disable-fast-redirects, + * plus it must be activated by a "fast-redirects" + * line in the config file, has its own log level + * and of course wants to be displayed by show-proxy-args + * Note: Boy, all the #ifdefs in 1001 locations and + * all the fumbling with configure.in and acconfig.h + * were *way* more work than the feature itself :-( + * + * - Because a generic redirect template was needed for + * this, tinygif = 3 now uses the same. + * + * - Moved GIFs, and other static HTTP response templates + * to project.h + * + * - Many minor fixes + * + * - Removed some >400 CRs again (Jon, you really worked + * a lot! ;-) + * + * Revision 1.1.1.1 2001/05/15 13:58:45 oes + * Initial import of version 2.9.3 source tree + * * *********************************************************************/ @@ -63,10 +138,33 @@ #undef VERSION /* - * Regular expression matching for URLs. (Highly recommended). If this is - * not defined then you can ony use prefix matching. + * Status of the code: alpha, beta or stable */ -#undef REGEX +#undef CODE_STATUS + +/* + * Regular expression matching for URLs. (Highly recommended). If none of these + * is defined then you can ony use prefix matching. + * Don't bother to change this here! Use configure instead. + */ +#undef REGEX_GNU +#undef REGEX_PCRE + +/* + * Should pcre be statically built in instead of linkling with libpcre? + * (This is determined by configure depending on the availiability of + * libpcre and user preferences). The name is ugly, but pcre needs it. + * Don't bother to change this here! Use configure instead. + */ +#undef STATIC + +/* + * Should pcrs be statically built in instead of linkling with libpcrs? + * (This is determined by configure depending on the availiability of + * libpcrs and user preferences). + * Don't bother to change this here! Use configure instead. + */ +#undef STATIC_PCRS /* * Allow JunkBuster to be "disabled" so it is just a normal non-blocking @@ -77,11 +175,6 @@ */ #undef TOGGLE -/* - * Enables arbitrary content modification regexps - */ -#undef PCRS - /* * If a stream is compressed via gzip (Netscape specific I think), then * it cannot be modified with Perl regexps. This forces it to be @@ -99,6 +192,11 @@ */ #undef FORCE_LOAD +/* + * Locally redirect remote script-redirect URLs + */ +#undef FAST_REDIRECTS + /* * Split the show-proxy-args page into a page for each config file. */ @@ -116,9 +214,11 @@ /* * Detect image requests automatically for MSIE. Will fall back to - * other image-detection methods (i.e. USE_IMAGE_LIST) for other + * other image-detection methods (i.e. "+image" permission) for other * browsers. * + * You must also define IMAGE_BLOCKING to use this feature. + * * It detects the following header pair as an image request: * * User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0) @@ -145,13 +245,12 @@ #undef DETECT_MSIE_IMAGES /* - * Use image list to detect images. - * If you do not define this then everything is treated as HTML. + * Allow blocking using images as well as HTML. + * If you do not define this then everything is blocked as HTML. * - * Whatever the setting of this value, DETECT_MSIE_IMAGES will - * override it for people using Internet Explorer. + * Note that this is required if you want to use DETECT_MSIE_IMAGES. */ -#undef USE_IMAGE_LIST +#undef IMAGE_BLOCKING /* * Allows the use of ACL files to control access to the proxy by IP address. @@ -169,9 +268,11 @@ #undef JAR_FILES /* - * Use PCRE rather than GNU Regex + * Define this to use the Windows GUI for editing the blocklist. + * FIXME: This feature is only partially implemented and does not work + * FIXME: This #define can never be set by ./configure. */ -#undef PCRE +#undef WIN_GUI_EDIT @BOTTOM@