From: Eric Covener <covener@apache.org>
Date: Fri, 30 Mar 2018 12:44:57 +0000 (+0000)
Subject: Merge r1827599, r1827604 from trunk:
X-Git-Tag: 2.4.34~252
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=136ffc18c293c6c7f6dfcf5c26345d3c728916b3;p=apache

Merge r1827599, r1827604 from trunk:

Placeholder for RegexDefaultOptions.

Improvement and correction welcome.

Follow up to r1827599: don't mention EXTENDED.

It does/can *not* work as expected for now.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828061 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 8c794ab63d..3d629dfd43 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -3891,6 +3891,54 @@ Protocols h2 http/1.1
 </directivesynopsis>
 
 
+<directivesynopsis>
+    <name>RegexDefaultOptions</name>
+    <description>Allow to configure global/default options for regexes</description>
+    <syntax>RegexDefaultOptions [none] [+|-]<var>option</var> [[+|-]<var>option</var>] ...</syntax>
+    <default>RegexDefaultOptions DOLLAR_ENDONLY</default>
+    <contextlist><context>server config</context></contextlist>
+    <compatibility>Only available from Apache 2.4.30 and later.</compatibility>
+    
+    <usage>
+        <p>This directive adds some default behavior to ANY regular expression
+        used afterwards.</p>
+
+        <p>Any option preceded by a '+' is added to the already set options.<br />
+        Any option preceded by a '-' is removed from the already set options.<br />
+        Any option without a '+' or a '-' will be set, removing any other
+        already set option.<br />
+        The <code>none</code> keyword resets any already set options.</p>
+
+        <p><var>option</var> can be:</p>
+        <dl>
+            <dt><code>ICASE</code></dt>
+            <dd>Use a case-insensitive match.</dd>
+
+            <dt><code>DOTALL</code></dt>
+            <dd>Perl's /s flag.</dd>
+
+            <dt><code>DOLLAR_ENDONLY</code></dt>
+            <dd>'$' matches at end of subject string only.</dd>
+            <dd>.</dd>
+        </dl>
+        <highlight language="config">
+# 
+RegexDefaultOptions +ICASE +DOLLAR_ENDONLY
+...
+# Remove the ICASE option, but keep all the other already set options
+RegexDefaultOptions -ICASE
+...
+# Set the default option to DOTALL, resetting any other option
+RegexDefaultOptions DOTALL
+...
+# Reset all defined option
+RegexDefaultOptions none
+...
+        </highlight>
+    </usage>
+</directivesynopsis>
+
+
 <directivesynopsis>
 <name>RLimitCPU</name>
 <description>Limits the CPU consumption of processes launched