From 0623d61305fbb44ac0dd03afb079a80ab94b7a58 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Tue, 9 Jul 2013 14:37:39 +0000 Subject: [PATCH] restore "core_output_filter: writing data to the network" message when c->aborted is set in the core output filter, but now at TRACE1. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1501294 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ server/core_filters.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/CHANGES b/CHANGES index a8e629261f..e64f84c6bf 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) core: Log a message at TRACE1 when the client aborts a connection. + [Eric Covener] + *) core: Replace pre_htaccess hook with more flexible open_htaccess hook. [Stefan Fritsch] diff --git a/server/core_filters.c b/server/core_filters.c index 0798d2ef1e..fb826c3cfa 100644 --- 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; } -- 2.40.0