Compare commits

..

21 Commits

Author SHA1 Message Date
74c6036eb1 updated .gitignore. 2011-12-16 21:26:21 +08:00
68fe4b0a84 upgraded ngx_lua to 0.3.1rc40 and ngx_set_misc to v0.22rc4. 2011-12-16 21:22:12 +08:00
85a80e83b2 upgraded ngx_lua to 0.3.1rc39. 2011-12-16 15:53:31 +08:00
d0fc49168d bugfix: some old version of "cp" does not support trailing slashes in the destination argument and could break the ./configure script. thanks Weibin Yao for reporting it. 2011-12-16 14:50:02 +08:00
893262d13a upgraded ngx_srcache to 0.13rc3 and ngx_xss to 0.03rc8. 2011-12-14 20:25:52 +08:00
89d675fa91 fixed the link for lua-cjson-1.0.3 in our mirror-tarballs script. thanks Weibin Yao. 2011-12-12 16:03:37 +08:00
0e42b1d9ef updated the test suite to reflect recent changes. 2011-12-11 21:31:49 +08:00
16b594b22c released stable version 1.0.10.24. 2011-12-11 21:27:03 +08:00
fbb918187e upgraded ngx_rds_json to v0.12rc7 and ngx_xss to v0.03rc7. 2011-12-05 20:46:11 +08:00
1eb06f1ef3 upgraded ngx_lua to 0.3.1rc38. 2011-12-02 17:28:39 +08:00
f4745c3d28 fixed a serious regression for linux aio in nginx-1.0.10-epoll_check_stale_wev.patch, thanks Maxim Dounin! released ngx_openresty 1.0.10.21. 2011-11-30 11:36:09 +08:00
99f0e9f829 upgraded ngx_lua to 0.3.1rc37; also released ngx_openresty 1.0.10.19. 2011-11-29 22:22:56 +08:00
96c2c3559a upgraded ngx_lua to 0.3.1rc36; released ngx_openresty 1.0.10.17. 2011-11-26 22:37:04 +08:00
650f75a1f9 upgraded ngx_lua to 0.3.1rc35; released ngx_openresty 1.0.10.15. 2011-11-26 21:38:26 +08:00
c629e237b3 upgraded ngx_lua to 0.3.1rc34; also released ngx_openresty 1.0.10.13. 2011-11-25 21:23:56 +08:00
d5d36acbfc upgraded ngx_lua to 0.3.1rc33. 2011-11-24 22:25:12 +08:00
e4cddbf6dc upgraded ngx_lua to 0.3.1rc32; released ngx_openresty 1.0.10.11. 2011-11-24 22:13:29 +08:00
8b2352549c upgraded ngx_xss to 0.03rc6 and ngx_memc to 0.13rc2 and ngx_redis2 to 0.08rc2; released ngx_openresty 1.0.10.9. 2011-11-24 16:33:19 +08:00
69eabd6677 upgraded ngx_lua to v0.3.1rc31; released ngx_openresty 1.0.10.7. 2011-11-23 10:40:06 +08:00
48e6ec6682 upgraded ngx_lua to 0.3.1rc30; also released ngx_openresty 1.0.10.5. 2011-11-21 22:53:38 +08:00
658ead207e upgraded ngx_lua to v0.3.1rc29; released ngx_openresty 1.0.10.3. 2011-11-17 16:57:54 +08:00
6 changed files with 336 additions and 336 deletions

1
.gitignore vendored
View File

@ -2,6 +2,7 @@
bin/openresty.fcgi
demo/Admin/.rsync
*~
*.swo
*.json
*.o
*.hi

View File

@ -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;

File diff suppressed because it is too large Load Diff

8
util/configure vendored
View File

@ -401,14 +401,14 @@ _END_
}
if (-d 'build') {
system("rm -rf build");
system("rm -rf build") == 0 or
die "failed to remove directory build/.\n";
}
if (-f 'build') {
die "build/ directory already exists\n";
die "file \"build\" already exists. please remove it first.\n";
}
shell "cp -rp bundle/ build/";
shell "cp -rp bundle/ build";
cd 'build';

View File

@ -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
@ -78,12 +78,12 @@ $root/util/get-tarball "http://github.com/simpl/ngx_devel_kit/tarball/v$ver" -O
tar -xzf ngx_devel_kit-$ver.tar.gz || exit 1
mv simpl-ngx_devel_kit-* ngx_devel_kit-$ver || exit 1
ver=0.22rc3
ver=0.22rc4
$root/util/get-tarball "http://github.com/agentzh/set-misc-nginx-module/tarball/v$ver" -O set-misc-nginx-module-$ver.tar.gz || exit 1
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.1rc40
$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

View File

@ -1,7 +1,7 @@
#!/bin/bash
main_ver=1.0.10
minor_ver=1
minor_ver=27
version=$main_ver.$minor_ver
echo $version