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

factor out default regex flags

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1873747 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Covener
2020-02-07 17:08:41 +00:00
parent bb7a5ce924
commit 81313af01a
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/ap_mmn.h
View File

@ -618,6 +618,7 @@
* 20190312.5 (2.5.1-dev) Add proxy_tunnel_rec, ap_proxy_tunnel_create() * 20190312.5 (2.5.1-dev) Add proxy_tunnel_rec, ap_proxy_tunnel_create()
* and ap_proxy_tunnel_run() to proxy_util. * and ap_proxy_tunnel_run() to proxy_util.
* 20190312.6 (2.5.1-dev) Add proxy check_trans hook * 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
*/ */
#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */ #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
@ -625,7 +626,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR #ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20190312 #define MODULE_MAGIC_NUMBER_MAJOR 20190312
#endif #endif
#define MODULE_MAGIC_NUMBER_MINOR 6 /* 0...n */ #define MODULE_MAGIC_NUMBER_MINOR 7 /* 0...n */
/** /**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

2
include/ap_regex.h
View File

@ -89,6 +89,8 @@ extern "C" {
#define AP_REG_MATCH "MATCH_" /**< suggested prefix for ap_regname */ #define AP_REG_MATCH "MATCH_" /**< suggested prefix for ap_regname */
#define AP_REG_DEFAULT (AP_REG_DOTALL|AP_REG_DOLLAR_ENDONLY)
/* Arguments for ap_pcre_version_string */ /* Arguments for ap_pcre_version_string */
enum { enum {
AP_REG_PCRE_COMPILED = 0, /** PCRE version used during program compilation */ AP_REG_PCRE_COMPILED = 0, /** PCRE version used during program compilation */

2
server/core.c
View File

@ -5298,7 +5298,7 @@ static int core_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptem
init_config_defines(pconf); init_config_defines(pconf);
apr_pool_cleanup_register(pconf, NULL, reset_config, apr_pool_cleanup_null); apr_pool_cleanup_register(pconf, NULL, reset_config, apr_pool_cleanup_null);
ap_regcomp_set_default_cflags(AP_REG_DOLLAR_ENDONLY); ap_regcomp_set_default_cflags(AP_REG_DEFAULT);
mpm_common_pre_config(pconf); mpm_common_pre_config(pconf);

3
server/util_pcre.c
View File

@ -157,8 +157,7 @@ AP_DECLARE(void) ap_regfree(ap_regex_t *preg)
* Compile a regular expression * * Compile a regular expression *
*************************************************/ *************************************************/
static int default_cflags = AP_REG_DOTALL | static int default_cflags = AP_REG_DEFAULT;
AP_REG_DOLLAR_ENDONLY;
AP_DECLARE(int) ap_regcomp_get_default_cflags(void) AP_DECLARE(int) ap_regcomp_get_default_cflags(void)
{ {