upgraded ngx_lua to 0.5.0rc22 and lua-resty-mysql to 0.07. also upgraded the nginx core to 1.0.14.

This commit is contained in:
agentzh (章亦春)
2012-04-05 16:00:32 +08:00
parent ce803e8a94
commit 74c48651b9
18 changed files with 1297 additions and 8 deletions

View File

@ -0,0 +1,20 @@
--- nginx-1.0.14/src/event/modules/ngx_epoll_module.c 2011-09-30 22:12:53.000000000 +0800
+++ nginx-1.0.14-patched/src/event/modules/ngx_epoll_module.c 2011-11-30 11:08:46.775817019 +0800
@@ -682,6 +682,17 @@
wev = c->write;
if ((revents & EPOLLOUT) && wev->active) {
+ if (c->fd == -1 || wev->instance != instance) {
+
+ /*
+ * the stale event from a file descriptor
+ * that was just closed in this iteration
+ */
+
+ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+ "epoll: stale event %p", c);
+ continue;
+ }
if (flags & NGX_POST_THREAD_EVENTS) {
wev->posted_ready = 1;