X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=acconfig.h;h=29e953963c4e12f999d39f30026fc005165bca66;hb=af9c094410075dfcff1ab22701a9c5d6ef8e448e;hp=ac950bfa5893a50b575f28d1db26f1042ed66e82;hpb=b9d96835b666ba142057c0ef0c426d23b8bbd3d1;p=privoxy.git

diff --git a/acconfig.h b/acconfig.h
index ac950bfa..29e95396 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
+ * Copyright   :  Written by and Copyright (C) 2001-2009 the
  *                Privoxy team. http://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,7 +64,7 @@
  */
 #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.
@@ -72,7 +72,7 @@
  */
 #undef STATIC_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).
@@ -85,6 +85,11 @@
  */
 #undef FEATURE_ACL
 
+/*
+ * Allow Privoxy to use accf_http(9) if supported.
+ */
+#undef FEATURE_ACCEPT_FILTER
+
 /*
  * Enables the web-based configuration (actionsfile) editor.  If you
  * have a shared proxy, you might want to turn this off.
@@ -131,14 +136,14 @@
  * 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.
+ * And no, I haven't got that backwards - IE is being weird.
  *
- * Known limitations: 
+ * 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 
+ * 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 
+ *    "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
@@ -146,11 +151,6 @@
  */
 #undef FEATURE_IMAGE_DETECT_MSIE
 
-/*
- * Kills JavaScript popups - window.open, onunload, etc.
- */
-#undef FEATURE_KILL_POPUPS
-
 /*
  * Use PNG instead of GIF for built-in images
  */
@@ -237,7 +237,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 +287,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