httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/arch/win32 mod_isapi.c
Date Mon, 20 May 2002 16:51:31 GMT
wrowe       02/05/20 09:51:31

  Modified:    modules/arch/win32 mod_isapi.c
  Log:
    Clean up isapi_load, removing the request_rec arg [which we never need],
    and using the given server and request rather than deref'ing r->server
    [which segfaulted ISAPILoadModule in the 1.73 rev.]
  
  Reported by: Sebastian Hantsch
  
  Revision  Changes    Path
  1.76      +3 -3      httpd-2.0/modules/arch/win32/mod_isapi.c
  
  Index: mod_isapi.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/arch/win32/mod_isapi.c,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- mod_isapi.c	18 May 2002 04:13:12 -0000	1.75
  +++ mod_isapi.c	20 May 2002 16:51:31 -0000	1.76
  @@ -293,7 +293,7 @@
       return isapi_unload(isa, 1);
   }
   
  -static apr_status_t isapi_load(apr_pool_t *p, server_rec *s, request_rec *r, isapi_loaded
*isa)
  +static apr_status_t isapi_load(apr_pool_t *p, server_rec *s, isapi_loaded *isa)
   {
       apr_status_t rv;
   
  @@ -433,7 +433,7 @@
                */
               if (check_time == (*isa)->last_load_time) {
   
  -                rv = isapi_load(loaded.pool, r->server, r, *isa);
  +                rv = isapi_load(loaded.pool, s, *isa);
   
                   apr_thread_mutex_lock(loaded.lock);
                   (*isa)->last_load_rv = rv;
  @@ -485,7 +485,7 @@
        */
       apr_thread_mutex_unlock(loaded.lock);
   
  -    rv = isapi_load(loaded.pool, r->server, r, *isa);
  +    rv = isapi_load(loaded.pool, s, *isa);
       (*isa)->last_load_time = apr_time_now();
       (*isa)->last_load_rv = rv;
   
  
  
  

Mime
View raw message