You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2003/01/10 16:43:23 UTC
cvs commit: httpd-2.0/os/netware util_nw.c
bnicholes 2003/01/10 07:43:23
Modified: os/netware util_nw.c
Log:
Added a required parameter to RegisterForEventNotification() to allow the
function to be called in protected address space.
Revision Changes Path
1.6 +12 -3 httpd-2.0/os/netware/util_nw.c
Index: util_nw.c
===================================================================
RCS file: /home/cvs/httpd-2.0/os/netware/util_nw.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- util_nw.c 12 Dec 2002 19:40:51 -0000 1.5
+++ util_nw.c 10 Jan 2003 15:43:23 -0000 1.6
@@ -65,6 +65,7 @@
int nlmUnloadSignaled(int wait);
event_handle_t eh;
Warn_t ref;
+Report_t dum;
AP_DECLARE(apr_status_t) ap_os_create_privileged_process(
const request_rec *r,
@@ -82,18 +83,25 @@
}
// down server event callback
-void ap_down_server_cb(void *, void *)
+void ap_down_server_cb(void *, void *, void*)
{
nlmUnloadSignaled(0);
return;
}
+// Required place holder event callback
+void ap_dummy_cb(void *, void *)
+{
+ return;
+}
+
// destroy callback resources
void ap_cb_destroy(void *)
{
// cleanup down event notification
UnRegisterEventNotification(eh);
NX_UNWRAP_INTERFACE(ref);
+ NX_UNWRAP_INTERFACE(dum);
}
int _NonAppStart
@@ -126,10 +134,11 @@
rtag_t rt = AllocateResourceTag(NLMHandle, "Apache2 Down Server Callback",
EventSignature);
- NX_WRAP_INTERFACE((void *)ap_down_server_cb, 2, (void **)&ref);
+ NX_WRAP_INTERFACE((void *)ap_down_server_cb, 3, (void **)&ref);
+ NX_WRAP_INTERFACE((void *)ap_dummy_cb, 2, (void **)&dum);
eh = RegisterForEventNotification(rt, EVENT_DOWN_SERVER,
EVENT_PRIORITY_APPLICATION,
- ref, NULL, NULL);
+ ref, dum, NULL);
// clean-up
NXVmRegisterExitHandler(ap_cb_destroy, NULL);