upgraded ngx_headers_more to 0.16rc7.

.gitignore

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

patches/nginx-1.0.10-epoll_check_stale_wev.patch

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

t/Config.pm

@@ -2,6 +2,7 @@ package t::Config;
 
 use Test::Base -Base;
 use IPC::Run3 qw( run3 );
+use Cwd qw( cwd );
 
 our @EXPORT = qw(
     run_tests
@@ -13,6 +14,7 @@ sub shell (@);
 sub cd ($);
 
 our $BuildRoot;
+our $DistRoot;
 our @SavedTests;
 our $RootDir = `pwd`;
 chomp $RootDir;
@@ -23,6 +25,7 @@ sub run_tests {
 
     cd "ngx_openresty-$ver";
 
+    $DistRoot = cwd();
     $BuildRoot = File::Spec->rel2abs("./build");
 
     for my $block (blocks()) {
@@ -52,6 +55,7 @@ sub run_test ($) {
         $expected_err = '';
     } else {
         $expected_err =~ s/\$OPENRESTY_BUILD_DIR\b/$BuildRoot/gs;
+        $expected_err =~ s/\$OPENRESTY_DIR\b/$DistRoot/gs;
     }
 
     my $expected_out = $block->out;
@@ -64,6 +68,7 @@ sub run_test ($) {
     #die $BuildRoot;
 
     $stdout =~ s/\Q$BuildRoot\E/\$OPENRESTY_BUILD_DIR/g;
+    $stdout =~ s/\Q$DistRoot\E/\$OPENRESTY_DIR/g;
 
     is($stdout, $expected_out, "$name - stdout ok");
     is($stderr, $expected_err, "$name - stderr ok");

util/configure

@@ -212,6 +212,11 @@ for my $opt (@ARGV) {
     } elsif ($opt eq '--without-http_ssl_module') {
         $resty_opts{no_http_ssl} = 1;
 
+    } elsif ($opt =~ /^--add-module=(.*)/) {
+
+        my $mod_path = File::Spec->rel2abs($1);
+        push @ngx_opts, "--add-module=$mod_path";
+
     } elsif ($opt =~ /^--\w.*/) {
         push @ngx_opts, $opt;
 
@@ -401,14 +406,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';
 
@@ -986,9 +991,9 @@ sub gen_makefile {
 
     print $out ".PHONY: all install clean\n\n";
 
-    print $out "all:\n\t" . join("\n\t", @make_cmds) . "\n\n";
+        print $out "all:\n\t" . join("\n\t", @make_cmds) . "\n\n";
 
-    print $out "install:\n\t" . join("\n\t", @make_install_cmds) . "\n\n";
+    print $out "install: all\n\t" . join("\n\t", @make_install_cmds) . "\n\n";
 
     print $out "clean:\n\trm -rf build\n";
 

util/mirror-tarballs

@@ -54,6 +54,8 @@ patch -p1 < $root/patches/nginx-$main_ver-allow_request_body_updating.patch || e
 
 patch -p1 < $root/patches/nginx-$main_ver-log_escape_non_ascii.patch || exit 1
 
+#patch -p1 < $root/patches/nginx-$main_ver-gzip_ok_invalid_read_fix.patch || exit 1
+
 rm -f *.patch || exit 1
 
 cd .. || exit 1
@@ -68,7 +70,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.03rc6
+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 +80,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
@@ -93,7 +95,7 @@ $root/util/get-tarball "http://github.com/agentzh/rds-csv-nginx-module/tarball/v
 tar -xzf rds-csv-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1
 
-ver=0.16rc4
+ver=0.16rc7
 $root/util/get-tarball "http://github.com/agentzh/headers-more-nginx-module/tarball/v$ver" -O headers-more-nginx-module-$ver.tar.gz || exit 1
 tar -xzf headers-more-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-headers-more-nginx-module-* headers-more-nginx-module-$ver || exit 1
@@ -107,7 +109,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.3.1rc35
+ver=0.3.1rc42
 $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
@@ -128,7 +130,7 @@ 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
@@ -205,21 +207,21 @@ rm lua-makefile-fix.patch || exit 1
 
 #################################
 
-ver=2.0.0-beta8
+ver=2.0.0-beta9
 $root/util/get-tarball "http://luajit.org/download/LuaJIT-$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
 tar -xzf LuaJIT-$ver.tar.gz || exit 1
 
 cd LuaJIT-$ver || exit 1;
-$root/util/get-tarball http://luajit.org/download/beta8_hotfix1.patch -O beta8_hotfix1.patch
-patch -p1 < beta8_hotfix1.patch || exit 1
-rm beta8_hotfix1.patch || exit 1
+#$root/util/get-tarball http://luajit.org/download/beta8_hotfix1.patch -O beta8_hotfix1.patch
+#patch -p1 < beta8_hotfix1.patch || exit 1
+#rm beta8_hotfix1.patch || exit 1
 cp $root/misc/unwind-generic.h ./unwind.h || exit 1
 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

util/ver

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