httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
Subject cvs commit: apache-1.3/src/modules/standard mod_info.c
Date Tue, 09 May 2000 22:44:32 GMT
wrowe       00/05/09 15:44:31

  Modified:    src/include http_conf_globals.h
               src/main http_main.c
               src/modules/standard mod_info.c
    Correct http_conf_globals.h and http_main.c to agree with each other
    as well as ApacheCore.def.  Add extern definition to mod_info to
    resolve segfaults in Win32.
    Addresses PR1442, PR2472, PR4125, PR1643 and PR2208
    Jim Patterson <?>, Jan Just Keijser <>
  Revision  Changes    Path
  1.41      +16 -16    apache-1.3/src/include/http_conf_globals.h
  Index: http_conf_globals.h
  RCS file: /home/cvs/apache-1.3/src/include/http_conf_globals.h,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- http_conf_globals.h	1999/10/21 20:44:16	1.40
  +++ http_conf_globals.h	2000/05/09 22:44:28	1.41
  @@ -66,36 +66,36 @@
    * Process config --- what the process ITSELF is doing
  -extern int ap_standalone;
  +extern API_VAR_EXPORT int ap_standalone;
   extern int ap_configtestonly;
   extern int ap_docrootcheck;
  -extern uid_t ap_user_id;
  -extern char *ap_user_name;
  -extern gid_t ap_group_id;
  +extern API_VAR_EXPORT uid_t ap_user_id;
  +extern API_VAR_EXPORT char *ap_user_name;
  +extern API_VAR_EXPORT gid_t ap_group_id;
   #ifdef NETWARE
   extern unsigned int ap_thread_stack_size;
   extern gid_t group_id_list[NGROUPS_MAX];
  -extern int ap_max_requests_per_child;
  -extern int ap_threads_per_child;
  -extern int ap_excess_requests_per_child;
  +extern API_VAR_EXPORT int ap_max_requests_per_child;
  +extern API_VAR_EXPORT int ap_threads_per_child;
  +extern API_VAR_EXPORT int ap_excess_requests_per_child;
   extern struct in_addr ap_bind_address;
   extern listen_rec *ap_listeners;
  -extern int ap_daemons_to_start;
  -extern int ap_daemons_min_free;
  -extern int ap_daemons_max_free;
  -extern int ap_daemons_limit;
  -extern MODULE_VAR_EXPORT int ap_suexec_enabled;
  +extern API_VAR_EXPORT int ap_daemons_to_start;
  +extern API_VAR_EXPORT int ap_daemons_min_free;
  +extern API_VAR_EXPORT int ap_daemons_max_free;
  +extern API_VAR_EXPORT int ap_daemons_limit;
  +extern API_VAR_EXPORT int ap_suexec_enabled;
   extern int ap_listenbacklog;
   extern int ap_dump_settings;
   extern API_VAR_EXPORT int ap_extended_status;
  -extern char *ap_pid_fname;
  -extern char *ap_scoreboard_fname;
  +extern API_VAR_EXPORT char *ap_pid_fname;
  +extern API_VAR_EXPORT char *ap_scoreboard_fname;
   extern char *ap_lock_fname;
  -extern MODULE_VAR_EXPORT char *ap_server_argv0;
  +extern API_VAR_EXPORT char *ap_server_argv0;
   extern enum server_token_type ap_server_tokens;
  @@ -106,7 +106,7 @@
   extern API_VAR_EXPORT char ap_server_root[MAX_STRING_LEN];
  -extern char ap_server_confname[MAX_STRING_LEN];
  +extern API_VAR_EXPORT char ap_server_confname[MAX_STRING_LEN];
   /* for -C, -c and -D switches */
   extern array_header *ap_server_pre_read_config;
  1.493     +16 -16    apache-1.3/src/main/http_main.c
  Index: http_main.c
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.492
  retrieving revision 1.493
  diff -u -r1.492 -r1.493
  --- http_main.c	2000/02/28 13:42:24	1.492
  +++ http_main.c	2000/05/09 22:44:29	1.493
  @@ -233,29 +233,29 @@
   BOOL ap_main_finished = FALSE;
   unsigned int ap_thread_stack_size = 65536;
  -int ap_standalone=0;
  +API_VAR_EXPORT int ap_standalone=0;
   int ap_configtestonly=0;
   int ap_docrootcheck=1;
  -uid_t ap_user_id=0;
  -char *ap_user_name=NULL;
  -gid_t ap_group_id=0;
  +API_VAR_EXPORT uid_t ap_user_id=0;
  +API_VAR_EXPORT char *ap_user_name=NULL;
  +API_VAR_EXPORT gid_t ap_group_id=0;
   gid_t group_id_list[NGROUPS_MAX];
  -int ap_max_requests_per_child=0;
  -int ap_threads_per_child=0;
  -int ap_excess_requests_per_child=0;
  -char *ap_pid_fname=NULL;
  -char *ap_scoreboard_fname=NULL;
  +API_VAR_EXPORT int ap_max_requests_per_child=0;
  +API_VAR_EXPORT int ap_threads_per_child=0;
  +API_VAR_EXPORT int ap_excess_requests_per_child=0;
  +API_VAR_EXPORT char *ap_pid_fname=NULL;
  +API_VAR_EXPORT char *ap_scoreboard_fname=NULL;
   char *ap_lock_fname;
  -char *ap_server_argv0=NULL;
  +API_VAR_EXPORT char *ap_server_argv0=NULL;
   struct in_addr ap_bind_address;
  -int ap_daemons_to_start=0;
  -int ap_daemons_min_free=0;
  -int ap_daemons_max_free=0;
  -int ap_daemons_limit=0;
  +API_VAR_EXPORT int ap_daemons_to_start=0;
  +API_VAR_EXPORT int ap_daemons_min_free=0;
  +API_VAR_EXPORT int ap_daemons_max_free=0;
  +API_VAR_EXPORT int ap_daemons_limit=0;
   time_t ap_restart_time=0;
  -int ap_suexec_enabled = 0;
  +API_VAR_EXPORT int ap_suexec_enabled = 0;
   int ap_listenbacklog;
   int ap_dump_settings = 0;
   API_VAR_EXPORT int ap_extended_status = 0;
  @@ -288,7 +288,7 @@
   static listen_rec *head_listener;
   API_VAR_EXPORT char ap_server_root[MAX_STRING_LEN]="";
  -char ap_server_confname[MAX_STRING_LEN]="";
  +API_VAR_EXPORT char ap_server_confname[MAX_STRING_LEN]="";
   char ap_coredump_dir[MAX_STRING_LEN];
   array_header *ap_server_pre_read_config;
  1.48      +1 -1      apache-1.3/src/modules/standard/mod_info.c
  Index: mod_info.c
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_info.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- mod_info.c	1999/12/07 04:54:29	1.47
  +++ mod_info.c	2000/05/09 22:44:30	1.48
  @@ -103,7 +103,7 @@
   } info_cfg_lines;
   module MODULE_VAR_EXPORT info_module;
  -extern module *top_module;
  +module API_VAR_EXPORT *top_module;
   static void *create_info_config(pool *p, server_rec *s)

View raw message