Commit 9c7f39fa authored by David Reid's avatar David Reid
Browse files

Move the error logging of a failed send into the core output filter. This 

should catch errors in any way we send data.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88726 13f79535-47bb-0310-9956-ffa450edef68
parent 944e2625

server/core.c

+4 −6
Original line number Diff line number Diff line
@@ -2659,9 +2659,6 @@ static apr_status_t send_the_file(conn_rec *c, apr_file_t *fd, 
                o += bytes_sent;       /* o is where we are in the buffer */

                *nbytes += bytes_sent;

                togo -= bytes_sent;    /* track how much of the file we've sent */

            } else {

                ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,

                             "Failed to send data in send_the_file");

            }

        }

    }
@@ -3208,7 +3205,8 @@ static apr_status_t core_output_filter(ap_filter_t *f, apr_bucket_brigade *b) 


        apr_brigade_destroy(b);

        if (rv != APR_SUCCESS) {

            /* XXX: log the error */

            ap_log_error(APLOG_MARK, APLOG_ERR, rv, c->base_server,

               "core_output_filter: writing data to the network");

            if (more)

                apr_brigade_destroy(more);

            return rv;