X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=config.h.win;h=1dc1c2851c08ac6d53b33e5a67b6a74d11bc03c9;hp=380737b47ad1de09e9f8b6abda604612023252bd;hb=004d0cf61c498b0309f4b3b58818114fe3330a20;hpb=d3f416902c6d420c39bd6fe330e09331029f9346 diff --git a/config.h.win b/config.h.win index 380737b4..1dc1c285 100755 --- a/config.h.win +++ b/config.h.win @@ -1,6 +1,5 @@ -/* config.h.win - Microsoft Visual C++ version of config.h */ -#ifndef _CONFIG_H -#define _CONFIG_H +#ifndef CONFIG_H_INCLUDED +#define CONFIG_H_INCLUDED /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/config.h.win,v $ @@ -38,13 +37,56 @@ * * Revisions : * $Log: config.h.win,v $ - * Revision 1.1 2001/06/01 17:56:07 jongfoster - * Removing generated files config.h and pcre/chartables.c - * Now use a custom build step to copy config.h.win to config.h - * New VC++ project pcre/vc_dftables.dsp will generate pcre/chartables.c - * Also adding the new files list.[ch], actions.[ch] to the console build. + * Revision 1.13 2001/10/23 21:24:09 jongfoster + * Support for FEATURE_CGI_EDIT_ACTIONS * - * Revision 1.6 2001/05/29 09:50:24 jongfoster + * Revision 1.12 2001/10/07 15:33:14 oes + * Removed FEATURE_DENY_GZIP + * Bumped up version number + * + * Revision 1.11 2001/09/16 16:59:34 jongfoster + * Bugfix - couldn't build resources with previous version. + * + * Revision 1.10 2001/09/16 16:19:02 jongfoster + * New version based on latest configure.in and acconfig.h + * + * Revision 1.9 2001/07/30 22:16:07 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.8 2001/07/25 19:16:27 oes + * Bumping version number to 2.9.8 + * + * Revision 1.7 2001/07/21 18:00:07 jongfoster + * Bumping version number to 2.9.7 + * + * Revision 1.6 2001/07/15 20:08:40 jongfoster + * New build files for VC++ which provide the option of POSIX + * or Win32 threads. + * + * Revision 1.5 2001/07/15 18:00:46 jongfoster + * Renaming STATIC to STATIC_PCRE. + * Replacing this file with one built by "configure" from + * "config.h.in", for consistency. + * + * Revision 1.6 2001/07/15 17:54:29 jongfoster + * Renaming #define STATIC to STATIC_PCRE + * Adding new #define FEATURE_PTHREAD that will be used to enable + * POSIX threads support. + * + * Revision 1.5 2001/07/13 13:48:37 oes + * - (Fix:) Copied CODE_STATUS #define from config.h.in + * - split REGEX #define into REGEX_GNU and REGEX_PCRE + * and removed PCRE. + * (REGEX = REGEX_GNU || REGEX_PCRE per project.h) + * - Moved STATIC (for pcre) here from Makefile.in + * - Introduced STATIC_PCRS #define to allow for dynaimc linking with + * libpcrs + * - Removed PCRS #define, since pcrs is now needed for CGI anyway + * + * 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. @@ -67,46 +109,62 @@ * if it had been intercepted then it then it would have replaced * it with an image.) * - * Revision 1.5 2001/05/26 00:28:36 jongfoster - * Automatic reloading of config file. - * Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32). - * Most of the global variables have been moved to a new - * struct configuration_spec, accessed through csp->config->globalname - * Most of the globals remaining are used by the Win32 GUI. - * - * Revision 1.4 2001/05/25 22:17:28 jongfoster - * Resurrecting these files which are required for the MS Visual C++ - * build only. - * - * Revision 1.2 2001/05/20 01:21:20 jongfoster - * Version 2.9.4 checkin. - * - Merged popupfile and cookiefile, and added control over PCRS - * filtering, in new "permissionsfile". - * - Implemented LOG_LEVEL_FATAL, so that if there is a configuration - * file error you now get a message box (in the Win32 GUI) rather - * than the program exiting with no explanation. - * - Made killpopup use the PCRS MIME-type checking and HTTP-header - * skipping. - * - Removed tabs from "config" - * - Moved duplicated url parsing code in "loaders.c" to a new funcition. - * - Bumped up version number. - * - * Revision 1.1.1.1 2001/05/15 13:58:49 oes + * 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 * * *********************************************************************/ -/* Define to empty if the keyword does not work. */ -/* #undef const */ - -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - /* * Version number - Major (X._._) */ @@ -120,12 +178,12 @@ /* * Version number - Point (_._.X) */ -#define VERSION_POINT 4 +#define VERSION_POINT 10 /* * Version number, as a string */ -#define VERSION "2.9.4" +#define VERSION "2.9.10" /* * Status of the code: alpha, beta or stable @@ -133,68 +191,69 @@ #define CODE_STATUS "alpha" /* - * Regular expression matching for URLs. (Highly recommended). If this is - * not defined then you can ony use prefix matching. + * Regular expression matching for URLs. (Highly recommended). + * If neither of these are defined then you can ony use prefix matching. + * Don't bother to change this here! Use configure instead. */ -#define REGEX 1 +/* #define REGEX_GNU 1 */ +#define REGEX_PCRE 1 -/* - * Allow JunkBuster to be "disabled" so it is just a normal non-blocking - * non-anonymizing proxy. This is useful if you're trying to access a - * blocked or broken site - just change the setting in the config file - * and send a SIGHUP (UN*X), or use the handy "Disable" menu option (Windows - * GUI). +/* + * 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. */ -#define TOGGLE 1 +#define STATIC_PCRE 1 -/* - * Enables arbitrary content modification regexps +/* + * 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. */ -#define PCRS 1 +#define STATIC_PCRS 1 /* - * If a stream is compressed via gzip (Netscape specific I think), then - * it cannot be modified with Perl regexps. This forces it to be - * uncompressed. + * Allows the use of an ACL to control access to the proxy by IP address. */ -#define DENY_GZIP 1 +#define FEATURE_ACL 1 /* - * Enables statistics function. + * Enables the web-based configuration (actionsfile) editor. If you + * have a shared proxy, you might want to turn this off. */ -#define STATISTICS 1 +#define FEATURE_CGI_EDIT_ACTIONS 1 /* - * Bypass filtering for 1 page only + * Allows the use of jar files to capture cookies. */ -#define FORCE_LOAD 1 +#define FEATURE_COOKIE_JAR 1 /* * Locally redirect remote script-redirect URLs */ -#define FAST_REDIRECTS 1 - -/* - * Split the show-proxy-args page into a page for each config file. - */ -#define SPLIT_PROXY_ARGS 1 +#define FEATURE_FAST_REDIRECTS 1 /* - * Kills JavaScript popups - window.open, onunload, etc. + * Bypass filtering for 1 page only */ -#define KILLPOPUPS 1 +#define FEATURE_FORCE_LOAD 1 /* - * Support for webDAV - e.g. so Microsoft Outlook can access HotMail e-mail + * Allow blocking using images as well as HTML. + * If you do not define this then everything is blocked as HTML. + * + * Note that this is required if you want to use FEATURE_IMAGE_DETECT_MSIE. */ -#define WEBDAV 1 +#define FEATURE_IMAGE_BLOCKING 1 /* * Detect image requests automatically for MSIE. Will fall back to * other image-detection methods (i.e. "+image" permission) for other * browsers. * - * You must also define IMAGE_BLOCKING to use this feature. + * You must also define FEATURE_IMAGE_BLOCKING to use this feature. * * It detects the following header pair as an image request: * @@ -219,43 +278,154 @@ * These limitations are due to IE making inconsistent choices * about which "Accept:" header to send. */ -#define DETECT_MSIE_IMAGES 1 +#define FEATURE_IMAGE_DETECT_MSIE 1 /* - * Allow blocking using images as well as HTML. - * If you do not define this then everything is blocked as HTML. - * - * Note that this is required if you want to use DETECT_MSIE_IMAGES. + * Kills JavaScript popups - window.open, onunload, etc. + */ +#define FEATURE_KILL_POPUPS 1 + +/* + * Use POSIX threads instead of native threads. + */ +#define FEATURE_PTHREAD 1 + +/* + * Enables statistics function. */ -#define IMAGE_BLOCKING 1 +#define FEATURE_STATISTICS 1 /* - * Allows the use of ACL files to control access to the proxy by IP address. + * Allow JunkBuster to be "disabled" so it is just a normal non-blocking + * non-anonymizing proxy. This is useful if you're trying to access a + * blocked or broken site - just change the setting in the config file, + * or use the handy "Disable" menu option in the Windows GUI. */ -#define ACL_FILES 1 +#define FEATURE_TOGGLE 1 /* * Allows the use of trust files. */ -#define TRUST_FILES 1 +#define FEATURE_TRUST 1 + + +/**************************************************************************** + * The following values are correct for MS VC++97. + * You should normally not change them. + ***************************************************************************/ + /* - * Allows the use of jar files to capture cookies. + * Defined on Solaris only. Makes the system libraries thread safe. */ -#define JAR_FILES 1 +/* #define _REENTRANT 1 */ /* - * Use PCRE rather than GNU Regex + * Defined on Solaris only. Without this, many important functions are not + * defined in the system headers. */ -#define PCRE 1 +/* #define __EXTENSIONS__ 1 */ -/* Define if you have the bcopy function. */ -#define HAVE_BCOPY 1 +/* + * Defined always. + * FIXME: Don't know what it does or why we need it. + * (presumably something to do with MultiThreading?) + */ +#define __MT__ 1 + + +/* Define if you have the `bcopy' function. */ +/* #define HAVE_BCOPY 1 */ -/* Define if you have the memmove function. */ +/* Define if you have the header file. */ +/* #define HAVE_INTTYPES_H 1 */ + +/* Define if you have the `memmove' function. */ #define HAVE_MEMMOVE 1 -/* Define if you have the strerror function. */ +/* Define if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define if you have the header file. */ +/* #define HAVE_STDINT_H 1 */ + +/* Define if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define if you have the `strerror' function. */ #define HAVE_STRERROR 1 -#endif /* _CONFIG_H */ +/* Define if you have the header file. */ +/* #define HAVE_STRINGS_H 1 */ + +/* Define if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if you have the header file. */ +/* #define HAVE_UNISTD_H 1 */ + +/* The size of a `char *', as computed by sizeof. */ +#define SIZEOF_CHAR_P 4 + +/* The size of a `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of a `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + +/* The size of a `long long', as computed by sizeof. */ +/* #define SIZEOF_LONG_LONG ---not supported--- */ + +/* The size of a `size_t', as computed by sizeof. */ +#define SIZEOF_SIZE_T 4 + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #define const */ + +/* Define to `unsigned' if does not define. */ +/* #define size_t unsigned */ + +/* + * Defined always. + * FIXME: Don't know what it does or why we need it. + * (presumably something to do with ANSI Standard C?) + */ +/* Don't define for MS VC++ or you don't get strdup() declared. +#ifndef __STDC__ +#define __STDC__ 1 +#endif +*/ + +/* + * Need to set up this define only for the Pthreads library for + * Win32, available from http://sources.redhat.com/pthreads-win32/ + */ +#if defined(FEATURE_PTHREAD) && defined(_WIN32) +#define __CLEANUP_C +#endif /* defined(FEATURE_PTHREAD) && defined(_WIN32) */ + +/* + * BEOS does not currently support POSIX threads. + * This *should* be detected by ./configure, but let's be sure. + */ +#if defined(FEATURE_PTHREAD) && defined(__BEOS__) +#error BEOS does not support pthread - please run ./configure again with "--disable-pthread" + +#endif /* defined(FEATURE_PTHREAD) && defined(__BEOS__) */ + + +#if (!defined(_MSC_VER)) && (!defined(RC_INVOKED)) +#error This file is only intended for MS VC++ on Win32. For other compilers, please run configure. +#endif /* (!defined(_MSC_VER)) && (!defined(RC_INVOKED)) */ + +#endif /* CONFIG_H_INCLUDED */ +