Tidying up #defines:

- All feature #defines are now of the form FEATURE_xxx
- Permanently turned off WIN_GUI_EDIT
- Permanently turned on WEBDAV and SPLIT_PROXY_ARGS

diff --git a/config.h.win b/config.h.win
index 728f52b..797882d 100755 (executable)
--- a/config.h.win
+++ b/config.h.win
@@ -39,6 +39,9 @@
  *
  * Revisions   :
  *    $Log: config.h.win,v $
  *
  * Revisions   :
  *    $Log: config.h.win,v $

+ *    Revision 1.8  2001/07/25 19:16:27  oes
+ *    Bumping version number to 2.9.8
+ *

  *    Revision 1.7  2001/07/21 18:00:07  jongfoster
  *    Bumping version number to 2.9.7
  *
  *    Revision 1.7  2001/07/21 18:00:07  jongfoster
  *    Bumping version number to 2.9.7
  *


@@ -203,58 +206,72 @@
  */
 #define STATIC_PCRS 1
 
  */
 #define STATIC_PCRS 1
 

+

 /*
 /*

- * Allow JunkBuster to be "disabled" so it is just a normal non-blocking
- * non-anonymizing proxy.  This is useful if you're trying to access a
- * blocked or broken site - just change the setting in the config file
- * and send a SIGHUP (UN*X), or use the handy "Disable" menu option (Windows
- * GUI).
+ * Regular expression matching for URLs.  (Highly recommended).
+ * If neither of these are defined then you can ony use prefix matching.
+ * Don't bother to change this here! Use configure instead.

  */
  */

-#define TOGGLE 1
+/* #undef REGEX_GNU */
+#define REGEX_PCRE 1

 
 

-/*
- * If a stream is compressed via gzip (Netscape specific I think), then
- * it cannot be modified with Perl regexps.  This forces it to be 
- * uncompressed.
+/* 
+ * 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.
+ * Don't bother to change this here! Use configure instead.
+ */
+#define STATIC_PCRE 1
+
+/* 
+ * 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).
+ * Don't bother to change this here! Use configure instead.

  */
  */

-#define DENY_GZIP 1
+#define STATIC_PCRS 1

 
 /*
 
 /*

- * Enables statistics function.
+ * Allows the use of an ACL to control access to the proxy by IP address.

  */
  */

-#define STATISTICS 1
+#define FEATURE_ACL 1

 
 /*
 
 /*

- * Bypass filtering for 1 page only
+ * Allows the use of jar files to capture cookies.

  */
  */

-#define FORCE_LOAD 1
+#define FEATURE_COOKIE_JAR 1

 
 /*
 
 /*

- * Locally redirect remote script-redirect URLs
+ * If a stream is compressed via gzip, then it cannot be filtered through
+ * the PCRE regexps.  (Commonly happens with Netscape browsers).
+ * This forces it to be uncompressed.

  */
  */

-#define FAST_REDIRECTS 1
+/* #undef FEATURE_DENY_GZIP */

 
 /*
 
 /*

- * Split the show-proxy-args page into a page for each config file.
+ * Locally redirect remote script-redirect URLs

  */
  */

-#define SPLIT_PROXY_ARGS 1
+#define FEATURE_FAST_REDIRECTS 1

 
 /*
 
 /*

- * Kills JavaScript popups - window.open, onunload, etc.
+ * Bypass filtering for 1 page only

  */
  */

-#define KILLPOPUPS 1
+#define FEATURE_FORCE_LOAD 1

 
 /*
 
 /*

- * Support for webDAV - e.g. so Microsoft Outlook can access HotMail e-mail
+ * 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.

  */
  */

-#define WEBDAV 1
+#define FEATURE_IMAGE_BLOCKING 1

 
 /*
  * Detect image requests automatically for MSIE.  Will fall back to
  * other image-detection methods (i.e. "+image" permission) for other
  * browsers.
  *
 
 /*
  * 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 IMAGE_BLOCKING to use this feature.
+ * You must also define FEATURE_IMAGE_BLOCKING to use this feature.

  *
  * It detects the following header pair as an image request:
  *
  *
  * It detects the following header pair as an image request:
  *


@@ -279,35 +296,35 @@
  * These limitations are due to IE making inconsistent choices
  * about which "Accept:" header to send.
  */
  * These limitations are due to IE making inconsistent choices
  * about which "Accept:" header to send.
  */

