Skip to content

Commit 961741d

Browse files
committed
Merge r1915443, r1915459 from trunk: [docs only]
Clarifies advice around quoting regular expressions. Submitted by: nisbet-hubbard <[email protected]> Remove redundant slash from example - mod_proxy doc Submitted by: nisbet-hubbard <[email protected]> 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
1 parent 197a695 commit 961741d

File tree

6 files changed

+14
-4
lines changed

6 files changed

+14
-4
lines changed

docs/manual/mod/mod_proxy.html.en

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2191,4 +2191,4 @@ if (typeof(prettyPrint) !== 'undefined') {
21912191
prettyPrint();
21922192
}
21932193
//--><!]]></script>
2194-
</body></html>
2194+
</body></html>

docs/manual/mod/mod_proxy.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ ProxyPass "/some/ws/capable/path/" "http://example.com/some/ws/capable/path/" up
191191
<highlight language="config">
192192
&lt;FilesMatch "\.php$"&gt;
193193
# Unix sockets require 2.4.7 or later
194-
SetHandler "proxy:unix:/path/to/app.sock|fcgi://localhost/"
194+
SetHandler "proxy:unix:/path/to/app.sock|fcgi://localhost"
195195
&lt;/FilesMatch&gt;
196196
</highlight>
197197
</example>

docs/manual/mod/mod_rewrite.html.en

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1641,4 +1641,4 @@ if (typeof(prettyPrint) !== 'undefined') {
16411641
prettyPrint();
16421642
}
16431643
//--><!]]></script>
1644-
</body></html>
1644+
</body></html>

docs/manual/mod/mod_rewrite.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ URLs on the fly</description>
4949
sub-processing, external request redirection, or internal proxy
5050
throughput.</p>
5151

52+
<p>A regular expression only needs quoting if it contains unescaped space,
53+
in which case single and double quotes are equivalent.</p>
54+
5255
<p>Further details, discussion, and examples, are provided in the
5356
<a href="../rewrite/">detailed mod_rewrite documentation</a>.</p>
5457
</summary>

docs/manual/mod/mod_setenvif.html.en

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,4 +359,4 @@ if (typeof(prettyPrint) !== 'undefined') {
359359
prettyPrint();
360360
}
361361
//--><!]]></script>
362-
</body></html>
362+
</body></html>

docs/manual/mod/mod_setenvif.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ BrowserMatch MSIE !netscape
5959
are not separately evaluated in the subrequest due to the API phases
6060
<module>mod_setenvif</module> takes action in.</p>
6161

62+
<p>A regular expression only needs quoting when it contains space,
63+
in which case single and double quotes are equivalent. Unlike
64+
<module>mod_rewrite</module>, <module>mod_setenvif</module> strips every
65+
other backslash when parsing the expression; thus <code>\\</code>
66+
requires <code>\\\</code>, and <code>\\\</code> requires
67+
<code>\\\\\</code>.</p>
68+
6269
</summary>
6370

6471
<seealso><a href="../env.html">Environment Variables in Apache HTTP Server</a></seealso>

0 commit comments

Comments
 (0)