Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 10 May 2002 15:08:59 -0000
Message-ID: <20020510150859.29156.qmail@icarus.apache.org>
From: brianp@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server core.c

brianp      02/05/10 08:08:59

  Modified:    include  http_protocol.h
               server   core.c
  Log:
  Moved ap_setup_make_content_type() declaration to http_protocol.h
  
  Revision  Changes    Path
  1.79      +11 -1     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.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- http_protocol.h	19 Apr 2002 16:04:24 -0000	1.78
  +++ http_protocol.h	10 May 2002 15:08:59 -0000	1.79
  @@ -163,7 +163,17 @@
    * @return The content-type
    * @deffunc const char *ap_make_content_type(request_rec *r, const char *type);
    */ 
  -AP_DECLARE(const char *) ap_make_content_type(request_rec *r, const char *type);
  +AP_DECLARE(const char *) ap_make_content_type(request_rec *r,
  +                                              const char *type);
  +
  +#ifdef CORE_PRIVATE
  +/**
  + * Precompile metadata structures used by ap_make_content_type()
  + * @param r The pool to use for allocations
  + * @deffunc void ap_setup_make_content_type(apr_pool_t *pool)
  + */
  +AP_DECLARE(void) ap_setup_make_content_type(apr_pool_t *pool);
  +#endif /* CORE_PRIVATE */
   
   /**
    * Construct an entity tag from the resource information.  If it's a real
  
  
  
  1.175     +0 -2      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.174
  retrieving revision 1.175
  diff -u -r1.174 -r1.175
  --- core.c	10 May 2002 06:47:13 -0000	1.174
  +++ core.c	10 May 2002 15:08:59 -0000	1.175
  @@ -3851,8 +3851,6 @@
       return APR_SUCCESS;
   }
   
  -AP_DECLARE(void) ap_setup_make_content_type(apr_pool_t *pool);
  -
   static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
   {
       ap_set_version(pconf);