bumped version to 1.0.15.7 and also updated the test suite to reflect recent changes.

patches/nginx-1.0.15-add_core_vars_polluting_globals.patch

@@ -0,0 +1,26 @@
+--- nginx-1.0.15/src/http/ngx_http_variables.c	2012-03-05 20:36:51.000000000 +0800
++++ nginx-1.0.15-patched/src/http/ngx_http_variables.c	2012-05-17 16:21:42.120968722 +0800
+@@ -1898,6 +1898,7 @@
+ {
+     ngx_int_t                   rc;
+     ngx_http_variable_t        *v;
++    ngx_http_variable_t        *value;
+     ngx_http_core_main_conf_t  *cmcf;
+ 
+     cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
+@@ -1918,7 +1919,14 @@
+     }
+ 
+     for (v = ngx_http_core_variables; v->name.len; v++) {
+-        rc = ngx_hash_add_key(cmcf->variables_keys, &v->name, v,
++        value = ngx_palloc(cf->pool, sizeof(ngx_http_variable_t));
++        if (value == NULL) {
++            return NGX_ERROR;
++        }
++
++        *value = *v;
++
++        rc = ngx_hash_add_key(cmcf->variables_keys, &value->name, value,
+                               NGX_HASH_READONLY_KEY);
+ 
+         if (rc == NGX_OK) {

patches/nginx-1.0.15-epoll_check_stale_wev.patch

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

patches/nginx-1.0.15-filter_finalize_hang.patch

@@ -1,10 +1,10 @@
 --- nginx-1.0.15/src/http/ngx_http_request.c	2012-03-05 20:49:32.000000000 +0800
-+++ nginx-1.0.15-patched/src/http/ngx_http_request.c	2012-05-11 20:50:01.478111234 +0800
++++ nginx-1.0.15-patched/src/http/ngx_http_request.c	2012-05-22 20:46:57.000000000 +0800
-@@ -1900,6 +1900,7 @@
+@@ -1900,7 +1900,6 @@
  
      if (rc == NGX_OK && r->filter_finalize) {
          c->error = 1;
-+        ngx_http_finalize_connection(r);
+-        return;
-         return;
      }
  
+     if (rc == NGX_DECLINED) {

patches/nginx-1.1.15-epoll_check_stale_wev.patch

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

patches/nginx-1.1.15-null_character_fixes.patch

@@ -1,113 +0,0 @@
---- src/http/modules/ngx_http_fastcgi_module.c
-+++ src/http/modules/ngx_http_fastcgi_module.c
-@@ -1501,10 +1501,10 @@ ngx_http_fastcgi_process_header(ngx_http
-                     h->lowcase_key = h->key.data + h->key.len + 1
-                                      + h->value.len + 1;
- 
--                    ngx_cpystrn(h->key.data, r->header_name_start,
--                                h->key.len + 1);
--                    ngx_cpystrn(h->value.data, r->header_start,
--                                h->value.len + 1);
-+                    ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
-+                    h->key.data[h->key.len] = '\0';
-+                    ngx_memcpy(h->value.data, r->header_start, h->value.len);
-+                    h->value.data[h->value.len] = '\0';
-                 }
- 
-                 h->hash = r->header_hash;
---- src/http/modules/ngx_http_proxy_module.c
-+++ src/http/modules/ngx_http_proxy_module.c
-@@ -1381,8 +1381,10 @@ ngx_http_proxy_process_header(ngx_http_r
-             h->value.data = h->key.data + h->key.len + 1;
-             h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
- 
--            ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1);
--            ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1);
-+            ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
-+            h->key.data[h->key.len] = '\0';
-+            ngx_memcpy(h->value.data, r->header_start, h->value.len);
-+            h->value.data[h->value.len] = '\0';
- 
-             if (h->key.len == r->lowcase_index) {
-                 ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
---- src/http/modules/ngx_http_scgi_module.c
-+++ src/http/modules/ngx_http_scgi_module.c
-@@ -941,8 +941,10 @@ ngx_http_scgi_process_header(ngx_http_re
-             h->value.data = h->key.data + h->key.len + 1;
-             h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
- 
--            ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1);
--            ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1);
-+            ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
-+            h->key.data[h->key.len] = '\0';
-+            ngx_memcpy(h->value.data, r->header_start, h->value.len);
-+            h->value.data[h->value.len] = '\0';
- 
-             if (h->key.len == r->lowcase_index) {
-                 ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
---- src/http/modules/ngx_http_uwsgi_module.c
-+++ src/http/modules/ngx_http_uwsgi_module.c
-@@ -985,8 +985,10 @@ ngx_http_uwsgi_process_header(ngx_http_r
-             h->value.data = h->key.data + h->key.len + 1;
-             h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
- 
--            ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1);
--            ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1);
-+            ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
-+            h->key.data[h->key.len] = '\0';
-+            ngx_memcpy(h->value.data, r->header_start, h->value.len);
-+            h->value.data[h->value.len] = '\0';
- 
-             if (h->key.len == r->lowcase_index) {
-                 ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
---- src/http/ngx_http_parse.c
-+++ src/http/ngx_http_parse.c
-@@ -874,6 +874,10 @@ ngx_http_parse_header_line(ngx_http_requ
-                     break;
-                 }
- 
-+                if (ch == '\0') {
-+                    return NGX_HTTP_PARSE_INVALID_HEADER;
-+                }
-+
-                 r->invalid_header = 1;
- 
-                 break;
-@@ -936,6 +940,10 @@ ngx_http_parse_header_line(ngx_http_requ
-                 break;
-             }
- 
-+            if (ch == '\0') {
-+                return NGX_HTTP_PARSE_INVALID_HEADER;
-+            }
-+
-             r->invalid_header = 1;
- 
-             break;
-@@ -954,6 +962,8 @@ ngx_http_parse_header_line(ngx_http_requ
-                 r->header_start = p;
-                 r->header_end = p;
-                 goto done;
-+            case '\0':
-+                return NGX_HTTP_PARSE_INVALID_HEADER;
-             default:
-                 r->header_start = p;
-                 state = sw_value;
-@@ -975,6 +985,8 @@ ngx_http_parse_header_line(ngx_http_requ
-             case LF:
-                 r->header_end = p;
-                 goto done;
-+            case '\0':
-+                return NGX_HTTP_PARSE_INVALID_HEADER;
-             }
-             break;
- 
-@@ -988,6 +1000,8 @@ ngx_http_parse_header_line(ngx_http_requ
-                 break;
-             case LF:
-                 goto done;
-+            case '\0':
-+                return NGX_HTTP_PARSE_INVALID_HEADER;
-             default:
-                 state = sw_value;
-                 break;

patches/nginx-1.1.15-request_body_in_single_buf.patch

@@ -1,27 +0,0 @@
-# HG changeset patch
-# User Maxim Dounin <mdounin@mdounin.ru>
-# Date 1309799136 -14400
-# Node ID 99e276bba8596bc4df9e638482ee413f4c6bf700
-# Parent  e7b2f945d55ae44a2295facf9e3336dc4633e5b5
-Core: fix body with request_body_in_single_buf.
-
-If there were preread data and request body was big enough first part
-of request body was duplicated.
-
-See report here:
-http://nginx.org/pipermail/nginx/2011-July/027756.html
-
-diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
---- a/src/http/ngx_http_request_body.c
-+++ b/src/http/ngx_http_request_body.c
-@@ -372,7 +372,9 @@ ngx_http_do_read_client_request_body(ngx
-         }
-     }
- 
--    if (r->request_body_in_file_only && rb->bufs->next) {
-+    if (rb->bufs->next
-+        && (r->request_body_in_file_only || r->request_body_in_single_buf))
-+    {
-         rb->bufs = rb->bufs->next;
-     }
- 

patches/nginx-1.1.15-request_body_preread_fix.patch

@@ -1,17 +0,0 @@
-# HG changeset patch
-# User Maxim Dounin <mdounin@mdounin.ru>
-# Date 1309776931 -14400
-# Node ID e7b2f945d55ae44a2295facf9e3336dc4633e5b5
-# Parent  610e909bb9e29766188aa86fae3abe0bd3432940
-Core: fix body if it's preread and there are extra data.
-
---- nginx-1.1.15/src/http/ngx_http_request_body.c	2011-07-05 12:11:21.619264633 +0800
-+++ nginx-1.1.15-patched/src/http/ngx_http_request_body.c	2011-07-05 12:14:30.694321554 +0800
-@@ -141,6 +141,7 @@
- 
-             /* the whole request body was pre-read */
- 
-+            b->last = b->pos + r->headers_in.content_length_n;
-             r->header_in->pos += (size_t) r->headers_in.content_length_n;
-             r->request_length += r->headers_in.content_length_n;
- 

patches/nginx-1.1.15-variable_header_ignore_no_hash.patch

@@ -1,73 +0,0 @@
---- nginx-1.1.15/src/http/ngx_http_variables.c	2011-05-30 20:36:17.000000000 +0800
-+++ nginx-1.1.15-patched/src/http/ngx_http_variables.c	2011-11-08 22:21:55.229247198 +0800
-@@ -648,7 +648,17 @@
- 
-     a = (ngx_array_t *) ((char *) r + data);
- 
--    n = a->nelts;
-+    h = a->elts;
-+    n = 0;
-+
-+    for (i = 0; i < a->nelts; i++) {
-+
-+        if (h[i]->hash == 0) {
-+            continue;
-+        }
-+
-+        n++;
-+    }
- 
-     if (n == 0) {
-         v->not_found = 1;
-@@ -659,9 +669,7 @@
-     v->no_cacheable = 0;
-     v->not_found = 0;
- 
--    h = a->elts;
--
--    if (n == 1) {
-+    if (n == 1 && a->nelts == 1) {
-         v->len = (*h)->value.len;
-         v->data = (*h)->value.data;
- 
-@@ -670,7 +678,12 @@
- 
-     len = - (ssize_t) (sizeof("; ") - 1);
- 
--    for (i = 0; i < n; i++) {
-+    for (i = 0; i < a->nelts; i++) {
-+
-+        if (h[i]->hash == 0) {
-+            continue;
-+        }
-+
-         len += h[i]->value.len + sizeof("; ") - 1;
-     }
- 
-@@ -683,9 +696,14 @@
-     v->data = p;
- 
-     for (i = 0; /* void */ ; i++) {
-+
-+        if (h[i]->hash == 0) {
-+            continue;
-+        }
-+
-         p = ngx_copy(p, h[i]->value.data, h[i]->value.len);
- 
--        if (i == n - 1) {
-+        if (--n == 0) {
-             break;
-         }
- 
-@@ -738,6 +756,10 @@
-             i = 0;
-         }
- 
-+        if (header[i].hash == 0) {
-+            continue;
-+        }
-+
-         for (n = 0; n + prefix < var->len && n < header[i].key.len; n++) {
-             ch = header[i].key.data[n];
- 

util/configure

@@ -114,6 +114,7 @@ my $dry_run;
 my @ngx_rpaths;
 my $cc;
 my $cores;
+my $luajit_xcflags = '';
 
 my (@ngx_opts, @ngx_cc_opts, @ngx_ld_opts);
 
@@ -202,6 +203,9 @@ for my $opt (@ARGV) {
     } elsif ($opt =~ /^--with-luajit=(.*)/) {
         $resty_opts{luajit_path} = $1;
 
+    } elsif ($opt =~ /^--with-luajit-xcflags=(.*)/) {
+        $luajit_xcflags .= " $1";
+
     } elsif ($opt =~ /^--with-libdrizzle=(.*)/) {
         $resty_opts{libdrizzle} = $1;
 
@@ -511,13 +515,20 @@ _END_
         my $extra_opts = ' TARGET_STRIP=@:';
 
         if ($opts->{debug}) {
-            $extra_opts = q{ CCDEBUG=-g Q= XCFLAGS='-DLUA_USE_APICHECK}
+            $luajit_xcflags .= " -DLUA_USE_APICHECK -DLUA_USE_ASSERT";
-                .q{ -DLUA_USE_ASSERT'};
+            $luajit_xcflags =~ s/^ +//;
+            $extra_opts .= qq{ CCDEBUG=-g Q= XCFLAGS='$luajit_xcflags'};
+
+        } else {
+            if ($luajit_xcflags) {
+                $luajit_xcflags =~ s/^ +//;
+                $extra_opts .= qq{ XCFLAGS='$luajit_xcflags'};
+            }
         }
 
-        if ($platform =~ /bsd/i) {
+        #if ($platform =~ /bsd/i) {
-            $extra_opts .= ' CFLAGS=-I..';
+        #$extra_opts .= ' CFLAGS=-I..';
-        }
+        #}
 
         if ($on_solaris) {
             $extra_opts .= " INSTALL_X='$root_dir/build/install -m 0755' " .
@@ -888,6 +899,7 @@ _EOC_
   --with-lua51=PATH                  specify the external installation of Lua 5.1 by PATH
   --with-luajit                      enable and build LuaJIT 2.0
   --with-luajit=PATH                 use the external LuaJIT 2.0 installation specified by PATH
+  --with-luajit-xcflags=FLAGS        Specify extra C compiler flags for LuaJIT 2.0
   --with-libdrizzle=DIR              specify the libdrizzle 1.0 (or drizzle) installation prefix
   --with-libpq=DIR                   specify the libpq (or postgresql) installation prefix
   --with-pg_config=PATH              specify the path of the pg_config utility

util/fix-tests

@@ -37,7 +37,7 @@ for my $t_file (@t_files) {
     my $changed;
     while (<$in>) {
         for my $dir (@dirs) {
-            (my $pat = $dir) =~ s/\d.*//;
+            (my $pat = $dir) =~ s/-(\d+\..*)/-/;
             my $orig = $_;
             if (s{\.\./$pat\S+}{../$dir}g && $orig ne $_) {
                 $changed++;

util/mirror-tarballs

@@ -66,6 +66,9 @@ patch -p1 < $root/patches/nginx-$main_ver-reset_wev_handler_in_named_locations.p
 echo applying filter_finalize_hang.patch ...
 patch -p1 < $root/patches/nginx-$main_ver-filter_finalize_hang.patch || exit 1
 
+echo applying add_core_vars_polluting_globals.patch ...
+patch -p1 < $root/patches/nginx-$main_ver-add_core_vars_polluting_globals.patch || exit 1
+
 #echo "INFO: applying null-character-fixes patch"
 #patch -p0 < $root/patches/nginx-$main_ver-null_character_fixes.patch || exit 1
 
@@ -102,12 +105,12 @@ $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.12rc8
+ver=0.12rc9
 $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
 
-ver=0.05rc1
+ver=0.05rc2
 $root/util/get-tarball "http://github.com/agentzh/rds-csv-nginx-module/tarball/v$ver" -O rds-csv-nginx-module-$ver.tar.gz || exit 1
 tar -xzf rds-csv-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1
@@ -126,7 +129,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.5.0rc27
+ver=0.5.0rc29
 $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
@@ -237,17 +240,17 @@ rm lua-makefile-fix.patch || exit 1
 
 #################################
 
-ver=2.0.0-beta9
+ver=2.0.0-beta10
 $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;
+#cd LuaJIT-$ver || exit 1;
-$root/util/get-tarball http://luajit.org/download/beta9_hotfix1.patch -O beta9_hotfix1.patch
+#$root/util/get-tarball http://luajit.org/download/beta9_hotfix1.patch -O beta9_hotfix1.patch
-patch -p1 < beta9_hotfix1.patch || exit 1
+#patch -p1 < beta9_hotfix1.patch || exit 1
-rm beta9_hotfix1.patch || exit 1
+#rm beta9_hotfix1.patch || exit 1
 
-cp $root/misc/unwind-generic.h ./unwind.h || exit 1
+#cp $root/misc/unwind-generic.h ./unwind.h || exit 1
-cd ..
+#cd ..
 
 #################################
 
@@ -281,7 +284,7 @@ mv agentzh-lua-resty-memcached-* lua-resty-memcached-$ver || exit 1
 
 #################################
 
-ver=0.08
+ver=0.09
 $root/util/get-tarball "http://github.com/agentzh/lua-resty-redis/tarball/v$ver" -O "lua-resty-redis-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-redis-$ver.tar.gz || exit 1
 mv agentzh-lua-resty-redis-* lua-resty-redis-$ver || exit 1
@@ -302,7 +305,7 @@ mv agentzh-lua-resty-upload-* lua-resty-upload-$ver || exit 1
 
 #################################
 
-ver=0.05
+ver=0.06
 $root/util/get-tarball "http://github.com/agentzh/lua-resty-string/tarball/v$ver" -O "lua-resty-string-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-string-$ver.tar.gz || exit 1
 mv agentzh-lua-resty-string-* lua-resty-string-$ver || exit 1

util/ver

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