summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2020-02-07 18:08:41 +0100
committerEric Covener <covener@apache.org>2020-02-07 18:08:41 +0100
commit81313af01a49df05b4f7d3996ffc2b052d1638bc (patch)
tree48450c59311d62febb837c6c34f759a861e61de8 /include
parentbump (diff)
downloadapache2-81313af01a49df05b4f7d3996ffc2b052d1638bc.tar.xz
apache2-81313af01a49df05b4f7d3996ffc2b052d1638bc.zip
factor out default regex flags
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1873747 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
-rw-r--r--include/ap_mmn.h3
-rw-r--r--include/ap_regex.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 2a8a7eef27..401067e510 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 cdb887a6c5..9eb6b4b861 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 */