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

diff --git a/CHANGES b/CHANGES
index e88c05c01d21daaeb5d03ab8213c909cbd09f3ff..b2815c5e22ae2fc2d04b5ac1562918d13c49f4d3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 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]

diff --git a/STATUS b/STATUS
index 6d5b4f9b4d467b264ba05ee67a6f977846877b16..5c8173805704543d9dd26ccd7f6963747bdb20f9 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 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

diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index 21fd6c7319163097d2ab92a571c2b5b8a51dfa80..8bd5b9e60b64cb984b0b51fe6e7ae01c8d3fa498 100644 (file)
--- a/modules/mappers/mod_dir.c
+++ b/modules/mappers/mod_dir.c
@@ -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;
         }