]> granicus.if.org Git - apache/commitdiff
Fix bug 58528 - Do not read .htaccess if override and overridelist are "None"
authorDaniel Ruggeri <druggeri@apache.org>
Wed, 30 Mar 2016 13:31:07 +0000 (13:31 +0000)
committerDaniel Ruggeri <druggeri@apache.org>
Wed, 30 Mar 2016 13:31:07 +0000 (13:31 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1737114 13f79535-47bb-0310-9956-ffa450edef68

server/request.c

index b097e9900725c0b07afaa121255f6d38c1327042..5336eb26d081fdc1c0c6af00406293730063fdc4 100644 (file)
@@ -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;
                 }