Commit 1b28ae39 authored by Andre Malo's avatar Andre Malo
Browse files

allow proxying of directoryindex'd resources 

PR: 14648, 15112, 29961
Reviewed by: Justin Erenkrantz, Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104665 13f79535-47bb-0310-9956-ffa450edef68
parent 9273b4ab

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Changes with Apache 2.0.51









  *) Allow proxying of resources that are invoked via DirectoryIndex.









     PR 14648, 15112, 29961.  [André Malo]

















  *) util_ldap: Switched the lock types on the shared memory cache 









     from thread reader/writer locks to global mutexes in order to 









     provide cross process cache protection. [Brad Nicholes]


































STATUS



+1
−5



























Changes for STATUS: 1 added line, 5 removed lines.



Original line number
Diff line number
Diff line









APACHE 2.0 STATUS:                                              -*-text-*-









Last modified at [$Date: 2004/08/14 11:08:20 $]









Last modified at [$Date: 2004/08/15 21:35:15 $]



















Release:




















@@ -157,10 +157,6 @@ PATCHES TO BACKPORT FROM 2.1







         modules/mappers/mod_dir.c: r1.48









       +1: nd, jerenkrantz, trawick



















    *) mod_dir: Allow proxied DirectoryIndexes. PR 14648, 15112, 29961









         modules/mappers/mod_dir.c: r1.44









       +1: nd, jerenkrantz, trawick



















    *) mod_ssl: Remove some unused functions (after CAN-2004-0488 fix is applied)









       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/ssl/ssl_util.c?r1=1.46&r2=1.47









       +1: jorton


































modules/mappers/mod_dir.c



+3
−1



























Changes for modules/mappers/mod_dir.c: 3 added lines, 1 removed line.



Original line number
Diff line number
Diff line







@@ -158,7 +158,9 @@ static int fixup_dir(request_rec *r)







        rr = ap_sub_req_lookup_uri(name_ptr, r, NULL);



















        /* XXX: (filetype == APR_REG) - we can't use a non-file index??? */









        if (rr->status == HTTP_OK && rr->finfo.filetype == APR_REG) {









        if (   rr->status == HTTP_OK









            && (   (rr->handler && !strcmp(rr->handler, "proxy-server"))









                || rr->finfo.filetype == APR_REG)) {









            ap_internal_fast_redirect(rr, r);









            return OK;









        }