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 2a8a7eef278cb397260281267d2ad80a70bc0cbf..401067e5108b09dddf10bed3ea4f154a3332dc83 100644 (file)
--- 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 cdb887a6c5202f7357cc5963603ec9b9b0a3fb06..9eb6b4b861e4ddb4625e2d36d4b95c7d7e1ebdeb 100644 (file)
--- 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 6de5892a21d3a9e52d22d6c67bb9a71aaccb6e21..8211e7ea3e8454ae6e162a42f3dac692817c1f90 100644 (file)
--- 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 b7c1e041ee8553baddb48e4beacbaacab123a28f..581ccc031d6e34032fe3f229335c82788bea3545 100644 (file)
--- 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)
 {