Merge pull request #40 from tcp9/master

xiaokai-wang · web-flow · commit b8e7c1394a34 · 2019-10-23T21:05:33.000+08:00
fixed the bug: coredump on nginx quit under debug mode
diff --git a/src/ngx_stream_upsync_module.c b/src/ngx_stream_upsync_module.c
@@ -3438,7 +3438,7 @@ ngx_stream_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
`@@ -3438,7 +3438,7 @@ ngx_stream_upsync_clear_all_events(ngx_cycle_t *cycle)`
`3438`	`3438`	`next != ngx_queue_sentinel(head);`
`3439`	`3439`	`next = ngx_queue_next(next)) {`
`3440`	`3440`
`3441`		`- queue_event = ngx_queue_data(next, ngx_delay_event_t, delay_delete_ev);`
	`3441`	`+ queue_event = ngx_queue_data(next, ngx_delay_event_t, queue);`
`3442`	`3442`	`if (queue_event->delay_delete_ev.timer_set) {`
`3443`	`3443`	`ngx_del_timer(&queue_event->delay_delete_ev);`
`3444`	`3444`	`}`