updated the test suite to reflect recent changes.

patches/luajit-2.0.0-2ad9834d.patch

@@ -0,0 +1,202 @@
+diff --git a/doc/ext_ffi_semantics.html b/doc/ext_ffi_semantics.html
+index bf9f9be..30aa964 100644
+--- a/doc/ext_ffi_semantics.html
++++ b/doc/ext_ffi_semantics.html
+@@ -517,17 +517,17 @@ A VLA is only initialized with the element(s) given in the table.
+ Depending on the use case, you may need to explicitly add a
+ <tt>NULL</tt> or <tt>0</tt> terminator to a VLA.</li>
+ 
+-<li>If the table has a non-empty hash part, a
+-<tt>struct</tt>/<tt>union</tt> is initialized by looking up each field
+-name (as a string key) in the table. Each non-<tt>nil</tt> value is
+-used to initialize the corresponding field.</li>
+-
+-<li>Otherwise a <tt>struct</tt>/<tt>union</tt> is initialized in the
++<li>A <tt>struct</tt>/<tt>union</tt> can be initialized in the
+ order of the declaration of its fields. Each field is initialized with
+-the consecutive table elements, starting at either index <tt>[0]</tt>
++consecutive table elements, starting at either index <tt>[0]</tt>
+ or <tt>[1]</tt>. This process stops at the first <tt>nil</tt> table
+ element.</li>
+ 
++<li>Otherwise, if neither index <tt>[0]</tt> nor <tt>[1]</tt> is present,
++a <tt>struct</tt>/<tt>union</tt> is initialized by looking up each field
++name (as a string key) in the table. Each non-<tt>nil</tt> value is
++used to initialize the corresponding field.</li>
++
+ <li>Uninitialized fields of a <tt>struct</tt> are filled with zero
+ bytes, except for the trailing VLA of a VLS.</li>
+ 
+diff --git a/doc/running.html b/doc/running.html
+index 7870a5d..97c5c03 100644
+--- a/doc/running.html
++++ b/doc/running.html
+@@ -250,6 +250,8 @@ are enabled:
+ <tr class="even">
+ <td class="flag_name">abc</td><td class="flag_level">&nbsp;</td><td class="flag_level">&nbsp;</td><td class="flag_level">&bull;</td><td class="flag_desc">Array Bounds Check Elimination</td></tr>
+ <tr class="odd">
++<td class="flag_name">sink</td><td class="flag_level">&nbsp;</td><td class="flag_level">&nbsp;</td><td class="flag_level">&bull;</td><td class="flag_desc">Allocation/Store Sinking</td></tr>
++<tr class="even">
+ <td class="flag_name">fuse</td><td class="flag_level">&nbsp;</td><td class="flag_level">&nbsp;</td><td class="flag_level">&bull;</td><td class="flag_desc">Fusion of operands into instructions</td></tr>
+ </table>
+ <p>
+diff --git a/src/lj_arch.h b/src/lj_arch.h
+index 25c2cff..220f3df 100644
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
+@@ -300,7 +300,11 @@
+ 
+ /* Check target-specific constraints. */
+ #ifndef _BUILDVM_H
+-#if LJ_TARGET_ARM
++#if LJ_TARGET_X64
++#if __USING_SJLJ_EXCEPTIONS__
++#error "Need a C compiler with native exception handling on x64"
++#endif
++#elif LJ_TARGET_ARM
+ #if defined(__ARMEB__)
+ #error "No support for big-endian ARM"
+ #endif
+diff --git a/src/lj_asm_x86.h b/src/lj_asm_x86.h
+index 6d7dd5a..241da5a 100644
+--- a/src/lj_asm_x86.h
++++ b/src/lj_asm_x86.h
+@@ -367,6 +367,18 @@ static Reg asm_fuseload(ASMState *as, IRRef ref, RegSet allow)
+   return ra_allocref(as, ref, allow);
+ }
+ 
++#if LJ_64
++/* Don't fuse a 32 bit load into a 64 bit operation. */
++static Reg asm_fuseloadm(ASMState *as, IRRef ref, RegSet allow, int is64)
++{
++  if (is64 && !irt_is64(IR(ref)->t))
++    return ra_alloc1(as, ref, allow);
++  return asm_fuseload(as, ref, allow);
++}
++#else
++#define asm_fuseloadm(as, ref, allow, is64)  asm_fuseload(as, (ref), (allow))
++#endif
++
+ /* -- Calls --------------------------------------------------------------- */
+ 
+ /* Count the required number of stack slots for a call. */
+@@ -696,7 +708,7 @@ static void asm_conv(ASMState *as, IRIns *ir)
+     } else {  /* Integer to FP conversion. */
+       Reg left = (LJ_64 && (st == IRT_U32 || st == IRT_U64)) ?
+ 		 ra_alloc1(as, lref, RSET_GPR) :
+-		 asm_fuseload(as, lref, RSET_GPR);
++		 asm_fuseloadm(as, lref, RSET_GPR, st64);
+       if (LJ_64 && st == IRT_U64) {
+ 	MCLabel l_end = emit_label(as);
+ 	const void *k = lj_ir_k64_find(as->J, U64x(43f00000,00000000));
+@@ -1829,7 +1841,7 @@ static void asm_intarith(ASMState *as, IRIns *ir, x86Arith xa)
+     if (asm_swapops(as, ir)) {
+       IRRef tmp = lref; lref = rref; rref = tmp;
+     }
+-    right = asm_fuseload(as, rref, rset_clear(allow, dest));
++    right = asm_fuseloadm(as, rref, rset_clear(allow, dest), irt_is64(ir->t));
+   }
+   if (irt_isguard(ir->t))  /* For IR_ADDOV etc. */
+     asm_guardcc(as, CC_O);
+@@ -1842,7 +1854,7 @@ static void asm_intarith(ASMState *as, IRIns *ir, x86Arith xa)
+     emit_mrm(as, XO_IMUL, REX_64IR(ir, dest), right);
+   } else {  /* IMUL r, r, k. */
+     /* NYI: use lea/shl/add/sub (FOLD only does 2^k) depending on CPU. */
+-    Reg left = asm_fuseload(as, lref, RSET_GPR);
++    Reg left = asm_fuseloadm(as, lref, RSET_GPR, irt_is64(ir->t));
+     x86Op xo;
+     if (checki8(k)) { emit_i8(as, k); xo = XO_IMULi8;
+     } else { emit_i32(as, k); xo = XO_IMULi; }
+@@ -2072,7 +2084,7 @@ static void asm_comp(ASMState *as, IRIns *ir, uint32_t cc)
+     Reg r64 = REX_64IR(ir, 0);
+     int32_t imm = 0;
+     lua_assert(irt_is64(ir->t) || irt_isint(ir->t) ||
+-	       irt_isu32(ir->t) || irt_isaddr(ir->t));
++	       irt_isu32(ir->t) || irt_isaddr(ir->t) || irt_isu8(ir->t));
+     /* Swap constants (only for ABC) and fusable loads to the right. */
+     if (irref_isk(lref) || (!irref_isk(rref) && opisfusableload(leftop))) {
+       if ((cc & 0xc) == 0xc) cc ^= 0x53;  /* L <-> G, LE <-> GE */
+@@ -2109,7 +2121,7 @@ static void asm_comp(ASMState *as, IRIns *ir, uint32_t cc)
+ 	  }
+ 	}
+ 	as->curins--;  /* Skip to BAND to avoid failing in noconflict(). */
+-	right = asm_fuseload(as, irl->op1, allow);
++	right = asm_fuseloadm(as, irl->op1, allow, r64);
+ 	as->curins++;  /* Undo the above. */
+       test_nofuse:
+ 	asm_guardcc(as, cc);
+@@ -2146,7 +2158,7 @@ static void asm_comp(ASMState *as, IRIns *ir, uint32_t cc)
+ 	    return;
+ 	  }  /* Otherwise handle register case as usual. */
+ 	} else {
+-	  left = asm_fuseload(as, lref, RSET_GPR);
++	  left = asm_fuseloadm(as, lref, RSET_GPR, r64);
+ 	}
+ 	asm_guardcc(as, cc);
+ 	if (usetest && left != RID_MRM) {
+@@ -2160,7 +2172,7 @@ static void asm_comp(ASMState *as, IRIns *ir, uint32_t cc)
+       }
+     } else {
+       Reg left = ra_alloc1(as, lref, RSET_GPR);
+-      Reg right = asm_fuseload(as, rref, rset_exclude(RSET_GPR, left));
++      Reg right = asm_fuseloadm(as, rref, rset_exclude(RSET_GPR, left), r64);
+       asm_guardcc(as, cc);
+       emit_mrm(as, XO_CMP, r64 + left, right);
+     }
+diff --git a/src/lj_cconv.c b/src/lj_cconv.c
+index b81b4e9..7b32e35 100644
+--- a/src/lj_cconv.c
++++ b/src/lj_cconv.c
+@@ -493,17 +493,19 @@ static void cconv_substruct_tab(CTState *cts, CType *d, uint8_t *dp,
+     id = df->sib;
+     if (ctype_isfield(df->info) || ctype_isbitfield(df->info)) {
+       TValue *tv;
+-      int32_t i = *ip;
++      int32_t i = *ip, iz = i;
+       if (!gcref(df->name)) continue;  /* Ignore unnamed fields. */
+       if (i >= 0) {
+       retry:
+ 	tv = (TValue *)lj_tab_getint(t, i);
+ 	if (!tv || tvisnil(tv)) {
+ 	  if (i == 0) { i = 1; goto retry; }  /* 1-based tables. */
++	  if (iz == 0) { *ip = i = -1; goto tryname; }  /* Init named fields. */
+ 	  break;  /* Stop at first nil. */
+ 	}
+ 	*ip = i + 1;
+       } else {
++      tryname:
+ 	tv = (TValue *)lj_tab_getstr(t, gco2str(gcref(df->name)));
+ 	if (!tv || tvisnil(tv)) continue;
+       }
+@@ -524,7 +526,6 @@ static void cconv_struct_tab(CTState *cts, CType *d,
+ {
+   int32_t i = 0;
+   memset(dp, 0, d->size);  /* Much simpler to clear the struct first. */
+-  if (t->hmask) i = -1; else if (t->asize == 0) return;  /* Fast exit. */
+   cconv_substruct_tab(cts, d, dp, t, &i, flags);
+ }
+ 
+diff --git a/src/lj_err.c b/src/lj_err.c
+index 60d8fe1..fd3545e 100644
+--- a/src/lj_err.c
++++ b/src/lj_err.c
+@@ -485,7 +485,6 @@ LJ_NOINLINE void lj_err_mem(lua_State *L)
+ {
+   if (L->status == LUA_ERRERR+1)  /* Don't touch the stack during lua_open. */
+     lj_vm_unwind_c(L->cframe, LUA_ERRMEM);
+-  L->top = L->base;
+   setstrV(L, L->top++, lj_err_str(L, LJ_ERR_ERRMEM));
+   lj_err_throw(L, LUA_ERRMEM);
+ }
+diff --git a/src/lj_parse.c b/src/lj_parse.c
+index 2fecaef..92ebc04 100644
+--- a/src/lj_parse.c
++++ b/src/lj_parse.c
+@@ -1825,6 +1825,7 @@ static void expr_table(LexState *ls, ExpDesc *e)
+ 	}
+       }
+     }
++    lj_gc_check(fs->L);
+   }
+ }
+ 

