httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apache-1.3/src/os/netware os.c os.h
Date Tue, 27 Feb 2001 03:59:53 GMT
wrowe       01/02/26 19:59:53

  Modified:    src      CHANGES
               src/modules/standard mod_so.c
               src/os/netware os.c os.h
  Log:
    Added a new API for NetWare to allow Apache the chance to unimport
    module symbols before it shuts down.
  
      void ap_os_dso_unsym(void *handle, const char *symname)
  
    This is necessary so that Apache on NetWare can shutdown cleanly
    in an error condition such as a failure while reading the .CONF file.
  
  Submitted by:	Brad Nicholes <BNICHOLES@novell.com>
  Reviewed by:	William Rowe
  
  Revision  Changes    Path
  1.1661    +7 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1660
  retrieving revision 1.1661
  diff -u -r1.1660 -r1.1661
  --- CHANGES	2001/02/26 20:33:48	1.1660
  +++ CHANGES	2001/02/27 03:59:52	1.1661
  @@ -1,6 +1,13 @@
   Changes with Apache 1.3.20
   
     *) Introduce NUL device pipes for stdin and stdout for the parent Win32
  +  *) Added a new API for NetWare to allow Apache the chance to unimport
  +     module symbols before it shuts down.
  +	   void ap_os_dso_unsym(void *handle, const char *symname)
  +	 This is necessary so that Apache on NetWare can shutdown cleanly
  +	 in an error condition such as a failure while reading the .CONF
  +	 file. [Brad Nicholes <BNICHOLES@novell.com>]
  +
        service process.  This solves bugs such as PR7198 that report 
        "dup2(stdin) failed" when trying to use piped logs.  [William Rowe]
   
  
  
  
  1.37      +3 -0      apache-1.3/src/modules/standard/mod_so.c
  
  Index: mod_so.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_so.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- mod_so.c	2001/01/15 17:05:49	1.36
  +++ mod_so.c	2001/02/27 03:59:53	1.37
  @@ -179,6 +179,9 @@
       ap_remove_loaded_module(modi->modp);
   
       /* unload the module space itself */
  +#ifdef NETWARE
  +    ap_os_dso_unsym((ap_os_dso_handle_t)modi->modp->dynamic_load_handle, modi->name);
  +#endif
       ap_os_dso_unload((ap_os_dso_handle_t)modi->modp->dynamic_load_handle);
   
       /* destroy the module information */
  
  
  
  1.13      +5 -0      apache-1.3/src/os/netware/os.c
  
  Index: os.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/netware/os.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- os.c	2001/02/12 07:51:03	1.12
  +++ os.c	2001/02/27 03:59:53	1.13
  @@ -97,6 +97,11 @@
       return ImportSymbol((int)GetNLMHandle(), (char *)symname);
   }
   
  +void ap_os_dso_unsym(void *handle, const char *symname)
  +{
  +    UnimportSymbol((int)GetNLMHandle(), (char *)symname);
  +}
  +
   const char *ap_os_dso_error(void)
   {
       return NULL;
  
  
  
  1.13      +1 -0      apache-1.3/src/os/netware/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/netware/os.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- os.h	2001/01/26 02:12:50	1.12
  +++ os.h	2001/02/27 03:59:53	1.13
  @@ -147,6 +147,7 @@
   void *ap_os_dso_load(const char *);
   void ap_os_dso_unload(void *);
   void *ap_os_dso_sym(void *, const char *);
  +void ap_os_dso_unsym(void *handle, const char *symname);
   const char *ap_os_dso_error(void);
   char *remove_filename(char*);
   char *bslash2slash(char*);
  
  
  

Mime
View raw message