From 40dbbae3d2990c6812ed128a4ed3480fcd493c4d Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Mon, 15 Oct 2007 16:53:59 +0000 Subject: [PATCH] Merge r583813 from trunk: * modules/proxy/mod_proxy_http.c (ap_proxy_http_register_hook): Fix apr_pool_cleanup_register() invocation added in r583202, which was causing every apr_proc_create() call to segfault. Submitted by: jorton Reviewed by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@584821 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 6 ------ modules/proxy/mod_proxy_http.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/STATUS b/STATUS index a3fdaff36ac..a4e55cd6d0e 100644 --- a/STATUS +++ b/STATUS @@ -79,12 +79,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * modules/proxy/mod_proxy_http.c (ap_proxy_http_register_hook): Fix - apr_pool_cleanup_register() invocation added in r583202, which was - causing every apr_proc_create() call to segfault. - Trunk version of patch: - http://svn.apache.org/viewvc?view=rev&revision=583813 - +1: rpluem, jim, niq PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c index 34eef68c795..7e6493b41cb 100644 --- a/modules/proxy/mod_proxy_http.c +++ b/modules/proxy/mod_proxy_http.c @@ -1850,7 +1850,7 @@ static void ap_proxy_http_register_hook(apr_pool_t *p) proxy_hook_scheme_handler(proxy_http_handler, NULL, NULL, APR_HOOK_FIRST); proxy_hook_canon_handler(proxy_http_canon, NULL, NULL, APR_HOOK_FIRST); warn_rx = ap_pregcomp(p, "[0-9]{3}[ \t]+[^ \t]+[ \t]+\"[^\"]*\"([ \t]+\"([^\"]+)\")?", 0); - apr_pool_cleanup_register(p, p, warn_rx_free, NULL); + apr_pool_cleanup_register(p, p, warn_rx_free, apr_pool_cleanup_null); } module AP_MODULE_DECLARE_DATA proxy_http_module = { -- 2.47.2