Commit 6b286aaa authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* Ensure that aborted connections are logged as such. 

  Set c->aborted before apr_brigade_cleanup to have the correct status
  when logging the request as apr_brigade_cleanup triggers the logging
  of the request if it contains an EOR bucket.

PR: 62823
Submitted by: Arnaud Grandville <contact@grandville.net>
Reviewed by:rpluem


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

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.1



  *) core: Ensure that aborted connections are logged as such. PR 62823

     [Arnaud Grandville <contact@grandville.net>]



  *) mpm_event: Stop issuing AH00484 "server reached MaxRequestWorkers..." when

     there are still idle threads available. When there are less idle threads than

     MinSpareThreads, issue new one-time message AH10159. Matches worker MPM.

server/core_filters.c

+6 −1
Changes for server/core_filters.c: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -436,8 +436,13 @@ apr_status_t ap_core_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) 
        ap_log_cerror(

                APLOG_MARK, APLOG_TRACE1, rv, c,

                "core_output_filter: writing data to the network");

        apr_brigade_cleanup(bb);

        /*

         * Set c->aborted before apr_brigade_cleanup to have the correct status

         * when logging the request as apr_brigade_cleanup triggers the logging

         * of the request if it contains an EOR bucket.

         */

        c->aborted = 1;

        apr_brigade_cleanup(bb);

        return rv;

    }