Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A3D579639 for ; Mon, 19 Mar 2012 13:53:52 +0000 (UTC) Received: (qmail 71101 invoked by uid 500); 19 Mar 2012 13:53:52 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 71035 invoked by uid 500); 19 Mar 2012 13:53:52 -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 71028 invoked by uid 99); 19 Mar 2012 13:53:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Mar 2012 13:53:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Mar 2012 13:53:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 379772388860; Mon, 19 Mar 2012 13:53:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1302444 - in /httpd/httpd/trunk: CHANGES modules/proxy/mod_proxy.c Date: Mon, 19 Mar 2012 13:53:29 -0000 To: cvs@httpd.apache.org From: rpluem@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120319135329.379772388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rpluem Date: Mon Mar 19 13:53:28 2012 New Revision: 1302444 URL: http://svn.apache.org/viewvc?rev=1302444&view=rev Log: * Correctly save the reverse proxy worker in all virtual host proxy configs. PR: 52935 Obtained from: Petter Berntsen Modified: httpd/httpd/trunk/CHANGES httpd/httpd/trunk/modules/proxy/mod_proxy.c Modified: httpd/httpd/trunk/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1302444&r1=1302443&r2=1302444&view=diff ============================================================================== --- httpd/httpd/trunk/CHANGES [utf-8] (original) +++ httpd/httpd/trunk/CHANGES [utf-8] Mon Mar 19 13:53:28 2012 @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) mod_proxy: Correctly set up reverse proxy worker. PR 52935. + [Petter Berntsen ] + *) core: Add filesystem paths to access denied / access failed messages AH00035 and AH00036. [Eric Covener] Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1302444&r1=1302443&r2=1302444&view=diff ============================================================================== --- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original) +++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Mon Mar 19 13:53:28 2012 @@ -2461,11 +2461,11 @@ static void child_init(apr_pool_t *p, se ap_proxy_hashfunc(reverse->s->name, PROXY_HASHFUNC_FNV); /* Do not disable worker in case of errors */ reverse->s->status |= PROXY_WORKER_IGNORE_ERRORS; - conf->reverse = reverse; ap_proxy_initialize_worker(conf->reverse, s, conf->pool); /* Disable address cache for generic reverse worker */ reverse->s->is_address_reusable = 0; } + conf->reverse = reverse; s = s->next; } }