diff options
Diffstat (limited to '')
| -rw-r--r-- | src/event/ngx_event_proxy.c | 4 | ||||
| -rw-r--r-- | src/event/ngx_event_timer.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/event/ngx_event_proxy.c b/src/event/ngx_event_proxy.c index 9609d4cad..2bae88947 100644 --- a/src/event/ngx_event_proxy.c +++ b/src/event/ngx_event_proxy.c @@ -17,6 +17,10 @@ int ngx_event_proxy_read_upstream(ngx_event_proxy_t *p) ngx_hunk_t *h, *nh; ngx_chain_t *chain, *temp, *entry, *next; +#if (NGX_SUPPRESS_WARN) + entry = NULL; +#endif + #if (NGX_EVENT_COPY_FILTER) if (p->input_filter == NULL) { diff --git a/src/event/ngx_event_timer.h b/src/event/ngx_event_timer.h index 227f702c5..f5f78ae95 100644 --- a/src/event/ngx_event_timer.h +++ b/src/event/ngx_event_timer.h @@ -23,6 +23,11 @@ ngx_inline static void ngx_event_del_timer(ngx_event_t *ev) ngx_log_debug(ev->log, "del timer: %d" _ *(int *)(ev->data)); #endif + if (!ev->timer_next || !ev->timer_prev) { + ngx_log_error(NGX_LOG_ALERT, ev->log, 0, "timer already deleted"); + return; + } + if (ev->timer_prev) { ev->timer_prev->timer_next = ev->timer_next; } |