From e643b4c2184c03097e30276846a3c5df5d6906b6 Mon Sep 17 00:00:00 2001
From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 1 Apr 2016 12:36:42 +0000
Subject: [PATCH] Merge r1737114 from trunk:

Fix bug 58528 - Do not read .htaccess if override and overridelist are "None"

Submitted by: druggeri
Reviewed by: druggeri, ylavic, wrowe



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1737366 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES          | 4 ++++
 STATUS           | 7 -------
 server/request.c | 4 +++-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 964139f127..7be55d6cfa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.20
 
+  *) core: Do not read .htaccess if AllowOverride and AllowOverrideList
+     are "None". PR 58528.
+     [Michael Schlenker <msc contact.de, Ruediger Plum, Daniel Ruggeri]
+
   *) mod_proxy_express: Fix possible use of DB handle after close.  PR 59230.
      [Petr <pgajdos suse.cz>]
      
diff --git a/STATUS b/STATUS
index 987a2ddd94..2c494dd8bd 100644
--- a/STATUS
+++ b/STATUS
@@ -113,13 +113,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) core: Do not read .htaccess if AllowOverride and AllowOverrideList
-     are "None". PR 58528.
-     trunk patch: http://svn.apache.org/r1737114
-     2.4.x patch: http://people.apache.org/~druggeri/patches/2.4.x.AllowOverrideListFix.PR58528.patch
-     +1: druggeri, ylavic, wrowe
-     ylavic: please also apply r1737148 on merge to fix the typo on "Ruediger" (CHANGES entry)
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/server/request.c b/server/request.c
index f8a45d0b94..eecc0266b1 100644
--- a/server/request.c
+++ b/server/request.c
@@ -1005,7 +1005,9 @@ AP_DECLARE(int) ap_directory_walk(request_rec *r)
                 /* No htaccess in an incomplete root path,
                  * nor if it's disabled
                  */
-                if (seg < startseg || (!opts.override && opts.override_list == NULL)) {
+                if (seg < startseg || (!opts.override 
+                    && apr_is_empty_table(opts.override_list)
+                    )) {
                     break;
                 }