www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-07-01 07:01:42 +03:00
Code Activity

Follow up to r1873941: define AP_REG_NO_DEFAULT for raw ap_regcomp() usage.

Browse Source 
This avoids having to define AP_REG_NO_* for each APR_REG_* specific option,
thus replacing AP_REG_NO_DOTALL introduced lately.

For ap_rxplus_compile() and mod_substitute where default AP_REG_DOTALL is not
suitable, let's use:
    AP_REG_NO_DEFAULT | ap_regcomp_get_default_cflags() & AP_REG_DOLLAR_ENDONLY
to keep the default AP_REG_DOLLAR_ENDONLY unless RegexDefaultOptions unsets it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1874090 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2020-02-16 23:08:32 +00:00
parent e957c6ddc9
commit c8f486d716
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/ap_regex.h
View File

@ -87,7 +87,7 @@ extern "C" {
#define AP_REG_DOLLAR_ENDONLY 0x200 /**< '$' matches at end of subject string only */
#define AP_REG_NO_DOTALL 0x400 /**< remove AP_REG_DOTALL from defaults */
#define AP_REG_NO_DEFAULT 0x400 /**< Don't implicitely add AP_REG_DEFAULT options */
#define AP_REG_MATCH "MATCH_" /**< suggested prefix for ap_regname */