Commit d4d45e85 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1701436 from trunk: 

allow autoindex w/o mod_dir/mod_mime setting the DIR_MAGIC_TYPE.


Submitted by: covener
Reviewed/backported by: jim


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

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 


Changes with Apache 2.4.17



  *) mod_autoindex: Allow autoindexes when neither mod_dir nor mod_mime are

     loaded. [Eric Covener]



  *) mod_rewrite:  Allow cookies set by mod_rewrite to contain ':' by accepting

     ';' as an alternate separator.  PR47241. 

     [<bugzilla schermesser com>, Eric Covener]

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -109,11 +109,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mod_autoindex: Allow autoindexes to work without mod_dir or mod_mime

     trunk: http://svn.apache.org/r1701436

     2.4.x: trunk works

     +1: covener, ylavic, jim



  *) Easy patches - synch with trunk

        - core: Core filters do not need mod_proxy.h

        - core: Small speed optimization when parsing <Limit>, <LimitExcept>

modules/generators/mod_autoindex.c

+4 −1
Original line number Diff line number Diff line
@@ -2274,7 +2274,10 @@ static int handle_autoindex(request_rec *r) 
    autoindex_config_rec *d;

    int allow_opts;



    if(strcmp(r->handler,DIR_MAGIC_TYPE)) {

    if (strcmp(r->handler,DIR_MAGIC_TYPE) && !AP_IS_DEFAULT_HANDLER_NAME(r->handler)) {

        return DECLINED;

    }

    if (r->finfo.filetype != APR_DIR) {

        return DECLINED;

    }