Commit 64086b6e authored by Yann Ylavic's avatar Yann Ylavic
Browse files

mod_proxy_{ajp,fcgi}: Fix a possible crash when reusing an established 

backend connection, happening with LogLevel trace2 or higher configured,
or at any log level with compilers not detected as C99 compliant (e.g.
MSVC on Windows).



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

CHANGES

+5 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.0



  *) mod_proxy_{ajp,fcgi}: Fix a possible crash when reusing an established

     backend connection, happening with LogLevel trace2 or higher configured,

     or at any log level with compilers not detected as C99 compliant (e.g.

     MSVC on Windows).  [Yann Ylavic]



  *) mod_ext_filter: Don't interfere with "error buckets" issued by other

     modules. PR60375.  [Eric Covener, Lubos Uhliarik]

modules/proxy/proxy_util.c

+7 −4
Original line number Diff line number Diff line
@@ -2754,10 +2754,13 @@ PROXY_DECLARE(apr_status_t) ap_proxy_check_connection(const char *scheme, 
    }



    if (rv == APR_SUCCESS) {

        if (APLOGtrace2(server)) {

            apr_sockaddr_t *local_addr = NULL;

            apr_socket_addr_get(&local_addr, APR_LOCAL, conn->sock);

            ap_log_error(APLOG_MARK, APLOG_TRACE2, 0, server,

                         "%s: reusing backend connection %pI<>%pI",

                     scheme, conn->connection->local_addr,

                     conn->connection->client_addr);

                         scheme, local_addr, conn->addr);

        }

    }

    else if (conn->sock) {

        /* This clears conn->scpool (and associated data), so backup and