applied the official patch for the nginx security vulnerability CVE-2013-2070.

patches/lua-5.1.5-enable_debug_info.patch

@@ -0,0 +1,11 @@
+--- lua-5.1.5/src/Makefile	2012-02-13 12:41:22.000000000 -0800
++++ lua-5.1.5-patched/src/Makefile	2013-04-20 22:56:42.921286886 -0700
+@@ -8,7 +8,7 @@
+ PLAT= none
+ 
+ CC= gcc
+-CFLAGS= -O2 -Wall $(MYCFLAGS)
++CFLAGS= -g -O2 -Wall $(MYCFLAGS)
+ AR= ar rcu
+ RANLIB= ranlib
+ RM= rm -f

patches/nginx-1.2.7-cve-2013-2070.patch

@@ -0,0 +1,13 @@
+--- src/http/modules/ngx_http_proxy_module.c
++++ src/http/modules/ngx_http_proxy_module.c
+@@ -1865,6 +1865,10 @@ data:
+ 
+     }
+ 
++    if (ctx->size < 0 || ctx->length < 0) {
++        goto invalid;
++    }
++
+     return rc;
+ 
+ done:

patches/nginx-1.2.7-dtrace.patch

@@ -454,10 +454,10 @@ index efbc244..8d81aab 100644
  
 diff --git a/src/dtrace/nginx.stp b/src/dtrace/nginx.stp
 new file mode 100644
-index 0000000..8a5a54a
+index 0000000..4c228bd
 --- /dev/null
 +++ b/src/dtrace/nginx.stp
-@@ -0,0 +1,278 @@
+@@ -0,0 +1,288 @@
 +/* tapset for nginx */
 +
 +
@@ -598,6 +598,12 @@ index 0000000..8a5a54a
 +}
 +
 +
++function ngx_buf_last_in_chain(b)
++{
++    return @cast(b, "ngx_buf_t", "/home/agentzh/git/lua-nginx-module/work/nginx/sbin/nginx")->last_in_chain
++}
++
++
 +function ngx_buf_sync(b)
 +{
 +    return @cast(b, "ngx_buf_t", "/home/agentzh/git/lua-nginx-module/work/nginx/sbin/nginx")->sync
@@ -651,7 +657,11 @@ index 0000000..8a5a54a
 +        }
 +
 +        if (ngx_buf_last_buf(buf)) {
-+            out .= "<eof>"
++            out .= "<last_buf>"
++        }
++
++        if (ngx_buf_last_in_chain(buf)) {
++            out .= "<last_in_chain>"
 +        }
 +
 +        if (ngx_buf_sync(buf)) {

patches/nginx-1.2.7-nonbuffered-upstream-truncation.patch

@@ -1,63 +0,0 @@
---- nginx-1.2.7/src/http/ngx_http_upstream.c	2012-08-06 10:34:08.000000000 -0700
-+++ nginx-1.2.7-patched/src/http/ngx_http_upstream.c	2012-09-09 21:58:04.727761891 -0700
-@@ -2383,7 +2383,7 @@
- 
-     if (c->read->timedout) {
-         ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out");
--        ngx_http_upstream_finalize_request(r, u, 0);
-+        ngx_http_upstream_finalize_request(r, u, NGX_HTTP_GATEWAY_TIME_OUT);
-         return;
-     }
- 
-@@ -2430,13 +2430,17 @@
-             if (u->busy_bufs == NULL) {
- 
-                 if (u->length == 0
--                    || upstream->read->eof
--                    || upstream->read->error)
-+                    || (upstream->read->eof && u->headers_in.content_length_n == -1))
-                 {
-                     ngx_http_upstream_finalize_request(r, u, 0);
-                     return;
-                 }
- 
-+                if (upstream->read->eof || upstream->read->error) {
-+                    ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY);
-+                    return;
-+                }
-+
-                 b->pos = b->start;
-                 b->last = b->start;
-             }
-@@ -2710,7 +2714,16 @@
- #if 0
-             ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock);
- #endif
--            ngx_http_upstream_finalize_request(r, u, 0);
-+
-+            if (p->upstream_done
-+                || (p->upstream_eof && u->headers_in.content_length_n == -1))
-+            {
-+                ngx_http_upstream_finalize_request(r, u, 0);
-+
-+            } else {
-+                ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY);
-+            }
-+
-             return;
-         }
-     }
-@@ -3073,6 +3086,13 @@
-         && rc != NGX_HTTP_REQUEST_TIME_OUT
-         && (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE))
-     {
-+        if (rc == NGX_ERROR) {
-+            r->headers_out.status = NGX_HTTP_INTERNAL_SERVER_ERROR;
-+
-+        } else {
-+            r->headers_out.status = rc;
-+        }
-+
-         rc = 0;
-     }
- 

patches/nginx-1.2.7-run_posted_requests_in_resolver.patch

@@ -0,0 +1,46 @@
+diff -ruNp nginx-1.2.7/src/http/ngx_http_upstream.c nginx-1.2.7_zls/src/http/ngx_http_upstream.c
+--- nginx-1.2.7/src/http/ngx_http_upstream.c	2013-02-18 23:08:46.000000000 +0800
++++ nginx-1.2.7_zls/src/http/ngx_http_upstream.c	2013-03-13 00:01:01.490582380 +0800
+@@ -878,11 +878,13 @@ ngx_http_upstream_cache_send(ngx_http_re
+ static void
+ ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx)
+ {
++    ngx_connection_t              *c;
+     ngx_http_request_t            *r;
+     ngx_http_upstream_t           *u;
+     ngx_http_upstream_resolved_t  *ur;
+ 
+     r = ctx->data;
++    c = r->connection;
+ 
+     u = r->upstream;
+     ur = u->resolved;
+@@ -894,7 +896,8 @@ ngx_http_upstream_resolve_handler(ngx_re
+                       ngx_resolver_strerror(ctx->state));
+ 
+         ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY);
+-        return;
++
++        goto posted_requests;
+     }
+ 
+     ur->naddrs = ctx->naddrs;
+@@ -919,13 +922,17 @@ ngx_http_upstream_resolve_handler(ngx_re
+     if (ngx_http_upstream_create_round_robin_peer(r, ur) != NGX_OK) {
+         ngx_http_upstream_finalize_request(r, u,
+                                            NGX_HTTP_INTERNAL_SERVER_ERROR);
+-        return;
++        goto posted_requests;
+     }
+ 
+     ngx_resolve_name_done(ctx);
+     ur->ctx = NULL;
+ 
+     ngx_http_upstream_connect(r, u);
++
++posted_requests:
++
++    ngx_http_run_posted_requests(c);
+ }
+ 
+ 

patches/nginx-1.2.7-upstream_truncation.patch

