X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=acconfig.h;h=9ec87fdc1300537328d22df4d7ad6956c62e6c24;hp=ac950bfa5893a50b575f28d1db26f1042ed66e82;hb=36bed44da8971c4b75627ec86cc41163bfde81ae;hpb=b9d96835b666ba142057c0ef0c426d23b8bbd3d1

diff --git a/acconfig.h b/acconfig.h
index ac950bfa..9ec87fdc 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -5,19 +5,19 @@
  * 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 
+ *                .c file.  (Before even system headers).  It contains
  *                #define statements for various features.  It was
  *                introduced because the compile command line started
  *                getting ludicrously long with feature defines.
  *
- * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
- *                Privoxy team. http://www.privoxy.org/
+ * Copyright   :  Written by and Copyright (C) 2001-2014 the
+ *                Privoxy team. https://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
- *                by and Copyright (C) 1997 Anonymous Coders and 
+ *                by and Copyright (C) 1997 Anonymous Coders and
  *                Junkbusters Corporation.  http://www.junkbusters.com
  *
- *                This program is free software; you can redistribute it 
+ *                This program is free software; you can redistribute it
  *                and/or modify it under the terms of the GNU General
  *                Public License as published by the Free Software
  *                Foundation; either version 2 of the License, or (at
@@ -64,15 +64,15 @@
  */
 #undef CODE_STATUS
 
-/* 
+/*
  * 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.
+ * libpcre and user preferences).
  * Don't bother to change this here! Use configure instead.
  */
-#undef STATIC_PCRE
+#undef FEATURE_DYNAMIC_PCRE
 
-/* 
+/*
  * 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).
@@ -86,15 +86,15 @@
 #undef FEATURE_ACL
 
 /*
- * Enables the web-based configuration (actionsfile) editor.  If you
- * have a shared proxy, you might want to turn this off.
+ * Allow Privoxy to use accf_http(9) if supported.
  */
-#undef FEATURE_CGI_EDIT_ACTIONS
+#undef FEATURE_ACCEPT_FILTER
 
 /*
- * Allows the use of jar files to capture cookies.
+ * Enables the web-based configuration (actionsfile) editor.  If you
+ * have a shared proxy, you might want to turn this off.
  */
-#undef FEATURE_COOKIE_JAR
+#undef FEATURE_CGI_EDIT_ACTIONS
 
 /*
  * Locally redirect remote script-redirect URLs
@@ -109,62 +109,33 @@
 /*
  * 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.
  */
 #undef FEATURE_IMAGE_BLOCKING
 
 /*
- * 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 FEATURE_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)
- * Accept: * / *
- *
- * And the following as a HTML request:
- *
- * User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)
- * Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, * / *
- *
- * And no, I haven't got that backwards - IE is being wierd.
- *
- * Known limitations: 
- * 1) If you press shift-reload on a blocked HTML page, you get
- *    the image "blocked" page, not the HTML "blocked" page.
- * 2) Once an image "blocked" page has been sent, viewing it 
- *    in it's own browser window *should* bring up the HTML
- *    "blocked" page, but it doesn't.  You need to clear the 
- *    browser cache to get the HTML version again.
- *
- * These limitations are due to IE making inconsistent choices
- * about which "Accept:" header to send.
+ * Use PNG instead of GIF for built-in images
  */
-#undef FEATURE_IMAGE_DETECT_MSIE
+#undef FEATURE_NO_GIFS
 
 /*
- * Kills JavaScript popups - window.open, onunload, etc.
+ * Allow to shutdown Privoxy through the webinterface.
  */
-#undef FEATURE_KILL_POPUPS
+#undef FEATURE_GRACEFUL_TERMINATION
 
 /*
- * Use PNG instead of GIF for built-in images
+ * Allow PCRE syntax in host patterns.
  */
-#undef FEATURE_NO_GIFS
+#undef FEATURE_PCRE_HOST_PATTERNS
 
 /*
- * Allow to shutdown Privoxy through the webinterface.
+ * Gather extended statistics.
  */
-#undef FEATURE_GRACEFUL_TERMINATION
+#undef FEATURE_EXTENDED_STATISTICS
 
 /*
- * Allow PCRE syntax in host patterns.
+ * Allow filtering with scripts and programs.
  */
-#undef FEATURE_EXTENDED_HOST_PATTERNS
+#undef FEATURE_EXTERNAL_FILTERS
 
 /*
  * Keep connections alive if possible.
@@ -186,6 +157,11 @@
  */
 #undef FEATURE_STATISTICS
 
+/*
+ * Enable strptime() sanity checks.
+ */
+#undef FEATURE_STRPTIME_SANITY_CHECKS
+
 /*
  * Allow Privoxy to be "disabled" so it is just a normal non-blocking
  * non-anonymizing proxy.  This is useful if you're trying to access a
@@ -237,7 +213,7 @@
 #undef HAVE_GMTIME_R
 #undef HAVE_LOCALTIME_R
 
-/* Define to 'int' if <sys/socket.h> doesn't have it. 
+/* Define to 'int' if <sys/socket.h> doesn't have it.
  */
 #undef socklen_t
 
@@ -287,7 +263,7 @@
 
 /*
  * It's too easy to accidentally use a Cygwin or MinGW32 version of config.h
- * under VC++, and it usually gives many wierd error messages.  Let's make
+ * under VC++, and it usually gives many weird error messages.  Let's make
  * the error messages understandable, by bailing out now.
  */
 #ifdef _MSC_VER