X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=urlmatch.h;h=8643aa4e71b921323aafd924656657ce3b90b93c;hb=4d563db5b4a18bf40e12047f29572c91f2e2465f;hp=cbf864dee11537d95057c859fb6e9f45dcc37e81;hpb=8c3e4f19001300c07cb076353eba625e4729fdd2;p=privoxy.git

diff --git a/urlmatch.h b/urlmatch.h
index cbf864de..8643aa4e 100644
--- a/urlmatch.h
+++ b/urlmatch.h
@@ -1,6 +1,5 @@
 #ifndef URLMATCH_H_INCLUDED
 #define URLMATCH_H_INCLUDED
-#define URLMATCH_H_VERSION "$Id: urlmatch.h,v 1.17 2011/09/04 11:10:56 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/urlmatch.h,v $
@@ -9,7 +8,7 @@
  *                patterns.
  *
  * Copyright   :  Written by and Copyright (C) 2001-2002, 2006 the
- *                Privoxy team. http://www.privoxy.org/
+ *                Privoxy team. https://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
  *                by and Copyright (C) 1997 Anonymous Coders and
@@ -38,14 +37,8 @@
 
 #include "project.h"
 
-#ifdef __cplusplus
-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);
-#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,
@@ -54,23 +47,19 @@ extern int url_requires_percent_encoding(const char *url);
 
 #define REQUIRE_PROTOCOL 1
 
-extern int url_match(const struct url_spec *pattern,
+extern int url_match(const struct pattern_spec *pattern,
                      const struct http_request *http);
 
-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 */
-extern const char urlmatch_rcs[];
-extern const char urlmatch_h_rcs[];
-
-#ifdef __cplusplus
-} /* extern "C" */
+#ifdef HAVE_PCRE2
+extern int pcre2_pattern_matches(const pcre2_code *pattern, const char *string);
 #endif
 
+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,
+                                      char **username, char **password);
+
 #endif /* ndef URLMATCH_H_INCLUDED */
 
 /*