From: Luca Toscano <elukey@apache.org>
Date: Thu, 25 May 2017 13:34:54 +0000 (+0000)
Subject: Merge r1796135 from trunk:
X-Git-Tag: 2.4.26~84
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d143e41e9c9a6530e21415b63da2b7423a2d92c4;p=apache

Merge r1796135 from trunk:

Remove warning about nested If/ElseIf/Else evaluation

As noted by Christophe Jaillet in the dev@ ml nested
if/elseif/else conditions are now evaluated. The code
change has been already backported to 2.4.x.


Submitted by: elukey



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1796151 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index f02f80cdce..2d16fed0b1 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1041,6 +1041,7 @@ satisfied by a request at runtime</description>
 <context>directory</context><context>.htaccess</context>
 </contextlist>
 <override>All</override>
+<compatibility>Nested conditions are evaluated in 2.4.26 and later</compatibility>
 
 <usage>
     <p>The <directive type="section">Else</directive> applies the enclosed
@@ -1087,6 +1088,7 @@ satisfied</description>
 <context>directory</context><context>.htaccess</context>
 </contextlist>
 <override>All</override>
+<compatibility>Nested conditions are evaluated in 2.4.26 and later</compatibility>
 
 <usage>
     <p>The <directive type="section">ElseIf</directive> applies the enclosed
@@ -2145,6 +2147,7 @@ satisfied by a request at runtime</description>
 <context>directory</context><context>.htaccess</context>
 </contextlist>
 <override>All</override>
+<compatibility>Nested conditions are evaluated in 2.4.26 and later</compatibility>
 
 <usage>
     <p>The <directive type="section">If</directive> directive
@@ -2176,14 +2179,6 @@ satisfied by a request at runtime</description>
     <p>Only directives that support the <a href="directive-dict.html#Context"
     >directory context</a> can be used within this configuration section.</p>
 
-    <note><title>Not a scripting language</title>
-    The name of this directive is very familiar to programmers and admins 
-    but it should not be confused with its counterpart in scripting languages.
-    For example, the current implementation does not contemplate the possibility
-    of having a <directive type="section">If</directive> section inside another
-    one (the inner <directive type="section">If</directive> will be ignored).
-    </note>
-
     <note type="warning">
     Certain variables, such as <code>CONTENT_TYPE</code> and other
     response headers, are set after &lt;If&gt; conditions have already