Merge r1649632, r1649966 from trunk:

Be consistant with the code below which accepts lower or upper case.

Add CHANGE for r1649632
Submitted by: jailletc36
Reviewed/backported by: jim

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

diff --git a/CHANGES b/CHANGES
index 77415730108466f8400da9580ed404348bc4b71f..89807b499af25248121506ebcdc53d552011f6cf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,10 @@ Changes with Apache 2.4.11
      request headers earlier.  Adds "MergeTrailers" directive to restore
      legacy behavior.  [Edward Lu, Yann Ylavic, Joe Orton, Eric Covener]
 
+  *) mod_include: the 'env' function was incorrectly handled as 'getenv' if the
+     leading 'e' was written in upper case in <!--#if expr="..." -->
+     statements. [Christophe Jaillet]
+
   *) split-logfile: Fix perl error:  'Can't use string ("example.org:80") 
      as a symbol ref while "strict refs"'. PR 56329.
      [Holger Mauermann <mauermann gmail.com>]

diff --git a/STATUS b/STATUS
index 47a90b863bda5332d9b7c7aba94aa8736474f302..85eb51dc8491d028ebca632adadd6e8482845509 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -110,14 +110,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=32209
      +1: druggeri, gsmith, rjung
 
-   * mod_include: the 'env' function was incorrectly handled as 'getenv' if the
-     leading 'e' was written in upper case in <!--#if expr="..." -->
-     statements. [Christophe Jaillet]
-     trunk patch: http://svn.apache.org/r1649632
-                  http://svn.apache.org/r1649966
-     2.4.x patch: 1st trunk patch works, 2nd is for CHANGES
-     +1 jailletc36, covener, jim
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 497c582250b74e52bf827937cd16538f75c5e645..e8d8ea78f383d4aa2a183d5a9fa6228e93740d07 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -697,7 +697,7 @@ static const char *include_expr_var_fn(ap_expr_eval_ctx_t *eval_ctx,
 {
     const char *res, *name = data;
     include_ctx_t *ctx = eval_ctx->data;
-    if (name[0] == 'e') {
+    if ((name[0] == 'e') || (name[0] == 'E')) {
         /* keep legacy "env" semantics */
         if ((res = apr_table_get(ctx->r->notes, arg)) != NULL)
             return res;