Commit a518bcbb authored by Brian Pane's avatar Brian Pane
Browse files

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
parent 575dd280
Loading
Loading
Loading
Loading
+11 −1
Changes for include/http_protocol.h: 11 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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
+0 −2
Changes for server/core.c: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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);