Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 20 Mar 2002 17:44:13 -0000
Message-ID: <20020320174413.17234.qmail@icarus.apache.org>
From: stoddard@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server core.c util_script.c

stoddard    02/03/20 09:44:13

  Modified:    include  http_protocol.h
               server   core.c util_script.c
  Log:
  Commit 2 of 2 to:
  1. rename ap_rset_content_type to ap_set_content_type
  2. reverse the arguments to aligh with ap_set_content_length
  
  Revision  Changes    Path
  1.74      +8 -2      httpd-2.0/include/http_protocol.h
  
  Index: http_protocol.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_protocol.h,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- http_protocol.h	20 Mar 2002 12:03:49 -0000	1.73
  +++ http_protocol.h	20 Mar 2002 17:44:13 -0000	1.74
  @@ -321,9 +321,15 @@
   AP_DECLARE(void) ap_clear_method_list(ap_method_list_t *l);
       
   /**
  - *
  + * Set the content type for this request (r->content_type). 
  + * Note:
  + * This function must be called to set r->content_type in order 
  + * for the AddOutputFilterByType directive to work correctly.
  + * @param r The current request
  + * @param length The new content type
  + * @deffunc void ap_set_content_type(request_rec *r, const char* ct)
    */
  -AP_DECLARE(void) ap_rset_content_type(const char *str, request_rec *r);
  +AP_DECLARE(void) ap_set_content_type(request_rec *r, const char *ct);
   
   /* Hmmm... could macrofy these for now, and maybe forever, though the
    * definitions of the macros would get a whole lot hairier.
  
  
  
  1.165     +1 -1      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.164
  retrieving revision 1.165
  diff -u -r1.164 -r1.165
  --- core.c	20 Mar 2002 02:05:42 -0000	1.164
  +++ core.c	20 Mar 2002 17:44:13 -0000	1.165
  @@ -3095,7 +3095,7 @@
       /* Check for overrides with ForceType / SetHandler
        */
       if (conf->mime_type && strcmp(conf->mime_type, "none"))
  -        ap_rset_content_type((char*) conf->mime_type, r);
  +        ap_set_content_type(r, (char*) conf->mime_type);
   
       if (conf->handler && strcmp(conf->handler, "none"))
           r->handler = conf->handler;
  
  
  
  1.73      +1 -1      httpd-2.0/server/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/util_script.c,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- util_script.c	20 Mar 2002 02:05:43 -0000	1.72
  +++ util_script.c	20 Mar 2002 17:44:13 -0000	1.73
  @@ -569,7 +569,7 @@
   
   	    tmp = apr_pstrdup(r->pool, l);
   	    ap_content_type_tolower(tmp);
  -	    ap_rset_content_type(tmp, r);
  +	    ap_set_content_type(r, tmp);
   	}
   	/*
   	 * If the script returned a specific status, that's what