--- request1125.c	Thu Feb 20 09:12:50 2003
+++ request.c	Thu Feb 20 09:14:07 2003
@@ -534,7 +534,10 @@
      * so we can begin by checking the cache for a recent directory walk.
      * This call will ensure we have an absolute path in the same pass.
      */
-    if ((rv = apr_filepath_merge(&entry_dir, NULL, r->filename,
+	if (r->canonical_filename) {
+		entry_dir = r->canonical_filename;
+	}
+	else if ((rv = apr_filepath_merge(&entry_dir, NULL, r->filename,
                                  APR_FILEPATH_NOTRELATIVE, r->pool))
                   != APR_SUCCESS) {
         ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,