httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ruediger Pluem <rpl...@apache.org>
Subject Re: svn commit: r581374 - /httpd/httpd/trunk/modules/http/http_core.c
Date Tue, 02 Oct 2007 21:15:11 GMT


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).

Regards

RĂ¼diger



Mime
View raw message