Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 36968 invoked from network); 17 Aug 2010 15:48:48 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 17 Aug 2010 15:48:48 -0000 Received: (qmail 35585 invoked by uid 500); 17 Aug 2010 15:48:48 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 35464 invoked by uid 500); 17 Aug 2010 15:48:47 -0000 Mailing-List: contact dev-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 dev@httpd.apache.org Received: (qmail 35455 invoked by uid 99); 17 Aug 2010 15:48:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Aug 2010 15:48:47 +0000 X-ASF-Spam-Status: No, hits=-2.3 required=10.0 tests=RCVD_IN_DNSWL_MED,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of rainer.jung@kippdata.de designates 195.227.30.149 as permitted sender) Received: from [195.227.30.149] (HELO mailserver.kippdata.de) (195.227.30.149) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Aug 2010 15:48:39 +0000 Received: from [195.227.30.209] (notebook-rj [195.227.30.209]) by mailserver.kippdata.de (8.13.5/8.13.5) with ESMTP id o7HFmIrP005340 for ; Tue, 17 Aug 2010 17:48:18 +0200 (CEST) Message-ID: <4C6AAF3D.7030903@kippdata.de> Date: Tue, 17 Aug 2010 17:48:13 +0200 From: Rainer Jung User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.2.8) Gecko/20100802 Thunderbird/3.1.2 MIME-Version: 1.0 To: dev@httpd.apache.org Subject: Re: svn commit: r986333 - /httpd/httpd/trunk/modules/proxy/mod_proxy_http.c References: <20100817144346.08E5723888EA@eris.apache.org> <4C6AA2FB.9080605@kippdata.de> <41AE0A73-B41A-45E2-AE51-2C14CC714BBA@jaguNET.com> In-Reply-To: <41AE0A73-B41A-45E2-AE51-2C14CC714BBA@jaguNET.com> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit On 17.08.2010 17:22, Jim Jagielski wrote: > > On Aug 17, 2010, at 10:55 AM, Rainer Jung wrote: > >> On 17.08.2010 16:43, jim@apache.org wrote: >>> Author: jim >>> Date: Tue Aug 17 14:43:45 2010 >>> New Revision: 986333 >>> >>> URL: http://svn.apache.org/viewvc?rev=986333&view=rev >>> Log: >>> Further checks for non-body requests... >>> >>> Modified: >>> httpd/httpd/trunk/modules/proxy/mod_proxy_http.c >>> >>> Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_http.c >>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?rev=986333&r1=986332&r2=986333&view=diff >>> ============================================================================== >>> --- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original) >>> +++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Tue Aug 17 14:43:45 2010 >>> @@ -704,8 +704,15 @@ int ap_proxy_http_request(apr_pool_t *p, >>> * Send the HTTP/1.1 request to the remote server >>> */ >>> >>> + /* >>> + * To be compliant, we only use 100-Continue for requests with no bodies. >>> + * We also make sure we won't be talking HTTP/1.0 as well. >>> + */ >>> do_100_continue = (worker->ping_timeout_set >>> && !r->header_only >>> +&& !r->kept_body >>> +&& !(apr_table_get(r->headers_in, "Content-Length")) >>> +&& !(apr_table_get(r->headers_in, "Transfer-Encoding")) >> >> Did you mean: >> >> && (!apr_table_get(r->headers_in, "Content-Length") || >> !apr_table_get(r->headers_in, "Transfer-Encoding") >> > > I think you meant: > > && (!(apr_table_get(r->headers_in, "Content-Length") || apr_table_get(r->headers_in, "Transfer-Encoding"))) > > Which xforms to > > && !a > && !b See my other post about using expect only *if* there is a body, but indeed I got it wrong (sigh!): && (apr_table_get(r->headers_in, "Content-Length") || apr_table_get(r->headers_in, "Transfer-Encoding") Regards, Rainer