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

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

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index cff2ba7bdae7e1737f7ceaa6c650870baeb414df..b48d29dc9be05cea33c5a14fe8be7cf2566bdb29 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -620,7 +620,7 @@
  * 20190312.6 (2.5.1-dev)  Add proxy check_trans hook
  * 20190312.7 (2.5.1-dev)  AP_REG_DEFAULT macro in ap_regex.h
  * 20190312.8 (2.5.1-dev)  ap_is_chunked() in httpd.h
- * 20190312.9 (2.5.1-dev)  AP_REG_NO_DOTALL macro in ap_regex.h
+ * 20190312.9 (2.5.1-dev)  AP_REG_NO_DEFAULT macro in ap_regex.h
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */

diff --git a/include/ap_regex.h b/include/ap_regex.h
index 62a3eb287540685e0edf823e307fe1f42c499615..72c3743e8773bc8ef528f716e746c73f06a20e9a 100644 (file)
--- a/include/ap_regex.h
+++ b/include/ap_regex.h
@@ -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 */
 

diff --git a/modules/filters/mod_substitute.c b/modules/filters/mod_substitute.c
index 29e05b05ba81c2e93def320391787eb091be833e..efbdffc4049c88ea5e9d915e373eb465f70b778c 100644 (file)
--- a/modules/filters/mod_substitute.c
+++ b/modules/filters/mod_substitute.c
@@ -716,8 +716,10 @@ static const char *set_pattern(cmd_parms *cmd, void *cfg, const char *line)
 
     /* first see if we can compile the regex */
     if (!is_pattern) {
-        r = ap_pregcomp(cmd->pool, from, AP_REG_NO_DOTALL | AP_REG_EXTENDED |
-                        (ignore_case ? AP_REG_ICASE : 0));
+        int flags = AP_REG_NO_DEFAULT
+                    | (ap_regcomp_get_default_cflags() & AP_REG_DOLLAR_ENDONLY)
+                    | (ignore_case ? AP_REG_ICASE : 0);
+        r = ap_pregcomp(cmd->pool, from, flags);
         if (!r)
             return "Substitute could not compile regex";
     }

diff --git a/server/util_pcre.c b/server/util_pcre.c
index 3fb3b3ba17615af413e67275ff7000be265fbfa7..fedf6e6c75c47ba3afa6d1b6d358d2acde83f894 100644 (file)
--- a/server/util_pcre.c
+++ b/server/util_pcre.c
@@ -179,9 +179,6 @@ AP_DECLARE(int) ap_regcomp_default_cflag_by_name(const char *name)
     else if (ap_cstr_casecmp(name, "DOTALL") == 0) {
         cflag = AP_REG_DOTALL;
     }
-    else if (ap_cstr_casecmp(name, "NO_DOTALL") == 0) {
-        cflag = AP_REG_NO_DOTALL;
-    }
     else if (ap_cstr_casecmp(name, "DOLLAR_ENDONLY") == 0) {
         cflag = AP_REG_DOLLAR_ENDONLY;
     }
@@ -213,15 +210,15 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t * preg, const char *pattern, int cflags)
     int errcode = 0;
     int options = PCREn(DUPNAMES);
 
-    cflags |= default_cflags;
+    if ((cflags & AP_REG_NO_DEFAULT) == 0)
+        cflags |= default_cflags;
+
     if ((cflags & AP_REG_ICASE) != 0)
         options |= PCREn(CASELESS);
     if ((cflags & AP_REG_NEWLINE) != 0)
         options |= PCREn(MULTILINE);
     if ((cflags & AP_REG_DOTALL) != 0)
         options |= PCREn(DOTALL);
-    if ((cflags & AP_REG_NO_DOTALL) != 0)
-        options &= ~PCREn(DOTALL);
     if ((cflags & AP_REG_DOLLAR_ENDONLY) != 0)
         options |= PCREn(DOLLAR_ENDONLY);
 

diff --git a/server/util_regex.c b/server/util_regex.c
index daf0ae7caa5a0b99257d18a87d1d4fe2d4a4d936..5405f8d4d0b5ea33c34ff646fcf57469bd766e74 100644 (file)
--- 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;
@@ -101,13 +102,12 @@ AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool,
         case 'n': ret->flags |= AP_REG_NOMEM; break;
         case 'g': ret->flags |= AP_REG_MULTI; break;
         case 's': ret->flags |= AP_REG_DOTALL; break;
-        case 'S': ret->flags |= AP_REG_NO_DOTALL; break;
         case '^': ret->flags |= AP_REG_NOTBOL; break;
         case '$': ret->flags |= AP_REG_NOTEOL; break;
         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);
     }