cvs commit: jakarta-tomcat-connectors/webapp/apache-1.3 Makefile.in mod_webapp.c

[pier]

pier        01/07/09 15:00:28

  Modified:    webapp/apache-1.3 Makefile.in mod_webapp.c
  Log:
  Function renamed for clarity...
  
  Revision  Changes    Path
  1.4       +2 -2      jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in       2001/07/08 23:11:42     1.3
  +++ Makefile.in       2001/07/09 22:00:23     1.4
  @@ -56,7 +56,7 @@
   # ========================================================================= #
   
   # @author  Pier Fumagalli <mailto:[EMAIL PROTECTED]>
  -# @version $Id: Makefile.in,v 1.3 2001/07/08 23:11:42 pier Exp $
  +# @version $Id: Makefile.in,v 1.4 2001/07/09 22:00:23 pier Exp $
   
   include @SRCDIR@/Makedefs
   
  @@ -84,7 +84,7 @@
                -I$(APXS_INCLUDEDIR) $(CPPFLAGS) $(EXTRA_CPPFLAGS) \
                -c $< -o $@
   
  -mod_webapp.so: mod_webapp.lo
  +mod_webapp.so: mod_webapp.lo @SRCDIR@/lib/libwebapp.la @APRDIR@/libapr.la
        @echo Linking Apache 1.3 WebApp Module
        @$(SHELL) $(LIBTOOL) $(LTFLAGS) --mode=link \
                $(APXS_LD_SHLIB) $(APXS_LDFLAGS_SHLIB) \
  
  
  
  1.17      +9 -9      jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c
  
  Index: mod_webapp.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_webapp.c      2001/05/12 02:31:47     1.16
  +++ mod_webapp.c      2001/07/09 22:00:24     1.17
  @@ -57,7 +57,7 @@
   
   /**
    * @author  Pier Fumagalli <mailto:[EMAIL PROTECTED]>
  - * @version $Id: mod_webapp.c,v 1.16 2001/05/12 02:31:47 jon Exp $
  + * @version $Id: mod_webapp.c,v 1.17 2001/07/09 22:00:24 pier Exp $
    */
   
   #include <httpd.h>
  @@ -84,26 +84,26 @@
   /* MODULE AND LIBRARY INITIALIZATION AND DESTRUCTION                         */
   /* ************************************************************************* */
   
  -/* Destroy the module and the WebApp Library */
  -static void wam_destroy(void *nil) {
  -    if (!wam_initialized) return;
  -    wa_destroy();
  -    wam_initialized=FALSE;
  -}
  -
   /* Startup the module and the WebApp Library */
   static void wam_startup(server_rec *s, pool *p) {
       if (!wam_initialized) return;
       wa_startup();
   }
   
  +/* Destroy the module and the WebApp Library */
  +static void wam_shutdown(void *nil) {
  +    if (!wam_initialized) return;
  +    wa_shutdown();
  +    wam_initialized=FALSE;
  +}
  +
   /* Initialize the module and the WebApp Library */
   static const char *wam_init(pool *p) {
       const char *ret=NULL;
   
       if(wam_initialized) return(NULL);
       if ((ret=wa_init())!=NULL) return(ret);
  -    ap_register_cleanup(p,NULL,wam_destroy,NULL);
  +    ap_register_cleanup(p,NULL,wam_shutdown,NULL);
       wam_initialized=TRUE;
       return(NULL);
   }