From 47ec77ab30138cb0837232565b8fffe656c2ad9f Mon Sep 17 00:00:00 2001 From: Greg Ames Date: Wed, 17 Oct 2001 15:12:13 +0000 Subject: [PATCH] recognize filename subrequests without requiring a null URI. This fixes a problem with infinite recursion of dirent subrequests. Submitted by: Bill Rowe git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91525 13f79535-47bb-0310-9956-ffa450edef68 --- server/request.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/server/request.c b/server/request.c index d66c6ffcf8..8d0c7abd3f 100644 --- a/server/request.c +++ b/server/request.c @@ -139,6 +139,7 @@ static int decl_die(int status, char *phase, request_rec *r) */ AP_DECLARE(int) ap_process_request_internal(request_rec *r) { + int file_req = (r->main && r->filename); int access_status; /* Ignore embedded %2F's in path for proxy requests */ @@ -151,11 +152,11 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r) ap_getparents(r->uri); /* OK --- shrinking transformations... */ - /* File-specific requests with no 'true' URI are a huge pain... they - * cannot bubble through the next several steps. Only subrequests may - * have an empty uri, otherwise let translate_name kill the request. + /* All file subrequests are a huge pain... they cannot bubble through the + * next several steps. Only file subrequests are allowed an empty uri, + * otherwise let translate_name kill the request. */ - if (!r->main || (r->uri && r->uri[0])) + if (!file_req) { if ((access_status = ap_location_walk(r))) { return access_status; @@ -179,7 +180,7 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r) /* Excluding file-specific requests with no 'true' URI... */ - if (!r->main || (r->uri && r->uri[0])) + if (!file_req) { /* Rerun the location walk, which overrides any map_to_storage config. */ -- 2.40.0