core: Restore "core_output_filter: writing data to the network", but at TRACE1.

trunk patch: http://svn.apache.org/r1501294

Submitted by: covener
Reviewed by: jim, humbedooh

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1523262 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 0fa06e5bc1b37061575ef5032022b344ae3170d5..58adc0b11e7cd44031d11577439c5a22f7048bc3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.7
 
+  *) core: Log a message at TRACE1 when the client aborts a connection.
+     [Eric Covener]
+
   *) WinNT MPM: Don't crash during child process initialization if the
      Listen protocol is unrecognized.  [Jeff Trawick]
 

diff --git a/STATUS b/STATUS
index d353e8f4f10e70af8cd261a120f7eb59c2cb4059..b94d2aabab10d835420a20360cd3eb2e2d72a9e2 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -152,12 +152,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4.x patch: trunk works
     +1: covener, jim, humbedooh
 
-  
-  * core: Restore "core_output_filter: writing data to the network", but at TRACE1.
-    trunk patch: http://svn.apache.org/r1501294
-    2.4.x patch: trunk works
-    +1: covener, jim, humbedooh
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/server/core_filters.c b/server/core_filters.c
index 0798d2ef1ebbbd09d9c7fd0c6127eafee0640448..fb826c3cfabe5cca42c086eb2ba0c3919d0f4672 100644 (file)
--- a/server/core_filters.c
+++ b/server/core_filters.c
@@ -473,6 +473,8 @@ apr_status_t ap_core_output_filter(ap_filter_t *f, apr_bucket_brigade *new_bb)
         }
         else if (rv != APR_SUCCESS) {
             /* The client has aborted the connection */
+            ap_log_cerror(APLOG_MARK, APLOG_TRACE1, rv, c,
+                          "core_output_filter: writing data to the network");
             c->aborted = 1;
         }
         setaside_remaining_output(f, ctx, bb, c);
@@ -543,6 +545,8 @@ apr_status_t ap_core_output_filter(ap_filter_t *f, apr_bucket_brigade *new_bb)
                                    &(ctx->bytes_written), c);
         if (rv != APR_SUCCESS) {
             /* The client has aborted the connection */
+            ap_log_cerror(APLOG_MARK, APLOG_TRACE1, rv, c,
+                          "core_output_filter: writing data to the network");
             c->aborted = 1;
             return rv;
         }
@@ -554,6 +558,8 @@ apr_status_t ap_core_output_filter(ap_filter_t *f, apr_bucket_brigade *new_bb)
                                       &(ctx->bytes_written), c);
         if ((rv != APR_SUCCESS) && (!APR_STATUS_IS_EAGAIN(rv))) {
             /* The client has aborted the connection */
+            ap_log_cerror(APLOG_MARK, APLOG_TRACE1, rv, c,
+                          "core_output_filter: writing data to the network");
             c->aborted = 1;
             return rv;
         }