mirror of
https://github.com/openresty/openresty.git
synced 2024-10-13 00:29:41 +00:00
Compare commits
17 Commits
v1.0.10.1
...
v1.0.10.25
Author | SHA1 | Date | |
---|---|---|---|
893262d13a | |||
89d675fa91 | |||
0e42b1d9ef | |||
16b594b22c | |||
fbb918187e | |||
1eb06f1ef3 | |||
f4745c3d28 | |||
99f0e9f829 | |||
96c2c3559a | |||
650f75a1f9 | |||
c629e237b3 | |||
d5d36acbfc | |||
e4cddbf6dc | |||
8b2352549c | |||
69eabd6677 | |||
48e6ec6682 | |||
658ead207e |
@ -1,21 +1,20 @@
|
||||
--- nginx-1.0.10/src/event/modules/ngx_epoll_module.c 2011-09-30 22:12:53.000000000 +0800
|
||||
+++ nginx-1.0.10-patched/src/event/modules/ngx_epoll_module.c 2011-11-07 18:07:04.764111952 +0800
|
||||
@@ -681,6 +681,18 @@
|
||||
|
||||
+++ nginx-1.0.10-patched/src/event/modules/ngx_epoll_module.c 2011-11-30 11:08:46.775817019 +0800
|
||||
@@ -682,6 +682,17 @@
|
||||
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 (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;
|
||||
|
492
t/sanity.t
492
t/sanity.t
File diff suppressed because it is too large
Load Diff
@ -68,7 +68,7 @@ $root/util/get-tarball "http://github.com/agentzh/echo-nginx-module/tarball/v$ve
|
||||
tar -xzf echo-nginx-module-$ver.tar.gz || exit 1
|
||||
mv agentzh-echo-nginx-module-* echo-nginx-module-$ver || exit 1
|
||||
|
||||
ver=0.03rc5
|
||||
ver=0.03rc8
|
||||
$root/util/get-tarball "http://github.com/agentzh/xss-nginx-module/tarball/v$ver" -O xss-nginx-module-$ver.tar.gz || exit 1
|
||||
tar -xzf xss-nginx-module-$ver.tar.gz || exit 1
|
||||
mv agentzh-xss-nginx-module-* xss-nginx-module-$ver || exit 1
|
||||
@ -83,7 +83,7 @@ $root/util/get-tarball "http://github.com/agentzh/set-misc-nginx-module/tarball/
|
||||
tar -xzf set-misc-nginx-module-$ver.tar.gz || exit 1
|
||||
mv agentzh-set-misc-nginx-module-* set-misc-nginx-module-$ver || exit 1
|
||||
|
||||
ver=0.12rc6
|
||||
ver=0.12rc7
|
||||
$root/util/get-tarball "http://github.com/agentzh/rds-json-nginx-module/tarball/v$ver" -O rds-json-nginx-module-$ver.tar.gz || exit 1
|
||||
tar -xzf rds-json-nginx-module-$ver.tar.gz || exit 1
|
||||
mv agentzh-rds-json-nginx-module-* rds-json-nginx-module-$ver || exit 1
|
||||
@ -107,7 +107,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.3.1rc28
|
||||
ver=0.3.1rc38
|
||||
$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
|
||||
@ -121,14 +121,14 @@ mv agentzh-array-var-nginx-module-* array-var-nginx-module-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.13rc1
|
||||
ver=0.13rc2
|
||||
$root/util/get-tarball "http://github.com/agentzh/memc-nginx-module/tarball/v$ver" -O memc-nginx-module-$ver.tar.gz || exit 1
|
||||
tar -xzf memc-nginx-module-$ver.tar.gz || exit 1
|
||||
mv agentzh-memc-nginx-module-* memc-nginx-module-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.13rc2
|
||||
ver=0.13rc3
|
||||
$root/util/get-tarball "http://github.com/agentzh/srcache-nginx-module/tarball/v$ver" -O srcache-nginx-module-$ver.tar.gz || exit 1
|
||||
tar -xzf srcache-nginx-module-$ver.tar.gz || exit 1
|
||||
mv agentzh-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1
|
||||
@ -178,7 +178,7 @@ mv FRiCKLE-ngx_postgres-* ngx_postgres-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.08rc1
|
||||
ver=0.08rc2
|
||||
$root/util/get-tarball "http://github.com/agentzh/redis2-nginx-module/tarball/v$ver" -O redis2-nginx-module-$ver.tar.gz || exit 1
|
||||
tar -xzf redis2-nginx-module-$ver.tar.gz || exit 1
|
||||
mv agentzh-redis2-nginx-module-* redis2-nginx-module-$ver || exit 1
|
||||
@ -219,7 +219,7 @@ cd ..
|
||||
#################################
|
||||
|
||||
ver=1.0.3
|
||||
$root/util/get-tarball "http://www.kyne.com.au/~mark/software/lua-cjson-$ver.tar.gz" -O "lua-cjson-$ver.tar.gz" || exit 1
|
||||
$root/util/get-tarball "http://www.kyne.com.au/~mark/software/old/lua-cjson-$ver.tar.gz" -O "lua-cjson-$ver.tar.gz" || exit 1
|
||||
tar -xzf lua-cjson-$ver.tar.gz || exit 1
|
||||
cd lua-cjson-$ver || exit 1
|
||||
#patch -p1 < $root/patches/lua_cjson-$ver-array_detection_fix.patch || exit 1
|
||||
|
Reference in New Issue
Block a user