From c28ac1fea6fffe80b7c41f21650cd2a214a922fe Mon Sep 17 00:00:00 2001
From: Daniel Ruggeri <druggeri@apache.org>
Date: Wed, 30 Mar 2016 13:31:07 +0000
Subject: [PATCH] Fix bug 58528 - Do not read .htaccess if override and
 overridelist are "None"

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1737114 13f79535-47bb-0310-9956-ffa450edef68
---
 server/request.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/request.c b/server/request.c
index b097e99007..5336eb26d0 100644
--- a/server/request.c
+++ b/server/request.c
@@ -1009,7 +1009,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;
                 }
 
-- 
2.40.0