Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 49817 invoked from network); 6 Apr 2005 17:21:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Apr 2005 17:21:08 -0000 Received: (qmail 709 invoked by uid 500); 6 Apr 2005 17:20:56 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 614 invoked by uid 500); 6 Apr 2005 17:20:56 -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: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 569 invoked by uid 99); 6 Apr 2005 17:20:55 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: neutral (hermes.apache.org: local policy) Received: from scotch.ics.uci.edu (HELO scotch.ics.uci.edu) (128.195.24.168) by apache.org (qpsmtpd/0.28) with ESMTP; Wed, 06 Apr 2005 10:20:54 -0700 Received: from st-augustin.ics.uci.edu (st-augustin.ics.uci.edu [128.195.20.85]) (authenticated bits=0) by scotch.ics.uci.edu (8.12.11/8.12.11) with ESMTP id j36HKph5016607 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 6 Apr 2005 10:20:51 -0700 (PDT) Date: Wed, 06 Apr 2005 10:20:51 -0800 From: Justin Erenkrantz To: dev@httpd.apache.org Subject: Re: svn commit: r158798 - in httpd/httpd/trunk: CHANGES server/protocol.c Message-ID: In-Reply-To: <20050323163646.44711.qmail@minotaur.apache.org> References: <20050323163646.44711.qmail@minotaur.apache.org> X-Mailer: Mulberry/3.1.6 (Mac OS X) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Spam-Status: No, score=-2.8 required=5.0 tests=ALL_TRUSTED autolearn=no version=3.1.0-r156655 X-Spam-Checker-Version: SpamAssassin 3.1.0-r156655 (2005-03-09) on scotch.ics.uci.edu X-Virus-Scanned: ClamAV 0.80/645/Mon Dec 27 14:56:20 2004 clamav-milter version 0.80j on scotch.ics.uci.edu X-Virus-Status: Clean X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N --On Wednesday, March 23, 2005 4:36 PM +0000 gregames@apache.org wrote: > another @@ -1008,7 +1023,15 @@ > > rnew->status = HTTP_OK; > > - rnew->headers_in = r->headers_in; > + /* did the original request have a body? (e.g. POST w/SSI tags) > + * if so, make sure the subrequest doesn't inherit body headers > + */ > + if (r->read_length) { > + clone_headers_no_body(rnew, r); > + } else { > + /* no body (common case). clone headers the cheap way */ > + rnew->headers_in = r->headers_in; > + } As I just noted in STATUS for 2.0, read_length isn't a sufficient check. It'd only be set if the client has *already* read the body *and* they used the 1.3.x mechanisms for reading the request body. The proper check is to look for Transfer-Encoding and Content-Length in the request headers. This is what ap_http_filter in http_filters.c does to look for a request body. -- justin