Commit e643b4c2 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

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
parent d88d8835

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -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>]

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -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 ]

server/request.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

                }