summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorChristophe Jaillet <jailletc36@apache.org>2015-02-05 21:47:08 +0100
committerChristophe Jaillet <jailletc36@apache.org>2015-02-05 21:47:08 +0100
commitbe32097e6c360f5cea91969409c33bfc1d2d2469 (patch)
tree3b61865453118782658226f8231f779cdd379180 /docs
parentExpression parser: Optimize another concatenation (diff)
downloadapache2-be32097e6c360f5cea91969409c33bfc1d2d2469.tar.xz
apache2-be32097e6c360f5cea91969409c33bfc1d2d2469.zip
Improve doc as spotted by Kalessin in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657687 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--docs/manual/misc/security_tips.html.en4
-rw-r--r--docs/manual/misc/security_tips.xml4
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/manual/misc/security_tips.html.en b/docs/manual/misc/security_tips.html.en
index b14b76ca5d..522083f665 100644
--- a/docs/manual/misc/security_tips.html.en
+++ b/docs/manual/misc/security_tips.html.en
@@ -135,7 +135,7 @@
uses asynchronous processing to avoid devoting a thread to each
connection. Due to the nature of the OpenSSL library the
<code class="module"><a href="../mod/event.html">event</a></code> mpm is currently incompatible with
- <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> and other input filters. In these
+ <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> and other input filters. In these
cases it falls back to the behaviour of the
<code class="module"><a href="../mod/worker.html">worker</a></code> mpm.</li>
@@ -342,6 +342,8 @@
<p>This prevents the use of <code>.htaccess</code> files in all
directories apart from those specifically enabled.</p>
+ <p>Note that this setting is the default since Apache 2.3.9.</p>
+
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="protectserverfiles" id="protectserverfiles">Protect Server Files by Default</a></h2>
diff --git a/docs/manual/misc/security_tips.xml b/docs/manual/misc/security_tips.xml
index 79b25c6d9a..5664ff9d3e 100644
--- a/docs/manual/misc/security_tips.xml
+++ b/docs/manual/misc/security_tips.xml
@@ -122,7 +122,7 @@
uses asynchronous processing to avoid devoting a thread to each
connection. Due to the nature of the OpenSSL library the
<module>event</module> mpm is currently incompatible with
- <module>mod_ssl</module> and other input filters. In these
+ <module>mod_ssl</module> and other input filters. In these
cases it falls back to the behaviour of the
<module>worker</module> mpm.</li>
@@ -336,6 +336,8 @@
<p>This prevents the use of <code>.htaccess</code> files in all
directories apart from those specifically enabled.</p>
+ <p>Note that this setting is the default since Apache 2.3.9.</p>
+
</section>
<section id="protectserverfiles">