-#define DETECT_MSIE_IMAGES 1
+#define FEATURE_IMAGE_DETECT_MSIE 1

 
 /*
 
 /*

- * 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 DETECT_MSIE_IMAGES.
+ * Kills JavaScript popups - window.open, onunload, etc.

  */
  */

-#define IMAGE_BLOCKING 1
+#define FEATURE_KILL_POPUPS 1

 
 /*
 
 /*

- * Allows the use of ACL files to control access to the proxy by IP address.
+ * Use POSIX threads instead of native threads.

  */
  */

-#define ACL_FILES 1
+#define FEATURE_PTHREAD 1

 
 /*
 
 /*

- * Allows the use of trust files.
+ * Enables statistics function.

  */
  */

-#define TRUST_FILES 1
+#define FEATURE_STATISTICS 1

 
 /*
 
 /*

- * Allows the use of jar files to capture cookies.
+ * Allow JunkBuster to be "disabled" so it is just a normal non-blocking
+ * non-anonymizing proxy.  This is useful if you're trying to access a
+ * blocked or broken site - just change the setting in the config file,
+ * or use the handy "Disable" menu option in the Windows GUI.

  */
  */

-#define JAR_FILES 1
+#define FEATURE_TOGGLE 1

 
 /*
 
 /*

- * Use POSIX threads instead of native threads.
+ * Allows the use of trust files.

  */
  */

-#define FEATURE_PTHREAD 1
+#define FEATURE_TRUST 1

 
 /* Define if you have the bcopy function.  */
 #define HAVE_BCOPY 1
 
 /* Define if you have the bcopy function.  */
 #define HAVE_BCOPY 1

diff --git a/config.h.win32threads.win b/config.h.win32threads.win
index bb89bd7..f45d0e6 100644 (file)
--- a/config.h.win32threads.win
+++ b/config.h.win32threads.win
@@ -39,6 +39,9 @@
  *
  * Revisions   :
  *    $Log: config.h.win32threads.win,v $
  *
  * Revisions   :
  *    $Log: config.h.win32threads.win,v $

+ *    Revision 1.3  2001/07/25 19:16:27  oes
+ *    Bumping version number to 2.9.8
+ *

  *    Revision 1.2  2001/07/21 18:00:07  jongfoster
  *    Bumping version number to 2.9.7
  *
  *    Revision 1.2  2001/07/21 18:00:07  jongfoster
  *    Bumping version number to 2.9.7
  *


@@ -210,51 +213,41 @@
  * and send a SIGHUP (UN*X), or use the handy "Disable" menu option (Windows
  * GUI).
  */
  * and send a SIGHUP (UN*X), or use the handy "Disable" menu option (Windows
  * GUI).
  */

-#define TOGGLE 1
+#define FEATURE_TOGGLE 1

 
 /*
  * If a stream is compressed via gzip (Netscape specific I think), then
  * it cannot be modified with Perl regexps.  This forces it to be 
  * uncompressed.
  */
 
 /*
  * If a stream is compressed via gzip (Netscape specific I think), then
  * it cannot be modified with Perl regexps.  This forces it to be 
  * uncompressed.
  */

-#define DENY_GZIP 1
+#define FEATURE_DENY_GZIP 1

 
 /*
  * Enables statistics function.
  */
 
 /*
  * Enables statistics function.
  */

-#define STATISTICS 1
+#define FEATURE_STATISTICS 1

 
 /*
  * Bypass filtering for 1 page only
  */
 
 /*
  * Bypass filtering for 1 page only
  */

-#define FORCE_LOAD 1
+#define FEATURE_FORCE_LOAD 1

 
 /*
  * Locally redirect remote script-redirect URLs
  */
 
 /*
  * Locally redirect remote script-redirect URLs
  */

-#define FAST_REDIRECTS 1
-
-/*
- * Split the show-proxy-args page into a page for each config file.
- */
-#define SPLIT_PROXY_ARGS 1
+#define FEATURE_FAST_REDIRECTS 1

 
 /*
  * Kills JavaScript popups - window.open, onunload, etc.
  */
 
 /*
  * Kills JavaScript popups - window.open, onunload, etc.
  */

