cvs commit: httpd-2.0/server protocol.c listen.c config.c

[bn...@apache.org]

bnicholes    02/01/02 15:27:57

  Modified:    server   protocol.c listen.c config.c
  Log:
  Making sure that the global variables have been initialized to avoid linker
  problems at least on NetWare
  Submitted by: Pavel Novy
  
  Revision  Changes    Path
  1.64      +1 -1      httpd-2.0/server/protocol.c
  
  Index: protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- protocol.c	21 Dec 2001 04:21:15 -0000	1.63
  +++ protocol.c	2 Jan 2002 23:27:57 -0000	1.64
  @@ -104,7 +104,7 @@
   	    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
  
  
  
  1.67      +1 -1      httpd-2.0/server/listen.c
  
  Index: listen.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/listen.c,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- listen.c	8 Dec 2001 01:38:05 -0000	1.66
  +++ listen.c	2 Jan 2002 23:27:57 -0000	1.67
  @@ -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
  
  
  
  1.143     +4 -4      httpd-2.0/server/config.c
  
  Index: config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/config.c,v
  retrieving revision 1.142
  retrieving revision 1.143
  diff -u -r1.142 -r1.143
  --- config.c	26 Dec 2001 09:52:53 -0000	1.142
  +++ config.c	2 Jan 2002 23:27:57 -0000	1.143
  @@ -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;