Received: by taz.hyperreal.com (8.8.4/V2.0) id QAA05286;
 Thu, 20 Feb 1997 16:22:33 -0800 (PST)
Received: by taz.hyperreal.com (8.8.4/V2.0) id QAA05279;
 Thu, 20 Feb 1997 16:22:31 -0800 (PST)
Date: Thu, 20 Feb 1997 16:22:31 -0800 (PST)
From: Roy Fielding <fielding@hyperreal.com>
Message-Id: <199702210022.QAA05279@taz.hyperreal.com>
To: apache-cvs@hyperreal.com
Subject: cvs commit: apache/src http_request.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@hyperreal.com

fielding    97/02/20 16:22:30

  Modified:    src       http_request.c
  Log:
  We do not want TRACE to bypass a proxy request, since the proxy is
  supposed to pass it on following the rules in RFC 2068.  The code
  is currently failing to respond correctly to full-URIs if there is
  no proxy module compiled-in, but that's a different problem.
  
  Revision  Changes    Path
  1.46      +9 -9      apache/src/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_request.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -C3 -r1.45 -r1.46
  *** http_request.c	1997/02/20 23:36:40	1.45
  --- http_request.c	1997/02/21 00:22:29	1.46
  ***************
  *** 870,886 ****
    	return;
        }
    
  -     /* We don't want TRACE to run through the normal handler set,
  -      * we handle it specially.
  -      */
  -     if (r->method_number == M_TRACE) {
  - 	send_http_trace (r);
  - 	finalize_request_protocol (r);
  - 	return;
  -     }
  - 
        if (!r->proxyreq)
        {
    	access_status = unescape_url(r->uri);
    	if (access_status)
    	{
  --- 870,886 ----
    	return;
        }
    
        if (!r->proxyreq)
        {
  +         /* We don't want TRACE to run through the normal handler set,
  +          * we handle it specially.
  +          */
  +         if (r->method_number == M_TRACE) {
  +             send_http_trace(r);
  +             finalize_request_protocol(r);
  +             return;
  +         }
  + 
    	access_status = unescape_url(r->uri);
    	if (access_status)
    	{