-#define KILLPOPUPS 1
-
-/*
- * Support for webDAV - e.g. so Microsoft Outlook can access HotMail e-mail
- */
-#define WEBDAV 1
+#define FEATURE_KILL_POPUPS 1

 
 /*
  * Detect image requests automatically for MSIE.  Will fall back to
  * other image-detection methods (i.e. "+image" permission) for other
  * browsers.
  *
 
 /*
  * 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 IMAGE_BLOCKING to use this feature.
+ * You must also define FEATURE_IMAGE_BLOCKING to use this feature.

  *
  * It detects the following header pair as an image request:
  *
  *
  * It detects the following header pair as an image request:
  *


@@ -279,7 +272,7 @@
  * These limitations are due to IE making inconsistent choices
  * about which "Accept:" header to send.
  */
  * These limitations are due to IE making inconsistent choices
  * about which "Accept:" header to send.
  */

-#define DETECT_MSIE_IMAGES 1
+#define FEATURE_IMAGE_DETECT_MSIE 1

 
 /*
  * Allow blocking using images as well as HTML.
 
 /*
  * Allow blocking using images as well as HTML.


@@ -287,22 +280,22 @@
  *
  * Note that this is required if you want to use DETECT_MSIE_IMAGES.
  */
  *
  * Note that this is required if you want to use DETECT_MSIE_IMAGES.
  */

-#define IMAGE_BLOCKING 1
+#define FEATURE_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.
  */

-#define ACL_FILES 1
+#define FEATURE_ACL 1

 
 /*
  * Allows the use of trust files.
  */
 
 /*
  * Allows the use of trust files.
  */

-#define TRUST_FILES 1
+#define FEATURE_TRUST 1

 
 /*
  * Allows the use of jar files to capture cookies.
  */
 
 /*
  * Allows the use of jar files to capture cookies.
  */

-#define JAR_FILES 1
+#define FEATURE_COOKIE_JAR 1

 
 /*
  * Use POSIX threads instead of native threads.
 
 /*
  * Use POSIX threads instead of native threads.

diff --git a/w32.rc b/w32.rc
index 03525f0..2f3a291 100644 (file)
--- a/w32.rc
+++ b/w32.rc
@@ -31,6 +31,9 @@
  *
  * Revisions   :
  *    $Log: w32.rc,v $
  *
  * Revisions   :
  *    $Log: w32.rc,v $

+ *    Revision 1.11  2001/07/21 17:53:41  jongfoster
+ *    Adding version information block.
+ *

  *    Revision 1.10  2001/07/19 19:14:19  haroon
  *    -  Removed all #ifdef PCRS. The .rc file extension had eluded Andreas.
  *
  *    Revision 1.10  2001/07/19 19:14:19  haroon
  *    -  Removed all #ifdef PCRS. The .rc file extension had eluded Andreas.
  *


@@ -207,14 +210,14 @@ BEGIN
             MENUITEM                                SEPARATOR
             MENUITEM "&Actions...",                 ID_TOOLS_EDITACTIONS
             MENUITEM "Perl &Regexps...",            ID_TOOLS_EDITPERLRE
             MENUITEM                                SEPARATOR
             MENUITEM "&Actions...",                 ID_TOOLS_EDITACTIONS
             MENUITEM "Perl &Regexps...",            ID_TOOLS_EDITPERLRE

-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST

             MENUITEM "&Trust...",                   ID_TOOLS_EDITTRUST
             MENUITEM "&Trust...",                   ID_TOOLS_EDITTRUST

-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */

         END
         MENUITEM                              SEPARATOR
         END
         MENUITEM                              SEPARATOR

-#ifdef TOGGLE
+#ifdef FEATURE_TOGGLE

         MENUITEM "&Enable",                   ID_TOGGLE_IJB, CHECKED
         MENUITEM "&Enable",                   ID_TOGGLE_IJB, CHECKED

-#endif
+#endif /* def FEATURE_TOGGLE */

         MENUITEM "Show &JunkBuster Window",   ID_SHOWWINDOW
     END
 END
         MENUITEM "Show &JunkBuster Window",   ID_SHOWWINDOW
     END
 END


