projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add pcre2 support
[privoxy.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index
7fbcd3a
..
379c5e9
100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-828,8
+828,12
@@
int update_action_bits_for_tag(struct client_state *csp, const char *tag)
continue;
}
continue;
}
+#ifdef HAVE_PCRE2
+ if (pcre2_pattern_matches(b->url->pattern.tag_regex, tag))
+#else
/* and check if one of the tag patterns matches the tag, */
if (0 == regexec(b->url->pattern.tag_regex, tag, 0, NULL, 0))
/* and check if one of the tag patterns matches the tag, */
if (0 == regexec(b->url->pattern.tag_regex, tag, 0, NULL, 0))
+#endif
{
/* if it does, update the action bit map, */
if (merge_current_action(csp->action, b->action))
{
/* if it does, update the action bit map, */
if (merge_current_action(csp->action, b->action))
@@
-884,7
+888,11
@@
jb_err check_negative_tag_patterns(struct client_state *csp, unsigned int flag)
}
for (tag = csp->tags->first; NULL != tag; tag = tag->next)
{
}
for (tag = csp->tags->first; NULL != tag; tag = tag->next)
{
+#ifdef HAVE_PCRE2
+ if (pcre2_pattern_matches(b->url->pattern.tag_regex, tag->str))
+#else
if (0 == regexec(b->url->pattern.tag_regex, tag->str, 0, NULL, 0))
if (0 == regexec(b->url->pattern.tag_regex, tag->str, 0, NULL, 0))
+#endif
{
/*
* The pattern matches at least one tag, thus the action
{
/*
* The pattern matches at least one tag, thus the action