summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2024-01-16 17:56:58 +0100
committerYann Ylavic <ylavic@apache.org>2024-01-16 17:56:58 +0100
commit97a18733327438ac52ac13b2904e4319dca5ce0d (patch)
tree185e6edb9b0717a1567fa8bb48fc62c80f4f60c5 /server
parentregex: Add ap_regexec_ex() which can take a starting offset to match from. (diff)
downloadapache2-97a18733327438ac52ac13b2904e4319dca5ce0d.tar.xz
apache2-97a18733327438ac52ac13b2904e4319dca5ce0d.zip
regex: Add AP_REG_NOTEMPTY_ATSTART maching option.
* include/ap_mmn.h: Bump MMN minor. * include/ap_regex.h: Define AP_REG_NOTEMPTY_ATSTART bit. * server/util_pcre.c(ap_regexec_ex): Map AP_REG_NOTEMPTY_ATSTART to native PCRE_NOTEMPTY_ATSTART. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915268 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
-rw-r--r--server/util_pcre.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/server/util_pcre.c b/server/util_pcre.c
index da85c2da5d..f8817d2896 100644
--- a/server/util_pcre.c
+++ b/server/util_pcre.c
@@ -491,6 +491,8 @@ AP_DECLARE(int) ap_regexec_ex(const ap_regex_t *preg,
options |= PCREn(NOTEOL);
if ((eflags & AP_REG_NOTEMPTY) != 0)
options |= PCREn(NOTEMPTY);
+ if ((eflags & AP_REG_NOTEMPTY_ATSTART) != 0)
+ options |= PCREn(NOTEMPTY_ATSTART);
if ((eflags & AP_REG_ANCHORED) != 0)
options |= PCREn(ANCHORED);