From ce8b462f06e8cbbe6f1debfdca394e402d810d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?agentzh=20=28=E7=AB=A0=E4=BA=A6=E6=98=A5=29?= Date: Mon, 7 Nov 2011 18:28:41 +0800 Subject: [PATCH] upgraded ngx_lua to 0.3.1rc26 and lua-rds-parser to 0.04; also checked in the epoll_check_stale_wev patch. --- .../nginx-1.0.9-epoll_check_stale_wev.patch | 21 +++++++++++++++++++ util/mirror-tarballs | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 patches/nginx-1.0.9-epoll_check_stale_wev.patch diff --git a/patches/nginx-1.0.9-epoll_check_stale_wev.patch b/patches/nginx-1.0.9-epoll_check_stale_wev.patch new file mode 100644 index 0000000..4163cf2 --- /dev/null +++ b/patches/nginx-1.0.9-epoll_check_stale_wev.patch @@ -0,0 +1,21 @@ +--- nginx-1.0.9/src/event/modules/ngx_epoll_module.c 2011-09-30 22:12:53.000000000 +0800 ++++ nginx-1.0.9-patched/src/event/modules/ngx_epoll_module.c 2011-11-07 18:07:04.764111952 +0800 +@@ -681,6 +681,18 @@ + + wev = c->write; + ++ 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 ((revents & EPOLLOUT) && wev->active) { + + if (flags & NGX_POST_THREAD_EVENTS) { diff --git a/util/mirror-tarballs b/util/mirror-tarballs index e08edba..03915c2 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -105,7 +105,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1 ################################# -ver=0.3.1rc25 +ver=0.3.1rc26 $root/util/get-tarball "http://github.com/chaoslawful/lua-nginx-module/tarball/v$ver" -O lua-nginx-module-$ver.tar.gz || exit 1 tar -xzf lua-nginx-module-$ver.tar.gz || exit 1 mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1 @@ -232,7 +232,7 @@ mv agentzh-lua-redis-parser-* lua-redis-parser-$ver || exit 1 ################################# -ver=0.03 +ver=0.04 $root/util/get-tarball "http://github.com/agentzh/lua-rds-parser/tarball/v$ver" -O "lua-rds-parser-$ver.tar.gz" || exit 1 tar -xzf lua-rds-parser-$ver.tar.gz || exit 1 mv agentzh-lua-rds-parser-* lua-rds-parser-$ver || exit 1