cvs commit: apache-2.0/src/modules/standard mod_so.c

[stoddard]

stoddard00/01/21 11:24:49

  Modified:src/modules/standard mod_so.c
  Log:
  Fix Windows compile breakage.
  
  Revision  ChangesPath
  1.7   +1 -0  apache-2.0/src/modules/standard/mod_so.c
  
  Index: mod_so.c
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_so.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_so.c  1999/11/19 18:48:54 1.6
  +++ mod_so.c  2000/01/21 19:24:46 1.7
  @@ -129,6 +129,7 @@
   #include httpd.h
   #include http_config.h
   #include http_log.h
  +#include ap_config.h
   
   module MODULE_VAR_EXPORT so_module;
   
  
  
  

cvs commit: apache-2.0/src/modules/standard mod_so.c

[bjh]

bjh 99/11/13 22:07:41

  Modified:src/modules/standard mod_so.c
  Log:
  Make mod_so.c compile. Loading modules crashes for me though, haven't figured
  out why yet
  
  Revision  ChangesPath
  1.5   +11 -20apache-2.0/src/modules/standard/mod_so.c
  
  Index: mod_so.c
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_so.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_so.c  1999/10/11 22:39:53 1.4
  +++ mod_so.c  1999/11/14 06:07:40 1.5
  @@ -168,11 +168,11 @@
* This is called as a cleanup function from the core.
*/
   
  -static void unload_module(moduleinfo *modi)
  +static ap_status_t unload_module(moduleinfo *modi)
   {
   /* only unload if module information is still existing */
   if (modi-modp == NULL)
  -return;
  +return APR_SUCCESS;
   
   /* remove the module pointer from the core structure */
   ap_remove_loaded_module(modi-modp);
  @@ -183,6 +183,7 @@
   /* destroy the module information */
   modi-modp = NULL;
   modi-name = NULL;
  +return APR_SUCCESS;
   }
   
   /* 
  @@ -192,9 +193,10 @@
* or include the filename in error message.
*/
   
  -static void unload_file(void *handle)
  +static ap_status_t unload_file(void *handle)
   {
   ap_os_dso_unload((ap_os_dso_handle_t)handle);
  +return APR_SUCCESS;
   }
   
   /* 
  @@ -238,7 +240,7 @@
my_error ? my_error : (reason unknown),
NULL);
   }
  -ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL,
  +ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, NULL,
loaded module %s, modname);
   
   /*
  @@ -274,7 +276,7 @@
* shared object to be unloaded.
*/
   ap_register_cleanup(cmd-pool, modi, 
  -  (void (*)(void*))unload_module, ap_null_cleanup);
  +  (ap_status_t (*)(void*))unload_module, ap_null_cleanup);
   
   /* 
* Finally we need to run the configuration process for the module
  @@ -292,7 +294,7 @@
   static const char *load_file(cmd_parms *cmd, void *dummy, char *filename)
   {
   ap_os_dso_handle_t handle;
  -char *file;
  +const char *file;
   
   file = ap_server_root_relative(cmd-pool, filename);
   
  @@ -304,7 +306,7 @@
NULL);
   }
   
  -ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL,
  +ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, NULL,
loaded file %s, filename);
   
   ap_register_cleanup(cmd-pool, (void *)handle, unload_file, 
ap_null_cleanup);
  @@ -338,23 +340,12 @@
   };
   
   module MODULE_VAR_EXPORT so_module = {
  -   STANDARD_MODULE_STUFF,
  -   NULL, /* initializer */
  +   STANDARD20_MODULE_STUFF,
  NULL, /* create per-dir config */
  NULL, /* merge per-dir config */
  so_sconf_create,  /* server config */
  NULL, /* merge server config */
  so_cmds,  /* command ap_table_t */
  NULL, /* handlers */
  -   NULL, /* filename translation */
  -   NULL, /* check_user_id */
  -   NULL, /* check auth */
  -   NULL, /* check access */
  -   NULL, /* type_checker */
  -   NULL, /* fixer_upper */
  -   NULL, /* logger */
  -   NULL, /* header parser */
  -   NULL, /* child_init */
  -   NULL, /* child_exit */
  -   NULL  /* post read-request */
  +   NULL  /* register hooks */
   };