Moved ap_setup_make_content_type() declaration to http_protocol.h

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95031 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/http_protocol.h b/include/http_protocol.h
index cdea1b2eb711840e10adf887599d9c5bb663065c..08bd75019558bb3143ae6d5e0ff404c52c449f84 100644 (file)
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -163,7 +163,17 @@ AP_DECLARE(apr_time_t) ap_rationalize_mtime(request_rec *r, apr_time_t mtime);
  * @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

diff --git a/server/core.c b/server/core.c
index e42fe8cd243a4bffb40c41e98b26d9baff32e0a4..ff60706c2fd2c6ceee5f55b87837cd534944df4b 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -3851,8 +3851,6 @@ static apr_status_t core_output_filter(ap_filter_t *f, apr_bucket_brigade *b)
     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);