Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 56580 invoked from network); 6 Oct 2005 21:00:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Oct 2005 21:00:25 -0000 Received: (qmail 73932 invoked by uid 500); 6 Oct 2005 21:00:24 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 73899 invoked by uid 500); 6 Oct 2005 21:00:24 -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 73888 invoked by uid 99); 6 Oct 2005 21:00:24 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 06 Oct 2005 14:00:24 -0700 Received: (qmail 56419 invoked by uid 65534); 6 Oct 2005 21:00:03 -0000 Message-ID: <20051006210003.56418.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r306884 - in /httpd/httpd/branches/2.2.x: CHANGES modules/proxy/mod_proxy_balancer.c Date: Thu, 06 Oct 2005 20:59:59 -0000 To: cvs@httpd.apache.org From: rpluem@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: rpluem Date: Thu Oct 6 13:59:48 2005 New Revision: 306884 URL: http://svn.apache.org/viewcvs?rev=306884&view=rev Log: Merge r295013 from trunk: * Fix PR36507 (mod_proxy_balancer does not handle sticky sessions with tomcat correctly). Modified: httpd/httpd/branches/2.2.x/CHANGES httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c Modified: httpd/httpd/branches/2.2.x/CHANGES URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=306884&r1=306883&r2=306884&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original) +++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Thu Oct 6 13:59:48 2005 @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.1.9 + *) mod_proxy_balancer: mod_proxy_balancer does not handle sticky sessions + with tomcat correctly. PR36507. [Ruediger Pluem] + *) SECURITY: CAN-2005-2970 (cve.mitre.org) worker MPM: Fix a memory leak which can occur after an aborted connection in some limited circumstances. [Greg Ames, Jeff Trawick] Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c?rev=306884&r1=306883&r2=306884&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c (original) +++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c Thu Oct 6 13:59:48 2005 @@ -193,7 +193,18 @@ *route = get_path_param(r->pool, *url, balancer->sticky); if (!*route) *route = get_cookie_param(r, balancer->sticky); - if (*route) { + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, + "proxy: BALANCER: Found value %s for " + "stickysession %s", *route, balancer->sticky); + /* + * If we found a value for sticksession, find the first '.' within. + * Everything after '.' (if present) is our route. + */ + if ((*route) && ((*route = strchr(*route, '.')) != NULL )) + (*route)++; + if ((*route) && (**route)) { + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, + "proxy: BALANCER: Found route %s", *route); /* We have a route in path or in cookie * Find the worker that has this route defined. */