patches/nginx-1.2.4-slab_alloc_no_memory_as_info.patch

@@ -0,0 +1,11 @@
+--- nginx-1.2.4/src/core/ngx_slab.c	2012-09-24 11:34:04.000000000 -0700
++++ nginx-1.2.4-patched/src/core/ngx_slab.c	2012-12-05 20:47:07.296694952 -0800
+@@ -657,7 +657,7 @@ ngx_slab_alloc_pages(ngx_slab_pool_t *po
+         }
+     }
+ 
+-    ngx_slab_error(pool, NGX_LOG_CRIT, "ngx_slab_alloc() failed: no memory");
++    ngx_slab_error(pool, NGX_LOG_INFO, "ngx_slab_alloc() failed: no memory");
+ 
+     return NULL;
+ }

patches/nginx-1.2.4-upstream_pipelining.patch

@@ -1,7 +1,15 @@
-diff -ur nginx-1.2.4/src/http/ngx_http_upstream.c nginx-1.2.4-patched/src/http/ngx_http_upstream.c
+diff -rudp nginx-1.2.4/src/http/ngx_http_upstream.c nginx-1.2.4-patched/src/http/ngx_http_upstream.c
---- nginx-1.2.4/src/http/ngx_http_upstream.c	2011-12-14 02:34:34.000000000 +0800
+--- nginx-1.2.4/src/http/ngx_http_upstream.c	2012-08-06 10:34:08.000000000 -0700
-+++ nginx-1.2.4-patched/src/http/ngx_http_upstream.c	2012-03-21 21:20:17.333111806 +0800
++++ nginx-1.2.4-patched/src/http/ngx_http_upstream.c	2012-12-05 14:46:41.741173058 -0800
-@@ -1385,6 +1385,8 @@
+@@ -1216,6 +1216,7 @@ ngx_http_upstream_connect(ngx_http_reque
+     }
+ 
+     u->request_sent = 0;
++    u->request_all_sent = 0;
+ 
+     if (rc == NGX_AGAIN) {
+         ngx_add_timer(c->write, u->conf->connect_timeout);
+@@ -1418,6 +1419,8 @@ ngx_http_upstream_send_request(ngx_http_
  
      /* rc == NGX_OK */
  
@@ -10,7 +18,7 @@ diff -ur nginx-1.2.4/src/http/ngx_http_upstream.c nginx-1.2.4-patched/src/http/n
      if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
          if (ngx_tcp_push(c->fd) == NGX_ERROR) {
              ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno,
-@@ -1451,7 +1453,7 @@
+@@ -1484,7 +1487,7 @@ ngx_http_upstream_send_request_handler(n
  
  #endif
  
@@ -19,11 +27,11 @@ diff -ur nginx-1.2.4/src/http/ngx_http_upstream.c nginx-1.2.4-patched/src/http/n
          u->write_event_handler = ngx_http_upstream_dummy_handler;
  
          (void) ngx_handle_write_event(c->write, 0);
-diff -ur nginx-1.2.4/src/http/ngx_http_upstream.h nginx-1.2.4-patched/src/http/ngx_http_upstream.h
+diff -rudp nginx-1.2.4/src/http/ngx_http_upstream.h nginx-1.2.4-patched/src/http/ngx_http_upstream.h
---- nginx-1.2.4/src/http/ngx_http_upstream.h	2011-11-01 22:18:10.000000000 +0800
+--- nginx-1.2.4/src/http/ngx_http_upstream.h	2012-02-13 03:01:58.000000000 -0800
-+++ nginx-1.2.4-patched/src/http/ngx_http_upstream.h	2012-03-21 21:18:21.041237173 +0800
++++ nginx-1.2.4-patched/src/http/ngx_http_upstream.h	2012-12-05 14:41:09.763514741 -0800
-@@ -313,6 +313,7 @@
+@@ -324,6 +324,7 @@ struct ngx_http_upstream_s {
-     unsigned                         buffering:1;
+     unsigned                         keepalive:1;
  
      unsigned                         request_sent:1;
 +    unsigned                         request_all_sent:1;

patches/nginx-1.2.5-slab_alloc_no_memory_as_info.patch

@@ -0,0 +1,11 @@
+--- nginx-1.2.5/src/core/ngx_slab.c	2012-09-24 11:34:04.000000000 -0700
++++ nginx-1.2.5-patched/src/core/ngx_slab.c	2012-12-05 20:47:07.296694952 -0800
+@@ -657,7 +657,7 @@ ngx_slab_alloc_pages(ngx_slab_pool_t *po
+         }
+     }
+ 
+-    ngx_slab_error(pool, NGX_LOG_CRIT, "ngx_slab_alloc() failed: no memory");
++    ngx_slab_error(pool, NGX_LOG_INFO, "ngx_slab_alloc() failed: no memory");
+ 
+     return NULL;
+ }

patches/nginx-1.2.5-upstream_pipelining.patch

@@ -1,7 +1,15 @@
-diff -ur nginx-1.2.5/src/http/ngx_http_upstream.c nginx-1.2.5-patched/src/http/ngx_http_upstream.c
+diff -rudp nginx-1.2.5/src/http/ngx_http_upstream.c nginx-1.2.5-patched/src/http/ngx_http_upstream.c
---- nginx-1.2.5/src/http/ngx_http_upstream.c	2011-12-14 02:34:34.000000000 +0800
+--- nginx-1.2.5/src/http/ngx_http_upstream.c	2012-08-06 10:34:08.000000000 -0700
-+++ nginx-1.2.5-patched/src/http/ngx_http_upstream.c	2012-03-21 21:20:17.333111806 +0800
++++ nginx-1.2.5-patched/src/http/ngx_http_upstream.c	2012-12-05 14:46:41.741173058 -0800
-@@ -1385,6 +1385,8 @@
+@@ -1216,6 +1216,7 @@ ngx_http_upstream_connect(ngx_http_reque
+     }
+ 
+     u->request_sent = 0;
++    u->request_all_sent = 0;
+ 
+     if (rc == NGX_AGAIN) {
+         ngx_add_timer(c->write, u->conf->connect_timeout);
+@@ -1418,6 +1419,8 @@ ngx_http_upstream_send_request(ngx_http_
  
      /* rc == NGX_OK */
  
@@ -10,7 +18,7 @@ diff -ur nginx-1.2.5/src/http/ngx_http_upstream.c nginx-1.2.5-patched/src/http/n
      if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
          if (ngx_tcp_push(c->fd) == NGX_ERROR) {
              ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno,
-@@ -1451,7 +1453,7 @@
+@@ -1484,7 +1487,7 @@ ngx_http_upstream_send_request_handler(n
  
  #endif
  
@@ -19,11 +27,11 @@ diff -ur nginx-1.2.5/src/http/ngx_http_upstream.c nginx-1.2.5-patched/src/http/n
          u->write_event_handler = ngx_http_upstream_dummy_handler;
  
          (void) ngx_handle_write_event(c->write, 0);
-diff -ur nginx-1.2.5/src/http/ngx_http_upstream.h nginx-1.2.5-patched/src/http/ngx_http_upstream.h
+diff -rudp nginx-1.2.5/src/http/ngx_http_upstream.h nginx-1.2.5-patched/src/http/ngx_http_upstream.h
---- nginx-1.2.5/src/http/ngx_http_upstream.h	2011-11-01 22:18:10.000000000 +0800
+--- nginx-1.2.5/src/http/ngx_http_upstream.h	2012-02-13 03:01:58.000000000 -0800
-+++ nginx-1.2.5-patched/src/http/ngx_http_upstream.h	2012-03-21 21:18:21.041237173 +0800
++++ nginx-1.2.5-patched/src/http/ngx_http_upstream.h	2012-12-05 14:41:09.763514741 -0800
-@@ -313,6 +313,7 @@
+@@ -324,6 +324,7 @@ struct ngx_http_upstream_s {
-     unsigned                         buffering:1;
+     unsigned                         keepalive:1;
  
      unsigned                         request_sent:1;
 +    unsigned                         request_all_sent:1;

patches/nginx-1.3.7-slab_alloc_no_memory_as_info.patch

@@ -0,0 +1,11 @@
+--- nginx-1.3.7/src/core/ngx_slab.c	2012-09-24 11:34:04.000000000 -0700
++++ nginx-1.3.7-patched/src/core/ngx_slab.c	2012-12-05 20:47:07.296694952 -0800
+@@ -657,7 +657,7 @@ ngx_slab_alloc_pages(ngx_slab_pool_t *po
+         }
+     }
+ 
+-    ngx_slab_error(pool, NGX_LOG_CRIT, "ngx_slab_alloc() failed: no memory");
++    ngx_slab_error(pool, NGX_LOG_INFO, "ngx_slab_alloc() failed: no memory");
+ 
+     return NULL;
+ }

patches/nginx-1.3.7-upstream_pipelining.patch

@@ -1,7 +1,15 @@
-diff -ur nginx-1.3.7/src/http/ngx_http_upstream.c nginx-1.3.7-patched/src/http/ngx_http_upstream.c
+diff -rudp nginx-1.3.7/src/http/ngx_http_upstream.c nginx-1.3.7-patched/src/http/ngx_http_upstream.c
---- nginx-1.3.7/src/http/ngx_http_upstream.c	2011-12-14 02:34:34.000000000 +0800
+--- nginx-1.3.7/src/http/ngx_http_upstream.c	2012-08-06 10:34:08.000000000 -0700
-+++ nginx-1.3.7-patched/src/http/ngx_http_upstream.c	2012-03-21 21:20:17.333111806 +0800
++++ nginx-1.3.7-patched/src/http/ngx_http_upstream.c	2012-12-05 14:46:41.741173058 -0800
-@@ -1385,6 +1385,8 @@
+@@ -1216,6 +1216,7 @@ ngx_http_upstream_connect(ngx_http_reque
+     }
+ 
+     u->request_sent = 0;
++    u->request_all_sent = 0;
+ 
+     if (rc == NGX_AGAIN) {
+         ngx_add_timer(c->write, u->conf->connect_timeout);
+@@ -1418,6 +1419,8 @@ ngx_http_upstream_send_request(ngx_http_
  
      /* rc == NGX_OK */
  
@@ -10,7 +18,7 @@ diff -ur nginx-1.3.7/src/http/ngx_http_upstream.c nginx-1.3.7-patched/src/http/n
      if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
          if (ngx_tcp_push(c->fd) == NGX_ERROR) {
              ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno,
-@@ -1451,7 +1453,7 @@
+@@ -1484,7 +1487,7 @@ ngx_http_upstream_send_request_handler(n
  
  #endif
  
@@ -19,11 +27,11 @@ diff -ur nginx-1.3.7/src/http/ngx_http_upstream.c nginx-1.3.7-patched/src/http/n
          u->write_event_handler = ngx_http_upstream_dummy_handler;
  
          (void) ngx_handle_write_event(c->write, 0);
-diff -ur nginx-1.3.7/src/http/ngx_http_upstream.h nginx-1.3.7-patched/src/http/ngx_http_upstream.h
+diff -rudp nginx-1.3.7/src/http/ngx_http_upstream.h nginx-1.3.7-patched/src/http/ngx_http_upstream.h
---- nginx-1.3.7/src/http/ngx_http_upstream.h	2011-11-01 22:18:10.000000000 +0800
+--- nginx-1.3.7/src/http/ngx_http_upstream.h	2012-02-13 03:01:58.000000000 -0800
-+++ nginx-1.3.7-patched/src/http/ngx_http_upstream.h	2012-03-21 21:18:21.041237173 +0800
++++ nginx-1.3.7-patched/src/http/ngx_http_upstream.h	2012-12-05 14:41:09.763514741 -0800
-@@ -313,6 +313,7 @@
+@@ -324,6 +324,7 @@ struct ngx_http_upstream_s {
-     unsigned                         buffering:1;
+     unsigned                         keepalive:1;
  
      unsigned                         request_sent:1;
 +    unsigned                         request_all_sent:1;

t/sanity.t

@@ -224,7 +224,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -291,7 +291,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -367,7 +367,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -434,7 +434,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -500,7 +500,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -675,7 +675,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -932,7 +932,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -998,7 +998,7 @@ cd nginx-1.2.4
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../drizzle-nginx-module-0.1.4 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -1064,7 +1064,7 @@ cd nginx-1.2.4
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../drizzle-nginx-module-0.1.4 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -1143,7 +1143,7 @@ cd nginx-1.2.4
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../drizzle-nginx-module-0.1.4 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -1209,7 +1209,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -1276,7 +1276,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -1344,7 +1344,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -1424,7 +1424,7 @@ cd nginx-1.2.4
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../ngx_postgres-1.0rc2 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -1491,7 +1491,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -1579,7 +1579,7 @@ cd nginx-1.2.4
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../ngx_postgres-1.0rc2 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -1656,7 +1656,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -1721,7 +1721,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -1787,7 +1787,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -1853,7 +1853,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -1918,7 +1918,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -1986,7 +1986,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -2051,7 +2051,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -2114,7 +2114,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -2175,7 +2175,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -2234,7 +2234,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -2305,7 +2305,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -2369,7 +2369,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -2434,7 +2434,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -2500,7 +2500,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -2565,7 +2565,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -2630,7 +2630,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -2694,7 +2694,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -2758,7 +2758,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -2826,7 +2826,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \
@@ -2892,7 +2892,7 @@ cd nginx-1.2.4
   --add-module=../form-input-nginx-module-0.07rc5 \
   --add-module=../encrypted-session-nginx-module-0.02 \
   --add-module=../srcache-nginx-module-0.16 \
-  --add-module=../ngx_lua-0.7.5 \
+  --add-module=../ngx_lua-0.7.7 \
   --add-module=../headers-more-nginx-module-0.19 \
   --add-module=../array-var-nginx-module-0.03rc1 \
   --add-module=../memc-nginx-module-0.13rc3 \

util/mirror-tarballs

@@ -125,6 +125,10 @@ echo "$info_txt applying the upstream_test_connect_kqueue patch for nginx"
 patch -p1 < $root/patches/nginx-$main_ver-upstream_test_connect_kqueue.patch || exit 1
 echo
 
+echo "$info_txt applying the slab_alloc_no_memory_as_info patch for nginx"
+patch -p1 < $root/patches/nginx-$main_ver-slab_alloc_no_memory_as_info.patch || exit 1
+echo
+
 rm -f *.patch || exit 1
 
 cd .. || exit 1
@@ -194,7 +198,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.7.5
+ver=0.7.7
 $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
@@ -312,7 +316,11 @@ ver=2.0.0
 $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;
+echo "$info_txt applying luajit-2.0.0-2ad9834d.patch for luajit 2.0.0"
+cd LuaJIT-$ver || exit 1;
+patch -p1 < $root/patches/luajit-2.0.0-2ad9834d.patch || exit 1
+cd .. || exit 1
+
 #$root/util/get-tarball http://luajit.org/download/beta11_hotfix1.patch -O beta11_hotfix1.patch
 #patch -p1 < beta11_hotfix1.patch || exit 1
 #rm beta11_hotfix1.patch || exit 1

util/ver

@@ -3,7 +3,7 @@
 #main_ver=1.3.7
 #main_ver=1.2.5
 main_ver=1.2.4
-minor_ver=9
+minor_ver=11
 version=$main_ver.$minor_ver
 echo $version