From: Eric Covener
Date: Mon, 24 Jun 2024 18:21:31 +0000 (+0000)
Subject: Merge r1918565 from trunk:
X-Git-Tag: 2.4.60-rc1-candidate~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48c1107876a54884837c3045d407ef96ce0e7bc9;p=thirdparty%2Fapache%2Fhttpd.git
Merge r1918565 from trunk:
docs bld break
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1918566 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 659d92405cf..2deb201e5e2 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -5188,7 +5188,7 @@ hostname or IP address
paths derived from untrusted inputs.
Security
-UNC paths accessed outside of request processing, such as during startup,
+UNC paths accessed outside of request processing, such as during startup,
are not checked against the hosts configured with this directive.
diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 54a95fd9d6c..b0e996268af 100644
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -1493,7 +1493,7 @@ cannot use $N
in the substitution string!
UnsafePrefixStat |
- Allows potentially unsafe substitutions from a leading variable or backreference to a filesystem path. |
+ Allows potentially unsafe substitutions from a leading variable or backreference to a filesystem path.
details ...
|
diff --git a/docs/manual/rewrite/flags.xml b/docs/manual/rewrite/flags.xml
index 83ec846f7c8..da0f60af16f 100644
--- a/docs/manual/rewrite/flags.xml
+++ b/docs/manual/rewrite/flags.xml
@@ -850,6 +850,7 @@ otherwise the MIME-type set with this flag is lost due to an internal
re-processing (including subsequent rounds of mod_rewrite processing).
The L
flag can be useful in this context to end the
current round of mod_rewrite processing.
+
UnsafeAllow3F
Setting this flag is required to allow a rewrite to continue If the