Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 16 Jan 2002 04:29:10 -0000
Message-ID: <20020116042910.70221.qmail@icarus.apache.org>
From: ianh@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/http http_request.c

ianh        02/01/15 20:29:10

  Modified:    .        CHANGES
               server   request.c
               modules/http http_request.c
  Log:
  quick handler now runs on subrequests as well
  
  Revision  Changes    Path
  1.521     +1 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.520
  retrieving revision 1.521
  diff -u -r1.520 -r1.521
  --- CHANGES	14 Jan 2002 13:46:59 -0000	1.520
  +++ CHANGES	16 Jan 2002 04:29:10 -0000	1.521
  @@ -1,4 +1,5 @@
   Changes with Apache 2.0.31-dev
  +  *) allow quick_handler to be run on subrequests. [Ian Holsman]
   
     *) mod_dav now asks its provider to place content directly into the
        filter stack when handling a GET request. The mod_dav/provider
  
  
  
  1.91      +13 -0     httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -r1.90 -r1.91
  --- request.c	2 Jan 2002 21:58:43 -0000	1.90
  +++ request.c	16 Jan 2002 04:29:10 -0000	1.91
  @@ -143,6 +143,19 @@
       int file_req = (r->main && r->filename);
       int access_status;
   
  +    access_status = ap_run_quick_handler(r);
  +    if (access_status != DECLINED) {
  +        if ( access_status == OK )  {
  +            if (!r->main)
  +                return DONE;
  +            else
  +                return OK;
  +        }
  +        else  {
  +            return access_status;
  +        }
  +    }
  +
       /* Ignore embedded %2F's in path for proxy requests */
       if (!r->proxyreq && r->parsed_uri.path) {
           access_status = ap_unescape_url(r->parsed_uri.path);
  
  
  
  1.123     +7 -10     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.122
  retrieving revision 1.123
  diff -u -r1.122 -r1.123
  --- http_request.c	14 Dec 2001 03:29:13 -0000	1.122
  +++ http_request.c	16 Jan 2002 04:29:10 -0000	1.123
  @@ -285,16 +285,13 @@
        * to enable the quick handler to make decisions based on config
        * directives in Location blocks.
        */
  -    access_status = ap_run_quick_handler(r);
  -    if (access_status == DECLINED) {
  -        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;
  -        }
  +    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) {