From 65fad87237f366262e45253e595a157c1cc40e63 Mon Sep 17 00:00:00 2001
From: Rich Bowen <rbowen@apache.org>
Date: Mon, 29 Jan 2024 14:24:31 +0000
Subject: [PATCH 1/2] Clarifies advice around quoting regular expressions.

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

Github: closes #379


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915443 13f79535-47bb-0310-9956-ffa450edef68
---
 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 +++++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 5c5aa0b6860..b3efba5aad0 100644
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -1621,4 +1621,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 b648555abf8..94a7e66f98e 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 ac335b074dd..030b385c626 100644
--- a/docs/manual/mod/mod_setenvif.html.en
+++ b/docs/manual/mod/mod_setenvif.html.en
@@ -358,4 +358,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>

From 3707c96971281bace40b92a1d66b2382c61e7aa8 Mon Sep 17 00:00:00 2001
From: Rich Bowen <rbowen@apache.org>
Date: Mon, 29 Jan 2024 17:44:31 +0000
Subject: [PATCH 2/2] Merge r1915459 from trunk:

Remove redundant slash from example - mod_proxy doc

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

Github: closes #378

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915459 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/mod_proxy.html.en | 2 +-
 docs/manual/mod/mod_proxy.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 88e3562f929..64e1d9f54ac 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -2170,4 +2170,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 beacc3a4541..9efe0f26069 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>