eventMPM:

fix SEGV in the case socket callback was registered
and no timeout function was registered.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602409 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 9979ee03e50b2aa96895aaa9e767cfd5ba9aaf9e..531f84f74e0a958f32071965ddd7b1df2a40012e 100644 (file)
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -1974,7 +1974,9 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t * thd, void *dummy)
                 timer_event_t *te; 
                 int i = 0;
                 socket_callback_baton_t *baton = (socket_callback_baton_t *) pt->baton;
-                baton->cancel_event->canceled = 1;
+                if(baton->cancel_event){
+                    baton->cancel_event->canceled = 1;
+                }
 
                 /* We only signal once per N sockets with this baton */
                 if (!(baton->signaled)) {