Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge r1915443, r1915459 from trunk #463

Open
wants to merge 2 commits into
base: 2.4.x
Choose a base branch
from
Open

Merge r1915443, r1915459 from trunk #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65fad87
Clarifies advice around quoting regular expressions.
rbowen Jan 29, 2024
3707c96
Merge r1915459 from trunk:
rbowen Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/manual/mod/mod_proxy.html.en
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2170,4 +2170,4 @@ if (typeof(prettyPrint) !== 'undefined') {
prettyPrint();
}
//--><!]]></script>
</body></html>
</body></html>
2 changes: 1 addition & 1 deletion docs/manual/mod/mod_proxy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion docs/manual/mod/mod_rewrite.html.en
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1621,4 +1621,4 @@ if (typeof(prettyPrint) !== 'undefined') {
prettyPrint();
}
//--><!]]></script>
</body></html>
</body></html>
3 changes: 3 additions & 0 deletions docs/manual/mod/mod_rewrite.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion docs/manual/mod/mod_setenvif.html.en
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,4 +358,4 @@ if (typeof(prettyPrint) !== 'undefined') {
prettyPrint();
}
//--><!]]></script>
</body></html>
</body></html>
7 changes: 7 additions & 0 deletions docs/manual/mod/mod_setenvif.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down