Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 53263 invoked from network); 15 Oct 2007 16:54:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Oct 2007 16:54:22 -0000 Received: (qmail 25730 invoked by uid 500); 15 Oct 2007 16:54:09 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 25673 invoked by uid 500); 15 Oct 2007 16:54:09 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 25656 invoked by uid 99); 15 Oct 2007 16:54:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Oct 2007 09:54:09 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Oct 2007 16:54:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9EAAE1A9832; Mon, 15 Oct 2007 09:54:00 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r584821 - in /httpd/httpd/branches/2.2.x: STATUS modules/proxy/mod_proxy_http.c Date: Mon, 15 Oct 2007 16:54:00 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071015165400.9EAAE1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jim Date: Mon Oct 15 09:53:59 2007 New Revision: 584821 URL: http://svn.apache.org/viewvc?rev=584821&view=rev Log: 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 Modified: httpd/httpd/branches/2.2.x/STATUS httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c Modified: httpd/httpd/branches/2.2.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=584821&r1=584820&r2=584821&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/STATUS (original) +++ httpd/httpd/branches/2.2.x/STATUS Mon Oct 15 09:53:59 2007 @@ -79,12 +79,6 @@ 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 ] Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c?rev=584821&r1=584820&r2=584821&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c (original) +++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c Mon Oct 15 09:53:59 2007 @@ -1850,7 +1850,7 @@ 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 = {