httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_so.c
Date Fri, 19 Jan 2001 17:17:05 GMT
rbb         01/01/19 09:17:05

  Modified:    modules/mappers mod_so.c
  Log:
  Rely on the APR dso_load cleanup to unload the DSO correctly.  There is
  no reason for mod_so to register a second cleanup.
  
  Revision  Changes    Path
  1.34      +0 -26     httpd-2.0/modules/mappers/mod_so.c
  
  Index: mod_so.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_so.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- mod_so.c	2001/01/17 22:04:43	1.33
  +++ mod_so.c	2001/01/19 17:17:04	1.34
  @@ -185,14 +185,6 @@
       /* remove the module pointer from the core structure */
       ap_remove_loaded_module(modi->modp);
   
  -    /* unload the module space itself */
  -    if ((status = apr_dso_unload(modi->modp->dynamic_load_handle)) != APR_SUCCESS)
{
  -        ap_log_perror(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, 
  -                      APR_GET_POOL(modi->modp->dynamic_load_handle),
  -		      "dso unload failure");
  -        return status;
  -    }
  -
       /* destroy the module information */
       modi->modp = NULL;
       modi->name = NULL;
  @@ -200,22 +192,6 @@
   }
   
   /* 
  - * This is the cleanup routine for files loaded by
  - * load_file(). Unfortunately we don't keep a record of the filename
  - * that was loaded, so we can't report the unload for debug purposes
  - * or include the filename in error message.
  - */
  -
  -static apr_status_t unload_file(void *handle)
  -{
  -    apr_status_t status;
  -    
  -    if ((status = apr_dso_unload((apr_dso_handle_t *)handle)) != APR_SUCCESS)
  -        return status;
  -    return APR_SUCCESS;
  -}
  -
  -/* 
    * This is called for the directive LoadModule and actually loads
    * a shared object file into the address space of the server process.
    */
  @@ -339,8 +315,6 @@
       
       ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, NULL,
   		 "loaded file %s", filename);
  -
  -    apr_register_cleanup(cmd->pool, (void *)handle, unload_file, apr_null_cleanup);
   
       return NULL;
   }
  
  
  

Mime
View raw message