From: Ruediger Pluem <rpluem@apache.org>
Date: Fri, 5 Mar 2010 07:37:15 +0000 (+0000)
Subject: * Only log a 408 if it is no keepalive timeout.
X-Git-Tag: 2.3.6~398
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf715d43fc127aa9708a9f8b80d4c883b4940256;p=thirdparty%2Fapache%2Fhttpd.git

* Only log a 408 if it is no keepalive timeout.

PR: 39785
Submitted by: Mark Montague <markmont umich.edu>, rpluem
Reviewed by: rpluem


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

diff --git a/CHANGES b/CHANGES
index f3e69f7091d..341e6afd88c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@ Changes with Apache 2.3.7
      processing is completed, avoiding orphaned callback pointers.
      [Brett Gervasoni <brettg senseofsecurity.com>, Jeff Trawick]
 
+  *) core: Only log a 408 if it is no keepalive timeout. PR 39785
+     [Ruediger Pluem,  Mark Montague <markmont umich.edu>]
+
   *) support/rotatelogs: Add -L option to create a link to the current
      log file.  PR 48761 [<lyndon orthanc.ca>, Dan Poirier]
 
diff --git a/server/protocol.c b/server/protocol.c
index 494913b8366..ef4c4b76595 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -923,7 +923,9 @@ request_rec *ap_read_request(conn_rec *conn)
         }
         else if (r->status == HTTP_REQUEST_TIME_OUT) {
             ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
-            ap_run_log_transaction(r);
+            if (!r->connection->keepalives) {
+                ap_run_log_transaction(r);
+            }
             apr_brigade_destroy(tmp_bb);
             goto traceout;
         }