X-Git-Url: http://www.privoxy.org/gitweb/new.html?a=blobdiff_plain;f=urlmatch.c;h=868a16b3806d94cb65adb251727d90cceac58c6a;hb=8666662f482bbfbb9c8407af506b5b82e2ef0dae;hp=36699fc248471749d14cbd6badea70e78917b8c5;hpb=8ff919206b9740c46e7fe93e01d62f594d14262e;p=privoxy.git
diff --git a/urlmatch.c b/urlmatch.c
index 36699fc2..868a16b3 100644
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -5,7 +5,7 @@
* Purpose : Declares functions to match URLs against URL
* patterns.
*
- * Copyright : Written by and Copyright (C) 2001-2014
+ * Copyright : Written by and Copyright (C) 2001-2020
* the Privoxy team. https://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@ -63,7 +63,7 @@ enum regex_anchoring
RIGHT_ANCHORED_HOST
};
static jb_err compile_vanilla_host_pattern(struct pattern_spec *url, const char *host_pattern);
-#ifdef FEATURE_EXTENDED_HOST_PATTERNS
+#ifdef FEATURE_PCRE_HOST_PATTERNS
static jb_err compile_pcre_host_pattern(struct pattern_spec *url, const char *host_pattern);
#endif
@@ -700,11 +700,11 @@ static jb_err compile_url_pattern(struct pattern_spec *url, char *buf)
{
char *p;
-#ifdef FEATURE_EXTENDED_HOST_PATTERNS
+#ifdef FEATURE_PCRE_HOST_PATTERNS
const size_t prefix_length = 18;
if (strncmpic(buf, "PCRE-HOST-PATTERN:", prefix_length) == 0)
{
- url->pattern.url_spec.host_regex_type = EXTENDED_HOST_PATTERN;
+ url->pattern.url_spec.host_regex_type = PCRE_HOST_PATTERN;
/* Overwrite the "PCRE-HOST-PATTERN:" prefix */
memmove(buf, buf+prefix_length, strlen(buf+prefix_length)+1);
}
@@ -775,8 +775,8 @@ static jb_err compile_url_pattern(struct pattern_spec *url, char *buf)
if (buf[0] != '\0')
{
-#ifdef FEATURE_EXTENDED_HOST_PATTERNS
- if (url->pattern.url_spec.host_regex_type == EXTENDED_HOST_PATTERN)
+#ifdef FEATURE_PCRE_HOST_PATTERNS
+ if (url->pattern.url_spec.host_regex_type == PCRE_HOST_PATTERN)
{
return compile_pcre_host_pattern(url, buf);
}
@@ -792,7 +792,7 @@ static jb_err compile_url_pattern(struct pattern_spec *url, char *buf)
}
-#ifdef FEATURE_EXTENDED_HOST_PATTERNS
+#ifdef FEATURE_PCRE_HOST_PATTERNS
/*********************************************************************
*
* Function : compile_pcre_host_pattern
@@ -812,7 +812,7 @@ static jb_err compile_pcre_host_pattern(struct pattern_spec *url, const char *ho
{
return compile_pattern(host_pattern, RIGHT_ANCHORED_HOST, url, &url->pattern.url_spec.host_regex);
}
-#endif /* def FEATURE_EXTENDED_HOST_PATTERNS */
+#endif /* def FEATURE_PCRE_HOST_PATTERNS */
/*********************************************************************
@@ -1240,13 +1240,13 @@ void free_pattern_spec(struct pattern_spec *pattern)
if (pattern == NULL) return;
freez(pattern->spec);
-#ifdef FEATURE_EXTENDED_HOST_PATTERNS
+#ifdef FEATURE_PCRE_HOST_PATTERNS
if (pattern->pattern.url_spec.host_regex)
{
regfree(pattern->pattern.url_spec.host_regex);
freez(pattern->pattern.url_spec.host_regex);
}
-#endif /* def FEATURE_EXTENDED_HOST_PATTERNS */
+#endif /* def FEATURE_PCRE_HOST_PATTERNS */
freez(pattern->pattern.url_spec.dbuffer);
freez(pattern->pattern.url_spec.dvec);
pattern->pattern.url_spec.dcount = 0;
@@ -1300,8 +1300,8 @@ static int host_matches(const struct http_request *http,
const struct pattern_spec *pattern)
{
assert(http->host != NULL);
-#ifdef FEATURE_EXTENDED_HOST_PATTERNS
- if (pattern->pattern.url_spec.host_regex_type == EXTENDED_HOST_PATTERN) {
+#ifdef FEATURE_PCRE_HOST_PATTERNS
+ if (pattern->pattern.url_spec.host_regex_type == PCRE_HOST_PATTERN) {
return ((NULL == pattern->pattern.url_spec.host_regex)
|| (0 == regexec(pattern->pattern.url_spec.host_regex,
http->host, 0, NULL, 0)));