From: Luca Toscano <elukey@apache.org>
Date: Fri, 1 Apr 2016 13:31:42 +0000 (+0000)
Subject: Documentation rebuild
X-Git-Tag: 2.5.0-alpha~1802
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c4b9c7abec172dd521a9887c9a64e9d3d750894;p=apache

Documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1737383 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index dcd55f50eb..7891c78d5f 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -429,6 +429,14 @@ NoDecode option available in 2.3.12 and later.</td></tr>
     completely ignored. In this case, the server will not even attempt
     to read <code>.htaccess</code> files in the filesystem.</p>
 
+    <div class="note"><h3>AllowOverrideList bug in versions &lt;= 2.4.18</h3>
+    <p><code class="directive"><a href="#allowoverridelist">AllowOverrideList</a></code> will not prevent 
+    .htaccess files processing when explicitly set with None in httpd versions &lt;= 2.4.18 due to a 
+    <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=58528">bug</a>.
+    Set only <code class="directive"><a href="#allowoverride">AllowOverride</a></code> to None as workaround if 
+    you are unable to upgrade to httpd &gt; 2.4.18</p>
+    </div>
+
     <p>When this directive is set to <code>All</code>, then any
     directive which has the .htaccess <a href="directive-dict.html#Context">Context</a> is allowed in
     <code>.htaccess</code> files.</p>
@@ -584,6 +592,14 @@ NoDecode option available in 2.3.12 and later.</td></tr>
     ignored.  In this case, the server will not even attempt to read
     <code>.htaccess</code> files in the filesystem.</p>
 
+    <div class="note"><h3>AllowOverrideList bug in versions &lt;= 2.4.18</h3>
+    <p><code class="directive"><a href="#allowoverridelist">AllowOverrideList</a></code> will not prevent 
+    .htaccess files processing when explicitly set with None in httpd versions &lt;= 2.4.18 due to a 
+    <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=58528">bug</a>.
+    Set only <code class="directive"><a href="#allowoverride">AllowOverride</a></code> to None as workaround if 
+    you are unable to upgrade to httpd &gt; 2.4.18</p>
+    </div>
+
     <p>Example:</p>
 
     <pre class="prettyprint lang-config">AllowOverride None
diff --git a/docs/manual/mod/mod_http2.html.en b/docs/manual/mod/mod_http2.html.en
index fb8c6c30c8..28275eb225 100644
--- a/docs/manual/mod/mod_http2.html.en
+++ b/docs/manual/mod/mod_http2.html.en
@@ -193,7 +193,8 @@
     <h3><a name="envvars" id="envvars">Environment Variables</a></h3>
         <p>
             This module can be configured to provide HTTP/2 related information
-            as additional environment variables to the SSI and CGI namespace.
+            as additional environment variables to the SSI and CGI namespace, as well
+            as in custom log configurations (see <code>%{VAR_NAME}e</code>).
         </p>
         
         <table class="bordered">
@@ -204,7 +205,12 @@
                 <th>Description:</th>
             </tr>
             <tr><td><code>HTTP2</code></td><td>flag</td><td>HTTP/2 is being used.</td></tr>
-            <tr><td><code>H2PUSH</code></td><td>flag</td><td>HTTP/2 Server Push is enabled for this request and also supported by the client.</td></tr>
+            <tr><td><code>H2PUSH</code></td><td>flag</td><td>HTTP/2 Server Push is enabled for this connection and also supported by the client.</td></tr>
+            <tr><td><code>H2_PUSH</code></td><td>flag</td><td>alternate name for <code>H2PUSH</code></td></tr>
+            <tr><td><code>H2_PUSHED</code></td><td>string</td><td>empty or <code>PUSHED</code> for a request being pushed by the server.</td></tr>
+            <tr><td><code>H2_PUSHED_ON</code></td><td>number</td><td>HTTP/2 stream number that triggered the push of this request.</td></tr>
+            <tr><td><code>H2_STREAM_ID</code></td><td>number</td><td>HTTP/2 stream number of this request.</td></tr>
+            <tr><td><code>H2_STREAM_TAG</code></td><td>string</td><td>HTTP/2 process unique stream identifier, consisting of connection id and stream id separated by <code>-</code>.</td></tr>
         </table>