X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=actions.c;h=379c5e97b4ad6ad807960aaafd17fc797dc29163;hb=53748ca8ca3c893025be34dd4f104546fcbd0602;hp=a80ee64651fe9def54be007f89d485f52de9d24a;hpb=ea453e40281809c7e6f4bdfcc9c46969289226cf;p=privoxy.git diff --git a/actions.c b/actions.c index a80ee646..379c5e97 100644 --- a/actions.c +++ b/actions.c @@ -828,8 +828,12 @@ int update_action_bits_for_tag(struct client_state *csp, const char *tag) 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)) +#endif { /* 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) { +#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)) +#endif { /* * The pattern matches at least one tag, thus the action @@ -1115,6 +1123,8 @@ static const char *filter_type_to_string(enum filter_type filter_type) return "suppress tag filter"; case FT_CLIENT_BODY_FILTER: return "client body filter"; + case FT_CLIENT_BODY_TAGGER: + return "client body tagger"; case FT_ADD_HEADER: return "add-header action"; #ifdef FEATURE_EXTERNAL_FILTERS