From: Bill Stoddard <stoddard@apache.org>
Date: Wed, 2 May 2001 13:37:22 +0000 (+0000)
Subject: mod_log_config: %c connection status incorrectly logged
X-Git-Tag: 2.0.18~128
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cebc827303c9e00abce2b39da7e1e9fe24fc7000;p=apache

mod_log_config: %c connection status incorrectly logged
as "-" (non-keepalive) when MaxKeepAliveRequests is set to 0.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88974 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 9258562dbc..9f5e4eed4e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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
diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index 562ca45793..c2b655c455 100644
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -533,8 +533,9 @@ static const char *log_connection_status(request_rec *r, char *a)
     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 "-";