X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=loadcfg.h;h=4c9e992485c7b55e857d031e56cc4683656cbacd;hb=f2f1071b16f0c74edc0e89ffe7b0c01636c54c4f;hp=e567b7e0af4aeab7b553096a106c141d8e38880d;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7;p=privoxy.git

diff --git a/loadcfg.h b/loadcfg.h
index e567b7e0..4c9e9924 100644
--- a/loadcfg.h
+++ b/loadcfg.h
@@ -1,9 +1,9 @@
 #ifndef _LOADCFG_H
 #define _LOADCFG_H
-#define LOADCFG_H_VERSION "$Id: loadcfg.h,v 1.1 2001/05/13 21:57:06 administrator Exp $"
+#define LOADCFG_H_VERSION "$Id: loadcfg.h,v 1.3 2001/05/20 01:21:20 jongfoster Exp $"
 /*********************************************************************
  *
- * File        :  $Source: /home/administrator/cvs/ijb/loadcfg.h,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.h,v $
  *
  * Purpose     :  Loads settings from the configuration file into
  *                global variables.  This file contains both the 
@@ -37,6 +37,25 @@
  *
  * Revisions   :
  *    $Log: loadcfg.h,v $
+ *    Revision 1.3  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.2  2001/05/17 23:01:01  oes
+ *     - Cleaned CRLF's from the sources and related files
+ *
+ *    Revision 1.1.1.1  2001/05/15 13:58:58  oes
+ *    Initial import of version 2.9.3 source tree
+ *
  *
  *********************************************************************/
 
@@ -63,7 +82,7 @@ extern int multi_threaded;
 
 #if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST)
 extern int tinygif;
-extern const char *tinygifurl;
+extern const char *tinygifurl;
 #endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */
 
 extern const char *logfile;
@@ -75,17 +94,13 @@ extern const char *aclfile;
 #endif /* def ACL_FILES */
 
 extern const char *blockfile;
-extern const char *cookiefile;
+extern const char *permissions_file;
 extern const char *forwardfile;
 
 #ifdef USE_IMAGE_LIST
 extern const char *imagefile;
 #endif /* def USE_IMAGE_LIST */
 
-#ifdef KILLPOPUPS
-extern const char *popupfile;
-#endif /* def KILLPOPUPS */
-
 #ifdef TRUST_FILES
 extern const char *trustfile;
 #endif /* def TRUST_FILES */
@@ -94,13 +109,11 @@ extern const char *trustfile;
 extern const char *re_filterfile;
 #endif /* def PCRS */
 
-#ifdef PCRS
-extern int re_filter_all;
-#endif /* def PCRS */
+#ifdef FAST_REDIRECTS
+extern int fast_redirects;
+#endif /* def FAST_REDIRECTS */
 
-#ifdef KILLPOPUPS
-extern int kill_all_popups;     /* Not recommended really .. */
-#endif /* def KILLPOPUPS */
+extern int default_permissions;
 
 #ifdef JAR_FILES
 extern const char *jarfile;
@@ -135,7 +148,7 @@ extern int suppress_blocklists;  /* suppress listing sblock and simage */
 
 extern struct proxy_args proxy_args[1];
 
-extern int configret;
+extern int configret; /* FIXME: This is obsolete, always 0. */
 extern int config_changed;