You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2002/04/05 22:55:00 UTC
cvs commit: httpd-2.0/modules/http http_core.c mod_core.h
wrowe 02/04/05 12:55:00
Modified: server core.c protocol.c
modules/http http_core.c mod_core.h
Log:
Correct partitioning of filter handles between core and http, and
export the handle pointers on Win32.
Revision Changes Path
1.169 +5 -5 httpd-2.0/server/core.c
Index: core.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/core.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- core.c 29 Mar 2002 08:17:24 -0000 1.168
+++ core.c 5 Apr 2002 20:54:59 -0000 1.169
@@ -120,11 +120,11 @@
*/
/* 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)
{
1.95 +1 -0 httpd-2.0/server/protocol.c
Index: protocol.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- protocol.c 29 Mar 2002 08:17:24 -0000 1.94
+++ protocol.c 5 Apr 2002 20:54:59 -0000 1.95
@@ -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"
1.302 +4 -4 httpd-2.0/modules/http/http_core.c
Index: http_core.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/http/http_core.c,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- http_core.c 29 Mar 2002 08:17:22 -0000 1.301
+++ http_core.c 5 Apr 2002 20:55:00 -0000 1.302
@@ -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)
1.21 +6 -0 httpd-2.0/modules/http/mod_core.h
Index: mod_core.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/http/mod_core.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_core.h 13 Mar 2002 20:47:49 -0000 1.20
+++ mod_core.h 5 Apr 2002 20:55:00 -0000 1.21
@@ -70,6 +70,12 @@
* @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.
*/