186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

checked in the patches for nginx 1.0.12.

Browse Source
This commit is contained in:
agentzh (章亦春)
2012-02-17 23:15:10 +08:00
parent e9a14f843d
commit fda2e1e693
13 changed files with 1134 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/nginx-1.0.12-epoll_check_stale_wev.patch Normal file
View File

@ -0,0 +1,20 @@
--- nginx-1.0.12/src/event/modules/ngx_epoll_module.c 2011-09-30 22:12:53.000000000 +0800
+++ nginx-1.0.12-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;