Applied pthread fix by Paul Lieverse

[privoxy.git] / project.h

diff --git a/project.h b/project.h
index 92ee41c..50a7959 100644 (file)
--- a/project.h
+++ b/project.h
@@ -1,6 +1,6 @@
 #ifndef _PROJECT_H
 #define _PROJECT_H
-#define PROJECT_H_VERSION "$Id: project.h,v 1.20 2001/06/29 21:45:41 oes Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.23 2001/07/18 12:32:23 oes Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $
@@ -36,6 +36,20 @@
  *
  * Revisions   :
  *    $Log: project.h,v $
+ *    Revision 1.23  2001/07/18 12:32:23  oes
+ *    - Added ACTION_STRING_DEANIMATE
+ *    - moved #define freez from jcc.h to project.h
+ *
+ *    Revision 1.22  2001/07/15 17:51:41  jongfoster
+ *    Renaming #define STATIC to STATIC_PCRE
+ *
+ *    Revision 1.21  2001/07/13 14:03:19  oes
+ *     - Reorganized regex header inclusion and #defines to
+ *       comply to the scheme in configure.in
+ *     - Added csp->content_type and its CT_* keys
+ *     - Added ACTION_DEANIMATE
+ *     - Removed all #ifdef PCRS
+ *
  *    Revision 1.20  2001/06/29 21:45:41  oes
  *    Indentation, CRLF->LF, Tab-> Space
  *
@@ -224,7 +238,7 @@
 # define REGEX
 #endif /* defined(REGEX_PCRE) || defined (REGEX_GNU) */
 
-#ifdef STATIC
+#ifdef STATIC_PCRE
 #  include "pcre.h"
 #else
 #  include <pcre.h>
@@ -237,7 +251,7 @@
 #endif
 
 #if defined(REGEX_PCRE)
-#  ifdef STATIC
+#  ifdef STATIC_PCRE
 #    include "pcreposix.h"
 #  else
 #    include <pcreposix.h>
@@ -256,6 +270,8 @@
 extern "C" {
 #endif
 
+#define freez(X)  if(X) free(X); X = NULL
+
 #define BUFFER_SIZE 5000
 
 #define FOREVER 1
@@ -294,6 +310,7 @@ struct http_request
    char *ver;
    char *hostport; /* "host[:port]" */
    int   ssl;
+   char *user_agent; /* Client's User-Agent: header value */
 };
 
 /* Response generated by CGI, blocker, or error handler */
@@ -333,11 +350,11 @@ struct url_spec
 #endif
 };
 
+/* Constants for host part matching in URLs */
 #define ANCHOR_LEFT  1
 #define ANCHOR_RIGHT 2
 
 
-
 /* An I/O buffer */
 struct iob
 {
@@ -373,11 +390,13 @@ struct iob
 #define ACTION_NO_POPUPS       0x0800U
 #define ACTION_VANILLA_WAFER   0x1000U
 
-#define ACTION_STRING_FROM          0
-#define ACTION_STRING_IMAGE_BLOCKER 1
-#define ACTION_STRING_REFERER       2
-#define ACTION_STRING_USER_AGENT    3
-#define ACTION_STRING_COUNT         4
+#define ACTION_STRING_DEANIMATE     0
+#define ACTION_STRING_FROM          1
+#define ACTION_STRING_IMAGE_BLOCKER 2
+#define ACTION_STRING_REFERER       3
+#define ACTION_STRING_USER_AGENT    4
+#define ACTION_STRING_COUNT         5
+
 
 #define ACTION_MULTI_ADD_HEADER     0
 #define ACTION_MULTI_WAFER          1
@@ -654,6 +673,8 @@ struct forward_spec
 
 struct re_filterfile_spec
 {
+   char *username;
+   char *filtername;
    struct list patterns[1];
    pcrs_job *joblist;
 };