From 914c4c5ac4afbfd3c0fed9b17cfdefc978491fdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?agentzh=20=28=E7=AB=A0=E4=BA=A6=E6=98=A5=29?=
 <agentzh@gmail.com>
Date: Thu, 7 Jun 2012 17:50:33 +0800
Subject: [PATCH] applied poll_del_event_at_exit.patch:
 http://mailman.nginx.org/pipermail/nginx-devel/2012-June/002328.html

---
 .../nginx-1.0.15-poll_del_event_at_exit.patch | 36 +++++++++++++++++++
 util/mirror-tarballs                          |  3 ++
 util/ver                                      |  2 +-
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 patches/nginx-1.0.15-poll_del_event_at_exit.patch

diff --git a/patches/nginx-1.0.15-poll_del_event_at_exit.patch b/patches/nginx-1.0.15-poll_del_event_at_exit.patch
new file mode 100644
index 0000000..9632b3e
--- /dev/null
+++ b/patches/nginx-1.0.15-poll_del_event_at_exit.patch
@@ -0,0 +1,36 @@
+--- nginx-1.0.15/src/event/modules/ngx_poll_module.c	2012-02-06 04:02:59.000000000 +0800
++++ nginx-1.0.15-patched/src/event/modules/ngx_poll_module.c	2012-06-07 17:22:43.538168219 +0800
+@@ -205,19 +205,21 @@
+ 
+             event_list[ev->index] = event_list[nevents];
+ 
+-            c = ngx_cycle->files[event_list[nevents].fd];
++            if (ngx_cycle->files) {
++                c = ngx_cycle->files[event_list[nevents].fd];
+ 
+-            if (c->fd == -1) {
+-                ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
+-                              "unexpected last event");
+-
+-            } else {
+-                if (c->read->index == (ngx_uint_t) nevents) {
+-                    c->read->index = ev->index;
+-                }
+-
+-                if (c->write->index == (ngx_uint_t) nevents) {
+-                    c->write->index = ev->index;
++                if (c->fd == -1) {
++                    ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
++                                  "unexpected last event");
++
++                } else {
++                    if (c->read->index == (ngx_uint_t) nevents) {
++                        c->read->index = ev->index;
++                    }
++
++                    if (c->write->index == (ngx_uint_t) nevents) {
++                        c->write->index = ev->index;
++                    }
+                 }
+             }
+         }
diff --git a/util/mirror-tarballs b/util/mirror-tarballs
index 6ef7e3d..960ec99 100755
--- a/util/mirror-tarballs
+++ b/util/mirror-tarballs
@@ -72,6 +72,9 @@ patch -p1 < $root/patches/nginx-$main_ver-add_core_vars_polluting_globals.patch
 echo applying resolver_debug_log_overflow.patch ...
 patch -p1 < $root/patches/nginx-$main_ver-resolver_debug_log_overflow.patch || exit 1
 
+echo applying poll_del_event_at_exit.patch ...
+patch -p1 < $root/patches/nginx-$main_ver-poll_del_event_at_exit.patch
+
 #echo "INFO: applying null-character-fixes patch"
 #patch -p0 < $root/patches/nginx-$main_ver-null_character_fixes.patch || exit 1
 
diff --git a/util/ver b/util/ver
index be89e56..523810a 100755
--- a/util/ver
+++ b/util/ver
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 main_ver=1.0.15
-minor_ver=7
+minor_ver=9rc1
 version=$main_ver.$minor_ver
 echo $version