X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=acconfig.h;h=9604b1cf11723ccdb657d72587e4f8f1c9435a5d;hp=7cd53cabe74159670dbdcf96669455ceaa13de5c;hb=dc75357981147f069761a2dc781bf7bbc3934805;hpb=e72b401da5537a14b29e945944926373cb251825

diff --git a/acconfig.h b/acconfig.h
index 7cd53cab..9604b1cf 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -10,7 +10,7 @@
  *                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
@@ -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,7 +136,7 @@
  * 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: 
  * 1) If you press shift-reload on a blocked HTML page, you get
@@ -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
  */
@@ -167,10 +167,15 @@
 #undef FEATURE_EXTENDED_HOST_PATTERNS
 
 /*
- * Keep outgoing connections alive if possible.
+ * Keep connections alive if possible.
  */
 #undef FEATURE_CONNECTION_KEEP_ALIVE
 
+/*
+ * Allow to share outgoing connections between incoming connections.
+ */
+#undef FEATURE_CONNECTION_SHARING
+
 /*
  * Use POSIX threads instead of native threads.
  */
@@ -282,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