diff --recursive -buB httpd-2.0.43/modules/mappers/mod_dir.c httpd-2.0.43-mrc/modules/mappers/mod_dir.c
--- httpd-2.0.43/modules/mappers/mod_dir.c	Thu May 16 01:20:46 2002
+++ httpd-2.0.43-mrc/modules/mappers/mod_dir.c	Mon Dec  2 14:19:26 2002
@@ -202,7 +202,15 @@
 
         /* XXX: (filetype == APR_REG) - we can't use a non-file index??? */
         if (rr->status == HTTP_OK && rr->finfo.filetype == APR_REG) {
-            ap_internal_fast_redirect(rr, r);
+            char *new_uri = ap_escape_uri(r->pool, rr->uri);
+
+            if (rr->args != NULL)
+                new_uri = apr_pstrcat(r->pool, new_uri, "?", rr->args, NULL);
+            else if (r->args != NULL)
+                new_uri = apr_pstrcat(r->pool, new_uri, "?", r->args, NULL);
+
+            ap_destroy_sub_req(rr);
+            ap_internal_redirect(new_uri, r);
             return OK;
         }