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

don't use DOTALL from mod_substitute which leaves \n at the end of the line.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1873941 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Covener
2020-02-12 13:36:40 +00:00
parent 34ef2afa8c
commit b6dd2f55dc
5 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/ap_mmn.h
View File

@ -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

2
include/ap_regex.h
View File

@ -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)

2
modules/filters/mod_substitute.c
View File

@ -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";

5
server/util_pcre.c
View File

@ -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);

1
server/util_regex.c
View File

@ -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 */