From: Eric Covener <covener@apache.org>
Date: Fri, 7 Feb 2020 17:08:41 +0000 (+0000)
Subject: factor out default regex flags
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1674
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81313af01a49df05b4f7d3996ffc2b052d1638bc;p=thirdparty%2Fapache%2Fhttpd.git

factor out default regex flags



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1873747 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 2a8a7eef278..401067e5108 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -618,6 +618,7 @@
  * 20190312.5 (2.5.1-dev)  Add proxy_tunnel_rec, ap_proxy_tunnel_create()
  *                         and ap_proxy_tunnel_run() to proxy_util.
  * 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" */
@@ -625,7 +626,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20190312
 #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
diff --git a/include/ap_regex.h b/include/ap_regex.h
index cdb887a6c52..9eb6b4b861e 100644
--- a/include/ap_regex.h
+++ b/include/ap_regex.h
@@ -89,6 +89,8 @@ extern "C" {
 
 #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 */
 enum {
   AP_REG_PCRE_COMPILED = 0, /** PCRE version used during program compilation */
diff --git a/server/core.c b/server/core.c
index 6de5892a21d..8211e7ea3e8 100644
--- a/server/core.c
+++ b/server/core.c
@@ -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);
     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);
 
diff --git a/server/util_pcre.c b/server/util_pcre.c
index b7c1e041ee8..581ccc031d6 100644
--- a/server/util_pcre.c
+++ b/server/util_pcre.c
@@ -157,8 +157,7 @@ AP_DECLARE(void) ap_regfree(ap_regex_t *preg)
  *            Compile a regular expression       *
  *************************************************/
 
-static int default_cflags = AP_REG_DOTALL |
-                            AP_REG_DOLLAR_ENDONLY;
+static int default_cflags = AP_REG_DEFAULT;
 
 AP_DECLARE(int) ap_regcomp_get_default_cflags(void)
 {