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 mod_isapi.c
Date Mon, 02 Oct 2000 22:52:22 GMT
wrowe       00/10/02 15:52:21

  Modified:    src/os/win32 mod_isapi.c
  Log:
    Whoops... that there was a handle I left hanging (and growing).
  
  Revision  Changes    Path
  1.23      +7 -10     apache-2.0/src/os/win32/mod_isapi.c
  
  Index: mod_isapi.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/mod_isapi.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mod_isapi.c	2000/10/02 22:29:18	1.22
  +++ mod_isapi.c	2000/10/02 22:52:20	1.23
  @@ -161,7 +161,7 @@
   apr_status_t isapi_load(request_rec *r, isapi_loaded** isa);
   BOOL isapi_unload(isapi_loaded* isa, int force);
   
  -static apr_status_t cleanup_server_config(void *sconfv)
  +static apr_status_t cleanup_isapi_server_config(void *sconfv)
   {
       isapi_server_conf *sconf = sconfv;
       size_t n;
  @@ -172,12 +172,13 @@
       while(n--) {
           if (isa->handle)
               isapi_unload(isa, TRUE); 
  +        ++isa;
       }
       CloseHandle(sconf->lock);
       return APR_SUCCESS;
   }
   
  -static void *create_server_config(apr_pool_t *p, server_rec *s)
  +static void *create_isapi_server_config(apr_pool_t *p, server_rec *s)
   {
       isapi_server_conf *sconf = apr_palloc(p, sizeof(isapi_server_conf*));
       sconf->loaded = apr_make_array(p, 20, sizeof(isapi_loaded*));
  @@ -188,6 +189,9 @@
       sconf->AppendLogToErrors   = 0;
       sconf->AppendLogToQuery    = 0;
   
  +    apr_register_cleanup(p, sconf, cleanup_isapi_server_config, 
  +                                   apr_null_cleanup);
  +
       return sconf;
   }
   
  @@ -283,13 +287,6 @@
           return rv;
       }
   
  -    /* If we succeeded at caching this module - the first module needs to 
  -     * register a cleanup to be polite.
  -     */
  -    /* if (!sconf->loaded->nelts)
  -     *     apr_register_cleanup(p, sconf, cleanup_server_config, apr_null_cleanup);
  -     */
  -
       return APR_SUCCESS;
   }
   
  @@ -1092,7 +1089,7 @@
      STANDARD20_MODULE_STUFF,
      NULL,                        /* create per-dir config */
      NULL,                        /* merge per-dir config */
  -   create_server_config,        /* server config */
  +   create_isapi_server_config,  /* server config */
      NULL,                        /* merge server config */
      isapi_cmds,                  /* command apr_table_t */
      isapi_handlers,              /* handlers */
  
  
  

Mime
View raw message