httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1523262 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS server/core_filters.c
Date Sat, 14 Sep 2013 14:56:33 GMT
Author: minfrin
Date: Sat Sep 14 14:56:33 2013
New Revision: 1523262

URL: http://svn.apache.org/r1523262
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/server/core_filters.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1501294

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1523262&r1=1523261&r2=1523262&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sat Sep 14 14:56:33 2013
@@ -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]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1523262&r1=1523261&r2=1523262&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Sep 14 14:56:33 2013
@@ -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 ]

Modified: httpd/httpd/branches/2.4.x/server/core_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core_filters.c?rev=1523262&r1=1523261&r2=1523262&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/core_filters.c (original)
+++ httpd/httpd/branches/2.4.x/server/core_filters.c Sat Sep 14 14:56:33 2013
@@ -473,6 +473,8 @@ apr_status_t ap_core_output_filter(ap_fi
         }
         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_fi
                                    &(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_fi
                                       &(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;
         }



Mime
View raw message