httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server protocol.c
Date Sat, 01 Nov 2003 16:22:16 GMT
trawick     2003/11/01 08:22:16

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/http Tag: APACHE_2_0_BRANCH http_request.c
               server   Tag: APACHE_2_0_BRANCH protocol.c
  Log:
  backport this from Apache 2.1-dev:
  
      Set the scoreboard state to indicate logging prior to running
      logging hooks so that server-status will show 'L' for hung loggers
      instead of 'W'.
  
  Reviewed by:  stoddard, striker
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.177 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.176
  retrieving revision 1.988.2.177
  diff -u -r1.988.2.176 -r1.988.2.177
  --- CHANGES	24 Oct 2003 17:50:16 -0000	1.988.2.176
  +++ CHANGES	1 Nov 2003 16:22:15 -0000	1.988.2.177
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.49
   
  +  *) Set the scoreboard state to indicate logging prior to running 
  +     logging hooks so that server-status will show 'L' for hung loggers
  +     instead of 'W'.  [Jeff Trawick]
  +
   Changes with Apache 2.0.48
     
     *) SECURITY [CAN-2003-0789]: mod_cgid: Resolve some mishandling of
  
  
  
  1.751.2.517 +1 -8      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.516
  retrieving revision 1.751.2.517
  diff -u -r1.751.2.516 -r1.751.2.517
  --- STATUS	1 Nov 2003 16:09:29 -0000	1.751.2.516
  +++ STATUS	1 Nov 2003 16:22:15 -0000	1.751.2.517
  @@ -261,13 +261,6 @@
           modules/generators/mod_info.c r1.151
         +1: trawick, striker, nd
   
  -    * Set the scoreboard state to indicate logging prior to running
  -      logging hooks so that server-status will show 'L' for hung
  -      loggers instead of 'W'.
  -        modules/http/http_request.c r1.159
  -        server/protocol.c r1.138
  -      +1: trawick, stoddard, striker
  -
       * When UseCanonicalName is set to OFF, allow ap_get_server_port to 
         check r->connection->local_addr->port before defaulting to 
         server->port or ap_default_port()
  
  
  
  No                   revision
  No                   revision
  1.152.2.6 +2 -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.152.2.5
  retrieving revision 1.152.2.6
  diff -u -r1.152.2.5 -r1.152.2.6
  --- http_request.c	1 Jul 2003 01:25:06 -0000	1.152.2.5
  +++ http_request.c	1 Nov 2003 16:22:16 -0000	1.152.2.6
  @@ -86,6 +86,7 @@
   #include "util_charset.h"
   
   #include "mod_core.h"
  +#include "scoreboard.h"
   
   #if APR_HAVE_STDARG_H
   #include <stdarg.h>
  @@ -309,6 +310,7 @@
        * it's the application that's stalled.
        */
       check_pipeline_flush(r);
  +    ap_update_child_status(r->connection->sbh, SERVER_BUSY_LOG, r);
       ap_run_log_transaction(r);
   }
   
  
  
  
  No                   revision
  No                   revision
  1.121.2.11 +7 -0      httpd-2.0/server/protocol.c
  
  Index: protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
  retrieving revision 1.121.2.10
  retrieving revision 1.121.2.11
  diff -u -r1.121.2.10 -r1.121.2.11
  --- protocol.c	1 Nov 2003 16:09:29 -0000	1.121.2.10
  +++ protocol.c	1 Nov 2003 16:22:16 -0000	1.121.2.11
  @@ -90,6 +90,7 @@
   #include "mod_core.h"
   #include "util_charset.h"
   #include "util_ebcdic.h"
  +#include "scoreboard.h"
   
   #if APR_HAVE_STDARG_H
   #include <stdarg.h>
  @@ -903,6 +904,7 @@
               ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "request failed: URI too long");
               ap_send_error_response(r, 0);
  +            ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
               ap_run_log_transaction(r);
               apr_brigade_destroy(tmp_bb);
               return r;
  @@ -918,6 +920,7 @@
               ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "request failed: error reading the headers");
               ap_send_error_response(r, 0);
  +            ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
               ap_run_log_transaction(r);
               apr_brigade_destroy(tmp_bb);
               return r;
  @@ -936,6 +939,7 @@
               r->header_only = 0;
               r->status = HTTP_BAD_REQUEST;
               ap_send_error_response(r, 0);
  +            ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
               ap_run_log_transaction(r);
               apr_brigade_destroy(tmp_bb);
               return r;
  @@ -972,6 +976,7 @@
   
       if (r->status != HTTP_OK) {
           ap_send_error_response(r, 0);
  +        ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
           ap_run_log_transaction(r);
           return r;
       }
  @@ -993,6 +998,7 @@
                             "client sent an unrecognized expectation value of "
                             "Expect: %s", expect);
               ap_send_error_response(r, 0);
  +            ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
               ap_run_log_transaction(r);
               return r;
           }
  @@ -1003,6 +1009,7 @@
   
       if ((access_status = ap_run_post_read_request(r))) {
           ap_die(access_status, r);
  +        ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
           ap_run_log_transaction(r);
           return NULL;
       }
  
  
  

Mime
View raw message