httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grega...@apache.org
Subject cvs commit: httpd-2.0/server request.c
Date Wed, 17 Oct 2001 15:12:13 GMT
gregames    01/10/17 08:12:13

  Modified:    server   request.c
  Log:
  recognize filename subrequests without requiring a null URI.  This fixes
  a problem with infinite recursion of dirent subrequests.
  
  Submitted by:  Bill Rowe
  
  Revision  Changes    Path
  1.75      +6 -5      httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- request.c	2001/10/16 02:23:42	1.74
  +++ request.c	2001/10/17 15:12:13	1.75
  @@ -139,6 +139,7 @@
    */
   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_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 @@
   
       /* 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.
            */
  
  
  

Mime
View raw message