X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=urlmatch.h;h=254d52fcc09f004136e0cc244890a8bed7527c25;hp=8f55e6d528a944e422ec7223d1d8d636b0336648;hb=cf89cd7ace9007341dc8835f4b9c818dfb831666;hpb=11050ad03e957405c4ee436b28ead7b12e98bf25 diff --git a/urlmatch.h b/urlmatch.h index 8f55e6d5..254d52fc 100644 --- a/urlmatch.h +++ b/urlmatch.h @@ -1,6 +1,6 @@ #ifndef URLMATCH_H_INCLUDED #define URLMATCH_H_INCLUDED -#define URLMATCH_H_VERSION "$Id: urlmatch.h,v 1.8 2007/09/02 15:31:20 fabiankeil Exp $" +#define URLMATCH_H_VERSION "$Id: urlmatch.h,v 1.13 2009/03/02 19:18:11 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/urlmatch.h,v $ @@ -35,6 +35,26 @@ * * Revisions : * $Log: urlmatch.h,v $ + * Revision 1.13 2009/03/02 19:18:11 fabiankeil + * Streamline parse_http_request()'s prototype. As + * cparser pointed out it doesn't actually use csp. + * + * Revision 1.12 2008/05/04 16:18:32 fabiankeil + * Provide parse_http_url() with a third parameter to specify + * whether or not URLs without protocol are acceptable. + * + * Revision 1.11 2008/05/04 13:30:55 fabiankeil + * Streamline parse_http_url()'s prototype. + * + * Revision 1.10 2008/04/14 18:11:21 fabiankeil + * The compiler might not notice it, but the buffer passed to + * create_url_spec() is modified later on and thus shouldn't + * be declared immutable. + * + * Revision 1.9 2008/04/08 16:07:39 fabiankeil + * Make it harder to mistake url_match()'s + * second parameter for an url_spec. + * * Revision 1.8 2007/09/02 15:31:20 fabiankeil * Move match_portlist() from filter.c to urlmatch.c. * It's used for url matching, not for filtering. @@ -85,19 +105,19 @@ extern "C" { extern void free_http_request(struct http_request *http); extern jb_err init_domain_components(struct http_request *http); -extern jb_err parse_http_request(const char *req, - struct http_request *http, - const struct client_state *csp); -extern jb_err parse_http_url(const char * url, +extern jb_err parse_http_request(const char *req, struct http_request *http); +extern jb_err parse_http_url(const char *url, struct http_request *http, - const struct client_state *csp); + int require_protocol); +#define REQUIRE_PROTOCOL 1 extern int url_match(const struct url_spec *pattern, const struct http_request *http); -extern jb_err create_url_spec(struct url_spec * url, const char * buf); +extern jb_err create_url_spec(struct url_spec *url, char *buf); extern void free_url_spec(struct url_spec *url); extern int match_portlist(const char *portlist, int port); +extern jb_err parse_forwarder_address(char *address, char **hostname, int *port); /* Revision control strings from this header and associated .c file */