1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

mod_proxy: follow up to r1601291.

Since deferred_write_pool is needed by the core_output_filter and is a subpool
of the connection, shutdown in a pre_cleanup of the connection's pool to avoid
a freed memory access (SEGV).

Reported By: takashi


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601630 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2014-06-10 13:23:20 +00:00
parent 9614c0b8e6
commit 3dd42c024f

View File

@@ -2917,8 +2917,7 @@ PROXY_DECLARE(int) ap_proxy_connection_create(const char *proxy_function,
/* Shutdown the connection before closing it (eg. SSL connections /* Shutdown the connection before closing it (eg. SSL connections
* need to be close-notify-ed). * need to be close-notify-ed).
*/ */
apr_pool_cleanup_register(conn->scpool, conn, connection_shutdown, apr_pool_pre_cleanup_register(conn->scpool, conn, connection_shutdown);
apr_pool_cleanup_null);
return OK; return OK;
} }