svn commit: r1601630 - /httpd/httpd/trunk/modules/proxy/proxy_util.c

[yl...@apache.org]

Author: ylavic
Date: Tue Jun 10 13:23:20 2014
New Revision: 1601630

URL: http://svn.apache.org/r1601630
Log:
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

Modified:
    httpd/httpd/trunk/modules/proxy/proxy_util.c

Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1601630&r1=1601629&r2=1601630&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Tue Jun 10 13:23:20 2014
@@ -2917,8 +2917,7 @@ PROXY_DECLARE(int) ap_proxy_connection_c
     /* 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;
 }