@@ -0,0 +1,149 @@
+diff --exclude '*~' --exclude '*.swp' -urp nginx-1.2.7/src/http/modules/ngx_http_scgi_module.c nginx-1.2.7-patched/src/http/modules/ngx_http_scgi_module.c
+--- nginx-1.2.7/src/http/modules/ngx_http_scgi_module.c	2013-02-09 19:08:42.000000000 -0800
++++ nginx-1.2.7-patched/src/http/modules/ngx_http_scgi_module.c	2013-04-07 12:09:55.900492634 -0700
+@@ -39,6 +39,7 @@ static ngx_int_t ngx_http_scgi_process_s
+ static ngx_int_t ngx_http_scgi_process_header(ngx_http_request_t *r);
+ static void ngx_http_scgi_abort_request(ngx_http_request_t *r);
+ static void ngx_http_scgi_finalize_request(ngx_http_request_t *r, ngx_int_t rc);
++static ngx_int_t ngx_http_scgi_input_filter_init(void *data);
+ 
+ static void *ngx_http_scgi_create_loc_conf(ngx_conf_t *cf);
+ static char *ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent,
+@@ -446,6 +447,8 @@ ngx_http_scgi_handler(ngx_http_request_t
+     u->pipe->input_filter = ngx_event_pipe_copy_input_filter;
+     u->pipe->input_ctx = r;
+ 
++    u->input_filter_init = ngx_http_scgi_input_filter_init;
++
+     rc = ngx_http_read_client_request_body(r, ngx_http_upstream_init);
+ 
+     if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+@@ -1046,6 +1049,17 @@ ngx_http_scgi_finalize_request(ngx_http_
+ }
+ 
+ 
++static ngx_int_t
++ngx_http_scgi_input_filter_init(void *data)
++{
++    ngx_http_request_t    *r = data;
++
++    r->upstream->length = -1;
++
++    return NGX_OK;
++}
++
++
+ static void *
+ ngx_http_scgi_create_loc_conf(ngx_conf_t *cf)
+ {
+diff --exclude '*~' --exclude '*.swp' -urp nginx-1.2.7/src/http/modules/ngx_http_uwsgi_module.c nginx-1.2.7-patched/src/http/modules/ngx_http_uwsgi_module.c
+--- nginx-1.2.7/src/http/modules/ngx_http_uwsgi_module.c	2013-02-09 19:08:42.000000000 -0800
++++ nginx-1.2.7-patched/src/http/modules/ngx_http_uwsgi_module.c	2013-04-07 11:58:24.546915778 -0700
+@@ -46,6 +46,7 @@ static ngx_int_t ngx_http_uwsgi_process_
+ static void ngx_http_uwsgi_abort_request(ngx_http_request_t *r);
+ static void ngx_http_uwsgi_finalize_request(ngx_http_request_t *r,
+     ngx_int_t rc);
++static ngx_int_t ngx_http_uwsgi_input_filter_init(void *data);
+ 
+ static void *ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf);
+ static char *ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent,
+@@ -479,6 +480,8 @@ ngx_http_uwsgi_handler(ngx_http_request_
+     u->pipe->input_filter = ngx_event_pipe_copy_input_filter;
+     u->pipe->input_ctx = r;
+ 
++    u->input_filter_init = ngx_http_uwsgi_input_filter_init;
++
+     rc = ngx_http_read_client_request_body(r, ngx_http_upstream_init);
+ 
+     if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+@@ -1086,6 +1089,17 @@ ngx_http_uwsgi_finalize_request(ngx_http
+ }
+ 
+ 
++static ngx_int_t
++ngx_http_uwsgi_input_filter_init(void *data)
++{
++    ngx_http_request_t    *r = data;
++
++    r->upstream->length = -1;
++
++    return NGX_OK;
++}
++
++
+ static void *
+ ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf)
+ {
+diff --exclude '*~' --exclude '*.swp' -urp nginx-1.2.7/src/http/ngx_http_upstream.c nginx-1.2.7-patched/src/http/ngx_http_upstream.c
+--- nginx-1.2.7/src/http/ngx_http_upstream.c	2013-02-11 06:39:49.000000000 -0800
++++ nginx-1.2.7-patched/src/http/ngx_http_upstream.c	2013-04-08 16:37:48.326752696 -0700
+@@ -2399,7 +2399,7 @@ ngx_http_upstream_process_non_buffered_u
+ 
+     if (c->read->timedout) {
+         ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out");
+-        ngx_http_upstream_finalize_request(r, u, 0);
++        ngx_http_upstream_finalize_request(r, u, NGX_HTTP_GATEWAY_TIME_OUT);
+         return;
+     }
+ 
+@@ -2446,13 +2446,20 @@ ngx_http_upstream_process_non_buffered_r
+             if (u->busy_bufs == NULL) {
+ 
+                 if (u->length == 0
+-                    || upstream->read->eof
+-                    || upstream->read->error)
++                    || (upstream->read->eof
++                        && u->length == -1
++                        && u->pipe
++                        && u->pipe->length <= 0))
+                 {
+                     ngx_http_upstream_finalize_request(r, u, 0);
+                     return;
+                 }
+ 
++                if (upstream->read->eof || upstream->read->error) {
++                    ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY);
++                    return;
++                }
++
+                 b->pos = b->start;
+                 b->last = b->start;
+             }
+@@ -2720,7 +2727,9 @@ ngx_http_upstream_process_request(ngx_ht
+ 
+ #endif
+ 
+-        if (p->upstream_done || p->upstream_eof || p->upstream_error) {
++        if (p->upstream_done
++            || (p->upstream_eof && u->length == -1 && p->length <= 0))
++        {
+             ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                            "http upstream exit: %p", p->out);
+ #if 0
+@@ -2729,6 +2738,14 @@ ngx_http_upstream_process_request(ngx_ht
+             ngx_http_upstream_finalize_request(r, u, 0);
+             return;
+         }
++
++        if (p->upstream_eof || p->upstream_error) {
++            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++                           "http upstream exit: %p", p->out);
++
++            ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY);
++            return;
++       }
+     }
+ 
+     if (p->downstream_error) {
+@@ -3087,9 +3104,9 @@ ngx_http_upstream_finalize_request(ngx_h
+ 
+     if (u->header_sent
+         && rc != NGX_HTTP_REQUEST_TIME_OUT
+-        && (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE))
++        && rc >= NGX_HTTP_SPECIAL_RESPONSE)
+     {
+-        rc = 0;
++        rc = NGX_ERROR;
+     }
+ 
+     if (rc == NGX_DECLINED) {

patches/nginx-1.2.8-channel-uninit-params.patch

@@ -0,0 +1,42 @@
+diff -urp nginx-1.2.8/src/os/unix/ngx_channel.c nginx-1.2.8-patched/src/os/unix/ngx_channel.c
+--- nginx-1.2.8/src/os/unix/ngx_channel.c	2012-01-18 07:07:43.000000000 -0800
++++ nginx-1.2.8-patched/src/os/unix/ngx_channel.c	2012-09-17 11:33:09.215394217 -0700
+@@ -31,6 +31,8 @@ ngx_write_channel(ngx_socket_t s, ngx_ch
+         msg.msg_controllen = 0;
+ 
+     } else {
++        ngx_memzero(&cmsg, sizeof(cmsg));
++
+         msg.msg_control = (caddr_t) &cmsg;
+         msg.msg_controllen = sizeof(cmsg);
+ 
+diff -urp nginx-1.2.8/src/os/unix/ngx_process_cycle.c nginx-1.2.8-patched/src/os/unix/ngx_process_cycle.c
+--- nginx-1.2.8/src/os/unix/ngx_process_cycle.c	2012-07-02 09:23:14.000000000 -0700
++++ nginx-1.2.8-patched/src/os/unix/ngx_process_cycle.c	2012-09-17 11:33:09.214394215 -0700
+@@ -356,6 +356,8 @@ ngx_start_worker_processes(ngx_cycle_t *
+ 
+     ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "start worker processes");
+ 
++    ngx_memzero(&ch, sizeof(ngx_channel_t));
++
+     ch.command = NGX_CMD_OPEN_CHANNEL;
+ 
+     for (i = 0; i < n; i++) {
+@@ -463,6 +465,8 @@ ngx_signal_worker_processes(ngx_cycle_t
+     ngx_err_t      err;
+     ngx_channel_t  ch;
+ 
++    ngx_memzero(&ch, sizeof(ngx_channel_t));
++
+ #if (NGX_BROKEN_SCM_RIGHTS)
+ 
+     ch.command = 0;
+@@ -564,6 +568,8 @@ ngx_reap_children(ngx_cycle_t *cycle)
+     ngx_channel_t     ch;
+     ngx_core_conf_t  *ccf;
+ 
++    ngx_memzero(&ch, sizeof(ngx_channel_t));
++
+     ch.command = NGX_CMD_CLOSE_CHANNEL;
+     ch.fd = -1;
+ 

patches/nginx-1.2.8-cve-2013-2070.patch

@@ -0,0 +1,13 @@
+--- src/http/modules/ngx_http_proxy_module.c
++++ src/http/modules/ngx_http_proxy_module.c
+@@ -1865,6 +1865,10 @@ data:
+ 
+     }
+ 
++    if (ctx->size < 0 || ctx->length < 0) {
++        goto invalid;
++    }
++
+     return rc;
+ 
+ done:

patches/nginx-1.2.8-location_if_inherits_proxy.patch

@@ -0,0 +1,15 @@
+--- nginx-1.2.8/src/http/modules/ngx_http_proxy_module.c	2012-04-23 18:40:01.000000000 +0800
++++ nginx-1.2.8-patched/src/http/modules/ngx_http_proxy_module.c	2012-06-24 12:48:57.289834450 +0800
+@@ -3023,8 +3023,10 @@
+ 
+     if (conf->upstream.upstream || conf->proxy_lengths) {
+         clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+-        if (clcf->handler == NULL && clcf->lmt_excpt) {
+-            clcf->handler = ngx_http_proxy_handler;
++        if (clcf->handler == NULL) {
++            if (clcf->lmt_excpt) {
++                clcf->handler = ngx_http_proxy_handler;
++            }
+             conf->location = prev->location;
+         }
+     }

patches/nginx-1.2.8-log_escape_non_ascii.patch

@@ -0,0 +1,115 @@
+--- nginx-1.2.8/src/http/modules/ngx_http_log_module.c	2011-11-01 21:24:50.000000000 +0800
++++ nginx-1.2.8-patched/src/http/modules/ngx_http_log_module.c	2011-11-10 16:17:29.599039534 +0800
+@@ -61,6 +61,8 @@
+     time_t                      open_file_cache_valid;
+     ngx_uint_t                  open_file_cache_min_uses;
+ 
++    ngx_flag_t                  escape_non_ascii;
++
+     ngx_uint_t                  off;        /* unsigned  off:1 */
+ } ngx_http_log_loc_conf_t;
+ 
+@@ -104,7 +106,8 @@
+     uintptr_t data);
+ static u_char *ngx_http_log_variable(ngx_http_request_t *r, u_char *buf,
+     ngx_http_log_op_t *op);
+-static uintptr_t ngx_http_log_escape(u_char *dst, u_char *src, size_t size);
++static uintptr_t ngx_http_log_escape(ngx_http_log_loc_conf_t *lcf, u_char *dst,
++    u_char *src, size_t size);
+ 
+ 
+ static void *ngx_http_log_create_main_conf(ngx_conf_t *cf);
+@@ -146,6 +149,13 @@
+       0,
+       NULL },
+ 
++    { ngx_string("log_escape_non_ascii"),
++      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
++      ngx_conf_set_flag_slot,
++      NGX_HTTP_LOC_CONF_OFFSET,
++      offsetof(ngx_http_log_loc_conf_t, escape_non_ascii),
++      NULL },
++
+       ngx_null_command
+ };
+ 
+@@ -637,6 +647,7 @@
+ ngx_http_log_variable_getlen(ngx_http_request_t *r, uintptr_t data)
+ {
+     uintptr_t                   len;
++    ngx_http_log_loc_conf_t    *lcf;
+     ngx_http_variable_value_t  *value;
+ 
+     value = ngx_http_get_indexed_variable(r, data);
+@@ -645,7 +656,9 @@
+         return 1;
+     }
+ 
+-    len = ngx_http_log_escape(NULL, value->data, value->len);
++    lcf = ngx_http_get_module_loc_conf(r, ngx_http_log_module);
++
++    len = ngx_http_log_escape(lcf, NULL, value->data, value->len);
+ 
+     value->escape = len ? 1 : 0;
+ 
+@@ -656,6 +669,7 @@
+ static u_char *
+ ngx_http_log_variable(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op)
+ {
++    ngx_http_log_loc_conf_t    *lcf;
+     ngx_http_variable_value_t  *value;
+ 
+     value = ngx_http_get_indexed_variable(r, op->data);
+@@ -669,16 +683,18 @@
+         return ngx_cpymem(buf, value->data, value->len);
+ 
+     } else {
+-        return (u_char *) ngx_http_log_escape(buf, value->data, value->len);
++        lcf = ngx_http_get_module_loc_conf(r, ngx_http_log_module);
++        return (u_char *) ngx_http_log_escape(lcf, buf, value->data, value->len);
+     }
+ }
+ 
+ 
+ static uintptr_t
+-ngx_http_log_escape(u_char *dst, u_char *src, size_t size)
++ngx_http_log_escape(ngx_http_log_loc_conf_t *lcf, u_char *dst, u_char *src,
++    size_t size)
+ {
+-    ngx_uint_t      n;
+-    static u_char   hex[] = "0123456789ABCDEF";
++    ngx_uint_t                   n;
++    static u_char                hex[] = "0123456789ABCDEF";
+ 
+     static uint32_t   escape[] = {
+         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+@@ -698,6 +714,12 @@
+         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+     };
+ 
++    if (lcf->escape_non_ascii) {
++        ngx_memset(&escape[4], 0xff, sizeof(uint32_t) * 4);
++
++    } else {
++        ngx_memzero(&escape[4], sizeof(uint32_t) * 4);
++    }
+ 
+     if (dst == NULL) {
+ 
+@@ -781,6 +803,7 @@
+     }
+ 
+     conf->open_file_cache = NGX_CONF_UNSET_PTR;
++    conf->escape_non_ascii = NGX_CONF_UNSET;
+ 
+     return conf;
+ }
+@@ -796,6 +819,8 @@
+     ngx_http_log_fmt_t        *fmt;
+     ngx_http_log_main_conf_t  *lmcf;
+ 
++    ngx_conf_merge_value(conf->escape_non_ascii, prev->escape_non_ascii, 1);
++
+     if (conf->open_file_cache == NGX_CONF_UNSET_PTR) {
+ 
+         conf->open_file_cache = prev->open_file_cache;

patches/nginx-1.2.8-no_Werror.patch

@@ -0,0 +1,24 @@
+diff -ur nginx-1.2.8/auto/cc/gcc nginx-1.2.8-patched/auto/cc/gcc
+--- nginx-1.2.8/auto/cc/gcc	2011-06-27 19:53:00.205737804 +0800
++++ nginx-1.2.8-patched/auto/cc/gcc	2011-06-27 19:53:13.837741087 +0800
+@@ -169,7 +169,7 @@
+ 
+ 
+ # stop on warning
+-CFLAGS="$CFLAGS -Werror"
++#CFLAGS="$CFLAGS -Werror"
+ 
+ # debug
+ CFLAGS="$CFLAGS -g"
+diff -ur nginx-1.2.8/auto/cc/icc nginx-1.2.8-patched/auto/cc/icc
+--- nginx-1.2.8/auto/cc/icc	2011-06-27 19:52:56.370157068 +0800
++++ nginx-1.2.8-patched/auto/cc/icc	2011-06-27 19:53:19.508916811 +0800
+@@ -139,7 +139,7 @@
+ esac
+ 
+ # stop on warning
+-CFLAGS="$CFLAGS -Werror"
++#CFLAGS="$CFLAGS -Werror"
+ 
+ # debug
+ CFLAGS="$CFLAGS -g"

patches/nginx-1.2.8-no_error_pages.patch

@@ -0,0 +1,90 @@
+--- nginx-1.2.8/src/http/ngx_http_core_module.c	2010-12-14 18:38:42.000000000 +0800
++++ nginx-1.2.8-patched/src/http/ngx_http_core_module.c	2011-01-30 19:24:34.956354518 +0800
+@@ -57,6 +57,8 @@
+     void *conf);
+ static char *ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd,
+     void *conf);
++static char *ngx_http_core_no_error_pages(ngx_conf_t *cf, ngx_command_t *cmd,
++    void *conf);
+ static char *ngx_http_core_try_files(ngx_conf_t *cf, ngx_command_t *cmd,
+     void *conf);
+ static char *ngx_http_core_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd,
+@@ -614,6 +616,14 @@
+       0,
+       NULL },
+ 
++    { ngx_string("no_error_pages"),
++      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
++                        |NGX_CONF_NOARGS,
++      ngx_http_core_no_error_pages,
++      NGX_HTTP_LOC_CONF_OFFSET,
++      0,
++      NULL },
++
+     { ngx_string("try_files"),
+       NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_2MORE,
+       ngx_http_core_try_files,
+@@ -3052,7 +3062,6 @@
+      *     clcf->types = NULL;
+      *     clcf->default_type = { 0, NULL };
+      *     clcf->error_log = NULL;
+-     *     clcf->error_pages = NULL;
+      *     clcf->try_files = NULL;
+      *     clcf->client_body_path = NULL;
+      *     clcf->regex = NULL;
+@@ -3062,6 +3071,7 @@
+      *     clcf->gzip_proxied = 0;
+      */
+ 
++    clcf->error_pages = NGX_CONF_UNSET_PTR;
+     clcf->client_max_body_size = NGX_CONF_UNSET;
+     clcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE;
+     clcf->client_body_timeout = NGX_CONF_UNSET_MSEC;
+@@ -3250,9 +3260,7 @@
+         }
+     }
+ 
+-    if (conf->error_pages == NULL && prev->error_pages) {
+-        conf->error_pages = prev->error_pages;
+-    }
++    ngx_conf_merge_ptr_value(conf->error_pages, prev->error_pages, NULL);
+ 
+     ngx_conf_merge_str_value(conf->default_type,
+                               prev->default_type, "text/plain");
+@@ -3988,6 +3996,10 @@
+     ngx_http_compile_complex_value_t   ccv;
+ 
+     if (clcf->error_pages == NULL) {
++        return "conflicts with \"no_error_pages\"";
++    }
++
++    if (clcf->error_pages == NGX_CONF_UNSET_PTR) {
+         clcf->error_pages = ngx_array_create(cf->pool, 4,
+                                              sizeof(ngx_http_err_page_t));
+         if (clcf->error_pages == NULL) {
+@@ -4095,6 +4107,25 @@
+ 
+ 
+ static char *
++ngx_http_core_no_error_pages(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
++{
++    ngx_http_core_loc_conf_t *clcf = conf;
++
++    if (clcf->error_pages == NULL) {
++        return "is duplicate";
++    }
++
++    if (clcf->error_pages != NGX_CONF_UNSET_PTR) {
++        return "conflicts with \"error_page\"";
++    }
++
++    clcf->error_pages = NULL;
++
++    return NGX_CONF_OK;
++}
++
++
++static char *
+ ngx_http_core_try_files(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+ {
+     ngx_http_core_loc_conf_t *clcf = conf;

patches/nginx-1.2.8-no_pool.patch

@@ -0,0 +1,609 @@
+diff -ur nginx-1.2.8/src/core/nginx.h nginx-1.2.8-patched/src/core/nginx.h
+--- nginx-1.2.8/src/core/nginx.h	2011-08-29 17:30:22.000000000 +0800
++++ nginx-1.2.8-patched/src/core/nginx.h	2011-09-13 12:11:03.135622101 +0800
+@@ -10,7 +10,7 @@
+ 
+ 
+ #define nginx_version      1002008
+ #define NGINX_VERSION      "1.2.8"
+-#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown"
++#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
+ 
+ #define NGINX_VAR          "NGINX"
+diff -urx '*~' -x '*.swp' nginx-1.2.8/src/core/ngx_array.c nginx-1.2.8-patched/src/core/ngx_array.c
+--- nginx-1.2.8/src/core/ngx_array.c	2012-02-06 04:02:59.000000000 +0800
++++ nginx-1.2.8-patched/src/core/ngx_array.c	2012-06-20 23:10:36.870722387 +0800
+@@ -28,6 +28,7 @@
+     a->size = size;
+     a->nalloc = n;
+     a->pool = p;
++    a->old_elts = NULL;
+ 
+     return a;
+ }
+@@ -36,26 +37,30 @@
+ void
+ ngx_array_destroy(ngx_array_t *a)
+ {
+-    ngx_pool_t  *p;
++    ngx_pool_t          *p;
++    ngx_array_link_t    *link;
+ 
+     p = a->pool;
+ 
+-    if ((u_char *) a->elts + a->size * a->nalloc == p->d.last) {
+-        p->d.last -= a->size * a->nalloc;
++    if (a->elts) {
++        ngx_pfree(p, a->elts);
+     }
+ 
+-    if ((u_char *) a + sizeof(ngx_array_t) == p->d.last) {
+-        p->d.last = (u_char *) a;
++    for (link = a->old_elts; link; link = link->next) {
++        ngx_pfree(p, link->elts);
+     }
++
++    ngx_pfree(p, a);
+ }
+ 
+ 
+ void *
+ ngx_array_push(ngx_array_t *a)
+ {
+-    void        *elt, *new;
+-    size_t       size;
+-    ngx_pool_t  *p;
++    void                *elt, *new;
++    size_t               size;
++    ngx_pool_t          *p;
++    ngx_array_link_t    *link;
+ 
+     if (a->nelts == a->nalloc) {
+ 
+@@ -65,29 +70,27 @@
+ 
+         p = a->pool;
+ 
+-        if ((u_char *) a->elts + size == p->d.last
+-            && p->d.last + a->size <= p->d.end)
+-        {
+-            /*
+-             * the array allocation is the last in the pool
+-             * and there is space for new allocation
+-             */
+-
+-            p->d.last += a->size;
+-            a->nalloc++;
+-
+-        } else {
+-            /* allocate a new array */
+-
+-            new = ngx_palloc(p, 2 * size);
+-            if (new == NULL) {
+-                return NULL;
+-            }
+-
+-            ngx_memcpy(new, a->elts, size);
+-            a->elts = new;
+-            a->nalloc *= 2;
++        /* allocate a new array */
++
++        new = ngx_palloc(p, 2 * size);
++        if (new == NULL) {
++            return NULL;
++        }
++
++        ngx_memcpy(new, a->elts, size);
++
++        link = ngx_palloc(p, sizeof(ngx_array_link_t));
++        if (link == NULL) {
++            ngx_pfree(p, new);
++            return NULL;
+         }
++
++        link->next = a->old_elts;
++        link->elts = a->elts;
++        a->old_elts = link;
++
++        a->elts = new;
++        a->nalloc *= 2;
+     }
+ 
+     elt = (u_char *) a->elts + a->size * a->nelts;
+@@ -101,11 +104,10 @@
+ ngx_array_push_n(ngx_array_t *a, ngx_uint_t n)
+ {
+     void        *elt, *new;
+-    size_t       size;
+     ngx_uint_t   nalloc;
+     ngx_pool_t  *p;
+ 
+-    size = n * a->size;
++    ngx_array_link_t    *link;
+ 
+     if (a->nelts + n > a->nalloc) {
+ 
+@@ -113,31 +115,27 @@
+ 
+         p = a->pool;
+ 
+-        if ((u_char *) a->elts + a->size * a->nalloc == p->d.last
+-            && p->d.last + size <= p->d.end)
+-        {
+-            /*
+-             * the array allocation is the last in the pool
+-             * and there is space for new allocation
+-             */
+-
+-            p->d.last += size;
+-            a->nalloc += n;
+-
+-        } else {
+-            /* allocate a new array */
+-
+-            nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc);
+-
+-            new = ngx_palloc(p, nalloc * a->size);
+-            if (new == NULL) {
+-                return NULL;
+-            }
+-
+-            ngx_memcpy(new, a->elts, a->nelts * a->size);
+-            a->elts = new;
+-            a->nalloc = nalloc;
++        nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc);
++
++        new = ngx_palloc(p, nalloc * a->size);
++        if (new == NULL) {
++            return NULL;
++        }
++
++        ngx_memcpy(new, a->elts, a->nelts * a->size);
++
++        link = ngx_palloc(p, sizeof(ngx_array_link_t));
++        if (link == NULL) {
++            ngx_pfree(p, new);
++            return NULL;
+         }
++
++        link->next = a->old_elts;
++        link->elts = a->elts;
++        a->old_elts = link;
++
++        a->elts = new;
++        a->nalloc = nalloc;
+     }
+ 
+     elt = (u_char *) a->elts + a->size * a->nelts;
+diff -urx '*~' -x '*.swp' nginx-1.2.8/src/core/ngx_array.h nginx-1.2.8-patched/src/core/ngx_array.h
+--- nginx-1.2.8/src/core/ngx_array.h	2012-02-06 04:02:59.000000000 +0800
++++ nginx-1.2.8-patched/src/core/ngx_array.h	2012-06-20 23:25:38.800624960 +0800
+@@ -13,12 +13,23 @@
+ #include <ngx_core.h>
+ 
+ 
++typedef struct ngx_array_link_s ngx_array_link_t;
++
++
++struct ngx_array_link_s {
++    void                    *elts;
++    ngx_array_link_t        *next;
++};
++
++
+ struct ngx_array_s {
+     void        *elts;
+     ngx_uint_t   nelts;
+     size_t       size;
+     ngx_uint_t   nalloc;
+     ngx_pool_t  *pool;
++
++    ngx_array_link_t *old_elts;
+ };
+ 
+ 
+@@ -40,6 +51,7 @@
+     array->size = size;
+     array->nalloc = n;
+     array->pool = pool;
++    array->old_elts = NULL;
+ 
+     array->elts = ngx_palloc(pool, n * size);
+     if (array->elts == NULL) {
+diff -urx '*~' -x '*.swp' nginx-1.2.8/src/core/ngx_palloc.c nginx-1.2.8-patched/src/core/ngx_palloc.c
+--- nginx-1.2.8/src/core/ngx_palloc.c	2012-02-06 04:02:59.000000000 +0800
++++ nginx-1.2.8-patched/src/core/ngx_palloc.c	2012-06-20 22:56:30.148073066 +0800
+@@ -9,32 +9,23 @@
+ #include <ngx_core.h>
+ 
+ 
+-static void *ngx_palloc_block(ngx_pool_t *pool, size_t size);
+-static void *ngx_palloc_large(ngx_pool_t *pool, size_t size);
+-
+-
+ ngx_pool_t *
+ ngx_create_pool(size_t size, ngx_log_t *log)
+ {
+-    ngx_pool_t  *p;
++    ngx_pool_t        *p;
+ 
+-    p = ngx_memalign(NGX_POOL_ALIGNMENT, size, log);
++    size = sizeof(ngx_pool_t);
++    p = ngx_alloc(size, log);
+     if (p == NULL) {
+         return NULL;
+     }
+ 
+-    p->d.last = (u_char *) p + sizeof(ngx_pool_t);
+-    p->d.end = (u_char *) p + size;
+-    p->d.next = NULL;
+-    p->d.failed = 0;
++    ngx_memzero(p, size);
+ 
+     size = size - sizeof(ngx_pool_t);
+     p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
+ 
+     p->current = p;
+-    p->chain = NULL;
+-    p->large = NULL;
+-    p->cleanup = NULL;
+     p->log = log;
+ 
+     return p;
+@@ -44,8 +35,7 @@
+ void
+ ngx_destroy_pool(ngx_pool_t *pool)
+ {
+-    ngx_pool_t          *p, *n;
+-    ngx_pool_large_t    *l;
++    ngx_pool_data_t     *d, *n;
+     ngx_pool_cleanup_t  *c;
+ 
+     for (c = pool->cleanup; c; c = c->next) {
+@@ -56,13 +46,9 @@
+         }
+     }
+ 
+-    for (l = pool->large; l; l = l->next) {
+-
+-        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+-
+-        if (l->alloc) {
+-            ngx_free(l->alloc);
+-        }
++    if (pool->d == NULL) {
++        ngx_free(pool);
++        return;
+     }
+ 
+ #if (NGX_DEBUG)
+@@ -72,9 +58,9 @@
+      * so we cannot use this log while free()ing the pool
+      */
+ 
+-    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
++    for (d = pool->d, n = d->next; ; d = n, n = n->next) {
+         ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
+-                       "free: %p, unused: %uz", p, p->d.end - p->d.last);
++                       "free: %p, unused: %d", d, 0);
+ 
+         if (n == NULL) {
+             break;
+@@ -83,172 +69,82 @@
+ 
+ #endif
+ 
+-    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
+-        ngx_free(p);
++    for (d = pool->d, n = d->next; ; d = n, n = n->next) {
++        ngx_free(d->alloc);
++        ngx_free(d);
+ 
+         if (n == NULL) {
+             break;
+         }
+     }
+-}
+ 
++    pool->d = NULL;
+ 
+-void
+-ngx_reset_pool(ngx_pool_t *pool)
+-{
+-    ngx_pool_t        *p;
+-    ngx_pool_large_t  *l;
+-
+-    for (l = pool->large; l; l = l->next) {
+-        if (l->alloc) {
+-            ngx_free(l->alloc);
+-        }
+-    }
+-
+-    pool->large = NULL;
+-
+-    for (p = pool; p; p = p->d.next) {
+-        p->d.last = (u_char *) p + sizeof(ngx_pool_t);
+-    }
++    ngx_free(pool);
+ }
+ 
+ 
+-void *
+-ngx_palloc(ngx_pool_t *pool, size_t size)
++void
++ngx_reset_pool(ngx_pool_t *pool)
+ {
+-    u_char      *m;
+-    ngx_pool_t  *p;
+-
+-    if (size <= pool->max) {
++    ngx_pool_data_t     *d, *n;
++    ngx_pool_data_t     *saved = NULL;
+ 
+-        p = pool->current;
+-
+-        do {
+-            m = ngx_align_ptr(p->d.last, NGX_ALIGNMENT);
+-
+-            if ((size_t) (p->d.end - m) >= size) {
+-                p->d.last = m + size;
+-
+-                return m;
++    if (pool->d) {
++        for (d = pool->d, n = d->next; ; d = n, n = n->next) {
++            if (d->alloc == pool->log) {
++                saved = d;
++                continue;
+             }
+ 
+-            p = p->d.next;
+-
+-        } while (p);
+-
+-        return ngx_palloc_block(pool, size);
+-    }
+-
+-    return ngx_palloc_large(pool, size);
+-}
+-
++            ngx_free(d->alloc);
++            ngx_free(d);
+ 
+-void *
+-ngx_pnalloc(ngx_pool_t *pool, size_t size)
+-{
+-    u_char      *m;
+-    ngx_pool_t  *p;
+-
+-    if (size <= pool->max) {
+-
+-        p = pool->current;
+-
+-        do {
+-            m = p->d.last;
+-
+-            if ((size_t) (p->d.end - m) >= size) {
+-                p->d.last = m + size;
+-
+-                return m;
++            if (n == NULL) {
++                break;
+             }
++        }
+ 
+-            p = p->d.next;
+-
+-        } while (p);
+-
+-        return ngx_palloc_block(pool, size);
++        pool->d = saved;
+     }
+-
+-    return ngx_palloc_large(pool, size);
+ }
+ 
+ 
+-static void *
+-ngx_palloc_block(ngx_pool_t *pool, size_t size)
++void *
++ngx_malloc(ngx_pool_t *pool, size_t size)
+ {
+-    u_char      *m;
+-    size_t       psize;
+-    ngx_pool_t  *p, *new, *current;
++    ngx_pool_data_t     *d;
++    void                *p;
+ 
+-    psize = (size_t) (pool->d.end - (u_char *) pool);
+-
+-    m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
+-    if (m == NULL) {
++    p = ngx_alloc(size, pool->log);
++    if (p == NULL) {
+         return NULL;
+     }
+ 
+-    new = (ngx_pool_t *) m;
+-
+-    new->d.end = m + psize;
+-    new->d.next = NULL;
+-    new->d.failed = 0;
+-
+-    m += sizeof(ngx_pool_data_t);
+-    m = ngx_align_ptr(m, NGX_ALIGNMENT);
+-    new->d.last = m + size;
+-
+-    current = pool->current;
+-
+-    for (p = current; p->d.next; p = p->d.next) {
+-        if (p->d.failed++ > 4) {
+-            current = p->d.next;
+-        }
++    d = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
++    if (d == NULL){
++        ngx_free(p);
++        return NULL;
+     }
+ 
+-    p->d.next = new;
+-
+-    pool->current = current ? current : new;
+-
+-    return m;
++    d->alloc = p;
++    d->next = pool->d;
++    pool->d = d;
++    return p;
+ }
+ 
+ 
+-static void *
+-ngx_palloc_large(ngx_pool_t *pool, size_t size)
++void *
++ngx_palloc(ngx_pool_t *pool, size_t size)
+ {
+-    void              *p;
+-    ngx_uint_t         n;
+-    ngx_pool_large_t  *large;
+-
+-    p = ngx_alloc(size, pool->log);
+-    if (p == NULL) {
+-        return NULL;
+-    }
+-
+-    n = 0;
+-
+-    for (large = pool->large; large; large = large->next) {
+-        if (large->alloc == NULL) {
+-            large->alloc = p;
+-            return p;
+-        }
+-
+-        if (n++ > 3) {
+-            break;
+-        }
+-    }
+-
+-    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
+-    if (large == NULL) {
+-        ngx_free(p);
+-        return NULL;
+-    }
++    return ngx_malloc(pool, size);
++}
+ 
+-    large->alloc = p;
+-    large->next = pool->large;
+-    pool->large = large;
+ 
+-    return p;
++void *
++ngx_pnalloc(ngx_pool_t *pool, size_t size)
++{
++    return ngx_malloc(pool, size);
+ }
+ 
+ 
+@@ -256,38 +152,48 @@
+ ngx_pmemalign(ngx_pool_t *pool, size_t size, size_t alignment)
+ {
+     void              *p;
+-    ngx_pool_large_t  *large;
++    ngx_pool_data_t   *d;
+ 
+     p = ngx_memalign(alignment, size, pool->log);
+     if (p == NULL) {
+         return NULL;
+     }
+ 
+-    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
+-    if (large == NULL) {
++    d = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
++    if (d == NULL){
+         ngx_free(p);
+         return NULL;
+     }
+ 
+-    large->alloc = p;
+-    large->next = pool->large;
+-    pool->large = large;
+-
++    d->alloc = p;
++    d->next = pool->d;
++    pool->d = d;
+     return p;
+ }
+ 
+ 
+ ngx_int_t
+-ngx_pfree(ngx_pool_t *pool, void *p)
++ngx_pfree(ngx_pool_t *pool, void *data)
+ {
+-    ngx_pool_large_t  *l;
++    ngx_pool_data_t     *p, *d;
+ 
+-    for (l = pool->large; l; l = l->next) {
+-        if (p == l->alloc) {
+-            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
+-                           "free: %p", l->alloc);
+-            ngx_free(l->alloc);
+-            l->alloc = NULL;
++    p = NULL;
++    for (d = pool->d; d; p = d, d = d->next) {
++        if (data == d->alloc) {
++
++            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
++
++            ngx_free(d->alloc);
++            d->alloc = NULL;
++
++            if (p) {
++                p->next = d->next;
++
++            } else {
++                pool->d = d->next;
++            }
++
++            ngx_free(d);
+ 
+             return NGX_OK;
+         }
+diff -urx '*~' -x '*.swp' nginx-1.2.8/src/core/ngx_palloc.h nginx-1.2.8-patched/src/core/ngx_palloc.h
+--- nginx-1.2.8/src/core/ngx_palloc.h	2012-02-06 04:02:59.000000000 +0800
++++ nginx-1.2.8-patched/src/core/ngx_palloc.h	2012-06-21 10:35:47.463405863 +0800
+@@ -38,28 +38,21 @@
+ };
+ 
+ 
+-typedef struct ngx_pool_large_s  ngx_pool_large_t;
+-
+-struct ngx_pool_large_s {
+-    ngx_pool_large_t     *next;
+-    void                 *alloc;
+-};
++typedef struct ngx_pool_data_s   ngx_pool_large_t;
++typedef struct ngx_pool_data_s   ngx_pool_data_t;
+ 
+ 
+-typedef struct {
+-    u_char               *last;
+-    u_char               *end;
+-    ngx_pool_t           *next;
+-    ngx_uint_t            failed;
+-} ngx_pool_data_t;
++struct ngx_pool_data_s {
++    ngx_pool_data_t        *next;
++    void                   *alloc;
++};
+ 
+ 
+ struct ngx_pool_s {
+-    ngx_pool_data_t       d;
++    ngx_pool_data_t      *d;
+     size_t                max;
+     ngx_pool_t           *current;
+     ngx_chain_t          *chain;
+-    ngx_pool_large_t     *large;
+     ngx_pool_cleanup_t   *cleanup;
+     ngx_log_t            *log;
+ };

patches/nginx-1.2.8-server_header.patch

@@ -0,0 +1,26 @@
+diff -ur lz-nginx-1.2.8/nginx-1.2.8/src/core/nginx.h lz-nginx-1.2.8-patched/nginx-1.2.8/src/core/nginx.h
+--- lz-nginx-1.2.8/nginx-1.2.8/src/core/nginx.h	2010-02-12 17:31:01.000000000 +0800
++++ lz-nginx-1.2.8-patched/nginx-1.2.8/src/core/nginx.h	2010-03-30 10:52:13.240702627 +0800
+@@ -10,7 +10,7 @@
+ 
+ #define nginx_version         1002008
+ #define NGINX_VERSION      "1.2.8"
+-#define NGINX_VER          "nginx/" NGINX_VERSION
++#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown"
+ 
+ #define NGINX_VAR          "NGINX"
+ #define NGX_OLDPID_EXT     ".oldbin"
+Only in lz-nginx-1.2.8-patched/nginx-1.2.8/src/core: nginx.h.orig
+Only in lz-nginx-1.2.8-patched/nginx-1.2.8/src/core: nginx.h.rej
+diff -ur lz-nginx-1.2.8/nginx-1.2.8/src/http/ngx_http_header_filter_module.c lz-nginx-1.2.8-patched/nginx-1.2.8/src/http/ngx_http_header_filter_module.c
+--- lz-nginx-1.2.8/nginx-1.2.8/src/http/ngx_http_header_filter_module.c	2010-03-03 23:14:04.000000000 +0800
++++ lz-nginx-1.2.8-patched/nginx-1.2.8/src/http/ngx_http_header_filter_module.c	2010-03-30 10:52:53.670909405 +0800
+@@ -45,7 +45,7 @@
+ };
+ 
+ 
+-static char ngx_http_server_string[] = "Server: nginx" CRLF;
++static char ngx_http_server_string[] = "Server: ngx_openresty" CRLF;
+ static char ngx_http_server_full_string[] = "Server: " NGINX_VER CRLF;
+ 
+ 

patches/nginx-1.2.8-slab_alloc_no_memory_as_info.patch

@@ -0,0 +1,11 @@
+--- nginx-1.2.8/src/core/ngx_slab.c	2012-09-24 11:34:04.000000000 -0700
++++ nginx-1.2.8-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.8-upstream_pipelining.patch

@@ -0,0 +1,40 @@
+diff -rudp nginx-1.2.8/src/http/ngx_http_upstream.c nginx-1.2.8-patched/src/http/ngx_http_upstream.c
+--- nginx-1.2.8/src/http/ngx_http_upstream.c	2012-08-06 10:34:08.000000000 -0700
++++ nginx-1.2.8-patched/src/http/ngx_http_upstream.c	2012-12-05 14:46:41.741173058 -0800
+@@ -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 */
+ 
++    u->request_all_sent = 1;
++
+     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,
+@@ -1484,7 +1487,7 @@ ngx_http_upstream_send_request_handler(n
+ 
+ #endif
+ 
+-    if (u->header_sent) {
++    if (u->request_all_sent) {
+         u->write_event_handler = ngx_http_upstream_dummy_handler;
+ 
+         (void) ngx_handle_write_event(c->write, 0);
+diff -rudp nginx-1.2.8/src/http/ngx_http_upstream.h nginx-1.2.8-patched/src/http/ngx_http_upstream.h
+--- nginx-1.2.8/src/http/ngx_http_upstream.h	2012-02-13 03:01:58.000000000 -0800
++++ nginx-1.2.8-patched/src/http/ngx_http_upstream.h	2012-12-05 14:41:09.763514741 -0800
+@@ -324,6 +324,7 @@ struct ngx_http_upstream_s {
+     unsigned                         keepalive:1;
+ 
+     unsigned                         request_sent:1;
++    unsigned                         request_all_sent:1;
+     unsigned                         header_sent:1;
+ };
+ 

patches/nginx-1.2.8-upstream_truncation.patch

@@ -0,0 +1,149 @@
+diff --exclude '*~' --exclude '*.swp' -urp nginx-1.2.8/src/http/modules/ngx_http_scgi_module.c nginx-1.2.8-patched/src/http/modules/ngx_http_scgi_module.c
+--- nginx-1.2.8/src/http/modules/ngx_http_scgi_module.c	2013-02-09 19:08:42.000000000 -0800
++++ nginx-1.2.8-patched/src/http/modules/ngx_http_scgi_module.c	2013-04-07 12:09:55.900492634 -0700
+@@ -39,6 +39,7 @@ static ngx_int_t ngx_http_scgi_process_s
+ static ngx_int_t ngx_http_scgi_process_header(ngx_http_request_t *r);
+ static void ngx_http_scgi_abort_request(ngx_http_request_t *r);
+ static void ngx_http_scgi_finalize_request(ngx_http_request_t *r, ngx_int_t rc);
++static ngx_int_t ngx_http_scgi_input_filter_init(void *data);
+ 
+ static void *ngx_http_scgi_create_loc_conf(ngx_conf_t *cf);
+ static char *ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent,
+@@ -446,6 +447,8 @@ ngx_http_scgi_handler(ngx_http_request_t
+     u->pipe->input_filter = ngx_event_pipe_copy_input_filter;
+     u->pipe->input_ctx = r;
+ 
++    u->input_filter_init = ngx_http_scgi_input_filter_init;
++
+     rc = ngx_http_read_client_request_body(r, ngx_http_upstream_init);
+ 
+     if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+@@ -1046,6 +1049,17 @@ ngx_http_scgi_finalize_request(ngx_http_
+ }
+ 
+ 
++static ngx_int_t
++ngx_http_scgi_input_filter_init(void *data)
++{
++    ngx_http_request_t    *r = data;
++
++    r->upstream->length = -1;
++
++    return NGX_OK;
++}
++
++
+ static void *
+ ngx_http_scgi_create_loc_conf(ngx_conf_t *cf)
+ {
+diff --exclude '*~' --exclude '*.swp' -urp nginx-1.2.8/src/http/modules/ngx_http_uwsgi_module.c nginx-1.2.8-patched/src/http/modules/ngx_http_uwsgi_module.c
+--- nginx-1.2.8/src/http/modules/ngx_http_uwsgi_module.c	2013-02-09 19:08:42.000000000 -0800
++++ nginx-1.2.8-patched/src/http/modules/ngx_http_uwsgi_module.c	2013-04-07 11:58:24.546915778 -0700
+@@ -46,6 +46,7 @@ static ngx_int_t ngx_http_uwsgi_process_
+ static void ngx_http_uwsgi_abort_request(ngx_http_request_t *r);
+ static void ngx_http_uwsgi_finalize_request(ngx_http_request_t *r,
+     ngx_int_t rc);
++static ngx_int_t ngx_http_uwsgi_input_filter_init(void *data);
+ 
+ static void *ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf);
+ static char *ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent,
+@@ -479,6 +480,8 @@ ngx_http_uwsgi_handler(ngx_http_request_
+     u->pipe->input_filter = ngx_event_pipe_copy_input_filter;
+     u->pipe->input_ctx = r;
+ 
++    u->input_filter_init = ngx_http_uwsgi_input_filter_init;
++
+     rc = ngx_http_read_client_request_body(r, ngx_http_upstream_init);
+ 
+     if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+@@ -1086,6 +1089,17 @@ ngx_http_uwsgi_finalize_request(ngx_http
+ }
+ 
+ 
++static ngx_int_t
++ngx_http_uwsgi_input_filter_init(void *data)
++{
++    ngx_http_request_t    *r = data;
++
++    r->upstream->length = -1;
++
++    return NGX_OK;
++}
++
++
+ static void *
+ ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf)
+ {
+diff --exclude '*~' --exclude '*.swp' -urp nginx-1.2.8/src/http/ngx_http_upstream.c nginx-1.2.8-patched/src/http/ngx_http_upstream.c
+--- nginx-1.2.8/src/http/ngx_http_upstream.c	2013-02-11 06:39:49.000000000 -0800
++++ nginx-1.2.8-patched/src/http/ngx_http_upstream.c	2013-04-08 16:37:48.326752696 -0700
+@@ -2399,7 +2399,7 @@ ngx_http_upstream_process_non_buffered_u
+ 
+     if (c->read->timedout) {
+         ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out");
+-        ngx_http_upstream_finalize_request(r, u, 0);
++        ngx_http_upstream_finalize_request(r, u, NGX_HTTP_GATEWAY_TIME_OUT);
+         return;
+     }
+ 
+@@ -2446,13 +2446,20 @@ ngx_http_upstream_process_non_buffered_r
+             if (u->busy_bufs == NULL) {
+ 
+                 if (u->length == 0
+-                    || upstream->read->eof
+-                    || upstream->read->error)
++                    || (upstream->read->eof
++                        && u->length == -1
++                        && u->pipe
++                        && u->pipe->length <= 0))
+                 {
+                     ngx_http_upstream_finalize_request(r, u, 0);
+                     return;
+                 }
+ 
++                if (upstream->read->eof || upstream->read->error) {
++                    ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY);
++                    return;
++                }
++
+                 b->pos = b->start;
+                 b->last = b->start;
+             }
+@@ -2720,7 +2727,9 @@ ngx_http_upstream_process_request(ngx_ht
+ 
+ #endif
+ 
+-        if (p->upstream_done || p->upstream_eof || p->upstream_error) {
++        if (p->upstream_done
++            || (p->upstream_eof && u->length == -1 && p->length <= 0))
++        {
+             ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                            "http upstream exit: %p", p->out);
+ #if 0
+@@ -2729,6 +2738,14 @@ ngx_http_upstream_process_request(ngx_ht
+             ngx_http_upstream_finalize_request(r, u, 0);
+             return;
+         }
++
++        if (p->upstream_eof || p->upstream_error) {
++            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++                           "http upstream exit: %p", p->out);
++
++            ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY);
++            return;
++       }
+     }
+ 
+     if (p->downstream_error) {
+@@ -3087,9 +3104,9 @@ ngx_http_upstream_finalize_request(ngx_h
+ 
+     if (u->header_sent
+         && rc != NGX_HTTP_REQUEST_TIME_OUT
+-        && (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE))
++        && rc >= NGX_HTTP_SPECIAL_RESPONSE)
+     {
+-        rc = 0;
++        rc = NGX_ERROR;
+     }
+ 
+     if (rc == NGX_DECLINED) {

patches/ngx_http_redis-0.3.6-variables_in_redis_pass.patch

@@ -0,0 +1,190 @@
+--- ngx_http_redis-0.3.6/ngx_http_redis_module.c	2013-03-21 17:51:09.224660165 -0700
++++ ngx_http_redis-0.3.6-patched/ngx_http_redis_module.c	2013-03-21 17:50:51.928599875 -0700
+@@ -18,6 +18,8 @@ typedef struct {
+     ngx_int_t                  index;
+     ngx_int_t                  db;
+     ngx_uint_t                 gzip_flag;
++
++    ngx_http_complex_value_t  *complex_target; /* for redis_pass */
+ } ngx_http_redis_loc_conf_t;
+ 
+ 
+@@ -44,6 +46,9 @@ static char *ngx_http_redis_merge_loc_co
+ 
+ static char *ngx_http_redis_pass(ngx_conf_t *cf, ngx_command_t *cmd,
+     void *conf);
++static ngx_http_upstream_srv_conf_t *
++    ngx_http_redis_upstream_add(ngx_http_request_t *r, ngx_url_t *url);
++
+ 
+ static ngx_conf_bitmask_t  ngx_http_redis_next_upstream_masks[] = {
+     { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
+@@ -185,11 +190,43 @@ ngx_http_redis_handler(ngx_http_request_
+         return NGX_HTTP_INTERNAL_SERVER_ERROR;
+     }
+ 
++    rlcf = ngx_http_get_module_loc_conf(r, ngx_http_redis_module);
++    if (rlcf->complex_target) {
++        ngx_str_t           target;
++        ngx_url_t           url;
++
++        /* variables used in the redis_pass directive */
++
++        if (ngx_http_complex_value(r, rlcf->complex_target, &target)
++                != NGX_OK)
++        {
++            return NGX_ERROR;
++        }
++
++        if (target.len == 0) {
++            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
++                    "handler: empty \"redis_pass\" target");
++            return NGX_HTTP_INTERNAL_SERVER_ERROR;
++        }
++
++        url.host = target;
++        url.port = 0;
++        url.default_port = 6379;
++        url.no_resolve = 1;
++
++        rlcf->upstream.upstream = ngx_http_redis_upstream_add(r, &url);
++
++        if (rlcf->upstream.upstream == NULL) {
++            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
++                   "redis: upstream \"%V\" not found", &target);
++
++            return NGX_HTTP_INTERNAL_SERVER_ERROR;
++        }
++    }
++
+ #if defined nginx_version && nginx_version >= 8011
+     if (ngx_http_upstream_create(r) != NGX_OK) {
+ #else
+-    rlcf = ngx_http_get_module_loc_conf(r, ngx_http_redis_module);
+-
+     u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t));
+     if (u == NULL) {
+ #endif
+@@ -214,9 +251,7 @@ ngx_http_redis_handler(ngx_http_request_
+     u->peer.log_error = NGX_ERROR_ERR;
+ #endif
+ 
+-#if defined nginx_version && nginx_version >= 8011
+-    rlcf = ngx_http_get_module_loc_conf(r, ngx_http_redis_module);
+-#else
++#if !defined(nginx_version) || nginx_version < 8011
+     u->output.tag = (ngx_buf_tag_t) &ngx_http_redis_module;
+ #endif
+ 
+@@ -835,24 +870,15 @@ ngx_http_redis_pass(ngx_conf_t *cf, ngx_
+ 
+     ngx_str_t                 *value;
+     ngx_url_t                  u;
++    ngx_uint_t                 n;
+     ngx_http_core_loc_conf_t  *clcf;
+ 
++    ngx_http_compile_complex_value_t         ccv;
++
+     if (rlcf->upstream.upstream) {
+         return "is duplicate";
+     }
+ 
+-    value = cf->args->elts;
+-
+-    ngx_memzero(&u, sizeof(ngx_url_t));
+-
+-    u.url = value[1];
+-    u.no_resolve = 1;
+-
+-    rlcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0);
+-    if (rlcf->upstream.upstream == NULL) {
+-        return NGX_CONF_ERROR;
+-    }
+-
+     clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+ 
+     clcf->handler = ngx_http_redis_handler;
+@@ -869,6 +895,41 @@ ngx_http_redis_pass(ngx_conf_t *cf, ngx_
+ 
+     rlcf->db = ngx_http_get_variable_index(cf, &ngx_http_redis_db);
+ 
++    value = cf->args->elts;
++
++    n = ngx_http_script_variables_count(&value[1]);
++    if (n) {
++        rlcf->complex_target = ngx_palloc(cf->pool,
++                                          sizeof(ngx_http_complex_value_t));
++
++        if (rlcf->complex_target == NULL) {
++            return NGX_CONF_ERROR;
++        }
++
++        ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
++        ccv.cf = cf;
++        ccv.value = &value[1];
++        ccv.complex_value = rlcf->complex_target;
++
++        if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
++            return NGX_CONF_ERROR;
++        }
++
++        return NGX_CONF_OK;
++    }
++
++    rlcf->complex_target = NULL;
++
++    ngx_memzero(&u, sizeof(ngx_url_t));
++
++    u.url = value[1];
++    u.no_resolve = 1;
++
++    rlcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0);
++    if (rlcf->upstream.upstream == NULL) {
++        return NGX_CONF_ERROR;
++    }
++
+     return NGX_CONF_OK;
+ }
+ 
+@@ -906,3 +967,41 @@ ngx_http_redis_add_variables(ngx_conf_t
+ 
+     return NGX_OK;
+ }
++
++
++static ngx_http_upstream_srv_conf_t *
++ngx_http_redis_upstream_add(ngx_http_request_t *r, ngx_url_t *url)
++{
++    ngx_http_upstream_main_conf_t  *umcf;
++    ngx_http_upstream_srv_conf_t  **uscfp;
++    ngx_uint_t                      i;
++
++    umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
++
++    uscfp = umcf->upstreams.elts;
++
++    for (i = 0; i < umcf->upstreams.nelts; i++) {
++
++        if (uscfp[i]->host.len != url->host.len
++            || ngx_strncasecmp(uscfp[i]->host.data, url->host.data,
++               url->host.len) != 0)
++        {
++            continue;
++        }
++
++        if (uscfp[i]->port != url->port) {
++            continue;
++        }
++
++        if (uscfp[i]->default_port
++            && url->default_port
++            && uscfp[i]->default_port != url->default_port)
++        {
++            continue;
++        }
++
++        return uscfp[i];
++    }
++
++    return NULL;
++}

util/configure

@@ -420,7 +420,7 @@ _END_
     my $opts_line = '';
 
     if ($opts->{debug}) {
-        unshift @ngx_cc_opts, '-O0';
+        #unshift @ngx_cc_opts, '-O0';
         $opts_line .= " \\\n  --with-debug";
 
     } else {
@@ -512,12 +512,12 @@ _END_
 
         cd $luajit_src;
 
-        my $extra_opts = ' TARGET_STRIP=@:';
+        my $extra_opts = ' TARGET_STRIP=@: CCDEBUG=-g';
 
         if ($opts->{debug}) {
             $luajit_xcflags .= " -DLUA_USE_APICHECK -DLUA_USE_ASSERT";
             $luajit_xcflags =~ s/^ +//;
-            $extra_opts .= qq{ CCDEBUG=-g Q= XCFLAGS='$luajit_xcflags'};
+            $extra_opts .= qq{ Q= XCFLAGS='$luajit_xcflags'};
 
         } else {
             if ($luajit_xcflags) {
@@ -653,7 +653,7 @@ _EOC_
             if ($on_solaris) {
                 $extra_opts .= " INSTALL=$root_dir/build/install";
                 if ($opts->{debug}) {
-                    $extra_opts .= " CFLAGS=\"-g -O0 -Wall -pedantic -DMISSING_ISINF\"";
+                    $extra_opts .= " CFLAGS=\"-g -O -Wall -pedantic -DMISSING_ISINF\"";
 
                 } else {
                     $extra_opts .= " CFLAGS=\"-g -O3 -Wall -pedantic -DMISSING_ISINF\"";
@@ -661,7 +661,7 @@ _EOC_
 
             } else {
                 if ($opts->{debug}) {
-                    $extra_opts .= " CFLAGS=\"-g -O0 -Wall -pedantic\"";
+                    $extra_opts .= " CFLAGS=\"-g -O -Wall -pedantic\"";
                 }
             }
 
@@ -702,13 +702,13 @@ _EOC_
             if ($on_solaris) {
                 $extra_opts .= " INSTALL=$root_dir/build/install";
                 if ($opts->{debug}) {
-                    $extra_opts .= " CFLAGS=\"-g -O0 -Wall\"";
+                    $extra_opts .= " CFLAGS=\"-g -O -Wall\"";
 
                 }
 
             } else {
                 if ($opts->{debug}) {
-                    $extra_opts .= " CFLAGS=\"-g -O0 -Wall\"";
+                    $extra_opts .= " CFLAGS=\"-g -O -Wall\"";
                 }
             }
 
@@ -749,13 +749,13 @@ _EOC_
             if ($on_solaris) {
                 $extra_opts .= " INSTALL=$root_dir/build/install";
                 if ($opts->{debug}) {
-                    $extra_opts .= " CFLAGS=\"-g -O0 -Wall\"";
+                    $extra_opts .= " CFLAGS=\"-g -O -Wall\"";
 
                 }
 
             } else {
                 if ($opts->{debug}) {
-                    $extra_opts .= " CFLAGS=\"-g -O0 -Wall\"";
+                    $extra_opts .= " CFLAGS=\"-g -O -Wall\"";
                 }
             }
 

util/dist-check

@@ -0,0 +1,98 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+use Getopt::Std qw(getopts);
+use Cwd qw/cwd/;
+
+sub sh ($);
+
+my %opts;
+getopts("lf:", \%opts) or die "Usage: $0 [-f] <cores>\n";
+
+my $jobs = shift || 4;
+
+my $cwd = cwd();
+if ($cwd !~ /ngx_openresty-(\d+(?:\.\d+)+(?:rc\d+)?)$/) {
+    die "Bad current working directory: $cwd\n";
+}
+
+my $ver = $1;
+
+my ($make, $lua);
+
+if ($^O eq 'freebsd' || $^O eq 'solaris') {
+    $make = 'gmake';
+
+} else {
+    $make = 'make';
+}
+
+my $cfg_opts = "--with-http_iconv_module";
+
+if ($opts{l}) {
+    $lua = 'Lua';
+
+} else {
+    $lua = 'LuaJIT';
+    $cfg_opts .= " --with-luajit";
+}
+
+my $prefix;
+
+warn "=== Normal Build ===\n";
+$prefix = "/usr/local/openresty";
+unless ($opts{f}) {
+    sh "./configure $cfg_opts -j$jobs > /dev/null";
+}
+sh "$make -j$jobs > /dev/null";
+sh "sudo $make install > /dev/null";
+sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver";
+system "sudo killall nginx > /dev/null 2>&1";
+sh "sudo $prefix/nginx/sbin/nginx";
+sh "curl -si localhost/lua|grep $lua";
+sh "curl -si localhost/lua|grep $ver";
+sh "sudo $prefix/nginx/sbin/nginx -sstop";
+
+warn "\n=== Debug Build ===\n";
+$prefix = "/usr/local/openresty-debug";
+unless ($opts{f}) {
+    sh "./configure --with-debug $cfg_opts --prefix=$prefix -j$jobs > /dev/null";
+}
+sh "$make -j$jobs > /dev/null";
+sh "sudo $make install > /dev/null";
+sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver";
+sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-debug'";
+system "sudo killall nginx > /dev/null 2>&1";
+sh "sudo $prefix/nginx/sbin/nginx";
+sh "curl -si localhost/lua|grep $lua";
+sh "curl -si localhost/lua|grep $ver";
+sh "sudo $prefix/nginx/sbin/nginx -sstop";
+
+warn "\n=== DTrace Build ===\n";
+$prefix = "/usr/local/openresty-dtrace";
+unless ($opts{f}) {
+    sh "./configure $cfg_opts --with-dtrace-probes --prefix=$prefix -j$jobs > /dev/null";
+}
+sh "$make -j$jobs > /dev/null";
+sh "sudo $make install > /dev/null";
+sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver";
+sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-dtrace-probes'";
+system "sudo killall nginx > /dev/null 2>&1";
+sh "sudo $prefix/nginx/sbin/nginx";
+sh "curl -si localhost/lua|grep $lua";
+sh "curl -si localhost/lua|grep $ver";
+if ($^O eq 'linux') {
+    sh "stap -L 'process(\"$prefix/nginx/sbin/nginx\").mark(\"*\")'|grep http__lua__coroutine__done";
+
+} elsif ($^O eq 'freebsd' || $^O eq 'darwin' || $^O eq 'solaris') {
+    sh "sudo dtrace -l|grep http-lua-coroutine-done";
+}
+
+sh "sudo $prefix/nginx/sbin/nginx -sstop";
+
+sub sh ($) {
+    my $cmd = shift;
+    system($cmd) == 0 or die "Command \"$cmd\" failed";
+}

util/mirror-tarballs

@@ -109,8 +109,8 @@ echo "$info_txt applying the location_if_inherits_proxy patch for nginx"
 patch -p1 < $root/patches/nginx-$main_ver-location_if_inherits_proxy.patch || exit 1
 echo
 
-echo "$info_txt applying the nonbuffered-upstream-truncation patch for nginx"
-patch -p1 < $root/patches/nginx-$main_ver-nonbuffered-upstream-truncation.patch || exit 1
+echo "$info_txt applying the upstream_truncation patch for nginx"
+patch -p1 < $root/patches/nginx-$main_ver-upstream_truncation.patch || exit 1
 echo
 
 echo "$info_txt applying the channel-uninit-params patch for nginx"
@@ -139,6 +139,17 @@ if [ "$answer" = "N" ]; then
     echo
 fi
 
+answer=`$root/util/ver-ge "$main_ver" 1.2.8`
+if [ "$answer" = "N" ]; then
+    echo "$info_txt applying the run_posted_requests_in_resolver patch for nginx"
+    patch -p1 < $root/patches/nginx-$main_ver-run_posted_requests_in_resolver.patch || exit 1
+    echo
+fi
+
+echo "$info_txt applying patches/nginx-$main_ver-cve-2013-2070.patch for nginx"
+patch -p0 < $root/patches/nginx-$main_ver-cve-2013-2070.patch || exit 1
+echo
+
 rm -f *.patch || exit 1
 
 cd .. || exit 1
@@ -152,7 +163,7 @@ rm -rf no-pool-nginx-$ver
 
 #################################
 
-ver=0.42
+ver=0.45
 $root/util/get-tarball "http://github.com/agentzh/echo-nginx-module/tarball/v$ver" -O echo-nginx-module-$ver.tar.gz || exit 1
 tar -xzf echo-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-echo-nginx-module-* echo-nginx-module-$ver || exit 1
@@ -194,21 +205,21 @@ mv agentzh-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.19
+ver=0.20
 $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
 
 #################################
 
-ver=0.1.4
+ver=0.1.5
 $root/util/get-tarball "http://github.com/chaoslawful/drizzle-nginx-module/tarball/v$ver" -O drizzle-nginx-module-$ver.tar.gz || exit 1
 tar -xzf drizzle-nginx-module-$ver.tar.gz || exit 1
 mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.7.16
+ver=0.8.1
 $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
@@ -229,7 +240,7 @@ mv agentzh-memc-nginx-module-* memc-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.19
+ver=0.20
 $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
@@ -243,14 +254,14 @@ mv calio-form-input-nginx-module-* form-input-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.10rc7
+ver=0.10
 $root/util/get-tarball "http://github.com/calio/iconv-nginx-module/tarball/v$ver" -O iconv-nginx-module-$ver.tar.gz || exit 1
 tar -xzf iconv-nginx-module-$ver.tar.gz || exit 1
 mv calio-iconv-nginx-module-* iconv-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.02
+ver=0.03
 $root/util/get-tarball "http://github.com/agentzh/encrypted-session-nginx-module/tarball/v$ver" -O encrypted-session-nginx-module-$ver.tar.gz || exit 1
 tar -xzf encrypted-session-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-encrypted-session-nginx-module-* encrypted-session-nginx-module-$ver || exit 1
@@ -277,6 +288,11 @@ $root/util/get-tarball "http://people.freebsd.org/~osa/ngx_http_redis-$ver.tar.g
 tar -xzf redis-nginx-module-$ver.tar.gz || exit 1
 mv ngx_http_redis-* redis-nginx-module-$ver || exit 1
 
+cd redis-nginx-module-$ver
+echo "applying ngx_http_redis-$ver-variables_in_redis_pass.patch"
+patch -p1 < $root/patches/ngx_http_redis-$ver-variables_in_redis_pass.patch || exit 1
+cd ..
+
 #################################
 
 ver=1.0rc2
@@ -293,7 +309,7 @@ mv FRiCKLE-ngx_coolkit-* ngx_coolkit-$ver || exit 1
 
 #################################
 
-ver=0.09
+ver=0.10
 $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
@@ -312,24 +328,30 @@ tar -xzf lua-$ver.tar.gz || exit 1
 
 #rm "patch-lua-$ver-4" || exit 1
 
-echo "$info_txt applying the makefile_install_fix patch for lua 5.1"
+echo "$info_txt applying the makefile_install_fix patch for lua $ver"
 patch -p0 < $root/patches/lua-$ver-makefile_install_fix.patch || exit 1
 echo
 
-echo "$info_txt applying the disable_lua50_compat patch for lua 5.1"
+echo "$info_txt applying the disable_lua50_compat patch for lua $ver"
 patch -p0 < $root/patches/lua-$ver-disable_lua50_compat.patch || exit 1
 echo
 
+echo "$info_txt applying the enable_debug_info patch for lua $ver"
+patch -p0 < $root/patches/lua-$ver-enable_debug_info.patch || exit 1
+echo
+
 #################################
 
 ver=2.0.1
 $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
 
-#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
+echo "$info_txt applying luajit-$ver hotfix #1 patch for luajit $ver"
+$root/util/get-tarball http://luajit.org/download/v2.0.1_hotfix1.patch -O hotfix.patch
+cd LuaJIT-$ver || exit 1;
+patch -p1 < ../hotfix.patch || exit 1
+rm ../hotfix.patch
+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
@@ -370,7 +392,7 @@ mv agentzh-lua-resty-dns-* lua-resty-dns-$ver || exit 1
 
 #################################
 
-ver=0.10
+ver=0.11
 $root/util/get-tarball "http://github.com/agentzh/lua-resty-memcached/tarball/v$ver" -O "lua-resty-memcached-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-memcached-$ver.tar.gz || exit 1
 mv agentzh-lua-resty-memcached-* lua-resty-memcached-$ver || exit 1
@@ -384,14 +406,14 @@ mv agentzh-lua-resty-redis-* lua-resty-redis-$ver || exit 1
 
 #################################
 
-ver=0.12
+ver=0.13
 $root/util/get-tarball "http://github.com/agentzh/lua-resty-mysql/tarball/v$ver" -O "lua-resty-mysql-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-mysql-$ver.tar.gz || exit 1
 mv agentzh-lua-resty-mysql-* lua-resty-mysql-$ver || exit 1
 
 #################################
 
-ver=0.07
+ver=0.08
 $root/util/get-tarball "http://github.com/agentzh/lua-resty-upload/tarball/v$ver" -O "lua-resty-upload-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-upload-$ver.tar.gz || exit 1
 mv agentzh-lua-resty-upload-* lua-resty-upload-$ver || exit 1

util/ver

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 #main_ver=1.3.11
-main_ver=1.2.7
-minor_ver=1
+main_ver=1.2.8
+minor_ver=3
 version=$main_ver.$minor_ver
 echo $version