From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 5 Apr 2002 20:55:00 +0000 (+0000)
Subject:   Correct partitioning of filter handles between core and http, and
X-Git-Tag: 2.0.35~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5200732d3b9ee01762cb61840ec1f17884aaf29;p=thirdparty%2Fapache%2Fhttpd.git

  Correct partitioning of filter handles between core and http, and
  export the handle pointers on Win32.


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

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 61b15fa8afe..854b7c92893 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -78,10 +78,10 @@
 #include "mod_core.h"
 
 /* Handles for core filters */
-ap_filter_rec_t *ap_http_input_filter_handle;
-ap_filter_rec_t *ap_http_header_filter_handle;
-ap_filter_rec_t *ap_chunk_filter_handle;
-ap_filter_rec_t *ap_byterange_filter_handle;
+AP_DECLARE_DATA ap_filter_rec_t *ap_http_input_filter_handle;
+AP_DECLARE_DATA ap_filter_rec_t *ap_http_header_filter_handle;
+AP_DECLARE_DATA ap_filter_rec_t *ap_chunk_filter_handle;
+AP_DECLARE_DATA ap_filter_rec_t *ap_byterange_filter_handle;
 
 static const char *set_keep_alive_timeout(cmd_parms *cmd, void *dummy,
 					  const char *arg)
diff --git a/modules/http/mod_core.h b/modules/http/mod_core.h
index 38c2041fc83..f664f03bfac 100644
--- a/modules/http/mod_core.h
+++ b/modules/http/mod_core.h
@@ -70,6 +70,12 @@ extern "C" {
  * @package mod_core private header file
  */
 
+/* Handles for core filters */
+extern AP_DECLARE_DATA ap_filter_rec_t *ap_http_input_filter_handle;
+extern AP_DECLARE_DATA ap_filter_rec_t *ap_http_header_filter_handle;
+extern AP_DECLARE_DATA ap_filter_rec_t *ap_chunk_filter_handle;
+extern AP_DECLARE_DATA ap_filter_rec_t *ap_byterange_filter_handle;
+
 /*
  * These (input) filters are internal to the mod_core operation.
  */
diff --git a/server/core.c b/server/core.c
index dca2ffd57a5..c5685b9de3a 100644
--- a/server/core.c
+++ b/server/core.c
@@ -120,11 +120,11 @@ AP_IMPLEMENT_HOOK_RUN_ALL(int, get_mgmt_items,
  */
 
 /* Handles for core filters */
-ap_filter_rec_t *ap_subreq_core_filter_handle;
-ap_filter_rec_t *ap_core_output_filter_handle;
-ap_filter_rec_t *ap_content_length_filter_handle;
-ap_filter_rec_t *ap_net_time_filter_handle;
-ap_filter_rec_t *ap_core_input_filter_handle;
+AP_DECLARE_DATA ap_filter_rec_t *ap_subreq_core_filter_handle;
+AP_DECLARE_DATA ap_filter_rec_t *ap_core_output_filter_handle;
+AP_DECLARE_DATA ap_filter_rec_t *ap_content_length_filter_handle;
+AP_DECLARE_DATA ap_filter_rec_t *ap_net_time_filter_handle;
+AP_DECLARE_DATA ap_filter_rec_t *ap_core_input_filter_handle;
 
 static void *create_core_dir_config(apr_pool_t *a, char *dir)
 {
diff --git a/server/protocol.c b/server/protocol.c
index 1304a230c05..5ec855ec079 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -86,6 +86,7 @@
 #include "http_vhost.h"
 #include "http_log.h"           /* For errors detected in basic auth common
                                  * support code... */
+#include "mod_core.h"
 #include "util_charset.h"
 #include "util_ebcdic.h"