From 6ddfbf06625eca15ddf24ac95b755cdc9db32bfa Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Thu, 15 May 2003 15:42:53 +0000
Subject: nginx-0.0.1-2003-05-15-19:42:53 import

---
 src/event/ngx_event_proxy.c | 4 ++++
 src/event/ngx_event_timer.h | 5 +++++
 2 files changed, 9 insertions(+)

(limited to 'src/event')

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;
     }
-- 
cgit