Merge pull request #267 from tcp9/fix-quit-coredump

xiaokai-wang · web-flow · commit 506d9bedff26 · 2019-10-22T14:23:27.000+08:00
fixed the bug: coredump when nginx reload or restarted
diff --git a/src/ngx_http_upsync_module.c b/src/ngx_http_upsync_module.c
@@ -3612,7 +3612,7 @@ ngx_http_upsync_clear_all_events(ngx_cycle_t *cycle)
                 next != ngx_queue_sentinel(head);
                 next = ngx_queue_next(next)) {
 
-            queue_event = ngx_queue_data(next, ngx_delay_event_t, delay_delete_ev);
+            queue_event = ngx_queue_data(next, ngx_delay_event_t, queue);
             if (queue_event->delay_delete_ev.timer_set) {
                 ngx_del_timer(&queue_event->delay_delete_ev);
             }

Original file line number	Diff line number	Diff line change
`@@ -3612,7 +3612,7 @@ ngx_http_upsync_clear_all_events(ngx_cycle_t *cycle)`
`3612`	`3612`	`next != ngx_queue_sentinel(head);`
`3613`	`3613`	`next = ngx_queue_next(next)) {`
`3614`	`3614`
`3615`		`- queue_event = ngx_queue_data(next, ngx_delay_event_t, delay_delete_ev);`
	`3615`	`+ queue_event = ngx_queue_data(next, ngx_delay_event_t, queue);`
`3616`	`3616`	`if (queue_event->delay_delete_ev.timer_set) {`
`3617`	`3617`	`ngx_del_timer(&queue_event->delay_delete_ev);`
`3618`	`3618`	`}`