httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-2.0/src/os/win32 main_win32.c
Date Sun, 28 May 2000 03:52:46 GMT
wrowe       00/05/27 20:52:46

  Modified:    src      ApacheCore.def
               src/include http_config.h util_uri.h
               src/main http_config.c http_main.c util_uri.c
               src/os/win32 main_win32.c
  Log:
    Finally a patch that can't (well, shouldn't :-) break any other platform.
  
    Open up the symbols defined for http_main.c to move main() from the core
    under Win32 (that's the real main(), not that apache_main() thing).
  
    Win32 Project file changes will follow in a seperate patch.
  
  Revision  Changes    Path
  1.19      +12 -1     apache-2.0/src/ApacheCore.def
  
  Index: ApacheCore.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ApacheCore.def	2000/05/17 00:35:16	1.18
  +++ ApacheCore.def	2000/05/28 03:52:31	1.19
  @@ -299,7 +299,7 @@
   ;	ap_snprintf   @292
   	;ap_suexec_enabled  @293 
   ;	ap_table_do   @294
  -	apache_main   @295
  +;	apache_main   @295
   	asis_module   @296
   	auth_module   @297
   	autoindex_module  @298 
  @@ -400,3 +400,14 @@
           ap_bread_core @395
           ap_bwrite_core @396
   	ap_mpm_init_complete @397
  +
  +;       Exclusively provided for http_main.c
  +        ap_register_hooks @398
  +        ap_prelinked_modules @399
  +        ap_preloaded_modules @400
  +        ap_post_config_hook @401
  +        ap_run_pre_config @402
  +        ap_run_rewrite_args @403
  +        ap_show_directives @404
  +        ap_show_modules @405
  +        ap_util_uri_init @406
  
  
  
  1.26      +14 -11    apache-2.0/src/include/http_config.h
  
  Index: http_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_config.h,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- http_config.h	2000/05/27 22:53:46	1.25
  +++ http_config.h	2000/05/28 03:52:36	1.26
  @@ -368,8 +368,8 @@
   
   extern API_VAR_EXPORT module *top_module;
   
  -extern module *ap_prelinked_modules[];
  -extern module *ap_preloaded_modules[];
  +extern API_VAR_EXPORT module *ap_prelinked_modules[];
  +extern API_VAR_EXPORT module *ap_preloaded_modules[];
   extern API_VAR_EXPORT module **ap_loaded_modules;
   
   /* For mod_so.c... */
  @@ -378,16 +378,15 @@
   
   /* For http_main.c... */
   
  -void ap_setup_prelinked_modules(process_rec *process);
  -void ap_show_directives(void);
  -void ap_show_modules(void);
  -server_rec *ap_read_config(process_rec *process, ap_pool_t *temp_pool, const char *config_name);
  -void ap_post_config_hook(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec
*s);
  -void ap_child_init_hook(ap_pool_t *pchild, server_rec *s);
  -void ap_run_rewrite_args(process_rec *process);
  -void ap_run_pre_config(ap_pool_t *p, ap_pool_t *plog, ap_pool_t *ptemp);
  +API_EXPORT(void) ap_setup_prelinked_modules(process_rec *process);
  +API_EXPORT(void) ap_show_directives(void);
  +API_EXPORT(void) ap_show_modules(void);
  +API_EXPORT(server_rec*) ap_read_config(process_rec *process, ap_pool_t *temp_pool, const
char *config_name);
  +API_EXPORT(void) ap_post_config_hook(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp,
server_rec *s);
  +API_EXPORT(void) ap_run_rewrite_args(process_rec *process);
  +API_EXPORT(void) ap_run_pre_config(ap_pool_t *p, ap_pool_t *plog, ap_pool_t *ptemp);
   
  -void ap_register_hooks(module *m);
  +API_EXPORT(void) ap_register_hooks(module *m);
   
   /* For http_request.c... */
   
  @@ -407,6 +406,10 @@
   CORE_EXPORT(const char *) ap_init_virtual_host(ap_pool_t *p, const char *hostname,
   				server_rec *main_server, server_rec **);
   void ap_process_resource_config(server_rec *s, const char *fname, ap_pool_t *p, ap_pool_t
*ptemp);
  +
  +/* For individual MPMs... */
  +
  +void ap_child_init_hook(ap_pool_t *pchild, server_rec *s);
   
   /* Module-method dispatchers, also for http_request.c */
   
  
  
  
  1.6       +1 -1      apache-2.0/src/include/util_uri.h
  
  Index: util_uri.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_uri.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- util_uri.h	2000/04/14 15:58:17	1.5
  +++ util_uri.h	2000/05/28 03:52:38	1.6
  @@ -121,7 +121,7 @@
   API_EXPORT(int) ap_parse_uri_components(ap_pool_t *p, const char *uri, uri_components *uptr);
   API_EXPORT(int) ap_parse_hostinfo_components(ap_pool_t *p, const char *hostinfo, uri_components
*uptr);
   /* called by the core in main() */
  -extern void ap_util_uri_init(void);
  +API_EXPORT(void) ap_util_uri_init(void);
   
   #ifdef __cplusplus
   }
  
  
  
  1.54      +9 -8      apache-2.0/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- http_config.c	2000/05/27 22:53:48	1.53
  +++ http_config.c	2000/05/28 03:52:41	1.54
  @@ -366,7 +366,7 @@
       return HTTP_INTERNAL_SERVER_ERROR;
   }
   
  -void ap_register_hooks(module *m)
  +API_EXPORT(void) ap_register_hooks(module *m)
       {
       if(m->register_hooks)
   	{
  @@ -534,7 +534,7 @@
       *m = NULL;
   }
   
  -void ap_setup_prelinked_modules(process_rec *process)
  +API_EXPORT(void) ap_setup_prelinked_modules(process_rec *process)
   {
       module **m;
       module **m2;
  @@ -1529,7 +1529,8 @@
   }
   
   
  -server_rec *ap_read_config(process_rec *process, ap_pool_t *ptemp, const char *confname)
  +API_EXPORT(server_rec*) ap_read_config(process_rec *process, ap_pool_t *ptemp,
  +                                       const char *confname)
   {
       ap_pool_t *p = process->pconf;
       server_rec *s = init_server_config(process, p);
  @@ -1561,7 +1562,7 @@
                                (*m->create_dir_config)(p, NULL));
   }
   
  -void ap_run_rewrite_args(process_rec *process)
  +API_EXPORT(void) ap_run_rewrite_args(process_rec *process)
   {
       module *m;
   
  @@ -1570,7 +1571,7 @@
               (*m->rewrite_args) (process);
   }
   
  -void ap_run_pre_config(ap_pool_t *p, ap_pool_t *plog, ap_pool_t *ptemp)
  +API_EXPORT(void) ap_run_pre_config(ap_pool_t *p, ap_pool_t *plog, ap_pool_t *ptemp)
   {
       module *m;
   
  @@ -1580,7 +1581,7 @@
       init_handlers(p);
   }
   
  -void ap_post_config_hook(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec
*s)
  +API_EXPORT(void) ap_post_config_hook(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp,
server_rec *s)
   {
       ap_run_post_config(pconf,plog,ptemp,s); 
       init_handlers(pconf);
  @@ -1672,7 +1673,7 @@
    * the directive arguments, in what module they are handled, and in
    * what parts of the configuration they are allowed.  Used for httpd -h.
    */
  -void ap_show_directives()
  +API_EXPORT(void) ap_show_directives()
   {
       const command_rec *pc;
       int n;
  @@ -1687,7 +1688,7 @@
   }
   
   /* Show the preloaded module names.  Used for httpd -l. */
  -void ap_show_modules()
  +API_EXPORT(void) ap_show_modules()
   {
       int n;
   
  
  
  
  1.50      +1 -1      apache-2.0/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- http_main.c	2000/05/27 23:53:45	1.49
  +++ http_main.c	2000/05/28 03:52:41	1.50
  @@ -279,7 +279,7 @@
   }
   
   #ifdef WIN32
  -API_EXPORT_NONSTD(int) apache_main(int argc, char *argv[])
  +int apache_main(int argc, char *argv[])
   #else
   API_EXPORT(int)        main(int argc, char *argv[])
   #endif
  
  
  
  1.10      +2 -2      apache-2.0/src/main/util_uri.c
  
  Index: util_uri.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_uri.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- util_uri.c	2000/04/14 15:58:57	1.9
  +++ util_uri.c	2000/05/28 03:52:42	1.10
  @@ -233,7 +233,7 @@
   static regex_t re_uri;
   static regex_t re_hostpart;
   
  -void ap_util_uri_init(void)
  +API_EXPORT(void) ap_util_uri_init(void)
   {
       int ret;
       const char *re_str;
  @@ -431,7 +431,7 @@
   #define NOTEND_HOSTINFO	(T_SLASH | T_QUESTION | T_HASH | T_NUL)
   #define NOTEND_PATH	(T_QUESTION | T_HASH | T_NUL)
   
  -void ap_util_uri_init(void)
  +API_EXPORT(void) ap_util_uri_init(void)
   {
       /* nothing to do */
   }
  
  
  
  1.18      +1 -1      apache-2.0/src/os/win32/main_win32.c
  
  Index: main_win32.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/main_win32.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- main_win32.c	2000/05/27 05:27:38	1.17
  +++ main_win32.c	2000/05/28 03:52:44	1.18
  @@ -85,7 +85,7 @@
   
   #define DEFAULTSERVICENAME "Apache"
   
  -API_EXPORT_NONSTD(int) apache_main(int argc, char *argv[]);
  +int apache_main(int argc, char *argv[]);
   
   static const char* read_config_cmd(char *filename, char *cmd, ap_pool_t *p)
   {
  
  
  

Mime
View raw message