Making sure that the global variables have been initialized to avoid linker

problems at least on NetWare
Submitted by: Pavel Novy

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

diff --git a/server/config.c b/server/config.c
index 6d88929a5f848b84ba25fbe3123ea2ade3889d4d..5b61ad3c9b860ac6085f7453b51a71771d1e9688 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -95,13 +95,13 @@
 #include "mpm.h"
 
 
-AP_DECLARE_DATA const char *ap_server_argv0;
+AP_DECLARE_DATA const char *ap_server_argv0 = NULL;
 
 AP_DECLARE_DATA const char *ap_server_root = NULL;
 
-AP_DECLARE_DATA apr_array_header_t *ap_server_pre_read_config;
-AP_DECLARE_DATA apr_array_header_t *ap_server_post_read_config;
-AP_DECLARE_DATA apr_array_header_t *ap_server_config_defines;
+AP_DECLARE_DATA apr_array_header_t *ap_server_pre_read_config = NULL;
+AP_DECLARE_DATA apr_array_header_t *ap_server_post_read_config = NULL;
+AP_DECLARE_DATA apr_array_header_t *ap_server_config_defines = NULL;
 
 AP_DECLARE_DATA ap_directive_t *ap_conftree = NULL;
 

diff --git a/server/listen.c b/server/listen.c
index 4f16276dfb486bdbcd98c617c6f2c6b95cbfcd73..bc1796e3c140486f75f8d9fa28f743da99a79430 100644 (file)
--- a/server/listen.c
+++ b/server/listen.c
@@ -72,7 +72,7 @@
 #include "mpm.h"
 #include "mpm_common.h"
 
-ap_listen_rec *ap_listeners;
+ap_listen_rec *ap_listeners = NULL;
 #if APR_HAVE_IPV6
 static int default_family = APR_UNSPEC;
 #else

diff --git a/server/protocol.c b/server/protocol.c
index d4e225bef7ee37e89477c53a5535db17afc73cf7..ed8fd7a5a82da495bf6c689d1d8c8a565d207cfd 100644 (file)
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -104,7 +104,7 @@ APR_HOOK_STRUCT(
            APR_HOOK_LINK(default_port)
 )
 
-AP_DECLARE_DATA ap_filter_rec_t *ap_old_write_func;
+AP_DECLARE_DATA ap_filter_rec_t *ap_old_write_func = NULL;
 
 /*
  * Builds the content-type that should be sent to the client from the