httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/standard mod_so.c
Date Wed, 05 Apr 2000 15:45:33 GMT
stoddard    00/04/05 08:45:33

  Modified:    src      CHANGES
               src/lib/apr/dso/win32 dso.c
               src/modules/standard mod_so.c
  Log:
  Get DSOs working on Windows. Required cross platform change to mod_so.c.
  Tim tested on Windows. Not tested on other platforms.
  
  Submitted by:	Tim Costello
  Reviewed by:	Bill Stoddard
  
  Revision  Changes    Path
  1.56      +5 -1      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- CHANGES	2000/04/04 20:33:45	1.55
  +++ CHANGES	2000/04/05 15:45:31	1.56
  @@ -1,11 +1,15 @@
   Changes with Apache 2.0a3-dev
  +  *) Get APR DSO code working under Windows. Includes cross platform
  +     fixes to mod_so.c.
  +     [Tim.Costello@BTFinancialgroup.com]
  +
     *) Fix some of the Windows APR time functions.
        [William Rowe]
   
     *) FAQ changes related to tidying up historical documents on the web site.
        [Joshua Slive <slive@finance.commerce.ubc.ca>]
   
  -  *) Get APR DSO code working under Windows.
  +  *) Move Windows DSO code into APR.
        [Bill Stoddard]
   
     *) Eliminate apr_win.h and apr_winconfig.h (and the ugly #ifdefs they cause).
  
  
  
  1.2       +3 -3      apache-2.0/src/lib/apr/dso/win32/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/win32/dso.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- dso.c	2000/04/03 20:41:11	1.1
  +++ dso.c	2000/04/05 15:45:32	1.2
  @@ -74,7 +74,7 @@
       
   ap_status_t ap_dso_unload(struct ap_dso_handle_t *handle)
   {
  -    if (!FreeLibrary(handle)) {
  +    if (!FreeLibrary(handle->handle)) {
           return GetLastError();
       }
       return APR_SUCCESS;
  @@ -84,12 +84,12 @@
                          struct ap_dso_handle_t *handle, 
                          const char *symname)
   {
  -    HINSTANCE retval = GetProcAddress(handle->handle, symname);
  +    FARPROC retval = GetProcAddress(handle->handle, symname);
       if (!retval) {
           return GetLastError();
       }
       
  -    ressym = retval;
  +    *ressym = retval;
       
       return APR_SUCCESS;
   }
  
  
  
  1.12      +4 -3      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_so.c	2000/04/03 20:41:12	1.11
  +++ mod_so.c	2000/04/05 15:45:33	1.12
  @@ -222,7 +222,7 @@
   {
       ap_status_t stat;
       ap_dso_handle_t *modhandle;
  -    ap_dso_handle_sym_t *modsym;
  +    ap_dso_handle_sym_t modsym;
       module *modp;
       const char *szModuleFile=ap_server_root_relative(cmd->pool, filename);
       so_server_conf *sconf;
  @@ -263,12 +263,13 @@
        * First with the hidden variant (prefix `AP_') and then with the plain
        * symbol name.
        */
  -    if ((stat = ap_dso_sym(modsym, modhandle, modname)) != APR_SUCCESS) {
  +    if ((stat = ap_dso_sym(&modsym, modhandle, modname)) != APR_SUCCESS) {
   	return ap_pstrcat(cmd->pool, "Can't locate API module structure `", modname,
   		       "' in file ", szModuleFile, ": ", ap_os_dso_error(), NULL);
       }
  -    modi->modp = (module *)modsym;
  +    modp = (module*) modsym;
       modp->dynamic_load_handle = (ap_dso_handle_t *)modhandle;
  +    modi->modp = modp;
   
       /* 
        * Make sure the found module structure is really a module structure
  
  
  

Mime
View raw message