X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=urlmatch.h;h=35befbddb4047a8380ed940fd4bcd84719dcfb5c;hp=0056407f1a9e1703cd8db3c1416236dfdc5150a3;hb=138747bd3f178c448de25dce2ca1d90de6e0f6cb;hpb=591a3d86f6b0c6fd35067560fc94c1a71b4ddd21

diff --git a/urlmatch.h b/urlmatch.h
index 0056407f..35befbdd 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.6 2006/12/06 19:12:43 fabiankeil Exp $"
+#define URLMATCH_H_VERSION "$Id: urlmatch.h,v 1.20 2013/11/24 14:23:28 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/urlmatch.h,v $
@@ -8,14 +8,14 @@
  * Purpose     :  Declares functions to match URLs against URL
  *                patterns.
  *
- * Copyright   :  Written by and Copyright (C) 2001-2002, 2006 the SourceForge
+ * Copyright   :  Written by and Copyright (C) 2001-2002, 2006 the
  *                Privoxy team. http://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
- *                by and Copyright (C) 1997 Anonymous Coders and 
+ *                by and Copyright (C) 1997 Anonymous Coders and
  *                Junkbusters Corporation.  http://www.junkbusters.com
  *
- *                This program is free software; you can redistribute it 
+ *                This program is free software; you can redistribute it
  *                and/or modify it under the terms of the GNU General
  *                Public License as published by the Free Software
  *                Foundation; either version 2 of the License, or (at
@@ -33,72 +33,36 @@
  *                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.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"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "project.h"
 
 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,
+#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,
-                             const struct client_state *csp);
+                             int require_protocol);
+extern int url_requires_percent_encoding(const char *url);
+
+#define REQUIRE_PROTOCOL 1
 
-extern int url_match(const struct url_spec *pattern,
-                     const struct http_request *url);
+extern int url_match(const struct pattern_spec *pattern,
+                     const struct http_request *http);
 
-extern jb_err create_url_spec(struct url_spec * url, const char * buf);
-extern void free_url_spec(struct url_spec *url);
+extern jb_err create_pattern_spec(struct pattern_spec *url, char *buf);
+extern void free_pattern_spec(struct pattern_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 */
 extern const char urlmatch_rcs[];
 extern const char urlmatch_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef URLMATCH_H_INCLUDED */
 
 /*