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 61b15fa8afef83fa0a1a6c60ee02e534a7470800..854b7c9289341351ba56e0411173e8813c6c6c51 100644 (file)
--- 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 38c2041fc8392e876f1edc8150e1956a476d10b4..f664f03bfac9f2a186d65da93962715848837ce6 100644 (file)
--- 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 dca2ffd57a588e1bca305a7610db8c4225aaf5ea..c5685b9de3ad2e7b8e7ea2827ebc6fca08a8e5e0 100644 (file)
--- 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 1304a230c0569d45e6c0a01521133f9235e71002..5ec855ec079389d17c70cbb7dda7d6b19ddd367c 100644 (file)
--- 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"