Changes for AmigaOS added.

[privoxy.git] / config.h

diff --git a/config.h b/config.h
index 6f50a53..02f9724 100644 (file)
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
 #define _CONFIG_H
 /*********************************************************************
  *
 #define _CONFIG_H
 /*********************************************************************
  *

- * File        :  $Source: /cvsroot/ijbswa/current/Attic/config.h,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/config.h,v $

  *
  * Purpose     :  This file should be the first thing included in every
  *                .c file.  (Before even system headers).  It contains 
  *
  * Purpose     :  This file should be the first thing included in every
  *                .c file.  (Before even system headers).  It contains 


@@ -39,6 +39,17 @@
  *
  * Revisions   :
  *    $Log: config.h,v $
  *
  * Revisions   :
  *    $Log: config.h,v $

+ *    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
  *    Revision 1.2  2001/05/20 01:21:20  jongfoster
  *    Version 2.9.4 checkin.
  *    - Merged popupfile and cookiefile, and added control over PCRS


@@ -125,6 +136,11 @@
  */
 #define FORCE_LOAD 1
 
  */
 #define FORCE_LOAD 1
 

+/*
+ * Locally redirect remote script-redirect URLs
+ */
+#define FAST_REDIRECTS 1
+

 /*
  * Split the show-proxy-args page into a page for each config file.
  */
 /*
  * Split the show-proxy-args page into a page for each config file.
  */


@@ -142,9 +158,11 @@
 
 /*
  * Detect image requests automatically for MSIE.  Will fall back to
 
 /*
  * 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.
  *
  * 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)
  * It detects the following header pair as an image request:
  *
  * User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)


@@ -171,13 +189,12 @@
 #define DETECT_MSIE_IMAGES 1
 
 /*
 #define DETECT_MSIE_IMAGES 1
 
 /*

- * 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.

  */
  */

-#define USE_IMAGE_LIST 1
+#define IMAGE_BLOCKING 1

 
 /*
  * Allows the use of ACL files to control access to the proxy by IP address.
 
 /*
  * Allows the use of ACL files to control access to the proxy by IP address.