You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@apache.org on 2001/05/02 15:37:22 UTC

cvs commit: httpd-2.0/modules/loggers mod_log_config.c

stoddard    01/05/02 06:37:22

  Modified:    .        CHANGES
               modules/loggers mod_log_config.c
  Log:
  mod_log_config: %c connection status incorrectly logged
  as "-" (non-keepalive) when MaxKeepAliveRequests is set to 0.
  
  Revision  Changes    Path
  1.191     +6 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.190
  retrieving revision 1.191
  diff -u -r1.190 -r1.191
  --- CHANGES	2001/04/29 17:05:49	1.190
  +++ CHANGES	2001/05/02 13:37:21	1.191
  @@ -1,4 +1,10 @@
   Changes with Apache 2.0.18-dev
  +  *) mod_log_config: %c connection status incorrectly logged
  +     as "-" (non-keepalive) when MaxKeepAliveRequests is set to 0.
  +     [Bill Stoddard]
  +
  +  *) Get mod_cern_meta working under Windows
  +     [Bill Stoddard]
   
     *) Create Files, and thus MMAPs, out of the request pool, not the
        connection pool.  This solves a small resource leak that had us
  
  
  
  1.58      +3 -2      httpd-2.0/modules/loggers/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/loggers/mod_log_config.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- mod_log_config.c	2001/04/21 22:17:59	1.57
  +++ mod_log_config.c	2001/05/02 13:37:22	1.58
  @@ -533,8 +533,9 @@
       if (r->connection->aborted)
           return "X";
   
  -    if ((r->connection->keepalive) &&
  -        ((r->server->keep_alive_max - r->connection->keepalives) > 0)) {
  +    if (r->connection->keepalive && 
  +        (!r->server->keep_alive_max ||
  +         (r->server->keep_alive_max - r->connection->keepalives) > 0)) {
           return "+";
       }
       return "-";