allow proxying of directoryindex'd resources

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102332 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 2c16539556505e35e4f0a5eea3675d693558ce3c..178a964ddfd996cbc22b28d9eba5c025daee7fd0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Allow proxying of resources that are invoked via DirectoryIndex.
+     PR 14648.  [André Malo]
+
   *) mod_rewrite: Allow proxying and RewriteRules in directory context
      for subrequests.  PR 14648, 15114.  [André Malo]
 

diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index acb1ac7da00860e61c3c2c57851d41e73ca20b23..0acefbe529e2afc7bf312c79cf1a5a9216bbf011 100644 (file)
--- a/modules/mappers/mod_dir.c
+++ b/modules/mappers/mod_dir.c
@@ -201,7 +201,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;
         }