From 961741da8f3b39806943bf0806f9db89d2df1dc8 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@apache.org>
Date: Thu, 18 Dec 2025 12:56:03 +0000
Subject: [PATCH] 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
---
 docs/manual/mod/mod_proxy.html.en    | 2 +-
 docs/manual/mod/mod_proxy.xml        | 2 +-
 docs/manual/mod/mod_rewrite.html.en  | 2 +-
 docs/manual/mod/mod_rewrite.xml      | 3 +++
 docs/manual/mod/mod_setenvif.html.en | 2 +-
 docs/manual/mod/mod_setenvif.xml     | 7 +++++++
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index ed640a0c6bd..bc8418e0b0e 100644
--- 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 19ca725fa2d..4672e17fb8c 100644
--- 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 938a3d7b954..4f6592c3816 100644
--- 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 a10f3f38c0e..fe54cc58ff2 100644
--- 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 95f96c65131..1fc667be0c5 100644
--- 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 a569e11f6d5..ab974d9e7ee 100644
--- 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>
-- 
2.47.3