From 3dd42c024f40aadd08e4cb237d537fafdcb5f3a3 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Tue, 10 Jun 2014 13:23:20 +0000 Subject: [PATCH] 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 --- modules/proxy/proxy_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 513b865719..8e2942f1a1 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -2917,8 +2917,7 @@ PROXY_DECLARE(int) ap_proxy_connection_create(const char *proxy_function, /* Shutdown the connection before closing it (eg. SSL connections * need to be close-notify-ed). */ - apr_pool_cleanup_register(conn->scpool, conn, connection_shutdown, - apr_pool_cleanup_null); + apr_pool_pre_cleanup_register(conn->scpool, conn, connection_shutdown); return OK; }