httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/http http_request.c
Date Fri, 31 Aug 2001 02:46:29 GMT
wrowe       01/08/30 19:46:29

  Modified:    modules/http http_request.c
  Log:
    Much better - sorry - I missed one case of forcing pipeline flush when
    the handler returned a non-OK result.  ergo, 304's weren't sent.
  
  Revision  Changes    Path
  1.112     +7 -14     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.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- http_request.c	2001/08/31 02:29:48	1.111
  +++ http_request.c	2001/08/31 02:46:29	1.112
  @@ -280,26 +280,19 @@
        * 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);
  +    }
  +
       if (access_status == OK) {
           ap_finalize_request_protocol(r);
       }
  -    else if (access_status == DECLINED) {
  -         access_status = ap_process_request_internal(r);
  -         if (access_status == OK) {
  -             if ((access_status = ap_invoke_handler(r)) != 0) {
  -                 ap_die(access_status, r);
  -                 return;
  -             }
  -             ap_finalize_request_protocol(r);
  -         }
  -         else {
  -             ap_die(access_status, r);
  -         }
  -    }
       else {
           ap_die(access_status, r);
       }
  -
  +    
       /*
        * We want to flush the last packet if this isn't a pipelining connection
        * *before* we start into logging.  Suppose that the logging causes a DNS
  
  
  

Mime
View raw message