diff options
| -rw-r--r-- | include/ap_mmn.h | 3 | ||||
| -rw-r--r-- | include/ap_regex.h | 2 | ||||
| -rw-r--r-- | modules/filters/mod_substitute.c | 2 | ||||
| -rw-r--r-- | server/util_pcre.c | 5 | ||||
| -rw-r--r-- | server/util_regex.c | 1 |
5 files changed, 11 insertions, 2 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 5d1941228c..cff2ba7bda 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -620,6 +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 */ #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */ @@ -627,7 +628,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20190312 #endif -#define MODULE_MAGIC_NUMBER_MINOR 8 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 9 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a diff --git a/include/ap_regex.h b/include/ap_regex.h index 9eb6b4b861..62a3eb2875 100644 --- a/include/ap_regex.h +++ b/include/ap_regex.h @@ -87,6 +87,8 @@ 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_MATCH "MATCH_" /**< suggested prefix for ap_regname */ #define AP_REG_DEFAULT (AP_REG_DOTALL|AP_REG_DOLLAR_ENDONLY) diff --git a/modules/filters/mod_substitute.c b/modules/filters/mod_substitute.c index f4563c1433..ee397d198e 100644 --- a/modules/filters/mod_substitute.c +++ b/modules/filters/mod_substitute.c @@ -716,7 +716,7 @@ 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_EXTENDED | + r = ap_pregcomp(cmd->pool, from, AP_REG_NO_DOTALL | AP_REG_EXTENDED | (ignore_case ? AP_REG_ICASE : 0)); if (!r) return "Substitute could not compile regex"; diff --git a/server/util_pcre.c b/server/util_pcre.c index 581ccc031d..94e85e44a0 100644 --- a/server/util_pcre.c +++ b/server/util_pcre.c @@ -179,6 +179,9 @@ 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; } @@ -217,6 +220,8 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t * preg, const char *pattern, int cflags) 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 2a30d68176..daf0ae7caa 100644 --- a/server/util_regex.c +++ b/server/util_regex.c @@ -101,6 +101,7 @@ 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 */ |