From: Jim Jagielski <jim@apache.org>
Date: Tue, 6 Dec 2016 17:35:52 +0000 (+0000)
Subject: Merge r1772489, r1772504 from trunk:
X-Git-Tag: 2.4.24~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fec2022087c39fa3d8b59e1693e3e0fafa722763;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1772489, r1772504 from trunk:

The default value of 'inherit' should be AP_LUA_INHERIT_UNSET.
With this value, the behavior is the same as 'parent-first' in the 'LuaInherit' directive

If not explicitelly initialized, its value is 0 because of the 'apr_calloc 'in 'create_dir_config'. 0 means 'AP_LUA_INHERIT_NONE'

PR 60419

Missing CHNAGES for r1772489
Submitted by: jailletc36
Reviewed/backported by: jim


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

diff --git a/CHANGES b/CHANGES
index 23ba1c97580..1b290fd251e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,6 @@
 
 Changes with Apache 2.4.24
 
-
   *) SECURITY: CVE-2016-8740 (cve.mitre.org)
      mod_http2: Mitigate DoS memory exhaustion via endless
      CONTINUATION frames.
@@ -13,6 +12,10 @@ Changes with Apache 2.4.24
      core: Mitigate [f]cgi "httpoxy" issues.
      [Dominic Scheirlinck <dominic vendhq.com>, Yann Ylavic]
 
+  *) mod_lua: Fix default value of LuaInherit directive. It should be 
+     'parent-first' instead of 'none', as per documentation.  PR 60419
+     [Christophe Jaillet]
+
   *) Enforce http request grammer corresponding to RFC7230 for request lines
      and request headers [William Rowe, Stefan Fritsch]
 
diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c
index 459e252e4e1..3add43648d4 100644
--- a/modules/lua/mod_lua.c
+++ b/modules/lua/mod_lua.c
@@ -1956,6 +1956,7 @@ static void *create_dir_config(apr_pool_t *p, char *dir)
     cfg->codecache = AP_LUA_CACHE_UNSET;
     cfg->vm_min = 0;
     cfg->vm_max = 0;
+    cfg->inherit = AP_LUA_INHERIT_UNSET;
 
     return cfg;
 }