Merge r1915443, r1915459 from trunk: [docs only]

Clarifies advice around quoting regular expressions.

Submitted by: nisbet-hubbard <87453615+nisbet-hubbard@users.noreply.github.com>

Remove redundant slash from example - mod_proxy doc

Submitted by: nisbet-hubbard <87453615+nisbet-hubbard@users.noreply.github.com>

Submitted by: rbowen
Github: closes #463

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

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index ed640a0c6bd0e270918a18b9c68006595dd50b79..bc8418e0b0e007b57822fcfb9f43b02f20b7744d 100644 (file)
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -2191,4 +2191,4 @@ if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();
 }
 //--><!]]></script>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 19ca725fa2daa92aa6e4cf9eca2ddc375e9fb245..4672e17fb8cf25eaa807f0189d5abd6e158133d9 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -191,7 +191,7 @@ ProxyPass "/some/ws/capable/path/" "http://example.com/some/ws/capable/path/" up
       <highlight language="config">
 &lt;FilesMatch "\.php$"&gt;
     # Unix sockets require 2.4.7 or later
-    SetHandler  "proxy:unix:/path/to/app.sock|fcgi://localhost/"
+    SetHandler  "proxy:unix:/path/to/app.sock|fcgi://localhost"
 &lt;/FilesMatch&gt;
       </highlight>
       </example>

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 938a3d7b9547a20b2e7bdfc57e1b17298a53ee5d..4f6592c38165f95552c5ebf51d9a1022983b9b8a 100644 (file)
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -1641,4 +1641,4 @@ if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();
 }
 //--><!]]></script>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index a10f3f38c0e5208222b958b5fa48de67b597302b..fe54cc58ff2810033b0e8823fd154340902fe23b 100644 (file)
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -49,6 +49,9 @@ URLs on the fly</description>
       sub-processing, external request redirection, or internal proxy
       throughput.</p>
 
+      <p>A regular expression only needs quoting if it contains unescaped space, 
+      in which case single and double quotes are equivalent.</p>
+
       <p>Further details, discussion, and examples, are provided in the
       <a href="../rewrite/">detailed mod_rewrite documentation</a>.</p>
 </summary>

diff --git a/docs/manual/mod/mod_setenvif.html.en b/docs/manual/mod/mod_setenvif.html.en
index 95f96c6513148e8666ff0c5530856905748afe8c..1fc667be0c5378e91f64b056436334d1de7ce7e7 100644 (file)
--- a/docs/manual/mod/mod_setenvif.html.en
+++ b/docs/manual/mod/mod_setenvif.html.en
@@ -359,4 +359,4 @@ if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();
 }
 //--><!]]></script>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/docs/manual/mod/mod_setenvif.xml b/docs/manual/mod/mod_setenvif.xml
index a569e11f6d5d6befcb2f69481005c1d690ea60da..ab974d9e7eef139429d27ee4c49390dd4937dbe5 100644 (file)
--- a/docs/manual/mod/mod_setenvif.xml
+++ b/docs/manual/mod/mod_setenvif.xml
@@ -59,6 +59,13 @@ BrowserMatch MSIE !netscape
    are not separately evaluated in the subrequest due to the API phases
    <module>mod_setenvif</module> takes action in.</p>
 
+   <p>A regular expression only needs quoting when it contains space, 
+   in which case single and double quotes are equivalent. Unlike 
+   <module>mod_rewrite</module>, <module>mod_setenvif</module> strips every 
+   other backslash when parsing the expression; thus <code>\\</code> 
+   requires <code>\\\</code>, and <code>\\\</code> requires 
+   <code>\\\\\</code>.</p>
+
 </summary>
 
 <seealso><a href="../env.html">Environment Variables in Apache HTTP Server</a></seealso>