Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 28386 invoked from network); 3 Sep 2007 21:07:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Sep 2007 21:07:48 -0000 Received: (qmail 69065 invoked by uid 500); 3 Sep 2007 21:07:42 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 69042 invoked by uid 500); 3 Sep 2007 21:07:42 -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 69031 invoked by uid 99); 3 Sep 2007 21:07:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Sep 2007 14:07:42 -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, 03 Sep 2007 21:07:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A645D1A9832; Mon, 3 Sep 2007 14:07:18 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r572421 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/proxy/mod_proxy_http.c Date: Mon, 03 Sep 2007 21:07:18 -0000 To: cvs@httpd.apache.org From: rpluem@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070903210718.A645D1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rpluem Date: Mon Sep 3 14:07:17 2007 New Revision: 572421 URL: http://svn.apache.org/viewvc?rev=572421&view=rev Log: Merge r572000 from trunk: * Fix proxy-sendchunk(s|ed) problem. PR: 43183 Submitted by: Brian Rectanus , Vincent Bray Reviewed by: niq, rpluem, fielding Modified: httpd/httpd/branches/2.2.x/CHANGES 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/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=572421&r1=572420&r2=572421&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original) +++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Sep 3 14:07:17 2007 @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.2.6 + *) mod_proxy_http: accept proxy-sendchunked/proxy-sendchunks as synonymous. + PR 43183 [Brian Rectanus , Vincent Bray] + *) mod_proxy: Ensure that at least scheme://hostname[:port] matches between worker and URL when searching for the best fitting worker for a given URL. PR 40910 [Ruediger Pluem] Modified: httpd/httpd/branches/2.2.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=572421&r1=572420&r2=572421&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/STATUS (original) +++ httpd/httpd/branches/2.2.x/STATUS Mon Sep 3 14:07:17 2007 @@ -79,14 +79,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * mod_proxy_http: make proxy-sendchunked work as documented. - PR 43183 - Trunk version of patch: - http://svn.apache.org/viewcvs.cgi?rev=572000&view=rev - 2.2 version: noodl's patch at - http://issues.apache.org/bugzilla/attachment.cgi?id=20699 - +1: niq, rpluem, fielding - PATCHES PROPOSED TO BACKPORT FROM TRUNK: 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=572421&r1=572420&r2=572421&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 Sep 3 14:07:17 2007 @@ -954,7 +954,8 @@ else if (old_te_val) { if (force10 || (apr_table_get(r->subprocess_env, "proxy-sendcl") - && !apr_table_get(r->subprocess_env, "proxy-sendchunks"))) { + && !apr_table_get(r->subprocess_env, "proxy-sendchunks") + && !apr_table_get(r->subprocess_env, "proxy-sendchunked"))) { rb_method = RB_SPOOL_CL; } else { @@ -966,7 +967,8 @@ rb_method = RB_STREAM_CL; } else if (!force10 - && apr_table_get(r->subprocess_env, "proxy-sendchunks") + && (apr_table_get(r->subprocess_env, "proxy-sendchunks") + || apr_table_get(r->subprocess_env, "proxy-sendchunked")) && !apr_table_get(r->subprocess_env, "proxy-sendcl")) { rb_method = RB_STREAM_CHUNKED; }