svn commit: r919323 - in /httpd/httpd/trunk: CHANGES server/protocol.c

[rp...@apache.org]

Author: rpluem
Date: Fri Mar  5 07:37:15 2010
New Revision: 919323

URL: http://svn.apache.org/viewvc?rev=919323&view=rev
Log:
* Only log a 408 if it is no keepalive timeout.

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

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/protocol.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=919323&r1=919322&r2=919323&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Mar  5 07:37:15 2010
@@ -7,6 +7,9 @@
      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]
 

Modified: httpd/httpd/trunk/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/protocol.c?rev=919323&r1=919322&r2=919323&view=diff
==============================================================================
--- httpd/httpd/trunk/server/protocol.c (original)
+++ httpd/httpd/trunk/server/protocol.c Fri Mar  5 07:37:15 2010
@@ -923,7 +923,9 @@
         }
         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;
         }