X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=urlmatch.h;h=74948560149c0ee3951ebab79d358889b741cada;hp=b83ae721d961a1eeb25facee0950d38c9eeaae65;hb=54b4e8c141117d636f6113ec4c43579248b77ed7;hpb=8fe6bb275095d03b4dc1c68edf2dd72babf56428

diff --git a/urlmatch.h b/urlmatch.h
index b83ae721..74948560 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.10 2008/04/14 18:11:21 fabiankeil Exp $"
+#define URLMATCH_H_VERSION "$Id: urlmatch.h,v 1.15 2009/05/16 13:27:20 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/urlmatch.h,v $
@@ -33,58 +33,8 @@
  *                or write to the Free Software Foundation, Inc., 59
  *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * Revisions   :
- *    $Log: urlmatch.h,v $
- *    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.
- *
- *    Revision 1.7  2007/01/06 14:24:38  fabiankeil
- *    Mark *csp as immutable for parse_http_url()
- *    and url_match().
- *
- *    Revision 1.6  2006/12/06 19:12:43  fabiankeil
- *    Added prototype for init_domain_components().
- *
- *    Revision 1.5  2006/07/18 14:48:47  david__schmidt
- *    Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
- *    with what was really the latest development (the v_3_0_branch branch)
- *
- *    Revision 1.3  2002/03/26 22:29:55  swa
- *    we have a new homepage!
- *
- *    Revision 1.2  2002/03/24 13:25:43  swa
- *    name change related issues
- *
- *    Revision 1.1  2002/01/17 20:53:46  jongfoster
- *    Moving all our URL and URL pattern parsing code to the same file - it
- *    was scattered around in filters.c, loaders.c and parsers.c.
- *
- *    Providing a single, simple url_match(pattern,url) function - rather than
- *    the 3-line match routine which was repeated all over the place.
- *
- *    Renaming free_url to free_url_spec, since it frees a struct url_spec.
- *
- *    Providing parse_http_url() so that URLs can be parsed without faking a
- *    HTTP request line for parse_http_request() or repeating the parsing
- *    code (both of which were techniques that were actually in use).
- *
- *    Standardizing that struct http_request is used to represent a URL, and
- *    struct url_spec is used to represent a URL pattern.  (Before, URLs were
- *    represented as seperate variables and a partially-filled-in url_spec).
- *
- *
  *********************************************************************/
-
+
 
 #include "project.h"
 
@@ -93,11 +43,14 @@ extern "C" {
 #endif
 
 extern void free_http_request(struct http_request *http);
+#ifndef FEATURE_EXTENDED_HOST_PATTERNS
 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, struct http_request *http);
+#endif
+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,
+                             int require_protocol);
+#define REQUIRE_PROTOCOL 1
 
 extern int url_match(const struct url_spec *pattern,
                      const struct http_request *http);
@@ -105,6 +58,7 @@ extern int url_match(const struct url_spec *pattern,
 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 */