@@ -240,17 +243,17 @@ BEGIN
     END
     POPUP "&Options"
     BEGIN
     END
     POPUP "&Options"
     BEGIN

-#ifdef TOGGLE
+#ifdef FEATURE_TOGGLE

         MENUITEM "&Enable",                     ID_TOGGLE_IJB, CHECKED
         MENUITEM                                SEPARATOR
         MENUITEM "&Enable",                     ID_TOGGLE_IJB, CHECKED
         MENUITEM                                SEPARATOR

-#endif
+#endif /* def FEATURE_TOGGLE */

         MENUITEM "&Configuration...",           ID_TOOLS_EDITJUNKBUSTER
         MENUITEM                                SEPARATOR
         MENUITEM "&Actions...",                 ID_TOOLS_EDITACTIONS
             MENUITEM "Perl &Regexps...",        ID_TOOLS_EDITPERLRE
         MENUITEM "&Configuration...",           ID_TOOLS_EDITJUNKBUSTER
         MENUITEM                                SEPARATOR
         MENUITEM "&Actions...",                 ID_TOOLS_EDITACTIONS
             MENUITEM "Perl &Regexps...",        ID_TOOLS_EDITPERLRE

-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST

             MENUITEM "&Trust...",               ID_TOOLS_EDITTRUST
             MENUITEM "&Trust...",               ID_TOOLS_EDITTRUST

-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */

     END
     POPUP "&Help"
     BEGIN
     END
     POPUP "&Help"
     BEGIN


@@ -282,72 +285,4 @@ BEGIN
     "C",            ID_EDIT_COPY,           VIRTKEY, CONTROL, NOINVERT
 END
 
     "C",            ID_EDIT_COPY,           VIRTKEY, CONTROL, NOINVERT
 END
 

-#ifdef WIN_GUI_EDIT
-
-/*
- * Icons
- *
- * Icon with lowest ID value placed first to ensure application icon
- * remains consistent on all systems.
- */
-IDI_DENYRULE            ICON    DISCARDABLE     "icons/denyrule.ico"
-IDI_ALLOWRULE           ICON    DISCARDABLE     "icons/icon1.ico"
-
-/*
- * Dialog
- */
-
-IDD_RULES DIALOG DISCARDABLE  0, 0, 239, 225
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Blockers"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "New Rule",IDC_STATIC,5,5,230,55
-    LTEXT           "For:",IDC_STATIC,10,15,13,8
-    EDITTEXT        IDC_NEW,10,25,220,12,ES_AUTOHSCROLL
-    COMBOBOX        IDC_ACTION,10,40,75,37,CBS_DROPDOWNLIST | CBS_SORT |
-                    WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "C&reate!",IDC_CREATE,90,40,50,14
-    GROUPBOX        "Rules",IDC_STATIC,5,65,230,135
-    CONTROL         "List1",IDC_RULES,"SysListView32",LVS_REPORT |
-                    LVS_SHOWSELALWAYS | LVS_EDITLABELS | WS_BORDER |
-                    WS_TABSTOP,10,75,220,100
-    PUSHBUTTON      "Move &Up",IDC_MOVEUP,10,180,50,14,WS_DISABLED
-    PUSHBUTTON      "Move &Down",IDC_MOVEDOWN,65,180,50,14,WS_DISABLED
-    PUSHBUTTON      "&Delete",IDC_DELETE,120,180,50,14,WS_DISABLED
-    PUSHBUTTON      "&Save",IDC_SAVE,130,205,50,14
-    PUSHBUTTON      "&Cancel",IDCANCEL,185,205,50,14
-END
-
-
-/*
- * DESIGNINFO
- */
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
-BEGIN
-    IDD_RULES, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 232
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 218
-    END
-END
-#endif /* def APSTUDIO_INVOKED */
-
-
-/*
- * String Table
- */
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_NEW_BLOCKER         "Create rule for ""%s""..."
-END
-
-
-#endif /* def WIN_GUI_EDIT */
-

 #endif /* English (U.S.) resources */
 #endif /* English (U.S.) resources */