Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 25272 invoked from network); 2 Oct 2007 21:23:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Oct 2007 21:23:43 -0000 Received: (qmail 63938 invoked by uid 500); 2 Oct 2007 21:23:26 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 63870 invoked by uid 500); 2 Oct 2007 21:23:26 -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 63859 invoked by uid 99); 2 Oct 2007 21:23:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Oct 2007 14:23:26 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [209.133.199.10] (HELO jimsys.jagunet.com) (209.133.199.10) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Oct 2007 21:23:28 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) by jimsys.jagunet.com (Postfix) with ESMTP id 80E87BA3B4E for ; Tue, 2 Oct 2007 17:22:37 -0400 (EDT) Mime-Version: 1.0 (Apple Message framework v752.2) In-Reply-To: <4702B4DF.40407@apache.org> References: <20071002203648.350A01A9832@eris.apache.org> <4702B4DF.40407@apache.org> Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: <052C4214-4175-4A3A-B6BA-B84C1E127337@jaguNET.com> Content-Transfer-Encoding: 7bit From: Jim Jagielski Subject: Re: svn commit: r581374 - /httpd/httpd/trunk/modules/http/http_core.c Date: Tue, 2 Oct 2007 17:22:37 -0400 To: dev@httpd.apache.org X-Mailer: Apple Mail (2.752.2) X-Virus-Checked: Checked by ClamAV on apache.org On Oct 2, 2007, at 5:15 PM, Ruediger Pluem wrote: > > > On 10/02/2007 10:36 PM, fielding@apache.org wrote: >> Author: fielding >> Date: Tue Oct 2 13:36:47 2007 >> New Revision: 581374 >> >> URL: http://svn.apache.org/viewvc?rev=581374&view=rev >> Log: >> Reduce the last change to a minimum, since OPTIONS * does not >> include an Allow header field (* is not a resource). >> >> >> Modified: >> httpd/httpd/trunk/modules/http/http_core.c >> >> Modified: httpd/httpd/trunk/modules/http/http_core.c >> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/ >> http_core.c?rev=581374&r1=581373&r2=581374&view=diff >> ===================================================================== >> ========= >> --- httpd/httpd/trunk/modules/http/http_core.c (original) >> +++ httpd/httpd/trunk/modules/http/http_core.c Tue Oct 2 13:36:47 >> 2007 >> @@ -236,21 +236,11 @@ >> >> static int http_send_options(request_rec *r) >> { >> - int rv; >> - if ((r->method_number != M_OPTIONS) || !r->uri || strcmp(r- >> >uri, "*")) { >> - return DECLINED; >> + if ((r->method_number == M_OPTIONS) && r->uri && (r->uri[0] >> == '*')) { >> + return OK; /* Send HTTP pong, without Allow >> header */ > > Why OK and not DONE? > AFAIK DONE causes to shortcut further processing whereas OK causes > the full processing > including Directories / Locations / handler (See > request.c:ap_process_request_internal:150 and > http_request.c:ap_process_async_request:242-251). > Already fixed... I noticed this right off the bat.