httpd-dev mailing list archives

This patch intends to fix PR2415 and PR1442.

The following patches are needed to compile and run mod_info.c on Win32
(changes WRT Apache 1.3.9 Win32 source code):

*** modules/standard/mod_info-old.c	Sat Jun 05 10:48:12 1999
--- modules/standard/mod_info.c	Tue Sep 21 13:57:26 1999
***************
*** 103,109 ****
  } info_cfg_lines;
  
  module MODULE_VAR_EXPORT info_module;
! extern module *top_module;
  
  static void *create_info_config(pool *p, server_rec *s)
  {
--- 103,109 ----
  } info_cfg_lines;
  
  module MODULE_VAR_EXPORT info_module;
! module API_VAR_EXPORT *top_module;
  
  static void *create_info_config(pool *p, server_rec *s)
  {


*** include/http_conf_globals-old.h	Tue Jun 29 10:13:12 1999
--- include/http_conf_globals.h	Tue Sep 21 13:57:50 1999
***************
*** 66,100 ****
   * Process config --- what the process ITSELF is doing
   */
  
! extern 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;
  #ifdef MULTIPLE_GROUPS
! extern gid_t group_id_list[NGROUPS_MAX];
  #endif
! extern int ap_max_requests_per_child;
! extern int ap_threads_per_child;
! extern 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 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 char *ap_lock_fname;
  extern MODULE_VAR_EXPORT char *ap_server_argv0;
  
! extern enum server_token_type ap_server_tokens;
  
  /* Trying to allocate these in the config pool gets us into some *nasty*
   * chicken-and-egg problems in http_main.c --- where do you stick them
--- 66,100 ----
   * Process config --- what the process ITSELF is doing
   */
  
! extern API_VAR_EXPORT int ap_standalone;
! extern API_VAR_EXPORT int ap_configtestonly;
! extern API_VAR_EXPORT int ap_docrootcheck;
! 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 MULTIPLE_GROUPS
! extern API_VAR_EXPORT gid_t group_id_list[NGROUPS_MAX];
  #endif
! 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 API_VAR_EXPORT struct in_addr ap_bind_address;
! extern API_VAR_EXPORT listen_rec *ap_listeners;
! 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 MODULE_VAR_EXPORT int ap_suexec_enabled;
! extern API_VAR_EXPORT int ap_listenbacklog;
! extern API_VAR_EXPORT int ap_dump_settings;
  extern API_VAR_EXPORT int ap_extended_status;
  
! extern API_VAR_EXPORT char *ap_pid_fname;
! extern API_VAR_EXPORT char *ap_scoreboard_fname;
! extern API_VAR_EXPORT char *ap_lock_fname;
  extern MODULE_VAR_EXPORT char *ap_server_argv0;
  
! extern API_VAR_EXPORT enum server_token_type ap_server_tokens;
  
  /* Trying to allocate these in the config pool gets us into some *nasty*
   * chicken-and-egg problems in http_main.c --- where do you stick them
***************
*** 103,109 ****
   */
  
  extern API_VAR_EXPORT char ap_server_root[MAX_STRING_LEN];
! extern char ap_server_confname[MAX_STRING_LEN];
  
  /* for -C, -c and -D switches */
  extern array_header *ap_server_pre_read_config;
--- 103,109 ----
   */
  
  extern API_VAR_EXPORT char ap_server_root[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;
***************
*** 113,119 ****
  /* We want this to have the least chance of being corrupted if there
   * is some memory corruption, so we allocate it statically.
   */
! extern char ap_coredump_dir[MAX_STRING_LEN];
  
  #ifdef __cplusplus
  }
--- 113,119 ----
  /* We want this to have the least chance of being corrupted if there
   * is some memory corruption, so we allocate it statically.
   */
! extern API_VAR_EXPORT char ap_coredump_dir[MAX_STRING_LEN];
  
  #ifdef __cplusplus
  }


Regards,

JJ Keijser
UNIX Systems Engineer
Logica Inc