X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=project.h;h=9c24d57eb6e0dad2796754a8180d3042da8918d6;hp=efc2400edc27916e7801e59f67ed0a30e30107e9;hb=9aa4205dbe851eea7d5801a58191fcb78d71518d;hpb=eb7d670180a9e22a4a1581c5b29825a5ece9d18f diff --git a/project.h b/project.h index efc2400e..9c24d57e 100644 --- a/project.h +++ b/project.h @@ -1,7 +1,7 @@ #ifndef PROJECT_H_INCLUDED #define PROJECT_H_INCLUDED /** Version string. */ -#define PROJECT_H_VERSION "$Id: project.h,v 1.98 2007/07/14 07:31:26 fabiankeil Exp $" +#define PROJECT_H_VERSION "$Id: project.h,v 1.100 2007/09/02 13:42:11 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/project.h,v $ @@ -37,6 +37,16 @@ * * Revisions : * $Log: project.h,v $ + * Revision 1.100 2007/09/02 13:42:11 fabiankeil + * - Allow port lists in url patterns. + * - Ditch unused url_spec member pathlen. + * + * Revision 1.99 2007/07/21 11:51:36 fabiankeil + * As Hal noticed, checking dispatch_cgi() as the last cruncher + * looks like a bug if CGI requests are blocked unintentionally, + * so don't do it unless the user enabled the new config option + * "allow-cgi-request-crunching". + * * Revision 1.98 2007/07/14 07:31:26 fabiankeil * Add new csp->content_type flag (CT_DECLARED). * @@ -894,10 +904,9 @@ struct url_spec int dcount; /**< How many parts to this domain? (length of dvec) */ int unanchored; /**< Bitmap - flags are ANCHOR_LEFT and ANCHOR_RIGHT. */ - int port; /**< The port number, or 0 to match all ports. */ + char *port_list; /**< List of acceptable ports, or NULL to match all ports */ - char *path; /**< The source for the regex. */ - size_t pathlen; /**< ==strlen(path). Needed for prefix matching. FIXME: Now obsolete? */ + char *path; /**< The source for the regex. */ regex_t *preg; /**< Regex for matching path part */ regex_t *tag_regex; /**< Regex for matching tags */ }; @@ -905,7 +914,7 @@ struct url_spec /** * If you declare a static url_spec, this is the value to initialize it to zero. */ -#define URL_SPEC_INITIALIZER { NULL, NULL, NULL, 0, 0, 0, NULL, 0, NULL, NULL } +#define URL_SPEC_INITIALIZER { NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL } /** * Constant for host part matching in URLs. If set, indicates that the start of @@ -1318,9 +1327,6 @@ struct client_state /** MIME-Type key, see CT_* above */ unsigned int content_type; - /** The "X-Forwarded-For:" header sent by the client */ - char *x_forwarded; - /** Actions files associated with this client */ struct file_list *actions_list[MAX_AF_FILES];