From c54018b07a9085c0a3aedbc2bd01a85a3b3e20cf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 25 May 2024 06:41:27 +0200 Subject: Merging upstream version 2.4.59. Signed-off-by: Daniel Baumann --- server/util_regex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'server/util_regex.c') diff --git a/server/util_regex.c b/server/util_regex.c index 2a30d68..5405f8d 100644 --- a/server/util_regex.c +++ b/server/util_regex.c @@ -94,6 +94,7 @@ AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool, } /* anything after the current delimiter is flags */ + ret->flags = ap_regcomp_get_default_cflags() & AP_REG_DOLLAR_ENDONLY; while (*++endp) { switch (*endp) { case 'i': ret->flags |= AP_REG_ICASE; break; @@ -106,7 +107,7 @@ AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool, default: break; /* we should probably be stricter here */ } } - if (ap_regcomp(&ret->rx, rxstr, ret->flags) == 0) { + if (ap_regcomp(&ret->rx, rxstr, AP_REG_NO_DEFAULT | ret->flags) == 0) { apr_pool_cleanup_register(pool, &ret->rx, rxplus_cleanup, apr_pool_cleanup_null); } -- cgit v1.2.3