From 05fba48654fb450e3886984dcd018b6f7603991b Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Mon, 20 May 2002 16:51:31 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95187 13f79535-47bb-0310-9956-ffa450edef68 --- modules/arch/win32/mod_isapi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c index 51135e1dc7..6d54e0bda3 100644 --- a/modules/arch/win32/mod_isapi.c +++ b/modules/arch/win32/mod_isapi.c @@ -293,7 +293,7 @@ static apr_status_t cleanup_isapi(void *isa_) 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 @@ apr_status_t isapi_lookup(apr_pool_t *p, server_rec *s, request_rec *r, */ 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_status_t isapi_lookup(apr_pool_t *p, server_rec *s, request_rec *r, */ 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; -- 2.40.0