Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 20 Sep 2001 17:54:51 -0000
Message-ID: <20010920175451.94359.qmail@icarus.apache.org>
From: trawick@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server request.c

trawick     01/09/20 10:54:51

  Modified:    modules/http http_request.c
               server   request.c
  Log:
  Currently, when the map-to-storage handler for TRACE returns DONE, the
  caller -- ap_process_request_internal() -- catches that and returns
  OK to its caller -- ap_process_request().  But ap_process_request(),
  seeing OK, tries to run a handler.  It needs to skip that if the
  request was completed in ap_process_request_internal().
  
  Reviewed by:	William A. Rowe, Jr.
  
  Revision  Changes    Path
  1.115     +4 -0      httpd-2.0/modules/http/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_request.c,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -u -r1.114 -r1.115
  --- http_request.c	2001/09/19 05:52:42	1.114
  +++ http_request.c	2001/09/20 17:54:51	1.115
  @@ -284,6 +284,10 @@
           access_status = ap_process_request_internal(r);
           if (access_status == OK)
               access_status = ap_invoke_handler(r);
  +        else if (access_status == DONE) {
  +            /* e.g., something not in storage like TRACE */
  +            access_status = OK;
  +        }
       }
   
       if (access_status == OK) {
  
  
  
  1.51      +1 -4      httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- request.c	2001/09/06 17:58:28	1.50
  +++ request.c	2001/09/20 17:54:51	1.51
  @@ -162,10 +162,7 @@
   
       if ((access_status = ap_run_map_to_storage(r))) {
           /* This request wasn't in storage (e.g. TRACE) */
  -        if (access_status == DONE)
  -	    return OK;
  -	else
  -            return access_status;
  +        return access_status;
       }
   
       if ((access_status = ap_location_walk(r))) {