upgraded ngx_echo to 0.37rc8.

.gitignore

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

README

@@ -9,73 +9,11 @@ that all these modules are played well together.
 
 The bundled software components are copyrighted by the respective copyright holders.
 
-A quick note to Debian and Ubuntu users:
-    You're recommended to install the following packages using apt-get before
-    installing this bundle:
+The homepage for this project is http://openresty.org.
 
-        apt-get install libreadline-dev libpcre3-dev libssl-dev perl
-
-A quick note to Fedora/RedHat users:
-    You're recommended to install the following packages using yum before
-    installing this bundle:
-
-        yum install readline-devel pcre-devel openssl-devel
-
-A quick note to Mac OS X (Darwin) users:
-    You're recommended to install prerequisites PCRE using some package
-    management tool, like Homebrew:
-
-        brew install pcre
-
-    Alternatively you can install PCRE from source all by yourself :)
-
-To build ngx_openresty, you need a working perl (perl 5.6.0 or better)
-in your PATH environment, and then follow the following steps:
-
-1. download the latest ngx_openresty tarball can be downloaded from
-
-     http://agentzh.org/misc/nginx/ngx_openresty-0.8.54.5.tar.gz
-
-   we will eventually migrate to the openresty.org domain.
-
-2. and then enter the ngx_openresty-0.8.54.5/ directory,
-   and type the following command to configure:
-
-        ./configure
-
-   by default, --prefix=/usr/local/openresty is assumed. You can
-   specify various options, as in
-
-        ./configure --prefix=/opt/openresty \
-            --with-luajit \
-            --without-http_drizzle_module \
-            --with-http_iconv_module \
-            --with-http_postgres_module
-
-    try ./configure --help to see more options.
-
-    For Solaris, it's common to install libraries like OpenSSL to /lib,
-    so when it complaints about OpenSSL and you have indeed
-    already installed it, specify the --with-ld-opt='-L/lib' option.
-
-3. build everything locally
-
-        make
-
-   Note that, "make -jN" may not work at least for FreeBSD's "bsdmake"; use
-   gmake (i.e., GNU make) instead or avoid using the jobserver feature with
-   your make.
-
-4. install ngx_openresty into the target directory that you specified by
-   the --prefix option in Step 2.
-
-        make install
-
-Then you can start your server this way:
-
-    /usr/local/openresty/nginx/sbin/nginx -p /path/to/your/server/root -c /path/to/your/nginx.conf
-
-assuming you're using the default "prefix", i.e., /usr/local/openresty, in Step 2.
+For users:
+    Visit http://openresty.org/#Download to download the latest bundle tarball, and
+    follow the installation instructions in the page http://openresty.org/#Installation.
 
 For bundle maintainers:
 
@@ -89,31 +27,6 @@ For bundle maintainers:
 
     at the top of the bundle source tree.
 
-The following packages are bundled in the 0.8.54.5 release:
-
-    LuaJIT-2.0.0-beta7
-    array-var-nginx-module-0.02
-    auth-request-nginx-module-0.2
-    drizzle-nginx-module-0.0.15rc9
-    echo-nginx-module-0.36rc3
-    encrypted-session-nginx-module-0.01
-    form-input-nginx-module-0.07rc4
-    headers-more-nginx-module-0.15rc1
-    iconv-nginx-module-0.10rc3
-    libdrizzle-0.8
-    lua-5.1.4
-    memc-nginx-module-0.12rc1
-    nginx-0.8.54
-    ngx_devel_kit-0.2.17
-    ngx_lua-0.1.6rc9
-    ngx_postgres-0.8
-    rds-json-nginx-module-0.11rc2
-    redis2-nginx-module-0.07rc1
-    set-misc-nginx-module-0.21
-    srcache-nginx-module-0.12rc4
-    upstream-keepalive-nginx-module-0.3
-    xss-nginx-module-0.03rc2
-
 REPORT BUGS
 
 You're very welcome to report issues on GitHub:

misc/unwind-generic.h

@@ -0,0 +1,241 @@
+/* Exception handling and frame unwind runtime interface routines.
+   Copyright (C) 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
+
+   This file is part of GCC.
+
+   GCC is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   GCC is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GCC; see the file COPYING.  If not, write to the Free
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+/* As a special exception, if you include this header file into source
+   files compiled by GCC, this header file does not by itself cause
+   the resulting executable to be covered by the GNU General Public
+   License.  This exception does not however invalidate any other
+   reasons why the executable file might be covered by the GNU General
+   Public License.  */
+
+/* This is derived from the C++ ABI for IA-64.  Where we diverge
+   for cross-architecture compatibility are noted with "@@@".  */
+
+#ifndef _UNWIND_H
+#define _UNWIND_H
+
+#ifndef HIDE_EXPORTS
+#pragma GCC visibility push(default)
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Level 1: Base ABI  */
+
+/* @@@ The IA-64 ABI uses uint64 throughout.  Most places this is
+   inefficient for 32-bit and smaller machines.  */
+typedef unsigned _Unwind_Word __attribute__((__mode__(__word__)));
+typedef signed _Unwind_Sword __attribute__((__mode__(__word__)));
+#if defined(__ia64__) && defined(__hpux__)
+typedef unsigned _Unwind_Ptr __attribute__((__mode__(__word__)));
+#else
+typedef unsigned _Unwind_Ptr __attribute__((__mode__(__pointer__)));
+#endif
+typedef unsigned _Unwind_Internal_Ptr __attribute__((__mode__(__pointer__)));
+
+/* @@@ The IA-64 ABI uses a 64-bit word to identify the producer and
+   consumer of an exception.  We'll go along with this for now even on
+   32-bit machines.  We'll need to provide some other option for
+   16-bit machines and for machines with > 8 bits per byte.  */
+typedef unsigned _Unwind_Exception_Class __attribute__((__mode__(__DI__)));
+
+/* The unwind interface uses reason codes in several contexts to
+   identify the reasons for failures or other actions.  */
+typedef enum
+{
+  _URC_NO_REASON = 0,
+  _URC_FOREIGN_EXCEPTION_CAUGHT = 1,
+  _URC_FATAL_PHASE2_ERROR = 2,
+  _URC_FATAL_PHASE1_ERROR = 3,
+  _URC_NORMAL_STOP = 4,
+  _URC_END_OF_STACK = 5,
+  _URC_HANDLER_FOUND = 6,
+  _URC_INSTALL_CONTEXT = 7,
+  _URC_CONTINUE_UNWIND = 8
+} _Unwind_Reason_Code;
+
+
+/* The unwind interface uses a pointer to an exception header object
+   as its representation of an exception being thrown. In general, the
+   full representation of an exception object is language- and
+   implementation-specific, but it will be prefixed by a header
+   understood by the unwind interface.  */
+
+struct _Unwind_Exception;
+
+typedef void (*_Unwind_Exception_Cleanup_Fn) (_Unwind_Reason_Code,
+					      struct _Unwind_Exception *);
+
+struct _Unwind_Exception
+{
+  _Unwind_Exception_Class exception_class;
+  _Unwind_Exception_Cleanup_Fn exception_cleanup;
+  _Unwind_Word private_1;
+  _Unwind_Word private_2;
+
+  /* @@@ The IA-64 ABI says that this structure must be double-word aligned.
+     Taking that literally does not make much sense generically.  Instead we
+     provide the maximum alignment required by any type for the machine.  */
+} __attribute__((__aligned__));
+
+
+/* The ACTIONS argument to the personality routine is a bitwise OR of one
+   or more of the following constants.  */
+typedef int _Unwind_Action;
+
+#define _UA_SEARCH_PHASE	1
+#define _UA_CLEANUP_PHASE	2
+#define _UA_HANDLER_FRAME	4
+#define _UA_FORCE_UNWIND	8
+#define _UA_END_OF_STACK	16
+
+/* This is an opaque type used to refer to a system-specific data
+   structure used by the system unwinder. This context is created and
+   destroyed by the system, and passed to the personality routine
+   during unwinding.  */
+struct _Unwind_Context;
+
+/* Raise an exception, passing along the given exception object.  */
+extern _Unwind_Reason_Code _Unwind_RaiseException (struct _Unwind_Exception *);
+
+/* Raise an exception for forced unwinding.  */
+
+typedef _Unwind_Reason_Code (*_Unwind_Stop_Fn)
+     (int, _Unwind_Action, _Unwind_Exception_Class,
+      struct _Unwind_Exception *, struct _Unwind_Context *, void *);
+
+extern _Unwind_Reason_Code _Unwind_ForcedUnwind (struct _Unwind_Exception *,
+						 _Unwind_Stop_Fn,
+						 void *);
+
+/* Helper to invoke the exception_cleanup routine.  */
+extern void _Unwind_DeleteException (struct _Unwind_Exception *);
+
+/* Resume propagation of an existing exception.  This is used after
+   e.g. executing cleanup code, and not to implement rethrowing.  */
+extern void _Unwind_Resume (struct _Unwind_Exception *);
+
+/* @@@ Resume propagation of an FORCE_UNWIND exception, or to rethrow
+   a normal exception that was handled.  */
+extern _Unwind_Reason_Code _Unwind_Resume_or_Rethrow (struct _Unwind_Exception *);
+
+/* @@@ Use unwind data to perform a stack backtrace.  The trace callback
+   is called for every stack frame in the call chain, but no cleanup
+   actions are performed.  */
+typedef _Unwind_Reason_Code (*_Unwind_Trace_Fn)
+     (struct _Unwind_Context *, void *);
+
+extern _Unwind_Reason_Code _Unwind_Backtrace (_Unwind_Trace_Fn, void *);
+
+/* These functions are used for communicating information about the unwind
+   context (i.e. the unwind descriptors and the user register state) between
+   the unwind library and the personality routine and landing pad.  Only
+   selected registers maybe manipulated.  */
+
+extern _Unwind_Word _Unwind_GetGR (struct _Unwind_Context *, int);
+extern void _Unwind_SetGR (struct _Unwind_Context *, int, _Unwind_Word);
+
+extern _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *);
+extern _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *);
+extern void _Unwind_SetIP (struct _Unwind_Context *, _Unwind_Ptr);
+
+/* @@@ Retrieve the CFA of the given context.  */
+extern _Unwind_Word _Unwind_GetCFA (struct _Unwind_Context *);
+
+extern void *_Unwind_GetLanguageSpecificData (struct _Unwind_Context *);
+
+extern _Unwind_Ptr _Unwind_GetRegionStart (struct _Unwind_Context *);
+
+
+/* The personality routine is the function in the C++ (or other language)
+   runtime library which serves as an interface between the system unwind
+   library and language-specific exception handling semantics.  It is
+   specific to the code fragment described by an unwind info block, and
+   it is always referenced via the pointer in the unwind info block, and
+   hence it has no ABI-specified name.
+
+   Note that this implies that two different C++ implementations can
+   use different names, and have different contents in the language
+   specific data area.  Moreover, that the language specific data
+   area contains no version info because name of the function invoked
+   provides more effective versioning by detecting at link time the
+   lack of code to handle the different data format.  */
+
+typedef _Unwind_Reason_Code (*_Unwind_Personality_Fn)
+     (int, _Unwind_Action, _Unwind_Exception_Class,
+      struct _Unwind_Exception *, struct _Unwind_Context *);
+
+/* @@@ The following alternate entry points are for setjmp/longjmp
+   based unwinding.  */
+
+struct SjLj_Function_Context;
+extern void _Unwind_SjLj_Register (struct SjLj_Function_Context *);
+extern void _Unwind_SjLj_Unregister (struct SjLj_Function_Context *);
+
+extern _Unwind_Reason_Code _Unwind_SjLj_RaiseException
+     (struct _Unwind_Exception *);
+extern _Unwind_Reason_Code _Unwind_SjLj_ForcedUnwind
+     (struct _Unwind_Exception *, _Unwind_Stop_Fn, void *);
+extern void _Unwind_SjLj_Resume (struct _Unwind_Exception *);
+extern _Unwind_Reason_Code _Unwind_SjLj_Resume_or_Rethrow (struct _Unwind_Exception *);
+
+/* @@@ The following provide access to the base addresses for text
+   and data-relative addressing in the LDSA.  In order to stay link
+   compatible with the standard ABI for IA-64, we inline these.  */
+
+#ifdef __ia64__
+#include <stdlib.h>
+
+static inline _Unwind_Ptr
+_Unwind_GetDataRelBase (struct _Unwind_Context *_C)
+{
+  /* The GP is stored in R1.  */
+  return _Unwind_GetGR (_C, 1);
+}
+
+static inline _Unwind_Ptr
+_Unwind_GetTextRelBase (struct _Unwind_Context *_C __attribute__ ((__unused__)))
+{
+  abort ();
+  return 0;
+}
+
+/* @@@ Retrieve the Backing Store Pointer of the given context.  */
+extern _Unwind_Word _Unwind_GetBSP (struct _Unwind_Context *);
+#else
+extern _Unwind_Ptr _Unwind_GetDataRelBase (struct _Unwind_Context *);
+extern _Unwind_Ptr _Unwind_GetTextRelBase (struct _Unwind_Context *);
+#endif
+
+/* @@@ Given an address, return the entry point of the function that
+   contains it.  */
+extern void * _Unwind_FindEnclosingFunction (void *pc);
+
+#ifdef __cplusplus
+}
+#endif
+
+#ifndef HIDE_EXPORTS
+#pragma GCC visibility pop
+#endif
+
+#endif /* unwind.h */

patches/lua_cjson-1.0.2-array_detection_fix.patch

@@ -0,0 +1,13 @@
+diff --git a/lua_cjson.c b/lua_cjson.c
+index 4b1915a..b46e915 100644
+--- a/lua_cjson.c
++++ b/lua_cjson.c
+@@ -501,7 +501,7 @@ static int lua_array_length(lua_State *l, json_config_t *cfg)
+     /* table, startkey */
+     while (lua_next(l, -2) != 0) {
+         /* table, key, value */
+-        if (lua_isnumber(l, -2) &&
++        if (lua_type(l, -2) == LUA_TNUMBER &&
+             (k = lua_tonumber(l, -2))) {
+             /* Integer >= 1 ? */
+             if (floor(k) == k && k >= 1) {

patches/nginx-0.8.54-allow_request_body_updating.patch

@@ -0,0 +1,117 @@
+diff -ur nginx-0.8.54/src/http/ngx_http_request_body.c nginx-0.8.54-patched/src/http/ngx_http_request_body.c
+--- nginx-0.8.54/src/http/ngx_http_request_body.c	2011-09-30 22:36:19.000000000 +0800
++++ nginx-0.8.54-patched/src/http/ngx_http_request_body.c	2011-10-21 21:54:08.460350482 +0800
+@@ -38,7 +38,7 @@
+ 
+     r->main->count++;
+ 
+-    if (r->request_body || r->discard_body) {
++    if (r->request_body || r->discard_body || r->content_length_n == 0) {
+         post_handler(r);
+         return NGX_OK;
+     }
+@@ -440,7 +440,7 @@
+     ssize_t       size;
+     ngx_event_t  *rev;
+ 
+-    if (r != r->main || r->discard_body) {
++    if (r != r->main || r->discard_body || r->content_length_n == 0) {
+         return NGX_OK;
+     }
+ 
+@@ -456,20 +456,22 @@
+         ngx_del_timer(rev);
+     }
+ 
+-    if (r->headers_in.content_length_n <= 0 || r->request_body) {
++    r->content_length_n = r->headers_in.content_length_n;
++
++    if (r->content_length_n <= 0 || r->request_body) {
+         return NGX_OK;
+     }
+ 
+     size = r->header_in->last - r->header_in->pos;
+ 
+     if (size) {
+-        if (r->headers_in.content_length_n > size) {
++        if (r->content_length_n > size) {
+             r->header_in->pos += size;
+-            r->headers_in.content_length_n -= size;
++            r->content_length_n -= size;
+ 
+         } else {
+-            r->header_in->pos += (size_t) r->headers_in.content_length_n;
+-            r->headers_in.content_length_n = 0;
++            r->header_in->pos += (size_t) r->content_length_n;
++            r->content_length_n = 0;
+             return NGX_OK;
+         }
+     }
+@@ -568,7 +570,7 @@
+                    "http read discarded body");
+ 
+     for ( ;; ) {
+-        if (r->headers_in.content_length_n == 0) {
++        if (r->content_length_n == 0) {
+             r->read_event_handler = ngx_http_block_reading;
+             return NGX_OK;
+         }
+@@ -577,9 +579,9 @@
+             return NGX_AGAIN;
+         }
+ 
+-        size = (r->headers_in.content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
++        size = (r->content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
+                    NGX_HTTP_DISCARD_BUFFER_SIZE:
+-                   (size_t) r->headers_in.content_length_n;
++                   (size_t) r->content_length_n;
+ 
+         n = r->connection->recv(r->connection, buffer, size);
+ 
+@@ -596,7 +598,7 @@
+             return NGX_OK;
+         }
+ 
+-        r->headers_in.content_length_n -= n;
++        r->content_length_n -= n;
+     }
+ }
+ 
+Only in nginx-0.8.54-patched/src/http: ngx_http_request_body.c~
+diff -ur nginx-0.8.54/src/http/ngx_http_request.c nginx-0.8.54-patched/src/http/ngx_http_request.c
+--- nginx-0.8.54/src/http/ngx_http_request.c	2011-09-30 22:36:19.000000000 +0800
++++ nginx-0.8.54-patched/src/http/ngx_http_request.c	2011-10-21 19:06:38.404350692 +0800
+@@ -286,6 +286,8 @@
+ 
+         r->pipeline = hc->pipeline;
+ 
++        r->content_length_n = -1;
++
+         if (hc->nbusy) {
+             r->header_in = hc->busy[0];
+         }
+@@ -297,6 +299,8 @@
+             return;
+         }
+ 
++        r->content_length_n = -1;
++
+         hc->request = r;
+     }
+ 
+Only in nginx-0.8.54-patched/src/http: ngx_http_request.c~
+diff -ur nginx-0.8.54/src/http/ngx_http_request.h nginx-0.8.54-patched/src/http/ngx_http_request.h
+--- nginx-0.8.54/src/http/ngx_http_request.h	2011-08-29 18:39:23.000000000 +0800
++++ nginx-0.8.54-patched/src/http/ngx_http_request.h	2011-10-21 17:26:13.203807584 +0800
+@@ -366,6 +366,9 @@
+     ngx_pool_t                       *pool;
+     ngx_buf_t                        *header_in;
+ 
++    off_t                             content_length_n;
++                                          /* for discarding request body */
++
+     ngx_http_headers_in_t             headers_in;
+     ngx_http_headers_out_t            headers_out;
+ 
+Only in nginx-0.8.54-patched/src/http: ngx_http_request.h~
+Only in nginx-0.8.54-patched/src/http: tags

patches/nginx-0.8.54-named_location_clear_mods_ctx.patch

@@ -0,0 +1,12 @@
+--- nginx-0.8.54/src/http/ngx_http_core_module.c	2011-09-27 19:14:02.000000000 +0800
++++ nginx-0.8.54-patched/src/http/ngx_http_core_module.c	2011-10-13 15:02:24.414550532 +0800
+@@ -2542,6 +2542,9 @@
+             r->content_handler = NULL;
+             r->loc_conf = (*clcfp)->loc_conf;
+ 
++            /* clear the modules contexts */
++            ngx_memzero(r->ctx, sizeof(void *) * ngx_http_max_module);
++
+             ngx_http_update_location_config(r);
+ 
+             cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);

patches/nginx-0.8.54-no_Werror.patch

@@ -0,0 +1,24 @@
+diff -ur nginx-0.8.54/auto/cc/gcc nginx-0.8.54-patched/auto/cc/gcc
+--- nginx-0.8.54/auto/cc/gcc	2011-06-27 19:53:00.205737804 +0800
++++ nginx-0.8.54-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-0.8.54/auto/cc/icc nginx-0.8.54-patched/auto/cc/icc
+--- nginx-0.8.54/auto/cc/icc	2011-06-27 19:52:56.370157068 +0800
++++ nginx-0.8.54-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-0.8.54-request_body_in_single_buf.patch

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

patches/nginx-0.8.54-request_body_preread_fix.patch

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

patches/nginx-0.8.54-subrequest_loop.patch

@@ -0,0 +1,40 @@
+# HG changeset patch
+# User Maxim Dounin <mdounin@mdounin.ru>
+# Date 1309187571 -14400
+# Node ID 283a416b2235d5383c12a975edc8866f007fb628
+# Parent  f5fc40783ddcbf4db33859ee2a9bce54cf32c350
+Core: protect from subrequest loops.
+
+Without protection subrequest loop results in r->count overflow and
+SIGSEGV.  Protection was broken in 0.7.25.
+
+Note that this also limits number of parallel subrequests.  This
+wasn't exactly the case before 0.7.25 as local subrequests were
+completed directly.
+
+See here for details:
+
+http://nginx.org/pipermail/nginx-ru/2010-February/032184.html
+
+diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
+--- a/src/http/ngx_http_core_module.c
++++ b/src/http/ngx_http_core_module.c
+@@ -2287,7 +2287,6 @@ ngx_http_subrequest(ngx_http_request_t *
+    sr->start_sec = tp->sec;
+    sr->start_msec = tp->msec;
+ 
+-    r->main->subrequests++;
+    r->main->count++;
+ 
+    *psr = sr;
+diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
+--- a/src/http/ngx_http_request.c
++++ b/src/http/ngx_http_request.c
+@@ -1981,6 +1981,7 @@ ngx_http_finalize_request(ngx_http_reque
+        if (r == c->data) {
+ 
+            r->main->count--;
++            r->main->subrequests++;
+ 
+            if (!r->logged) {
+

patches/nginx-0.8.54-variable_header_ignore_no_hash.patch

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

patches/nginx-1.0.10-allow_request_body_updating.patch

@@ -0,0 +1,117 @@
+diff -ur nginx-1.0.10/src/http/ngx_http_request_body.c nginx-1.0.10-patched/src/http/ngx_http_request_body.c
+--- nginx-1.0.10/src/http/ngx_http_request_body.c	2011-09-30 22:36:19.000000000 +0800
++++ nginx-1.0.10-patched/src/http/ngx_http_request_body.c	2011-10-21 21:54:08.460350482 +0800
+@@ -38,7 +38,7 @@
+ 
+     r->main->count++;
+ 
+-    if (r->request_body || r->discard_body) {
++    if (r->request_body || r->discard_body || r->content_length_n == 0) {
+         post_handler(r);
+         return NGX_OK;
+     }
+@@ -440,7 +440,7 @@
+     ssize_t       size;
+     ngx_event_t  *rev;
+ 
+-    if (r != r->main || r->discard_body) {
++    if (r != r->main || r->discard_body || r->content_length_n == 0) {
+         return NGX_OK;
+     }
+ 
+@@ -456,20 +456,22 @@
+         ngx_del_timer(rev);
+     }
+ 
+-    if (r->headers_in.content_length_n <= 0 || r->request_body) {
++    r->content_length_n = r->headers_in.content_length_n;
++
++    if (r->content_length_n <= 0 || r->request_body) {
+         return NGX_OK;
+     }
+ 
+     size = r->header_in->last - r->header_in->pos;
+ 
+     if (size) {
+-        if (r->headers_in.content_length_n > size) {
++        if (r->content_length_n > size) {
+             r->header_in->pos += size;
+-            r->headers_in.content_length_n -= size;
++            r->content_length_n -= size;
+ 
+         } else {
+-            r->header_in->pos += (size_t) r->headers_in.content_length_n;
+-            r->headers_in.content_length_n = 0;
++            r->header_in->pos += (size_t) r->content_length_n;
++            r->content_length_n = 0;
+             return NGX_OK;
+         }
+     }
+@@ -568,7 +570,7 @@
+                    "http read discarded body");
+ 
+     for ( ;; ) {
+-        if (r->headers_in.content_length_n == 0) {
++        if (r->content_length_n == 0) {
+             r->read_event_handler = ngx_http_block_reading;
+             return NGX_OK;
+         }
+@@ -577,9 +579,9 @@
+             return NGX_AGAIN;
+         }
+ 
+-        size = (r->headers_in.content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
++        size = (r->content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
+                    NGX_HTTP_DISCARD_BUFFER_SIZE:
+-                   (size_t) r->headers_in.content_length_n;
++                   (size_t) r->content_length_n;
+ 
+         n = r->connection->recv(r->connection, buffer, size);
+ 
+@@ -596,7 +598,7 @@
+             return NGX_OK;
+         }
+ 
+-        r->headers_in.content_length_n -= n;
++        r->content_length_n -= n;
+     }
+ }
+ 
+Only in nginx-1.0.10-patched/src/http: ngx_http_request_body.c~
+diff -ur nginx-1.0.10/src/http/ngx_http_request.c nginx-1.0.10-patched/src/http/ngx_http_request.c
+--- nginx-1.0.10/src/http/ngx_http_request.c	2011-09-30 22:36:19.000000000 +0800
++++ nginx-1.0.10-patched/src/http/ngx_http_request.c	2011-10-21 19:06:38.404350692 +0800
+@@ -286,6 +286,8 @@
+ 
+         r->pipeline = hc->pipeline;
+ 
++        r->content_length_n = -1;
++
+         if (hc->nbusy) {
+             r->header_in = hc->busy[0];
+         }
+@@ -297,6 +299,8 @@
+             return;
+         }
+ 
++        r->content_length_n = -1;
++
+         hc->request = r;
+     }
+ 
+Only in nginx-1.0.10-patched/src/http: ngx_http_request.c~
+diff -ur nginx-1.0.10/src/http/ngx_http_request.h nginx-1.0.10-patched/src/http/ngx_http_request.h
+--- nginx-1.0.10/src/http/ngx_http_request.h	2011-08-29 18:39:23.000000000 +0800
++++ nginx-1.0.10-patched/src/http/ngx_http_request.h	2011-10-21 17:26:13.203807584 +0800
+@@ -366,6 +366,9 @@
+     ngx_pool_t                       *pool;
+     ngx_buf_t                        *header_in;
+ 
++    off_t                             content_length_n;
++                                          /* for discarding request body */
++
+     ngx_http_headers_in_t             headers_in;
+     ngx_http_headers_out_t            headers_out;
+ 
+Only in nginx-1.0.10-patched/src/http: ngx_http_request.h~
+Only in nginx-1.0.10-patched/src/http: tags

patches/nginx-1.0.10-epoll_check_stale_wev.patch

@@ -0,0 +1,20 @@
+--- nginx-1.0.10/src/event/modules/ngx_epoll_module.c	2011-09-30 22:12:53.000000000 +0800
++++ nginx-1.0.10-patched/src/event/modules/ngx_epoll_module.c	2011-11-30 11:08:46.775817019 +0800
+@@ -682,6 +682,17 @@
+         wev = c->write;
+ 
+         if ((revents & EPOLLOUT) && wev->active) {
++            if (c->fd == -1 || wev->instance != instance) {
++
++                /*
++                 * the stale event from a file descriptor
++                 * that was just closed in this iteration
++                 */
++
++                ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
++                               "epoll: stale event %p", c);
++                continue;
++            }
+ 
+             if (flags & NGX_POST_THREAD_EVENTS) {
+                 wev->posted_ready = 1;

patches/nginx-1.0.10-gzip_empty_flush_buf.patch

@@ -0,0 +1,69 @@
+# HG changeset patch
+# User Maxim Dounin <mdounin@mdounin.ru>
+# Date 1315324342 -14400
+# Node ID 4cf0af103bc382a78f894302d1706929a79df4bb
+# Parent  d603ce98fada855f0100b422b7b5672fd22fabea
+Gzip filter: handle empty flush buffers.
+
+Empty flush buffers are legitimate and may happen e.g. due to $r->flush()
+calls in embedded perl.  If there are no data buffered in zlib deflate()
+will return Z_BUF_ERROR (i.e. no progress possible) without adding anything
+to output.  Don't treat Z_BUF_ERROR as fatal and correctly send empty flush
+buffer if we have no data in output at all.
+
+See this thread for details:
+http://mailman.nginx.org/pipermail/nginx/2010-November/023693.html
+
+diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
+--- a/src/http/modules/ngx_http_gzip_filter_module.c
++++ b/src/http/modules/ngx_http_gzip_filter_module.c
+@@ -758,6 +758,7 @@ static ngx_int_t
+ ngx_http_gzip_filter_deflate(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
+ {
+    int                    rc;
++    ngx_buf_t             *b;
+    ngx_chain_t           *cl;
+    ngx_http_gzip_conf_t  *conf;
+
+@@ -769,7 +770,7 @@ ngx_http_gzip_filter_deflate(ngx_http_re
+
+    rc = deflate(&ctx->zstream, ctx->flush);
+
+-    if (rc != Z_OK && rc != Z_STREAM_END) {
++    if (rc != Z_OK && rc != Z_STREAM_END && rc != Z_BUF_ERROR) {
+        ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                      "deflate() failed: %d, %d", ctx->flush, rc);
+        return NGX_ERROR;
+@@ -818,8 +819,6 @@ ngx_http_gzip_filter_deflate(ngx_http_re
+
+    if (ctx->flush == Z_SYNC_FLUSH) {
+
+-        ctx->zstream.avail_out = 0;
+-        ctx->out_buf->flush = 1;
+        ctx->flush = Z_NO_FLUSH;
+
+        cl = ngx_alloc_chain_link(r->pool);
+@@ -827,7 +826,22 @@ ngx_http_gzip_filter_deflate(ngx_http_re
+            return NGX_ERROR;
+        }
+
+-        cl->buf = ctx->out_buf;
++        b = ctx->out_buf;
++
++        if (ngx_buf_size(b) == 0) {
++
++            b = ngx_calloc_buf(ctx->request->pool);
++            if (b == NULL) {
++                return NGX_ERROR;
++            }
++
++        } else {
++            ctx->zstream.avail_out = 0;
++        }
++
++        b->flush = 1;
++
++        cl->buf = b;
+        cl->next = NULL;
+        *ctx->last_out = cl;
+        ctx->last_out = &cl->next;

patches/nginx-1.0.10-log_escape_non_ascii.patch

@@ -0,0 +1,115 @@
+--- nginx-1.0.10/src/http/modules/ngx_http_log_module.c	2011-11-01 21:24:50.000000000 +0800
++++ nginx-1.0.10-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.0.10-named_location_clear_mods_ctx.patch

@@ -0,0 +1,12 @@
+--- nginx-1.0.10/src/http/ngx_http_core_module.c	2011-09-27 19:14:02.000000000 +0800
++++ nginx-1.0.10-patched/src/http/ngx_http_core_module.c	2011-10-13 15:02:24.414550532 +0800
+@@ -2542,6 +2542,9 @@
+             r->content_handler = NULL;
+             r->loc_conf = (*clcfp)->loc_conf;
+ 
++            /* clear the modules contexts */
++            ngx_memzero(r->ctx, sizeof(void *) * ngx_http_max_module);
++
+             ngx_http_update_location_config(r);
+ 
+             cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);

patches/nginx-1.0.10-no_Werror.patch

@@ -0,0 +1,24 @@
+diff -ur nginx-1.0.10/auto/cc/gcc nginx-1.0.10-patched/auto/cc/gcc
+--- nginx-1.0.10/auto/cc/gcc	2011-06-27 19:53:00.205737804 +0800
++++ nginx-1.0.10-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.0.10/auto/cc/icc nginx-1.0.10-patched/auto/cc/icc
+--- nginx-1.0.10/auto/cc/icc	2011-06-27 19:52:56.370157068 +0800
++++ nginx-1.0.10-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.0.10-no_error_pages.patch

@@ -0,0 +1,90 @@
+--- nginx-1.0.10/src/http/ngx_http_core_module.c	2010-12-14 18:38:42.000000000 +0800
++++ nginx-1.0.10-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.0.10-no_pool.patch

@@ -0,0 +1,504 @@
+diff -ur nginx-1.0.10/src/core/nginx.h nginx-1.0.10-patched/src/core/nginx.h
+--- nginx-1.0.10/src/core/nginx.h	2011-08-29 17:30:22.000000000 +0800
++++ nginx-1.0.10-patched/src/core/nginx.h	2011-09-13 12:11:03.135622101 +0800
+@@ -10,7 +10,7 @@
+ 
+ 
+ #define nginx_version      1000010
+ #define NGINX_VERSION      "1.0.10"
+-#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown"
++#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
+ 
+ #define NGINX_VAR          "NGINX"
+diff -ur nginx-1.0.10/src/core/ngx_array.c nginx-1.0.10-patched/src/core/ngx_array.c
+--- nginx-1.0.10/src/core/ngx_array.c	2008-06-17 23:00:30.000000000 +0800
++++ nginx-1.0.10-patched/src/core/ngx_array.c	2011-09-14 12:02:56.263128538 +0800
+@@ -39,13 +39,7 @@
+ 
+     p = a->pool;
+ 
+-    if ((u_char *) a->elts + a->size * a->nalloc == p->d.last) {
+-        p->d.last -= a->size * a->nalloc;
+-    }
+-
+-    if ((u_char *) a + sizeof(ngx_array_t) == p->d.last) {
+-        p->d.last = (u_char *) a;
+-    }
++    ngx_pfree(p, a);
+ }
+ 
+ 
+@@ -64,29 +58,17 @@
+ 
+         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);
++        a->elts = new;
++        a->nalloc *= 2;
++
+     }
+ 
+     elt = (u_char *) a->elts + a->size * a->nelts;
+@@ -100,43 +82,25 @@
+ 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;
+-
+     if (a->nelts + n > a->nalloc) {
+ 
+         /* the array is full */
+ 
+         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);
++        a->elts = new;
++        a->nalloc = nalloc;
+     }
+ 
+     elt = (u_char *) a->elts + a->size * a->nelts;
+diff -ur nginx-1.0.10/src/core/ngx_palloc.c nginx-1.0.10-patched/src/core/ngx_palloc.c
+--- nginx-1.0.10/src/core/ngx_palloc.c	2009-12-17 20:25:46.000000000 +0800
++++ nginx-1.0.10-patched/src/core/ngx_palloc.c	2011-09-14 12:03:41.663126519 +0800
+@@ -8,24 +8,31 @@
+ #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;
++    ngx_pool_data_t     *d;
+ 
+-    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;
++    d = ngx_alloc(sizeof(ngx_pool_data_t), log);
++	
++    if (d == NULL) {
++	return NULL;
++    }
++
++    d->next = d;
++    d->prev = d;
++    d->alloc = NULL;
++    p->d = d;
+ 
+     size = size - sizeof(ngx_pool_t);
+     p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
+@@ -43,7 +50,7 @@
+ void
+ ngx_destroy_pool(ngx_pool_t *pool)
+ {
+-    ngx_pool_t          *p, *n;
++    ngx_pool_data_t     *d, *n;
+     ngx_pool_large_t    *l;
+     ngx_pool_cleanup_t  *c;
+ 
+@@ -55,7 +62,7 @@
+         }
+     }
+ 
+-    for (l = pool->large; l; l = l->next) {
++    for (l = pool->large; l ; l = l->next) {
+ 
+         ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+ 
+@@ -71,34 +78,45 @@
+      * so we can not use this log while the 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", d);
+ 
+-        if (n == NULL) {
++        if (n == pool->d) {
+             break;
+         }
+     }
+ 
+ #endif
++    if (pool->d->next == pool->d) {
++    	ngx_free(pool->d);
++    } else {
++        for (d = pool->d, n = d->next; ; d = n, n = n->next) {
++            if (d->alloc) {
++    	        ngx_free(d->alloc);
++            }
++            ngx_free(d);
+ 
+-    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
+-        ngx_free(p);
+-
+-        if (n == NULL) {
+-            break;
++            if (n == pool->d) {
++                break;
++            }
+         }
+     }
++
++    ngx_free(pool);
+ }
+ 
+ 
+ void
+ ngx_reset_pool(ngx_pool_t *pool)
+ {
+-    ngx_pool_t        *p;
+-    ngx_pool_large_t  *l;
++    ngx_pool_data_t     *p, *tmp;
++    ngx_pool_large_t    *l;
++
++    for (l = pool->large; l ; l = l->next) {
++
++        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+ 
+-    for (l = pool->large; l; l = l->next) {
+         if (l->alloc) {
+             ngx_free(l->alloc);
+         }
+@@ -106,109 +124,65 @@
+ 
+     pool->large = NULL;
+ 
+-    for (p = pool; p; p = p->d.next) {
+-        p->d.last = (u_char *) p + sizeof(ngx_pool_t);
++    p = pool->d->next;
++    while (p != pool->d) {
++        tmp = p;
++        ngx_free(p->alloc);
++        p->prev->next = p->next;
++        p->next->prev = p->prev;
++        p = p->next;
++        ngx_free(tmp);
+     }
+-}
+ 
++    ngx_free(pool->d->alloc);
++    pool->d->alloc = NULL;
++
++}
+ 
+ void *
+-ngx_palloc(ngx_pool_t *pool, size_t size)
++ngx_malloc(ngx_pool_t *pool, size_t size)
+ {
+-    u_char      *m;
+-    ngx_pool_t  *p;
+-
+-    if (size <= pool->max) {
++    ngx_pool_data_t     *new;
++    void        	*m;
+ 
+-        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;
+-            }
+-
+-            p = p->d.next;
+-
+-        } while (p);
++    m = ngx_alloc(size, pool->log);
++    if (m == NULL) {
++	return NULL;
++    }
+ 
+-        return ngx_palloc_block(pool, size);
++    new = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
++    if (new == NULL){
++        ngx_free(m);
++	return NULL;
+     }
+ 
+-    return ngx_palloc_large(pool, size);
++    new->alloc = m;
++    new->next = pool->d;
++    new->prev = pool->d->prev;
++    pool->d->prev->next = new;
++    pool->d->prev = new;
++    return m;	
+ }
+ 
+-
+ void *
+-ngx_pnalloc(ngx_pool_t *pool, size_t size)
++ngx_palloc(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;
+-            }
+-
+-            p = p->d.next;
+-
+-        } while (p);
+-
+-        return ngx_palloc_block(pool, size);
++    if (size <= 1024) {
++        return ngx_malloc(pool, size);
+     }
+ 
+     return ngx_palloc_large(pool, size);
+ }
+ 
+ 
+-static void *
+-ngx_palloc_block(ngx_pool_t *pool, size_t size)
++void *
++ngx_pnalloc(ngx_pool_t *pool, size_t size)
+ {
+-    u_char      *m;
+-    size_t       psize;
+-    ngx_pool_t  *p, *new, *current;
+-
+-    psize = (size_t) (pool->d.end - (u_char *) pool);
+-
+-    m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
+-    if (m == 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;
+-        }
++    if (size <= 1024) {
++        return ngx_malloc(pool, size);
+     }
+ 
+-    p->d.next = new;
+-
+-    pool->current = current ? current : new;
+-
+-    return m;
++    return ngx_palloc_large(pool, size);
+ }
+ 
+ 
+@@ -216,7 +190,6 @@
+ ngx_palloc_large(ngx_pool_t *pool, size_t size)
+ {
+     void              *p;
+-    ngx_uint_t         n;
+     ngx_pool_large_t  *large;
+ 
+     p = ngx_alloc(size, pool->log);
+@@ -224,20 +197,7 @@
+         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));
++    large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
+     if (large == NULL) {
+         ngx_free(p);
+         return NULL;
+@@ -262,7 +222,7 @@
+         return NULL;
+     }
+ 
+-    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
++    large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
+     if (large == NULL) {
+         ngx_free(p);
+         return NULL;
+@@ -279,17 +239,41 @@
+ ngx_int_t
+ ngx_pfree(ngx_pool_t *pool, void *p)
+ {
+-    ngx_pool_large_t  *l;
++    ngx_pool_large_t    *l;
++    ngx_pool_large_t    *ll;
++    ngx_pool_data_t     *d, *n;
+ 
+-    for (l = pool->large; l; l = l->next) {
++    for (l = pool->large, ll = l; l; ll = 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;
++	    if (l == pool->large) {
++		pool->large = NULL;
++	    }
++
++            ll->next = l->next;
++	    p = l;
++	    break;
++        }
++    }
+ 
++    for (d = pool->d, n = d->next; ; d = n, n = d->next) {
++        if (p == d->alloc) {
++            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
++            if (d->alloc) {
++                ngx_free(d->alloc);
++            }
++            d->alloc = NULL;
++            d->prev->next = d->next;
++            d->next->prev = d->prev;
++            ngx_free(d);
+             return NGX_OK;
+         }
++        if (d->next == pool->d) {
++            break;
++        }
+     }
+ 
+     return NGX_DECLINED;
+diff -ur nginx-1.0.10/src/core/ngx_palloc.h nginx-1.0.10-patched/src/core/ngx_palloc.h
+--- nginx-1.0.10/src/core/ngx_palloc.h	2009-12-17 20:25:46.000000000 +0800
++++ nginx-1.0.10-patched/src/core/ngx_palloc.h	2011-09-13 12:11:03.155622101 +0800
+@@ -38,6 +38,7 @@
+ 
+ 
+ typedef struct ngx_pool_large_s  ngx_pool_large_t;
++typedef struct ngx_pool_data_s   ngx_pool_data_t;
+ 
+ struct ngx_pool_large_s {
+     ngx_pool_large_t     *next;
+@@ -45,16 +46,15 @@
+ };
+ 
+ 
+-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;
++    ngx_pool_data_t		*prev;
++	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;

patches/nginx-1.0.10-request_body_in_single_buf.patch

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

patches/nginx-1.0.10-request_body_preread_fix.patch

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

patches/nginx-1.0.10-server_header.patch

@@ -0,0 +1,26 @@
+diff -ur lz-nginx-1.0.10/nginx-1.0.10/src/core/nginx.h lz-nginx-1.0.10-patched/nginx-1.0.10/src/core/nginx.h
+--- lz-nginx-1.0.10/nginx-1.0.10/src/core/nginx.h	2010-02-12 17:31:01.000000000 +0800
++++ lz-nginx-1.0.10-patched/nginx-1.0.10/src/core/nginx.h	2010-03-30 10:52:13.240702627 +0800
+@@ -10,7 +10,7 @@
+ 
+ #define nginx_version         1000010
+ #define NGINX_VERSION      "1.0.10"
+-#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.0.10-patched/nginx-1.0.10/src/core: nginx.h.orig
+Only in lz-nginx-1.0.10-patched/nginx-1.0.10/src/core: nginx.h.rej
+diff -ur lz-nginx-1.0.10/nginx-1.0.10/src/http/ngx_http_header_filter_module.c lz-nginx-1.0.10-patched/nginx-1.0.10/src/http/ngx_http_header_filter_module.c
+--- lz-nginx-1.0.10/nginx-1.0.10/src/http/ngx_http_header_filter_module.c	2010-03-03 23:14:04.000000000 +0800
++++ lz-nginx-1.0.10-patched/nginx-1.0.10/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.0.10-subrequest_loop.patch

@@ -0,0 +1,40 @@
+# HG changeset patch
+# User Maxim Dounin <mdounin@mdounin.ru>
+# Date 1309187571 -14400
+# Node ID 283a416b2235d5383c12a975edc8866f007fb628
+# Parent  f5fc40783ddcbf4db33859ee2a9bce54cf32c350
+Core: protect from subrequest loops.
+
+Without protection subrequest loop results in r->count overflow and
+SIGSEGV.  Protection was broken in 0.7.25.
+
+Note that this also limits number of parallel subrequests.  This
+wasn't exactly the case before 0.7.25 as local subrequests were
+completed directly.
+
+See here for details:
+
+http://nginx.org/pipermail/nginx-ru/2010-February/032184.html
+
+diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
+--- a/src/http/ngx_http_core_module.c
++++ b/src/http/ngx_http_core_module.c
+@@ -2287,7 +2287,6 @@ ngx_http_subrequest(ngx_http_request_t *
+    sr->start_sec = tp->sec;
+    sr->start_msec = tp->msec;
+ 
+-    r->main->subrequests++;
+    r->main->count++;
+ 
+    *psr = sr;
+diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
+--- a/src/http/ngx_http_request.c
++++ b/src/http/ngx_http_request.c
+@@ -1981,6 +1981,7 @@ ngx_http_finalize_request(ngx_http_reque
+        if (r == c->data) {
+ 
+            r->main->count--;
++            r->main->subrequests++;
+ 
+            if (!r->logged) {
+

patches/nginx-1.0.10-variable_header_ignore_no_hash.patch

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

patches/nginx-1.0.11-allow_request_body_updating.patch

@@ -0,0 +1,117 @@
+diff -ur nginx-1.0.11/src/http/ngx_http_request_body.c nginx-1.0.11-patched/src/http/ngx_http_request_body.c
+--- nginx-1.0.11/src/http/ngx_http_request_body.c	2011-09-30 22:36:19.000000000 +0800
++++ nginx-1.0.11-patched/src/http/ngx_http_request_body.c	2011-10-21 21:54:08.460350482 +0800
+@@ -38,7 +38,7 @@
+ 
+     r->main->count++;
+ 
+-    if (r->request_body || r->discard_body) {
++    if (r->request_body || r->discard_body || r->content_length_n == 0) {
+         post_handler(r);
+         return NGX_OK;
+     }
+@@ -440,7 +440,7 @@
+     ssize_t       size;
+     ngx_event_t  *rev;
+ 
+-    if (r != r->main || r->discard_body) {
++    if (r != r->main || r->discard_body || r->content_length_n == 0) {
+         return NGX_OK;
+     }
+ 
+@@ -456,20 +456,22 @@
+         ngx_del_timer(rev);
+     }
+ 
+-    if (r->headers_in.content_length_n <= 0 || r->request_body) {
++    r->content_length_n = r->headers_in.content_length_n;
++
++    if (r->content_length_n <= 0 || r->request_body) {
+         return NGX_OK;
+     }
+ 
+     size = r->header_in->last - r->header_in->pos;
+ 
+     if (size) {
+-        if (r->headers_in.content_length_n > size) {
++        if (r->content_length_n > size) {
+             r->header_in->pos += size;
+-            r->headers_in.content_length_n -= size;
++            r->content_length_n -= size;
+ 
+         } else {
+-            r->header_in->pos += (size_t) r->headers_in.content_length_n;
+-            r->headers_in.content_length_n = 0;
++            r->header_in->pos += (size_t) r->content_length_n;
++            r->content_length_n = 0;
+             return NGX_OK;
+         }
+     }
+@@ -568,7 +570,7 @@
+                    "http read discarded body");
+ 
+     for ( ;; ) {
+-        if (r->headers_in.content_length_n == 0) {
++        if (r->content_length_n == 0) {
+             r->read_event_handler = ngx_http_block_reading;
+             return NGX_OK;
+         }
+@@ -577,9 +579,9 @@
+             return NGX_AGAIN;
+         }
+ 
+-        size = (r->headers_in.content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
++        size = (r->content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
+                    NGX_HTTP_DISCARD_BUFFER_SIZE:
+-                   (size_t) r->headers_in.content_length_n;
++                   (size_t) r->content_length_n;
+ 
+         n = r->connection->recv(r->connection, buffer, size);
+ 
+@@ -596,7 +598,7 @@
+             return NGX_OK;
+         }
+ 
+-        r->headers_in.content_length_n -= n;
++        r->content_length_n -= n;
+     }
+ }
+ 
+Only in nginx-1.0.11-patched/src/http: ngx_http_request_body.c~
+diff -ur nginx-1.0.11/src/http/ngx_http_request.c nginx-1.0.11-patched/src/http/ngx_http_request.c
+--- nginx-1.0.11/src/http/ngx_http_request.c	2011-09-30 22:36:19.000000000 +0800
++++ nginx-1.0.11-patched/src/http/ngx_http_request.c	2011-10-21 19:06:38.404350692 +0800
+@@ -286,6 +286,8 @@
+ 
+         r->pipeline = hc->pipeline;
+ 
++        r->content_length_n = -1;
++
+         if (hc->nbusy) {
+             r->header_in = hc->busy[0];
+         }
+@@ -297,6 +299,8 @@
+             return;
+         }
+ 
++        r->content_length_n = -1;
++
+         hc->request = r;
+     }
+ 
+Only in nginx-1.0.11-patched/src/http: ngx_http_request.c~
+diff -ur nginx-1.0.11/src/http/ngx_http_request.h nginx-1.0.11-patched/src/http/ngx_http_request.h
+--- nginx-1.0.11/src/http/ngx_http_request.h	2011-08-29 18:39:23.000000000 +0800
++++ nginx-1.0.11-patched/src/http/ngx_http_request.h	2011-10-21 17:26:13.203807584 +0800
+@@ -366,6 +366,9 @@
+     ngx_pool_t                       *pool;
+     ngx_buf_t                        *header_in;
+ 
++    off_t                             content_length_n;
++                                          /* for discarding request body */
++
+     ngx_http_headers_in_t             headers_in;
+     ngx_http_headers_out_t            headers_out;
+ 
+Only in nginx-1.0.11-patched/src/http: ngx_http_request.h~
+Only in nginx-1.0.11-patched/src/http: tags

patches/nginx-1.0.11-epoll_check_stale_wev.patch

@@ -0,0 +1,20 @@
+--- nginx-1.0.11/src/event/modules/ngx_epoll_module.c	2011-09-30 22:12:53.000000000 +0800
++++ nginx-1.0.11-patched/src/event/modules/ngx_epoll_module.c	2011-11-30 11:08:46.775817019 +0800
+@@ -682,6 +682,17 @@
+         wev = c->write;
+ 
+         if ((revents & EPOLLOUT) && wev->active) {
++            if (c->fd == -1 || wev->instance != instance) {
++
++                /*
++                 * the stale event from a file descriptor
++                 * that was just closed in this iteration
++                 */
++
++                ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
++                               "epoll: stale event %p", c);
++                continue;
++            }
+ 
+             if (flags & NGX_POST_THREAD_EVENTS) {
+                 wev->posted_ready = 1;

patches/nginx-1.0.11-gzip_empty_flush_buf.patch

@@ -0,0 +1,69 @@
+# HG changeset patch
+# User Maxim Dounin <mdounin@mdounin.ru>
+# Date 1315324342 -14400
+# Node ID 4cf0af103bc382a78f894302d1706929a79df4bb
+# Parent  d603ce98fada855f0100b422b7b5672fd22fabea
+Gzip filter: handle empty flush buffers.
+
+Empty flush buffers are legitimate and may happen e.g. due to $r->flush()
+calls in embedded perl.  If there are no data buffered in zlib deflate()
+will return Z_BUF_ERROR (i.e. no progress possible) without adding anything
+to output.  Don't treat Z_BUF_ERROR as fatal and correctly send empty flush
+buffer if we have no data in output at all.
+
+See this thread for details:
+http://mailman.nginx.org/pipermail/nginx/2010-November/023693.html
+
+diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
+--- a/src/http/modules/ngx_http_gzip_filter_module.c
++++ b/src/http/modules/ngx_http_gzip_filter_module.c
+@@ -758,6 +758,7 @@ static ngx_int_t
+ ngx_http_gzip_filter_deflate(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
+ {
+    int                    rc;
++    ngx_buf_t             *b;
+    ngx_chain_t           *cl;
+    ngx_http_gzip_conf_t  *conf;
+
+@@ -769,7 +770,7 @@ ngx_http_gzip_filter_deflate(ngx_http_re
+
+    rc = deflate(&ctx->zstream, ctx->flush);
+
+-    if (rc != Z_OK && rc != Z_STREAM_END) {
++    if (rc != Z_OK && rc != Z_STREAM_END && rc != Z_BUF_ERROR) {
+        ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                      "deflate() failed: %d, %d", ctx->flush, rc);
+        return NGX_ERROR;
+@@ -818,8 +819,6 @@ ngx_http_gzip_filter_deflate(ngx_http_re
+
+    if (ctx->flush == Z_SYNC_FLUSH) {
+
+-        ctx->zstream.avail_out = 0;
+-        ctx->out_buf->flush = 1;
+        ctx->flush = Z_NO_FLUSH;
+
+        cl = ngx_alloc_chain_link(r->pool);
+@@ -827,7 +826,22 @@ ngx_http_gzip_filter_deflate(ngx_http_re
+            return NGX_ERROR;
+        }
+
+-        cl->buf = ctx->out_buf;
++        b = ctx->out_buf;
++
++        if (ngx_buf_size(b) == 0) {
++
++            b = ngx_calloc_buf(ctx->request->pool);
++            if (b == NULL) {
++                return NGX_ERROR;
++            }
++
++        } else {
++            ctx->zstream.avail_out = 0;
++        }
++
++        b->flush = 1;
++
++        cl->buf = b;
+        cl->next = NULL;
+        *ctx->last_out = cl;
+        ctx->last_out = &cl->next;

patches/nginx-1.0.11-log_escape_non_ascii.patch

@@ -0,0 +1,115 @@
+--- nginx-1.0.11/src/http/modules/ngx_http_log_module.c	2011-11-01 21:24:50.000000000 +0800
++++ nginx-1.0.11-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.0.11-named_location_clear_mods_ctx.patch

@@ -0,0 +1,12 @@
+--- nginx-1.0.11/src/http/ngx_http_core_module.c	2011-09-27 19:14:02.000000000 +0800
++++ nginx-1.0.11-patched/src/http/ngx_http_core_module.c	2011-10-13 15:02:24.414550532 +0800
+@@ -2542,6 +2542,9 @@
+             r->content_handler = NULL;
+             r->loc_conf = (*clcfp)->loc_conf;
+ 
++            /* clear the modules contexts */
++            ngx_memzero(r->ctx, sizeof(void *) * ngx_http_max_module);
++
+             ngx_http_update_location_config(r);
+ 
+             cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);

patches/nginx-1.0.11-no_Werror.patch

@@ -0,0 +1,24 @@
+diff -ur nginx-1.0.11/auto/cc/gcc nginx-1.0.11-patched/auto/cc/gcc
+--- nginx-1.0.11/auto/cc/gcc	2011-06-27 19:53:00.205737804 +0800
++++ nginx-1.0.11-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.0.11/auto/cc/icc nginx-1.0.11-patched/auto/cc/icc
+--- nginx-1.0.11/auto/cc/icc	2011-06-27 19:52:56.370157068 +0800
++++ nginx-1.0.11-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.0.11-no_error_pages.patch

@@ -0,0 +1,90 @@
+--- nginx-1.0.11/src/http/ngx_http_core_module.c	2010-12-14 18:38:42.000000000 +0800
++++ nginx-1.0.11-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.0.11-no_pool.patch

@@ -0,0 +1,504 @@
+diff -ur nginx-1.0.11/src/core/nginx.h nginx-1.0.11-patched/src/core/nginx.h
+--- nginx-1.0.11/src/core/nginx.h	2011-08-29 17:30:22.000000000 +0800
++++ nginx-1.0.11-patched/src/core/nginx.h	2011-09-13 12:11:03.135622101 +0800
+@@ -10,7 +10,7 @@
+ 
+ 
+ #define nginx_version      1000011
+ #define NGINX_VERSION      "1.0.11"
+-#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown"
++#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
+ 
+ #define NGINX_VAR          "NGINX"
+diff -ur nginx-1.0.11/src/core/ngx_array.c nginx-1.0.11-patched/src/core/ngx_array.c
+--- nginx-1.0.11/src/core/ngx_array.c	2008-06-17 23:00:30.000000000 +0800
++++ nginx-1.0.11-patched/src/core/ngx_array.c	2011-09-14 12:02:56.263128538 +0800
+@@ -39,13 +39,7 @@
+ 
+     p = a->pool;
+ 
+-    if ((u_char *) a->elts + a->size * a->nalloc == p->d.last) {
+-        p->d.last -= a->size * a->nalloc;
+-    }
+-
+-    if ((u_char *) a + sizeof(ngx_array_t) == p->d.last) {
+-        p->d.last = (u_char *) a;
+-    }
++    ngx_pfree(p, a);
+ }
+ 
+ 
+@@ -64,29 +58,17 @@
+ 
+         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);
++        a->elts = new;
++        a->nalloc *= 2;
++
+     }
+ 
+     elt = (u_char *) a->elts + a->size * a->nelts;
+@@ -100,43 +82,25 @@
+ 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;
+-
+     if (a->nelts + n > a->nalloc) {
+ 
+         /* the array is full */
+ 
+         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);
++        a->elts = new;
++        a->nalloc = nalloc;
+     }
+ 
+     elt = (u_char *) a->elts + a->size * a->nelts;
+diff -ur nginx-1.0.11/src/core/ngx_palloc.c nginx-1.0.11-patched/src/core/ngx_palloc.c
+--- nginx-1.0.11/src/core/ngx_palloc.c	2009-12-17 20:25:46.000000000 +0800
++++ nginx-1.0.11-patched/src/core/ngx_palloc.c	2011-09-14 12:03:41.663126519 +0800
+@@ -8,24 +8,31 @@
+ #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;
++    ngx_pool_data_t     *d;
+ 
+-    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;
++    d = ngx_alloc(sizeof(ngx_pool_data_t), log);
++	
++    if (d == NULL) {
++	return NULL;
++    }
++
++    d->next = d;
++    d->prev = d;
++    d->alloc = NULL;
++    p->d = d;
+ 
+     size = size - sizeof(ngx_pool_t);
+     p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
+@@ -43,7 +50,7 @@
+ void
+ ngx_destroy_pool(ngx_pool_t *pool)
+ {
+-    ngx_pool_t          *p, *n;
++    ngx_pool_data_t     *d, *n;
+     ngx_pool_large_t    *l;
+     ngx_pool_cleanup_t  *c;
+ 
+@@ -55,7 +62,7 @@
+         }
+     }
+ 
+-    for (l = pool->large; l; l = l->next) {
++    for (l = pool->large; l ; l = l->next) {
+ 
+         ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+ 
+@@ -71,34 +78,45 @@
+      * so we can not use this log while the 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", d);
+ 
+-        if (n == NULL) {
++        if (n == pool->d) {
+             break;
+         }
+     }
+ 
+ #endif
++    if (pool->d->next == pool->d) {
++    	ngx_free(pool->d);
++    } else {
++        for (d = pool->d, n = d->next; ; d = n, n = n->next) {
++            if (d->alloc) {
++    	        ngx_free(d->alloc);
++            }
++            ngx_free(d);
+ 
+-    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
+-        ngx_free(p);
+-
+-        if (n == NULL) {
+-            break;
++            if (n == pool->d) {
++                break;
++            }
+         }
+     }
++
++    ngx_free(pool);
+ }
+ 
+ 
+ void
+ ngx_reset_pool(ngx_pool_t *pool)
+ {
+-    ngx_pool_t        *p;
+-    ngx_pool_large_t  *l;
++    ngx_pool_data_t     *p, *tmp;
++    ngx_pool_large_t    *l;
++
++    for (l = pool->large; l ; l = l->next) {
++
++        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+ 
+-    for (l = pool->large; l; l = l->next) {
+         if (l->alloc) {
+             ngx_free(l->alloc);
+         }
+@@ -106,109 +124,65 @@
+ 
+     pool->large = NULL;
+ 
+-    for (p = pool; p; p = p->d.next) {
+-        p->d.last = (u_char *) p + sizeof(ngx_pool_t);
++    p = pool->d->next;
++    while (p != pool->d) {
++        tmp = p;
++        ngx_free(p->alloc);
++        p->prev->next = p->next;
++        p->next->prev = p->prev;
++        p = p->next;
++        ngx_free(tmp);
+     }
+-}
+ 
++    ngx_free(pool->d->alloc);
++    pool->d->alloc = NULL;
++
++}
+ 
+ void *
+-ngx_palloc(ngx_pool_t *pool, size_t size)
++ngx_malloc(ngx_pool_t *pool, size_t size)
+ {
+-    u_char      *m;
+-    ngx_pool_t  *p;
+-
+-    if (size <= pool->max) {
++    ngx_pool_data_t     *new;
++    void        	*m;
+ 
+-        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;
+-            }
+-
+-            p = p->d.next;
+-
+-        } while (p);
++    m = ngx_alloc(size, pool->log);
++    if (m == NULL) {
++	return NULL;
++    }
+ 
+-        return ngx_palloc_block(pool, size);
++    new = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
++    if (new == NULL){
++        ngx_free(m);
++	return NULL;
+     }
+ 
+-    return ngx_palloc_large(pool, size);
++    new->alloc = m;
++    new->next = pool->d;
++    new->prev = pool->d->prev;
++    pool->d->prev->next = new;
++    pool->d->prev = new;
++    return m;	
+ }
+ 
+-
+ void *
+-ngx_pnalloc(ngx_pool_t *pool, size_t size)
++ngx_palloc(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;
+-            }
+-
+-            p = p->d.next;
+-
+-        } while (p);
+-
+-        return ngx_palloc_block(pool, size);
++    if (size <= 1024) {
++        return ngx_malloc(pool, size);
+     }
+ 
+     return ngx_palloc_large(pool, size);
+ }
+ 
+ 
+-static void *
+-ngx_palloc_block(ngx_pool_t *pool, size_t size)
++void *
++ngx_pnalloc(ngx_pool_t *pool, size_t size)
+ {
+-    u_char      *m;
+-    size_t       psize;
+-    ngx_pool_t  *p, *new, *current;
+-
+-    psize = (size_t) (pool->d.end - (u_char *) pool);
+-
+-    m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
+-    if (m == 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;
+-        }
++    if (size <= 1024) {
++        return ngx_malloc(pool, size);
+     }
+ 
+-    p->d.next = new;
+-
+-    pool->current = current ? current : new;
+-
+-    return m;
++    return ngx_palloc_large(pool, size);
+ }
+ 
+ 
+@@ -216,7 +190,6 @@
+ ngx_palloc_large(ngx_pool_t *pool, size_t size)
+ {
+     void              *p;
+-    ngx_uint_t         n;
+     ngx_pool_large_t  *large;
+ 
+     p = ngx_alloc(size, pool->log);
+@@ -224,20 +197,7 @@
+         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));
++    large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
+     if (large == NULL) {
+         ngx_free(p);
+         return NULL;
+@@ -262,7 +222,7 @@
+         return NULL;
+     }
+ 
+-    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
++    large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
+     if (large == NULL) {
+         ngx_free(p);
+         return NULL;
+@@ -279,17 +239,41 @@
+ ngx_int_t
+ ngx_pfree(ngx_pool_t *pool, void *p)
+ {
+-    ngx_pool_large_t  *l;
++    ngx_pool_large_t    *l;
++    ngx_pool_large_t    *ll;
++    ngx_pool_data_t     *d, *n;
+ 
+-    for (l = pool->large; l; l = l->next) {
++    for (l = pool->large, ll = l; l; ll = 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;
++	    if (l == pool->large) {
++		pool->large = NULL;
++	    }
++
++            ll->next = l->next;
++	    p = l;
++	    break;
++        }
++    }
+ 
++    for (d = pool->d, n = d->next; ; d = n, n = d->next) {
++        if (p == d->alloc) {
++            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
++            if (d->alloc) {
++                ngx_free(d->alloc);
++            }
++            d->alloc = NULL;
++            d->prev->next = d->next;
++            d->next->prev = d->prev;
++            ngx_free(d);
+             return NGX_OK;
+         }
++        if (d->next == pool->d) {
++            break;
++        }
+     }
+ 
+     return NGX_DECLINED;
+diff -ur nginx-1.0.11/src/core/ngx_palloc.h nginx-1.0.11-patched/src/core/ngx_palloc.h
+--- nginx-1.0.11/src/core/ngx_palloc.h	2009-12-17 20:25:46.000000000 +0800
++++ nginx-1.0.11-patched/src/core/ngx_palloc.h	2011-09-13 12:11:03.155622101 +0800
+@@ -38,6 +38,7 @@
+ 
+ 
+ typedef struct ngx_pool_large_s  ngx_pool_large_t;
++typedef struct ngx_pool_data_s   ngx_pool_data_t;
+ 
+ struct ngx_pool_large_s {
+     ngx_pool_large_t     *next;
+@@ -45,16 +46,15 @@
+ };
+ 
+ 
+-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;
++    ngx_pool_data_t		*prev;
++	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;

patches/nginx-1.0.11-request_body_in_single_buf.patch

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

patches/nginx-1.0.11-request_body_preread_fix.patch

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

patches/nginx-1.0.11-server_header.patch

@@ -0,0 +1,26 @@
+diff -ur lz-nginx-1.0.11/nginx-1.0.11/src/core/nginx.h lz-nginx-1.0.11-patched/nginx-1.0.11/src/core/nginx.h
+--- lz-nginx-1.0.11/nginx-1.0.11/src/core/nginx.h	2010-02-12 17:31:01.000000000 +0800
++++ lz-nginx-1.0.11-patched/nginx-1.0.11/src/core/nginx.h	2010-03-30 10:52:13.240702627 +0800
+@@ -10,7 +10,7 @@
+ 
+ #define nginx_version         1000011
+ #define NGINX_VERSION      "1.0.11"
+-#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.0.11-patched/nginx-1.0.11/src/core: nginx.h.orig
+Only in lz-nginx-1.0.11-patched/nginx-1.0.11/src/core: nginx.h.rej
+diff -ur lz-nginx-1.0.11/nginx-1.0.11/src/http/ngx_http_header_filter_module.c lz-nginx-1.0.11-patched/nginx-1.0.11/src/http/ngx_http_header_filter_module.c
+--- lz-nginx-1.0.11/nginx-1.0.11/src/http/ngx_http_header_filter_module.c	2010-03-03 23:14:04.000000000 +0800
++++ lz-nginx-1.0.11-patched/nginx-1.0.11/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.0.11-subrequest_loop.patch

@@ -0,0 +1,40 @@
+# HG changeset patch
+# User Maxim Dounin <mdounin@mdounin.ru>
+# Date 1309187571 -14400
+# Node ID 283a416b2235d5383c12a975edc8866f007fb628
+# Parent  f5fc40783ddcbf4db33859ee2a9bce54cf32c350
+Core: protect from subrequest loops.
+
+Without protection subrequest loop results in r->count overflow and
+SIGSEGV.  Protection was broken in 0.7.25.
+
+Note that this also limits number of parallel subrequests.  This
+wasn't exactly the case before 0.7.25 as local subrequests were
+completed directly.
+
+See here for details:
+
+http://nginx.org/pipermail/nginx-ru/2010-February/032184.html
+
+diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
+--- a/src/http/ngx_http_core_module.c
++++ b/src/http/ngx_http_core_module.c
+@@ -2287,7 +2287,6 @@ ngx_http_subrequest(ngx_http_request_t *
+    sr->start_sec = tp->sec;
+    sr->start_msec = tp->msec;
+ 
+-    r->main->subrequests++;
+    r->main->count++;
+ 
+    *psr = sr;
+diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
+--- a/src/http/ngx_http_request.c
++++ b/src/http/ngx_http_request.c
+@@ -1981,6 +1981,7 @@ ngx_http_finalize_request(ngx_http_reque
+        if (r == c->data) {
+ 
+            r->main->count--;
++            r->main->subrequests++;
+ 
+            if (!r->logged) {
+

patches/nginx-1.0.11-variable_header_ignore_no_hash.patch

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

patches/nginx-1.0.4-gcc46_fixes.patch

@@ -0,0 +1,37 @@
+# HG changeset patch
+# User Maxim Dounin <mdounin@mdounin.ru>
+# Date 1309424678 -14400
+# Node ID 60a67d95638f9187418a3a26c1fcb9f06be7a4fc
+# Parent  1c167244d2fdb064c159012c50a7ae3fd1ed254a
+Fix another gcc46 unused-but-set warning.
+
+diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
+--- a/src/event/ngx_event_openssl.c
++++ b/src/event/ngx_event_openssl.c
+@@ -1687,20 +1687,24 @@ ngx_ssl_get_cached_session(ngx_ssl_conn_
+     ngx_int_t                 rc;
+     ngx_shm_zone_t           *shm_zone;
+     ngx_slab_pool_t          *shpool;
++#if (NGX_DEBUG)
+     ngx_connection_t         *c;
++#endif
+     ngx_rbtree_node_t        *node, *sentinel;
+     ngx_ssl_session_t        *sess;
+     ngx_ssl_sess_id_t        *sess_id;
+     ngx_ssl_session_cache_t  *cache;
+     u_char                    buf[NGX_SSL_MAX_SESSION_SIZE];
+ 
+-    c = ngx_ssl_get_connection(ssl_conn);
+-
+     hash = ngx_crc32_short(id, (size_t) len);
+     *copy = 0;
+ 
++#if (NGX_DEBUG)
++    c = ngx_ssl_get_connection(ssl_conn);
++
+     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                    "ssl get session: %08XD:%d", hash, len);
++#endif
+ 
+     shm_zone = SSL_CTX_get_ex_data(SSL_get_SSL_CTX(ssl_conn),
+                                    ngx_ssl_session_cache_index);

patches/nginx-1.0.4-no_Werror.patch

@@ -0,0 +1,24 @@
+diff -ur nginx-0.8.54/auto/cc/gcc nginx-0.8.54-patched/auto/cc/gcc
+--- nginx-0.8.54/auto/cc/gcc	2011-06-27 19:53:00.205737804 +0800
++++ nginx-0.8.54-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-0.8.54/auto/cc/icc nginx-0.8.54-patched/auto/cc/icc
+--- nginx-0.8.54/auto/cc/icc	2011-06-27 19:52:56.370157068 +0800
++++ nginx-0.8.54-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.0.4-no_error_pages.patch

@@ -0,0 +1,90 @@
+--- nginx-0.8.54/src/http/ngx_http_core_module.c	2010-12-14 18:38:42.000000000 +0800
++++ nginx-0.8.54-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.0.4-no_pool.patch

@@ -0,0 +1,483 @@
+diff -ur nginx-1.0.4/src/core/nginx.h nginx-1.0.4-no-pool/src/core/nginx.h
+--- nginx-1.0.4/src/core/nginx.h	2011-05-26 15:31:40.000000000 +0800
++++ nginx-1.0.4-no-pool/src/core/nginx.h	2011-06-30 17:00:43.540946999 +0800
+@@ -10,7 +10,7 @@
+ 
+ #define nginx_version      1000004
+ #define NGINX_VERSION      "1.0.4"
+-#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown"
++#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
+ 
+ #define NGINX_VAR          "NGINX"
+ #define NGX_OLDPID_EXT     ".oldbin"
+diff -ur nginx-1.0.4/src/core/ngx_array.c nginx-1.0.4-no-pool/src/core/ngx_array.c
+--- nginx-1.0.4/src/core/ngx_array.c	2008-06-17 23:00:30.000000000 +0800
++++ nginx-1.0.4-no-pool/src/core/ngx_array.c	2011-06-30 17:00:43.540946999 +0800
+@@ -39,13 +39,7 @@
+ 
+     p = a->pool;
+ 
+-    if ((u_char *) a->elts + a->size * a->nalloc == p->d.last) {
+-        p->d.last -= a->size * a->nalloc;
+-    }
+-
+-    if ((u_char *) a + sizeof(ngx_array_t) == p->d.last) {
+-        p->d.last = (u_char *) a;
+-    }
++    ngx_pfree(p, a);
+ }
+ 
+ 
+@@ -64,29 +58,17 @@
+ 
+         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);
++        a->elts = new;
++        a->nalloc *= 2;
++
+     }
+ 
+     elt = (u_char *) a->elts + a->size * a->nelts;
+@@ -112,31 +94,16 @@
+ 
+         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);
++        a->elts = new;
++        a->nalloc = nalloc;
+     }
+ 
+     elt = (u_char *) a->elts + a->size * a->nelts;
+diff -ur nginx-1.0.4/src/core/ngx_palloc.c nginx-1.0.4-no-pool/src/core/ngx_palloc.c
+--- nginx-1.0.4/src/core/ngx_palloc.c	2009-12-17 20:25:46.000000000 +0800
++++ nginx-1.0.4-no-pool/src/core/ngx_palloc.c	2011-06-30 17:06:36.060946999 +0800
+@@ -8,24 +8,31 @@
+ #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;
++    ngx_pool_data_t     *d;
+ 
+-    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;
++    d = ngx_alloc(sizeof(ngx_pool_data_t), log);
++	
++    if (d == NULL) {
++	return NULL;
++    }
++
++    d->next = d;
++    d->prev = d;
++    d->alloc = NULL;
++    p->d = d;
+ 
+     size = size - sizeof(ngx_pool_t);
+     p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
+@@ -43,7 +50,7 @@
+ void
+ ngx_destroy_pool(ngx_pool_t *pool)
+ {
+-    ngx_pool_t          *p, *n;
++    ngx_pool_data_t     *d, *n;
+     ngx_pool_large_t    *l;
+     ngx_pool_cleanup_t  *c;
+ 
+@@ -55,7 +62,7 @@
+         }
+     }
+ 
+-    for (l = pool->large; l; l = l->next) {
++    for (l = pool->large; l ; l = l->next) {
+ 
+         ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+ 
+@@ -71,34 +78,45 @@
+      * so we can not use this log while the 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", d);
+ 
+-        if (n == NULL) {
++        if (n == pool->d) {
+             break;
+         }
+     }
+ 
+ #endif
++    if (pool->d->next == pool->d) {
++    	ngx_free(pool->d);
++    } else {
++        for (d = pool->d, n = d->next; ; d = n, n = n->next) {
++            if (d->alloc) {
++    	        ngx_free(d->alloc);
++            }
++            ngx_free(d);
+ 
+-    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
+-        ngx_free(p);
+-
+-        if (n == NULL) {
+-            break;
++            if (n == pool->d) {
++                break;
++            }
+         }
+     }
++
++    ngx_free(pool);
+ }
+ 
+ 
+ void
+ ngx_reset_pool(ngx_pool_t *pool)
+ {
+-    ngx_pool_t        *p;
+-    ngx_pool_large_t  *l;
++    ngx_pool_data_t     *p, *tmp;
++    ngx_pool_large_t    *l;
++
++    for (l = pool->large; l ; l = l->next) {
++
++        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+ 
+-    for (l = pool->large; l; l = l->next) {
+         if (l->alloc) {
+             ngx_free(l->alloc);
+         }
+@@ -106,109 +124,65 @@
+ 
+     pool->large = NULL;
+ 
+-    for (p = pool; p; p = p->d.next) {
+-        p->d.last = (u_char *) p + sizeof(ngx_pool_t);
++    p = pool->d->next;
++    while (p != pool->d) {
++        tmp = p;
++        ngx_free(p->alloc);
++        p->prev->next = p->next;
++        p->next->prev = p->prev;
++        p = p->next;
++        ngx_free(tmp);
+     }
+-}
+ 
++    ngx_free(pool->d->alloc);
++    pool->d->alloc = NULL;
++
++}
+ 
+ void *
+-ngx_palloc(ngx_pool_t *pool, size_t size)
++ngx_malloc(ngx_pool_t *pool, size_t size)
+ {
+-    u_char      *m;
+-    ngx_pool_t  *p;
+-
+-    if (size <= pool->max) {
++    ngx_pool_data_t     *new;
++    void        	*m;
+ 
+-        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;
+-            }
+-
+-            p = p->d.next;
+-
+-        } while (p);
++    m = ngx_alloc(size, pool->log);
++    if (m == NULL) {
++	return NULL;
++    }
+ 
+-        return ngx_palloc_block(pool, size);
++    new = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
++    if (new == NULL){
++        ngx_free(m);
++	return NULL;
+     }
+ 
+-    return ngx_palloc_large(pool, size);
++    new->alloc = m;
++    new->next = pool->d;
++    new->prev = pool->d->prev;
++    pool->d->prev->next = new;
++    pool->d->prev = new;
++    return m;	
+ }
+ 
+-
+ void *
+-ngx_pnalloc(ngx_pool_t *pool, size_t size)
++ngx_palloc(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;
+-            }
+-
+-            p = p->d.next;
+-
+-        } while (p);
+-
+-        return ngx_palloc_block(pool, size);
++    if (size <= 1024) {
++        return ngx_malloc(pool, size);
+     }
+ 
+     return ngx_palloc_large(pool, size);
+ }
+ 
+ 
+-static void *
+-ngx_palloc_block(ngx_pool_t *pool, size_t size)
++void *
++ngx_pnalloc(ngx_pool_t *pool, size_t size)
+ {
+-    u_char      *m;
+-    size_t       psize;
+-    ngx_pool_t  *p, *new, *current;
+-
+-    psize = (size_t) (pool->d.end - (u_char *) pool);
+-
+-    m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
+-    if (m == NULL) {
+-        return NULL;
++    if (size <= 1024) {
++        return ngx_malloc(pool, size);
+     }
+ 
+-    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;
+-        }
+-    }
+-
+-    p->d.next = new;
+-
+-    pool->current = current ? current : new;
+-
+-    return m;
++    return ngx_palloc_large(pool, size);
+ }
+ 
+ 
+@@ -226,18 +200,7 @@
+ 
+     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));
++    large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
+     if (large == NULL) {
+         ngx_free(p);
+         return NULL;
+@@ -262,7 +225,7 @@
+         return NULL;
+     }
+ 
+-    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
++    large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
+     if (large == NULL) {
+         ngx_free(p);
+         return NULL;
+@@ -279,17 +242,41 @@
+ ngx_int_t
+ ngx_pfree(ngx_pool_t *pool, void *p)
+ {
+-    ngx_pool_large_t  *l;
++    ngx_pool_large_t    *l;
++    ngx_pool_large_t    *ll;
++    ngx_pool_data_t     *d, *n;
+ 
+-    for (l = pool->large; l; l = l->next) {
++    for (l = pool->large, ll = l; l; ll = 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;
++	    if (l == pool->large) {
++		pool->large = NULL;
++	    }
++
++            ll->next = l->next;
++	    p = l;
++	    break;
++        }
++    }
+ 
++    for (d = pool->d, n = d->next; ; d = n, n = d->next) {
++        if (p == d->alloc) {
++            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
++            if (d->alloc) {
++                ngx_free(d->alloc);
++            }
++            d->alloc = NULL;
++            d->prev->next = d->next;
++            d->next->prev = d->prev;
++            ngx_free(d);
+             return NGX_OK;
+         }
++        if (d->next == pool->d) {
++            break;
++        }
+     }
+ 
+     return NGX_DECLINED;
+Only in nginx-1.0.4-no-pool/src/core: ngx_palloc.c~
+diff -ur nginx-1.0.4/src/core/ngx_palloc.h nginx-1.0.4-no-pool/src/core/ngx_palloc.h
+--- nginx-1.0.4/src/core/ngx_palloc.h	2009-12-17 20:25:46.000000000 +0800
++++ nginx-1.0.4-no-pool/src/core/ngx_palloc.h	2011-06-30 17:00:43.540946999 +0800
+@@ -38,6 +38,7 @@
+ 
+ 
+ typedef struct ngx_pool_large_s  ngx_pool_large_t;
++typedef struct ngx_pool_data_s   ngx_pool_data_t;
+ 
+ struct ngx_pool_large_s {
+     ngx_pool_large_t     *next;
+@@ -45,16 +46,15 @@
+ };
+ 
+ 
+-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;
++    ngx_pool_data_t		*prev;
++	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;

patches/nginx-1.0.4-request_body_in_single_buf.patch

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

patches/nginx-1.0.4-request_body_preread_fix.patch

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

patches/nginx-1.0.4-server_header.patch

@@ -0,0 +1,26 @@
+diff -ur lz-nginx-1.0.4/nginx-1.0.4/src/core/nginx.h lz-nginx-1.0.4-patched/nginx-1.0.4/src/core/nginx.h
+--- lz-nginx-1.0.4/nginx-1.0.4/src/core/nginx.h	2010-02-12 17:31:01.000000000 +0800
++++ lz-nginx-1.0.4-patched/nginx-1.0.4/src/core/nginx.h	2010-03-30 10:52:13.240702627 +0800
+@@ -10,7 +10,7 @@
+ 
+ #define nginx_version         1000004
+ #define NGINX_VERSION      "1.0.4"
+-#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.0.4-patched/nginx-1.0.4/src/core: nginx.h.orig
+Only in lz-nginx-1.0.4-patched/nginx-1.0.4/src/core: nginx.h.rej
+diff -ur lz-nginx-1.0.4/nginx-1.0.4/src/http/ngx_http_header_filter_module.c lz-nginx-1.0.4-patched/nginx-1.0.4/src/http/ngx_http_header_filter_module.c
+--- lz-nginx-1.0.4/nginx-1.0.4/src/http/ngx_http_header_filter_module.c	2010-03-03 23:14:04.000000000 +0800
++++ lz-nginx-1.0.4-patched/nginx-1.0.4/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.0.4-subrequest_loop.patch

@@ -0,0 +1,40 @@
+# HG changeset patch
+# User Maxim Dounin <mdounin@mdounin.ru>
+# Date 1309187571 -14400
+# Node ID 283a416b2235d5383c12a975edc8866f007fb628
+# Parent  f5fc40783ddcbf4db33859ee2a9bce54cf32c350
+Core: protect from subrequest loops.
+
+Without protection subrequest loop results in r->count overflow and
+SIGSEGV.  Protection was broken in 0.7.25.
+
+Note that this also limits number of parallel subrequests.  This
+wasn't exactly the case before 0.7.25 as local subrequests were
+completed directly.
+
+See here for details:
+
+http://nginx.org/pipermail/nginx-ru/2010-February/032184.html
+
+diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
+--- a/src/http/ngx_http_core_module.c
++++ b/src/http/ngx_http_core_module.c
+@@ -2287,7 +2287,6 @@ ngx_http_subrequest(ngx_http_request_t *
+    sr->start_sec = tp->sec;
+    sr->start_msec = tp->msec;
+ 
+-    r->main->subrequests++;
+    r->main->count++;
+ 
+    *psr = sr;
+diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
+--- a/src/http/ngx_http_request.c
++++ b/src/http/ngx_http_request.c
+@@ -1981,6 +1981,7 @@ ngx_http_finalize_request(ngx_http_reque
+        if (r == c->data) {
+ 
+            r->main->count--;
++            r->main->subrequests++;
+ 
+            if (!r->logged) {
+

patches/nginx-1.0.5-no_Werror.patch

@@ -0,0 +1,24 @@
+diff -ur nginx-1.0.5/auto/cc/gcc nginx-1.0.5-patched/auto/cc/gcc
+--- nginx-1.0.5/auto/cc/gcc	2011-06-27 19:53:00.205737804 +0800
++++ nginx-1.0.5-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.0.5/auto/cc/icc nginx-1.0.5-patched/auto/cc/icc
+--- nginx-1.0.5/auto/cc/icc	2011-06-27 19:52:56.370157068 +0800
++++ nginx-1.0.5-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.0.5-no_error_pages.patch

@@ -0,0 +1,90 @@
+--- nginx-1.0.5/src/http/ngx_http_core_module.c	2010-12-14 18:38:42.000000000 +0800
++++ nginx-1.0.5-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.0.5-no_pool.patch

@@ -0,0 +1,483 @@
+diff -ur nginx-1.0.5/src/core/nginx.h nginx-1.0.5-no-pool/src/core/nginx.h
+--- nginx-1.0.5/src/core/nginx.h	2011-05-26 15:31:40.000000000 +0800
++++ nginx-1.0.5-no-pool/src/core/nginx.h	2011-06-30 17:00:43.540946999 +0800
+@@ -10,7 +10,7 @@
+ 
+ #define nginx_version      1000004
+ #define NGINX_VERSION      "1.0.5"
+-#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown"
++#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
+ 
+ #define NGINX_VAR          "NGINX"
+ #define NGX_OLDPID_EXT     ".oldbin"
+diff -ur nginx-1.0.5/src/core/ngx_array.c nginx-1.0.5-no-pool/src/core/ngx_array.c
+--- nginx-1.0.5/src/core/ngx_array.c	2008-06-17 23:00:30.000000000 +0800
++++ nginx-1.0.5-no-pool/src/core/ngx_array.c	2011-06-30 17:00:43.540946999 +0800
+@@ -39,13 +39,7 @@
+ 
+     p = a->pool;
+ 
+-    if ((u_char *) a->elts + a->size * a->nalloc == p->d.last) {
+-        p->d.last -= a->size * a->nalloc;
+-    }
+-
+-    if ((u_char *) a + sizeof(ngx_array_t) == p->d.last) {
+-        p->d.last = (u_char *) a;
+-    }
++    ngx_pfree(p, a);
+ }
+ 
+ 
+@@ -64,29 +58,17 @@
+ 
+         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);
++        a->elts = new;
++        a->nalloc *= 2;
++
+     }
+ 
+     elt = (u_char *) a->elts + a->size * a->nelts;
+@@ -112,31 +94,16 @@
+ 
+         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);
++        a->elts = new;
++        a->nalloc = nalloc;
+     }
+ 
+     elt = (u_char *) a->elts + a->size * a->nelts;
+diff -ur nginx-1.0.5/src/core/ngx_palloc.c nginx-1.0.5-no-pool/src/core/ngx_palloc.c
+--- nginx-1.0.5/src/core/ngx_palloc.c	2009-12-17 20:25:46.000000000 +0800
++++ nginx-1.0.5-no-pool/src/core/ngx_palloc.c	2011-06-30 17:06:36.060946999 +0800
+@@ -8,24 +8,31 @@
+ #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;
++    ngx_pool_data_t     *d;
+ 
+-    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;
++    d = ngx_alloc(sizeof(ngx_pool_data_t), log);
++	
++    if (d == NULL) {
++	return NULL;
++    }
++
++    d->next = d;
++    d->prev = d;
++    d->alloc = NULL;
++    p->d = d;
+ 
+     size = size - sizeof(ngx_pool_t);
+     p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
+@@ -43,7 +50,7 @@
+ void
+ ngx_destroy_pool(ngx_pool_t *pool)
+ {
+-    ngx_pool_t          *p, *n;
++    ngx_pool_data_t     *d, *n;
+     ngx_pool_large_t    *l;
+     ngx_pool_cleanup_t  *c;
+ 
+@@ -55,7 +62,7 @@
+         }
+     }
+ 
+-    for (l = pool->large; l; l = l->next) {
++    for (l = pool->large; l ; l = l->next) {
+ 
+         ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+ 
+@@ -71,34 +78,45 @@
+      * so we can not use this log while the 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", d);
+ 
+-        if (n == NULL) {
++        if (n == pool->d) {
+             break;
+         }
+     }
+ 
+ #endif
++    if (pool->d->next == pool->d) {
++    	ngx_free(pool->d);
++    } else {
++        for (d = pool->d, n = d->next; ; d = n, n = n->next) {
++            if (d->alloc) {
++    	        ngx_free(d->alloc);
++            }
++            ngx_free(d);
+ 
+-    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
+-        ngx_free(p);
+-
+-        if (n == NULL) {
+-            break;
++            if (n == pool->d) {
++                break;
++            }
+         }
+     }
++
++    ngx_free(pool);
+ }
+ 
+ 
+ void
+ ngx_reset_pool(ngx_pool_t *pool)
+ {
+-    ngx_pool_t        *p;
+-    ngx_pool_large_t  *l;
++    ngx_pool_data_t     *p, *tmp;
++    ngx_pool_large_t    *l;
++
++    for (l = pool->large; l ; l = l->next) {
++
++        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+ 
+-    for (l = pool->large; l; l = l->next) {
+         if (l->alloc) {
+             ngx_free(l->alloc);
+         }
+@@ -106,109 +124,65 @@
+ 
+     pool->large = NULL;
+ 
+-    for (p = pool; p; p = p->d.next) {
+-        p->d.last = (u_char *) p + sizeof(ngx_pool_t);
++    p = pool->d->next;
++    while (p != pool->d) {
++        tmp = p;
++        ngx_free(p->alloc);
++        p->prev->next = p->next;
++        p->next->prev = p->prev;
++        p = p->next;
++        ngx_free(tmp);
+     }
+-}
+ 
++    ngx_free(pool->d->alloc);
++    pool->d->alloc = NULL;
++
++}
+ 
+ void *
+-ngx_palloc(ngx_pool_t *pool, size_t size)
++ngx_malloc(ngx_pool_t *pool, size_t size)
+ {
+-    u_char      *m;
+-    ngx_pool_t  *p;
+-
+-    if (size <= pool->max) {
++    ngx_pool_data_t     *new;
++    void        	*m;
+ 
+-        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;
+-            }
+-
+-            p = p->d.next;
+-
+-        } while (p);
++    m = ngx_alloc(size, pool->log);
++    if (m == NULL) {
++	return NULL;
++    }
+ 
+-        return ngx_palloc_block(pool, size);
++    new = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
++    if (new == NULL){
++        ngx_free(m);
++	return NULL;
+     }
+ 
+-    return ngx_palloc_large(pool, size);
++    new->alloc = m;
++    new->next = pool->d;
++    new->prev = pool->d->prev;
++    pool->d->prev->next = new;
++    pool->d->prev = new;
++    return m;	
+ }
+ 
+-
+ void *
+-ngx_pnalloc(ngx_pool_t *pool, size_t size)
++ngx_palloc(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;
+-            }
+-
+-            p = p->d.next;
+-
+-        } while (p);
+-
+-        return ngx_palloc_block(pool, size);
++    if (size <= 1024) {
++        return ngx_malloc(pool, size);
+     }
+ 
+     return ngx_palloc_large(pool, size);
+ }
+ 
+ 
+-static void *
+-ngx_palloc_block(ngx_pool_t *pool, size_t size)
++void *
++ngx_pnalloc(ngx_pool_t *pool, size_t size)
+ {
+-    u_char      *m;
+-    size_t       psize;
+-    ngx_pool_t  *p, *new, *current;
+-
+-    psize = (size_t) (pool->d.end - (u_char *) pool);
+-
+-    m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
+-    if (m == NULL) {
+-        return NULL;
++    if (size <= 1024) {
++        return ngx_malloc(pool, size);
+     }
+ 
+-    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;
+-        }
+-    }
+-
+-    p->d.next = new;
+-
+-    pool->current = current ? current : new;
+-
+-    return m;
++    return ngx_palloc_large(pool, size);
+ }
+ 
+ 
+@@ -226,18 +200,7 @@
+ 
+     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));
++    large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
+     if (large == NULL) {
+         ngx_free(p);
+         return NULL;
+@@ -262,7 +225,7 @@
+         return NULL;
+     }
+ 
+-    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
++    large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
+     if (large == NULL) {
+         ngx_free(p);
+         return NULL;
+@@ -279,17 +242,41 @@
+ ngx_int_t
+ ngx_pfree(ngx_pool_t *pool, void *p)
+ {
+-    ngx_pool_large_t  *l;
++    ngx_pool_large_t    *l;
++    ngx_pool_large_t    *ll;
++    ngx_pool_data_t     *d, *n;
+ 
+-    for (l = pool->large; l; l = l->next) {
++    for (l = pool->large, ll = l; l; ll = 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;
++	    if (l == pool->large) {
++		pool->large = NULL;
++	    }
++
++            ll->next = l->next;
++	    p = l;
++	    break;
++        }
++    }
+ 
++    for (d = pool->d, n = d->next; ; d = n, n = d->next) {
++        if (p == d->alloc) {
++            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
++            if (d->alloc) {
++                ngx_free(d->alloc);
++            }
++            d->alloc = NULL;
++            d->prev->next = d->next;
++            d->next->prev = d->prev;
++            ngx_free(d);
+             return NGX_OK;
+         }
++        if (d->next == pool->d) {
++            break;
++        }
+     }
+ 
+     return NGX_DECLINED;
+Only in nginx-1.0.5-no-pool/src/core: ngx_palloc.c~
+diff -ur nginx-1.0.5/src/core/ngx_palloc.h nginx-1.0.5-no-pool/src/core/ngx_palloc.h
+--- nginx-1.0.5/src/core/ngx_palloc.h	2009-12-17 20:25:46.000000000 +0800
++++ nginx-1.0.5-no-pool/src/core/ngx_palloc.h	2011-06-30 17:00:43.540946999 +0800
+@@ -38,6 +38,7 @@
+ 
+ 
+ typedef struct ngx_pool_large_s  ngx_pool_large_t;
++typedef struct ngx_pool_data_s   ngx_pool_data_t;
+ 
+ struct ngx_pool_large_s {
+     ngx_pool_large_t     *next;
+@@ -45,16 +46,15 @@
+ };
+ 
+ 
+-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;
++    ngx_pool_data_t		*prev;
++	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;

patches/nginx-1.0.5-request_body_in_single_buf.patch

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

patches/nginx-1.0.5-request_body_preread_fix.patch

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

patches/nginx-1.0.5-server_header.patch

@@ -0,0 +1,26 @@
+diff -ur lz-nginx-1.0.5/nginx-1.0.5/src/core/nginx.h lz-nginx-1.0.5-patched/nginx-1.0.5/src/core/nginx.h
+--- lz-nginx-1.0.5/nginx-1.0.5/src/core/nginx.h	2010-02-12 17:31:01.000000000 +0800
++++ lz-nginx-1.0.5-patched/nginx-1.0.5/src/core/nginx.h	2010-03-30 10:52:13.240702627 +0800
+@@ -10,7 +10,7 @@
+ 
+ #define nginx_version         1000005
+ #define NGINX_VERSION      "1.0.5"
+-#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.0.5-patched/nginx-1.0.5/src/core: nginx.h.orig
+Only in lz-nginx-1.0.5-patched/nginx-1.0.5/src/core: nginx.h.rej
+diff -ur lz-nginx-1.0.5/nginx-1.0.5/src/http/ngx_http_header_filter_module.c lz-nginx-1.0.5-patched/nginx-1.0.5/src/http/ngx_http_header_filter_module.c
+--- lz-nginx-1.0.5/nginx-1.0.5/src/http/ngx_http_header_filter_module.c	2010-03-03 23:14:04.000000000 +0800
++++ lz-nginx-1.0.5-patched/nginx-1.0.5/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.0.5-subrequest_loop.patch

@@ -0,0 +1,40 @@
+# HG changeset patch
+# User Maxim Dounin <mdounin@mdounin.ru>
+# Date 1309187571 -14400
+# Node ID 283a416b2235d5383c12a975edc8866f007fb628
+# Parent  f5fc40783ddcbf4db33859ee2a9bce54cf32c350
+Core: protect from subrequest loops.
+
+Without protection subrequest loop results in r->count overflow and
+SIGSEGV.  Protection was broken in 0.7.25.
+
+Note that this also limits number of parallel subrequests.  This
+wasn't exactly the case before 0.7.25 as local subrequests were
+completed directly.
+
+See here for details:
+
+http://nginx.org/pipermail/nginx-ru/2010-February/032184.html
+
+diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
+--- a/src/http/ngx_http_core_module.c
++++ b/src/http/ngx_http_core_module.c
+@@ -2287,7 +2287,6 @@ ngx_http_subrequest(ngx_http_request_t *
+    sr->start_sec = tp->sec;
+    sr->start_msec = tp->msec;
+ 
+-    r->main->subrequests++;
+    r->main->count++;
+ 
+    *psr = sr;
+diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
+--- a/src/http/ngx_http_request.c
++++ b/src/http/ngx_http_request.c
+@@ -1981,6 +1981,7 @@ ngx_http_finalize_request(ngx_http_reque
+        if (r == c->data) {
+ 
+            r->main->count--;
++            r->main->subrequests++;
+ 
+            if (!r->logged) {
+

patches/nginx-1.0.6-gzip_empty_flush_buf.patch

@@ -0,0 +1,69 @@
+# HG changeset patch
+# User Maxim Dounin <mdounin@mdounin.ru>
+# Date 1315324342 -14400
+# Node ID 4cf0af103bc382a78f894302d1706929a79df4bb
+# Parent  d603ce98fada855f0100b422b7b5672fd22fabea
+Gzip filter: handle empty flush buffers.
+
+Empty flush buffers are legitimate and may happen e.g. due to $r->flush()
+calls in embedded perl.  If there are no data buffered in zlib deflate()
+will return Z_BUF_ERROR (i.e. no progress possible) without adding anything
+to output.  Don't treat Z_BUF_ERROR as fatal and correctly send empty flush
+buffer if we have no data in output at all.
+
+See this thread for details:
+http://mailman.nginx.org/pipermail/nginx/2010-November/023693.html
+
+diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
+--- a/src/http/modules/ngx_http_gzip_filter_module.c
++++ b/src/http/modules/ngx_http_gzip_filter_module.c
+@@ -758,6 +758,7 @@ static ngx_int_t
+ ngx_http_gzip_filter_deflate(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
+ {
+    int                    rc;
++    ngx_buf_t             *b;
+    ngx_chain_t           *cl;
+    ngx_http_gzip_conf_t  *conf;
+
+@@ -769,7 +770,7 @@ ngx_http_gzip_filter_deflate(ngx_http_re
+
+    rc = deflate(&ctx->zstream, ctx->flush);
+
+-    if (rc != Z_OK && rc != Z_STREAM_END) {
++    if (rc != Z_OK && rc != Z_STREAM_END && rc != Z_BUF_ERROR) {
+        ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                      "deflate() failed: %d, %d", ctx->flush, rc);
+        return NGX_ERROR;
+@@ -818,8 +819,6 @@ ngx_http_gzip_filter_deflate(ngx_http_re
+
+    if (ctx->flush == Z_SYNC_FLUSH) {
+
+-        ctx->zstream.avail_out = 0;
+-        ctx->out_buf->flush = 1;
+        ctx->flush = Z_NO_FLUSH;
+
+        cl = ngx_alloc_chain_link(r->pool);
+@@ -827,7 +826,22 @@ ngx_http_gzip_filter_deflate(ngx_http_re
+            return NGX_ERROR;
+        }
+
+-        cl->buf = ctx->out_buf;
++        b = ctx->out_buf;
++
++        if (ngx_buf_size(b) == 0) {
++
++            b = ngx_calloc_buf(ctx->request->pool);
++            if (b == NULL) {
++                return NGX_ERROR;
++            }
++
++        } else {
++            ctx->zstream.avail_out = 0;
++        }
++
++        b->flush = 1;
++
++        cl->buf = b;
+        cl->next = NULL;
+        *ctx->last_out = cl;
+        ctx->last_out = &cl->next;

patches/nginx-1.0.6-no_Werror.patch

@@ -0,0 +1,24 @@
+diff -ur nginx-1.0.6/auto/cc/gcc nginx-1.0.6-patched/auto/cc/gcc
+--- nginx-1.0.6/auto/cc/gcc	2011-06-27 19:53:00.205737804 +0800
++++ nginx-1.0.6-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.0.6/auto/cc/icc nginx-1.0.6-patched/auto/cc/icc
+--- nginx-1.0.6/auto/cc/icc	2011-06-27 19:52:56.370157068 +0800
++++ nginx-1.0.6-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.0.6-no_error_pages.patch

@@ -0,0 +1,90 @@
+--- nginx-1.0.6/src/http/ngx_http_core_module.c	2010-12-14 18:38:42.000000000 +0800
++++ nginx-1.0.6-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.0.6-no_pool.patch

@@ -0,0 +1,504 @@
+diff -ur nginx-1.0.6/src/core/nginx.h nginx-1.0.6-patched/src/core/nginx.h
+--- nginx-1.0.6/src/core/nginx.h	2011-08-29 17:30:22.000000000 +0800
++++ nginx-1.0.6-patched/src/core/nginx.h	2011-09-13 12:11:03.135622101 +0800
+@@ -10,7 +10,7 @@
+ 
+ 
+ #define nginx_version      1000006
+ #define NGINX_VERSION      "1.0.6"
+-#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown"
++#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
+ 
+ #define NGINX_VAR          "NGINX"
+diff -ur nginx-1.0.6/src/core/ngx_array.c nginx-1.0.6-patched/src/core/ngx_array.c
+--- nginx-1.0.6/src/core/ngx_array.c	2008-06-17 23:00:30.000000000 +0800
++++ nginx-1.0.6-patched/src/core/ngx_array.c	2011-09-14 12:02:56.263128538 +0800
+@@ -39,13 +39,7 @@
+ 
+     p = a->pool;
+ 
+-    if ((u_char *) a->elts + a->size * a->nalloc == p->d.last) {
+-        p->d.last -= a->size * a->nalloc;
+-    }
+-
+-    if ((u_char *) a + sizeof(ngx_array_t) == p->d.last) {
+-        p->d.last = (u_char *) a;
+-    }
++    ngx_pfree(p, a);
+ }
+ 
+ 
+@@ -64,29 +58,17 @@
+ 
+         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);
++        a->elts = new;
++        a->nalloc *= 2;
++
+     }
+ 
+     elt = (u_char *) a->elts + a->size * a->nelts;
+@@ -100,43 +82,25 @@
+ 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;
+-
+     if (a->nelts + n > a->nalloc) {
+ 
+         /* the array is full */
+ 
+         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);
++        a->elts = new;
++        a->nalloc = nalloc;
+     }
+ 
+     elt = (u_char *) a->elts + a->size * a->nelts;
+diff -ur nginx-1.0.6/src/core/ngx_palloc.c nginx-1.0.6-patched/src/core/ngx_palloc.c
+--- nginx-1.0.6/src/core/ngx_palloc.c	2009-12-17 20:25:46.000000000 +0800
++++ nginx-1.0.6-patched/src/core/ngx_palloc.c	2011-09-14 12:03:41.663126519 +0800
+@@ -8,24 +8,31 @@
+ #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;
++    ngx_pool_data_t     *d;
+ 
+-    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;
++    d = ngx_alloc(sizeof(ngx_pool_data_t), log);
++	
++    if (d == NULL) {
++	return NULL;
++    }
++
++    d->next = d;
++    d->prev = d;
++    d->alloc = NULL;
++    p->d = d;
+ 
+     size = size - sizeof(ngx_pool_t);
+     p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
+@@ -43,7 +50,7 @@
+ void
+ ngx_destroy_pool(ngx_pool_t *pool)
+ {
+-    ngx_pool_t          *p, *n;
++    ngx_pool_data_t     *d, *n;
+     ngx_pool_large_t    *l;
+     ngx_pool_cleanup_t  *c;
+ 
+@@ -55,7 +62,7 @@
+         }
+     }
+ 
+-    for (l = pool->large; l; l = l->next) {
++    for (l = pool->large; l ; l = l->next) {
+ 
+         ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+ 
+@@ -71,34 +78,45 @@
+      * so we can not use this log while the 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", d);
+ 
+-        if (n == NULL) {
++        if (n == pool->d) {
+             break;
+         }
+     }
+ 
+ #endif
++    if (pool->d->next == pool->d) {
++    	ngx_free(pool->d);
++    } else {
++        for (d = pool->d, n = d->next; ; d = n, n = n->next) {
++            if (d->alloc) {
++    	        ngx_free(d->alloc);
++            }
++            ngx_free(d);
+ 
+-    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
+-        ngx_free(p);
+-
+-        if (n == NULL) {
+-            break;
++            if (n == pool->d) {
++                break;
++            }
+         }
+     }
++
++    ngx_free(pool);
+ }
+ 
+ 
+ void
+ ngx_reset_pool(ngx_pool_t *pool)
+ {
+-    ngx_pool_t        *p;
+-    ngx_pool_large_t  *l;
++    ngx_pool_data_t     *p, *tmp;
++    ngx_pool_large_t    *l;
++
++    for (l = pool->large; l ; l = l->next) {
++
++        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+ 
+-    for (l = pool->large; l; l = l->next) {
+         if (l->alloc) {
+             ngx_free(l->alloc);
+         }
+@@ -106,109 +124,65 @@
+ 
+     pool->large = NULL;
+ 
+-    for (p = pool; p; p = p->d.next) {
+-        p->d.last = (u_char *) p + sizeof(ngx_pool_t);
++    p = pool->d->next;
++    while (p != pool->d) {
++        tmp = p;
++        ngx_free(p->alloc);
++        p->prev->next = p->next;
++        p->next->prev = p->prev;
++        p = p->next;
++        ngx_free(tmp);
+     }
+-}
+ 
++    ngx_free(pool->d->alloc);
++    pool->d->alloc = NULL;
++
++}
+ 
+ void *
+-ngx_palloc(ngx_pool_t *pool, size_t size)
++ngx_malloc(ngx_pool_t *pool, size_t size)
+ {
+-    u_char      *m;
+-    ngx_pool_t  *p;
+-
+-    if (size <= pool->max) {
++    ngx_pool_data_t     *new;
++    void        	*m;
+ 
+-        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;
+-            }
+-
+-            p = p->d.next;
+-
+-        } while (p);
++    m = ngx_alloc(size, pool->log);
++    if (m == NULL) {
++	return NULL;
++    }
+ 
+-        return ngx_palloc_block(pool, size);
++    new = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
++    if (new == NULL){
++        ngx_free(m);
++	return NULL;
+     }
+ 
+-    return ngx_palloc_large(pool, size);
++    new->alloc = m;
++    new->next = pool->d;
++    new->prev = pool->d->prev;
++    pool->d->prev->next = new;
++    pool->d->prev = new;
++    return m;	
+ }
+ 
+-
+ void *
+-ngx_pnalloc(ngx_pool_t *pool, size_t size)
++ngx_palloc(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;
+-            }
+-
+-            p = p->d.next;
+-
+-        } while (p);
+-
+-        return ngx_palloc_block(pool, size);
++    if (size <= 1024) {
++        return ngx_malloc(pool, size);
+     }
+ 
+     return ngx_palloc_large(pool, size);
+ }
+ 
+ 
+-static void *
+-ngx_palloc_block(ngx_pool_t *pool, size_t size)
++void *
++ngx_pnalloc(ngx_pool_t *pool, size_t size)
+ {
+-    u_char      *m;
+-    size_t       psize;
+-    ngx_pool_t  *p, *new, *current;
+-
+-    psize = (size_t) (pool->d.end - (u_char *) pool);
+-
+-    m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
+-    if (m == 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;
+-        }
++    if (size <= 1024) {
++        return ngx_malloc(pool, size);
+     }
+ 
+-    p->d.next = new;
+-
+-    pool->current = current ? current : new;
+-
+-    return m;
++    return ngx_palloc_large(pool, size);
+ }
+ 
+ 
+@@ -216,7 +190,6 @@
+ ngx_palloc_large(ngx_pool_t *pool, size_t size)
+ {
+     void              *p;
+-    ngx_uint_t         n;
+     ngx_pool_large_t  *large;
+ 
+     p = ngx_alloc(size, pool->log);
+@@ -224,20 +197,7 @@
+         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));
++    large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
+     if (large == NULL) {
+         ngx_free(p);
+         return NULL;
+@@ -262,7 +222,7 @@
+         return NULL;
+     }
+ 
+-    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
++    large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
+     if (large == NULL) {
+         ngx_free(p);
+         return NULL;
+@@ -279,17 +239,41 @@
+ ngx_int_t
+ ngx_pfree(ngx_pool_t *pool, void *p)
+ {
+-    ngx_pool_large_t  *l;
++    ngx_pool_large_t    *l;
++    ngx_pool_large_t    *ll;
++    ngx_pool_data_t     *d, *n;
+ 
+-    for (l = pool->large; l; l = l->next) {
++    for (l = pool->large, ll = l; l; ll = 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;
++	    if (l == pool->large) {
++		pool->large = NULL;
++	    }
++
++            ll->next = l->next;
++	    p = l;
++	    break;
++        }
++    }
+ 
++    for (d = pool->d, n = d->next; ; d = n, n = d->next) {
++        if (p == d->alloc) {
++            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
++            if (d->alloc) {
++                ngx_free(d->alloc);
++            }
++            d->alloc = NULL;
++            d->prev->next = d->next;
++            d->next->prev = d->prev;
++            ngx_free(d);
+             return NGX_OK;
+         }
++        if (d->next == pool->d) {
++            break;
++        }
+     }
+ 
+     return NGX_DECLINED;
+diff -ur nginx-1.0.6/src/core/ngx_palloc.h nginx-1.0.6-patched/src/core/ngx_palloc.h
+--- nginx-1.0.6/src/core/ngx_palloc.h	2009-12-17 20:25:46.000000000 +0800
++++ nginx-1.0.6-patched/src/core/ngx_palloc.h	2011-09-13 12:11:03.155622101 +0800
+@@ -38,6 +38,7 @@
+ 
+ 
+ typedef struct ngx_pool_large_s  ngx_pool_large_t;
++typedef struct ngx_pool_data_s   ngx_pool_data_t;
+ 
+ struct ngx_pool_large_s {
+     ngx_pool_large_t     *next;
+@@ -45,16 +46,15 @@
+ };
+ 
+ 
+-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;
++    ngx_pool_data_t		*prev;
++	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;

patches/nginx-1.0.6-request_body_in_single_buf.patch

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

patches/nginx-1.0.6-request_body_preread_fix.patch

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

patches/nginx-1.0.6-server_header.patch

@@ -0,0 +1,26 @@
+diff -ur lz-nginx-1.0.6/nginx-1.0.6/src/core/nginx.h lz-nginx-1.0.6-patched/nginx-1.0.6/src/core/nginx.h
+--- lz-nginx-1.0.6/nginx-1.0.6/src/core/nginx.h	2010-02-12 17:31:01.000000000 +0800
++++ lz-nginx-1.0.6-patched/nginx-1.0.6/src/core/nginx.h	2010-03-30 10:52:13.240702627 +0800
+@@ -10,7 +10,7 @@
+ 
+ #define nginx_version         1000006
+ #define NGINX_VERSION      "1.0.6"
+-#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.0.6-patched/nginx-1.0.6/src/core: nginx.h.orig
+Only in lz-nginx-1.0.6-patched/nginx-1.0.6/src/core: nginx.h.rej
+diff -ur lz-nginx-1.0.6/nginx-1.0.6/src/http/ngx_http_header_filter_module.c lz-nginx-1.0.6-patched/nginx-1.0.6/src/http/ngx_http_header_filter_module.c
+--- lz-nginx-1.0.6/nginx-1.0.6/src/http/ngx_http_header_filter_module.c	2010-03-03 23:14:04.000000000 +0800
++++ lz-nginx-1.0.6-patched/nginx-1.0.6/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.0.6-subrequest_loop.patch

@@ -0,0 +1,40 @@
+# HG changeset patch
+# User Maxim Dounin <mdounin@mdounin.ru>
+# Date 1309187571 -14400
+# Node ID 283a416b2235d5383c12a975edc8866f007fb628
+# Parent  f5fc40783ddcbf4db33859ee2a9bce54cf32c350
+Core: protect from subrequest loops.
+
+Without protection subrequest loop results in r->count overflow and
+SIGSEGV.  Protection was broken in 0.7.25.
+
+Note that this also limits number of parallel subrequests.  This
+wasn't exactly the case before 0.7.25 as local subrequests were
+completed directly.
+
+See here for details:
+
+http://nginx.org/pipermail/nginx-ru/2010-February/032184.html
+
+diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
+--- a/src/http/ngx_http_core_module.c
++++ b/src/http/ngx_http_core_module.c
+@@ -2287,7 +2287,6 @@ ngx_http_subrequest(ngx_http_request_t *
+    sr->start_sec = tp->sec;
+    sr->start_msec = tp->msec;
+ 
+-    r->main->subrequests++;
+    r->main->count++;
+ 
+    *psr = sr;
+diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
+--- a/src/http/ngx_http_request.c
++++ b/src/http/ngx_http_request.c
+@@ -1981,6 +1981,7 @@ ngx_http_finalize_request(ngx_http_reque
+        if (r == c->data) {
+ 
+            r->main->count--;
++            r->main->subrequests++;
+ 
+            if (!r->logged) {
+

patches/nginx-1.0.6-variable_header_ignore_no_hash.patch

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

patches/nginx-1.0.8-allow_request_body_updating.patch

@@ -0,0 +1,117 @@
+diff -ur nginx-1.0.8/src/http/ngx_http_request_body.c nginx-1.0.8-patched/src/http/ngx_http_request_body.c
+--- nginx-1.0.8/src/http/ngx_http_request_body.c	2011-09-30 22:36:19.000000000 +0800
++++ nginx-1.0.8-patched/src/http/ngx_http_request_body.c	2011-10-21 21:54:08.460350482 +0800
+@@ -38,7 +38,7 @@
+ 
+     r->main->count++;
+ 
+-    if (r->request_body || r->discard_body) {
++    if (r->request_body || r->discard_body || r->content_length_n == 0) {
+         post_handler(r);
+         return NGX_OK;
+     }
+@@ -440,7 +440,7 @@
+     ssize_t       size;
+     ngx_event_t  *rev;
+ 
+-    if (r != r->main || r->discard_body) {
++    if (r != r->main || r->discard_body || r->content_length_n == 0) {
+         return NGX_OK;
+     }
+ 
+@@ -456,20 +456,22 @@
+         ngx_del_timer(rev);
+     }
+ 
+-    if (r->headers_in.content_length_n <= 0 || r->request_body) {
++    r->content_length_n = r->headers_in.content_length_n;
++
++    if (r->content_length_n <= 0 || r->request_body) {
+         return NGX_OK;
+     }
+ 
+     size = r->header_in->last - r->header_in->pos;
+ 
+     if (size) {
+-        if (r->headers_in.content_length_n > size) {
++        if (r->content_length_n > size) {
+             r->header_in->pos += size;
+-            r->headers_in.content_length_n -= size;
++            r->content_length_n -= size;
+ 
+         } else {
+-            r->header_in->pos += (size_t) r->headers_in.content_length_n;
+-            r->headers_in.content_length_n = 0;
++            r->header_in->pos += (size_t) r->content_length_n;
++            r->content_length_n = 0;
+             return NGX_OK;
+         }
+     }
+@@ -568,7 +570,7 @@
+                    "http read discarded body");
+ 
+     for ( ;; ) {
+-        if (r->headers_in.content_length_n == 0) {
++        if (r->content_length_n == 0) {
+             r->read_event_handler = ngx_http_block_reading;
+             return NGX_OK;
+         }
+@@ -577,9 +579,9 @@
+             return NGX_AGAIN;
+         }
+ 
+-        size = (r->headers_in.content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
++        size = (r->content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
+                    NGX_HTTP_DISCARD_BUFFER_SIZE:
+-                   (size_t) r->headers_in.content_length_n;
++                   (size_t) r->content_length_n;
+ 
+         n = r->connection->recv(r->connection, buffer, size);
+ 
+@@ -596,7 +598,7 @@
+             return NGX_OK;
+         }
+ 
+-        r->headers_in.content_length_n -= n;
++        r->content_length_n -= n;
+     }
+ }
+ 
+Only in nginx-1.0.8-patched/src/http: ngx_http_request_body.c~
+diff -ur nginx-1.0.8/src/http/ngx_http_request.c nginx-1.0.8-patched/src/http/ngx_http_request.c
+--- nginx-1.0.8/src/http/ngx_http_request.c	2011-09-30 22:36:19.000000000 +0800
++++ nginx-1.0.8-patched/src/http/ngx_http_request.c	2011-10-21 19:06:38.404350692 +0800
+@@ -286,6 +286,8 @@
+ 
+         r->pipeline = hc->pipeline;
+ 
++        r->content_length_n = -1;
++
+         if (hc->nbusy) {
+             r->header_in = hc->busy[0];
+         }
+@@ -297,6 +299,8 @@
+             return;
+         }
+ 
++        r->content_length_n = -1;
++
+         hc->request = r;
+     }
+ 
+Only in nginx-1.0.8-patched/src/http: ngx_http_request.c~
+diff -ur nginx-1.0.8/src/http/ngx_http_request.h nginx-1.0.8-patched/src/http/ngx_http_request.h
+--- nginx-1.0.8/src/http/ngx_http_request.h	2011-08-29 18:39:23.000000000 +0800
++++ nginx-1.0.8-patched/src/http/ngx_http_request.h	2011-10-21 17:26:13.203807584 +0800
+@@ -366,6 +366,9 @@
+     ngx_pool_t                       *pool;
+     ngx_buf_t                        *header_in;
+ 
++    off_t                             content_length_n;
++                                          /* for discarding request body */
++
+     ngx_http_headers_in_t             headers_in;
+     ngx_http_headers_out_t            headers_out;
+ 
+Only in nginx-1.0.8-patched/src/http: ngx_http_request.h~
+Only in nginx-1.0.8-patched/src/http: tags

patches/nginx-1.0.8-gzip_empty_flush_buf.patch

@@ -0,0 +1,69 @@
+# HG changeset patch
+# User Maxim Dounin <mdounin@mdounin.ru>
+# Date 1315324342 -14400
+# Node ID 4cf0af103bc382a78f894302d1706929a79df4bb
+# Parent  d603ce98fada855f0100b422b7b5672fd22fabea
+Gzip filter: handle empty flush buffers.
+
+Empty flush buffers are legitimate and may happen e.g. due to $r->flush()
+calls in embedded perl.  If there are no data buffered in zlib deflate()
+will return Z_BUF_ERROR (i.e. no progress possible) without adding anything
+to output.  Don't treat Z_BUF_ERROR as fatal and correctly send empty flush
+buffer if we have no data in output at all.
+
+See this thread for details:
+http://mailman.nginx.org/pipermail/nginx/2010-November/023693.html
+
+diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
+--- a/src/http/modules/ngx_http_gzip_filter_module.c
++++ b/src/http/modules/ngx_http_gzip_filter_module.c
+@@ -758,6 +758,7 @@ static ngx_int_t
+ ngx_http_gzip_filter_deflate(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
+ {
+    int                    rc;
++    ngx_buf_t             *b;
+    ngx_chain_t           *cl;
+    ngx_http_gzip_conf_t  *conf;
+
+@@ -769,7 +770,7 @@ ngx_http_gzip_filter_deflate(ngx_http_re
+
+    rc = deflate(&ctx->zstream, ctx->flush);
+
+-    if (rc != Z_OK && rc != Z_STREAM_END) {
++    if (rc != Z_OK && rc != Z_STREAM_END && rc != Z_BUF_ERROR) {
+        ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                      "deflate() failed: %d, %d", ctx->flush, rc);
+        return NGX_ERROR;
+@@ -818,8 +819,6 @@ ngx_http_gzip_filter_deflate(ngx_http_re
+
+    if (ctx->flush == Z_SYNC_FLUSH) {
+
+-        ctx->zstream.avail_out = 0;
+-        ctx->out_buf->flush = 1;
+        ctx->flush = Z_NO_FLUSH;
+
+        cl = ngx_alloc_chain_link(r->pool);
+@@ -827,7 +826,22 @@ ngx_http_gzip_filter_deflate(ngx_http_re
+            return NGX_ERROR;
+        }
+
+-        cl->buf = ctx->out_buf;
++        b = ctx->out_buf;
++
++        if (ngx_buf_size(b) == 0) {
++
++            b = ngx_calloc_buf(ctx->request->pool);
++            if (b == NULL) {
++                return NGX_ERROR;
++            }
++
++        } else {
++            ctx->zstream.avail_out = 0;
++        }
++
++        b->flush = 1;
++
++        cl->buf = b;
+        cl->next = NULL;
+        *ctx->last_out = cl;
+        ctx->last_out = &cl->next;

patches/nginx-1.0.8-named_location_clear_mods_ctx.patch

@@ -0,0 +1,12 @@
+--- nginx-1.0.8/src/http/ngx_http_core_module.c	2011-09-27 19:14:02.000000000 +0800
++++ nginx-1.0.8-patched/src/http/ngx_http_core_module.c	2011-10-13 15:02:24.414550532 +0800
+@@ -2542,6 +2542,9 @@
+             r->content_handler = NULL;
+             r->loc_conf = (*clcfp)->loc_conf;
+ 
++            /* clear the modules contexts */
++            ngx_memzero(r->ctx, sizeof(void *) * ngx_http_max_module);
++
+             ngx_http_update_location_config(r);
+ 
+             cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);

patches/nginx-1.0.8-no_Werror.patch

@@ -0,0 +1,24 @@
+diff -ur nginx-1.0.8/auto/cc/gcc nginx-1.0.8-patched/auto/cc/gcc
+--- nginx-1.0.8/auto/cc/gcc	2011-06-27 19:53:00.205737804 +0800
++++ nginx-1.0.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.0.8/auto/cc/icc nginx-1.0.8-patched/auto/cc/icc
+--- nginx-1.0.8/auto/cc/icc	2011-06-27 19:52:56.370157068 +0800
++++ nginx-1.0.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.0.8-no_error_pages.patch

@@ -0,0 +1,90 @@
+--- nginx-1.0.8/src/http/ngx_http_core_module.c	2010-12-14 18:38:42.000000000 +0800
++++ nginx-1.0.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.0.8-no_pool.patch

@@ -0,0 +1,504 @@
+diff -ur nginx-1.0.8/src/core/nginx.h nginx-1.0.8-patched/src/core/nginx.h
+--- nginx-1.0.8/src/core/nginx.h	2011-08-29 17:30:22.000000000 +0800
++++ nginx-1.0.8-patched/src/core/nginx.h	2011-09-13 12:11:03.135622101 +0800
+@@ -10,7 +10,7 @@
+ 
+ 
+ #define nginx_version      1000008
+ #define NGINX_VERSION      "1.0.8"
+-#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown"
++#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
+ 
+ #define NGINX_VAR          "NGINX"
+diff -ur nginx-1.0.8/src/core/ngx_array.c nginx-1.0.8-patched/src/core/ngx_array.c
+--- nginx-1.0.8/src/core/ngx_array.c	2008-06-17 23:00:30.000000000 +0800
++++ nginx-1.0.8-patched/src/core/ngx_array.c	2011-09-14 12:02:56.263128538 +0800
+@@ -39,13 +39,7 @@
+ 
+     p = a->pool;
+ 
+-    if ((u_char *) a->elts + a->size * a->nalloc == p->d.last) {
+-        p->d.last -= a->size * a->nalloc;
+-    }
+-
+-    if ((u_char *) a + sizeof(ngx_array_t) == p->d.last) {
+-        p->d.last = (u_char *) a;
+-    }
++    ngx_pfree(p, a);
+ }
+ 
+ 
+@@ -64,29 +58,17 @@
+ 
+         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);
++        a->elts = new;
++        a->nalloc *= 2;
++
+     }
+ 
+     elt = (u_char *) a->elts + a->size * a->nelts;
+@@ -100,43 +82,25 @@
+ 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;
+-
+     if (a->nelts + n > a->nalloc) {
+ 
+         /* the array is full */
+ 
+         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);
++        a->elts = new;
++        a->nalloc = nalloc;
+     }
+ 
+     elt = (u_char *) a->elts + a->size * a->nelts;
+diff -ur nginx-1.0.8/src/core/ngx_palloc.c nginx-1.0.8-patched/src/core/ngx_palloc.c
+--- nginx-1.0.8/src/core/ngx_palloc.c	2009-12-17 20:25:46.000000000 +0800
++++ nginx-1.0.8-patched/src/core/ngx_palloc.c	2011-09-14 12:03:41.663126519 +0800
+@@ -8,24 +8,31 @@
+ #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;
++    ngx_pool_data_t     *d;
+ 
+-    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;
++    d = ngx_alloc(sizeof(ngx_pool_data_t), log);
++	
++    if (d == NULL) {
++	return NULL;
++    }
++
++    d->next = d;
++    d->prev = d;
++    d->alloc = NULL;
++    p->d = d;
+ 
+     size = size - sizeof(ngx_pool_t);
+     p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
+@@ -43,7 +50,7 @@
+ void
+ ngx_destroy_pool(ngx_pool_t *pool)
+ {
+-    ngx_pool_t          *p, *n;
++    ngx_pool_data_t     *d, *n;
+     ngx_pool_large_t    *l;
+     ngx_pool_cleanup_t  *c;
+ 
+@@ -55,7 +62,7 @@
+         }
+     }
+ 
+-    for (l = pool->large; l; l = l->next) {
++    for (l = pool->large; l ; l = l->next) {
+ 
+         ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+ 
+@@ -71,34 +78,45 @@
+      * so we can not use this log while the 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", d);
+ 
+-        if (n == NULL) {
++        if (n == pool->d) {
+             break;
+         }
+     }
+ 
+ #endif
++    if (pool->d->next == pool->d) {
++    	ngx_free(pool->d);
++    } else {
++        for (d = pool->d, n = d->next; ; d = n, n = n->next) {
++            if (d->alloc) {
++    	        ngx_free(d->alloc);
++            }
++            ngx_free(d);
+ 
+-    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
+-        ngx_free(p);
+-
+-        if (n == NULL) {
+-            break;
++            if (n == pool->d) {
++                break;
++            }
+         }
+     }
++
++    ngx_free(pool);
+ }
+ 
+ 
+ void
+ ngx_reset_pool(ngx_pool_t *pool)
+ {
+-    ngx_pool_t        *p;
+-    ngx_pool_large_t  *l;
++    ngx_pool_data_t     *p, *tmp;
++    ngx_pool_large_t    *l;
++
++    for (l = pool->large; l ; l = l->next) {
++
++        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+ 
+-    for (l = pool->large; l; l = l->next) {
+         if (l->alloc) {
+             ngx_free(l->alloc);
+         }
+@@ -106,109 +124,65 @@
+ 
+     pool->large = NULL;
+ 
+-    for (p = pool; p; p = p->d.next) {
+-        p->d.last = (u_char *) p + sizeof(ngx_pool_t);
++    p = pool->d->next;
++    while (p != pool->d) {
++        tmp = p;
++        ngx_free(p->alloc);
++        p->prev->next = p->next;
++        p->next->prev = p->prev;
++        p = p->next;
++        ngx_free(tmp);
+     }
+-}
+ 
++    ngx_free(pool->d->alloc);
++    pool->d->alloc = NULL;
++
++}
+ 
+ void *
+-ngx_palloc(ngx_pool_t *pool, size_t size)
++ngx_malloc(ngx_pool_t *pool, size_t size)
+ {
+-    u_char      *m;
+-    ngx_pool_t  *p;
+-
+-    if (size <= pool->max) {
++    ngx_pool_data_t     *new;
++    void        	*m;
+ 
+-        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;
+-            }
+-
+-            p = p->d.next;
+-
+-        } while (p);
++    m = ngx_alloc(size, pool->log);
++    if (m == NULL) {
++	return NULL;
++    }
+ 
+-        return ngx_palloc_block(pool, size);
++    new = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
++    if (new == NULL){
++        ngx_free(m);
++	return NULL;
+     }
+ 
+-    return ngx_palloc_large(pool, size);
++    new->alloc = m;
++    new->next = pool->d;
++    new->prev = pool->d->prev;
++    pool->d->prev->next = new;
++    pool->d->prev = new;
++    return m;	
+ }
+ 
+-
+ void *
+-ngx_pnalloc(ngx_pool_t *pool, size_t size)
++ngx_palloc(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;
+-            }
+-
+-            p = p->d.next;
+-
+-        } while (p);
+-
+-        return ngx_palloc_block(pool, size);
++    if (size <= 1024) {
++        return ngx_malloc(pool, size);
+     }
+ 
+     return ngx_palloc_large(pool, size);
+ }
+ 
+ 
+-static void *
+-ngx_palloc_block(ngx_pool_t *pool, size_t size)
++void *
++ngx_pnalloc(ngx_pool_t *pool, size_t size)
+ {
+-    u_char      *m;
+-    size_t       psize;
+-    ngx_pool_t  *p, *new, *current;
+-
+-    psize = (size_t) (pool->d.end - (u_char *) pool);
+-
+-    m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
+-    if (m == 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;
+-        }
++    if (size <= 1024) {
++        return ngx_malloc(pool, size);
+     }
+ 
+-    p->d.next = new;
+-
+-    pool->current = current ? current : new;
+-
+-    return m;
++    return ngx_palloc_large(pool, size);
+ }
+ 
+ 
+@@ -216,7 +190,6 @@
+ ngx_palloc_large(ngx_pool_t *pool, size_t size)
+ {
+     void              *p;
+-    ngx_uint_t         n;
+     ngx_pool_large_t  *large;
+ 
+     p = ngx_alloc(size, pool->log);
+@@ -224,20 +197,7 @@
+         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));
++    large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
+     if (large == NULL) {
+         ngx_free(p);
+         return NULL;
+@@ -262,7 +222,7 @@
+         return NULL;
+     }
+ 
+-    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
++    large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
+     if (large == NULL) {
+         ngx_free(p);
+         return NULL;
+@@ -279,17 +239,41 @@
+ ngx_int_t
+ ngx_pfree(ngx_pool_t *pool, void *p)
+ {
+-    ngx_pool_large_t  *l;
++    ngx_pool_large_t    *l;
++    ngx_pool_large_t    *ll;
++    ngx_pool_data_t     *d, *n;
+ 
+-    for (l = pool->large; l; l = l->next) {
++    for (l = pool->large, ll = l; l; ll = 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;
++	    if (l == pool->large) {
++		pool->large = NULL;
++	    }
++
++            ll->next = l->next;
++	    p = l;
++	    break;
++        }
++    }
+ 
++    for (d = pool->d, n = d->next; ; d = n, n = d->next) {
++        if (p == d->alloc) {
++            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
++            if (d->alloc) {
++                ngx_free(d->alloc);
++            }
++            d->alloc = NULL;
++            d->prev->next = d->next;
++            d->next->prev = d->prev;
++            ngx_free(d);
+             return NGX_OK;
+         }
++        if (d->next == pool->d) {
++            break;
++        }
+     }
+ 
+     return NGX_DECLINED;
+diff -ur nginx-1.0.8/src/core/ngx_palloc.h nginx-1.0.8-patched/src/core/ngx_palloc.h
+--- nginx-1.0.8/src/core/ngx_palloc.h	2009-12-17 20:25:46.000000000 +0800
++++ nginx-1.0.8-patched/src/core/ngx_palloc.h	2011-09-13 12:11:03.155622101 +0800
+@@ -38,6 +38,7 @@
+ 
+ 
+ typedef struct ngx_pool_large_s  ngx_pool_large_t;
++typedef struct ngx_pool_data_s   ngx_pool_data_t;
+ 
+ struct ngx_pool_large_s {
+     ngx_pool_large_t     *next;
+@@ -45,16 +46,15 @@
+ };
+ 
+ 
+-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;
++    ngx_pool_data_t		*prev;
++	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;

patches/nginx-1.0.8-request_body_in_single_buf.patch

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

patches/nginx-1.0.8-request_body_preread_fix.patch

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

patches/nginx-1.0.8-server_header.patch

@@ -0,0 +1,26 @@
+diff -ur lz-nginx-1.0.8/nginx-1.0.8/src/core/nginx.h lz-nginx-1.0.8-patched/nginx-1.0.8/src/core/nginx.h
+--- lz-nginx-1.0.8/nginx-1.0.8/src/core/nginx.h	2010-02-12 17:31:01.000000000 +0800
++++ lz-nginx-1.0.8-patched/nginx-1.0.8/src/core/nginx.h	2010-03-30 10:52:13.240702627 +0800
+@@ -10,7 +10,7 @@
+ 
+ #define nginx_version         1000008
+ #define NGINX_VERSION      "1.0.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.0.8-patched/nginx-1.0.8/src/core: nginx.h.orig
+Only in lz-nginx-1.0.8-patched/nginx-1.0.8/src/core: nginx.h.rej
+diff -ur lz-nginx-1.0.8/nginx-1.0.8/src/http/ngx_http_header_filter_module.c lz-nginx-1.0.8-patched/nginx-1.0.8/src/http/ngx_http_header_filter_module.c
+--- lz-nginx-1.0.8/nginx-1.0.8/src/http/ngx_http_header_filter_module.c	2010-03-03 23:14:04.000000000 +0800
++++ lz-nginx-1.0.8-patched/nginx-1.0.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.0.8-subrequest_loop.patch

@@ -0,0 +1,40 @@
+# HG changeset patch
+# User Maxim Dounin <mdounin@mdounin.ru>
+# Date 1309187571 -14400
+# Node ID 283a416b2235d5383c12a975edc8866f007fb628
+# Parent  f5fc40783ddcbf4db33859ee2a9bce54cf32c350
+Core: protect from subrequest loops.
+
+Without protection subrequest loop results in r->count overflow and
+SIGSEGV.  Protection was broken in 0.7.25.
+
+Note that this also limits number of parallel subrequests.  This
+wasn't exactly the case before 0.7.25 as local subrequests were
+completed directly.
+
+See here for details:
+
+http://nginx.org/pipermail/nginx-ru/2010-February/032184.html
+
+diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
+--- a/src/http/ngx_http_core_module.c
++++ b/src/http/ngx_http_core_module.c
+@@ -2287,7 +2287,6 @@ ngx_http_subrequest(ngx_http_request_t *
+    sr->start_sec = tp->sec;
+    sr->start_msec = tp->msec;
+ 
+-    r->main->subrequests++;
+    r->main->count++;
+ 
+    *psr = sr;
+diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
+--- a/src/http/ngx_http_request.c
++++ b/src/http/ngx_http_request.c
+@@ -1981,6 +1981,7 @@ ngx_http_finalize_request(ngx_http_reque
+        if (r == c->data) {
+ 
+            r->main->count--;
++            r->main->subrequests++;
+ 
+            if (!r->logged) {
+

patches/nginx-1.0.8-variable_header_ignore_no_hash.patch

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

patches/nginx-1.0.9-allow_request_body_updating.patch

@@ -0,0 +1,117 @@
+diff -ur nginx-1.0.9/src/http/ngx_http_request_body.c nginx-1.0.9-patched/src/http/ngx_http_request_body.c
+--- nginx-1.0.9/src/http/ngx_http_request_body.c	2011-09-30 22:36:19.000000000 +0800
++++ nginx-1.0.9-patched/src/http/ngx_http_request_body.c	2011-10-21 21:54:08.460350482 +0800
+@@ -38,7 +38,7 @@
+ 
+     r->main->count++;
+ 
+-    if (r->request_body || r->discard_body) {
++    if (r->request_body || r->discard_body || r->content_length_n == 0) {
+         post_handler(r);
+         return NGX_OK;
+     }
+@@ -440,7 +440,7 @@
+     ssize_t       size;
+     ngx_event_t  *rev;
+ 
+-    if (r != r->main || r->discard_body) {
++    if (r != r->main || r->discard_body || r->content_length_n == 0) {
+         return NGX_OK;
+     }
+ 
+@@ -456,20 +456,22 @@
+         ngx_del_timer(rev);
+     }
+ 
+-    if (r->headers_in.content_length_n <= 0 || r->request_body) {
++    r->content_length_n = r->headers_in.content_length_n;
++
++    if (r->content_length_n <= 0 || r->request_body) {
+         return NGX_OK;
+     }
+ 
+     size = r->header_in->last - r->header_in->pos;
+ 
+     if (size) {
+-        if (r->headers_in.content_length_n > size) {
++        if (r->content_length_n > size) {
+             r->header_in->pos += size;
+-            r->headers_in.content_length_n -= size;
++            r->content_length_n -= size;
+ 
+         } else {
+-            r->header_in->pos += (size_t) r->headers_in.content_length_n;
+-            r->headers_in.content_length_n = 0;
++            r->header_in->pos += (size_t) r->content_length_n;
++            r->content_length_n = 0;
+             return NGX_OK;
+         }
+     }
+@@ -568,7 +570,7 @@
+                    "http read discarded body");
+ 
+     for ( ;; ) {
+-        if (r->headers_in.content_length_n == 0) {
++        if (r->content_length_n == 0) {
+             r->read_event_handler = ngx_http_block_reading;
+             return NGX_OK;
+         }
+@@ -577,9 +579,9 @@
+             return NGX_AGAIN;
+         }
+ 
+-        size = (r->headers_in.content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
++        size = (r->content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
+                    NGX_HTTP_DISCARD_BUFFER_SIZE:
+-                   (size_t) r->headers_in.content_length_n;
++                   (size_t) r->content_length_n;
+ 
+         n = r->connection->recv(r->connection, buffer, size);
+ 
+@@ -596,7 +598,7 @@
+             return NGX_OK;
+         }
+ 
+-        r->headers_in.content_length_n -= n;
++        r->content_length_n -= n;
+     }
+ }
+ 
+Only in nginx-1.0.9-patched/src/http: ngx_http_request_body.c~
+diff -ur nginx-1.0.9/src/http/ngx_http_request.c nginx-1.0.9-patched/src/http/ngx_http_request.c
+--- nginx-1.0.9/src/http/ngx_http_request.c	2011-09-30 22:36:19.000000000 +0800
++++ nginx-1.0.9-patched/src/http/ngx_http_request.c	2011-10-21 19:06:38.404350692 +0800
+@@ -286,6 +286,8 @@
+ 
+         r->pipeline = hc->pipeline;
+ 
++        r->content_length_n = -1;
++
+         if (hc->nbusy) {
+             r->header_in = hc->busy[0];
+         }
+@@ -297,6 +299,8 @@
+             return;
+         }
+ 
++        r->content_length_n = -1;
++
+         hc->request = r;
+     }
+ 
+Only in nginx-1.0.9-patched/src/http: ngx_http_request.c~
+diff -ur nginx-1.0.9/src/http/ngx_http_request.h nginx-1.0.9-patched/src/http/ngx_http_request.h
+--- nginx-1.0.9/src/http/ngx_http_request.h	2011-08-29 18:39:23.000000000 +0800
++++ nginx-1.0.9-patched/src/http/ngx_http_request.h	2011-10-21 17:26:13.203807584 +0800
+@@ -366,6 +366,9 @@
+     ngx_pool_t                       *pool;
+     ngx_buf_t                        *header_in;
+ 
++    off_t                             content_length_n;
++                                          /* for discarding request body */
++
+     ngx_http_headers_in_t             headers_in;
+     ngx_http_headers_out_t            headers_out;
+ 
+Only in nginx-1.0.9-patched/src/http: ngx_http_request.h~
+Only in nginx-1.0.9-patched/src/http: tags

patches/nginx-1.0.9-epoll_check_stale_wev.patch

@@ -0,0 +1,21 @@
+--- nginx-1.0.9/src/event/modules/ngx_epoll_module.c	2011-09-30 22:12:53.000000000 +0800
++++ nginx-1.0.9-patched/src/event/modules/ngx_epoll_module.c	2011-11-07 18:07:04.764111952 +0800
+@@ -681,6 +681,18 @@
+ 
+         wev = c->write;
+ 
++        if (c->fd == -1 || wev->instance != instance) {
++
++            /*
++             * the stale event from a file descriptor
++             * that was just closed in this iteration
++             */
++
++            ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
++                           "epoll: stale event %p", c);
++            continue;
++        }
++
+         if ((revents & EPOLLOUT) && wev->active) {
+ 
+             if (flags & NGX_POST_THREAD_EVENTS) {

patches/nginx-1.0.9-gzip_empty_flush_buf.patch

@@ -0,0 +1,69 @@
+# HG changeset patch
+# User Maxim Dounin <mdounin@mdounin.ru>
+# Date 1315324342 -14400
+# Node ID 4cf0af103bc382a78f894302d1706929a79df4bb
+# Parent  d603ce98fada855f0100b422b7b5672fd22fabea
+Gzip filter: handle empty flush buffers.
+
+Empty flush buffers are legitimate and may happen e.g. due to $r->flush()
+calls in embedded perl.  If there are no data buffered in zlib deflate()
+will return Z_BUF_ERROR (i.e. no progress possible) without adding anything
+to output.  Don't treat Z_BUF_ERROR as fatal and correctly send empty flush
+buffer if we have no data in output at all.
+
+See this thread for details:
+http://mailman.nginx.org/pipermail/nginx/2010-November/023693.html
+
+diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
+--- a/src/http/modules/ngx_http_gzip_filter_module.c
++++ b/src/http/modules/ngx_http_gzip_filter_module.c
+@@ -758,6 +758,7 @@ static ngx_int_t
+ ngx_http_gzip_filter_deflate(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
+ {
+    int                    rc;
++    ngx_buf_t             *b;
+    ngx_chain_t           *cl;
+    ngx_http_gzip_conf_t  *conf;
+
+@@ -769,7 +770,7 @@ ngx_http_gzip_filter_deflate(ngx_http_re
+
+    rc = deflate(&ctx->zstream, ctx->flush);
+
+-    if (rc != Z_OK && rc != Z_STREAM_END) {
++    if (rc != Z_OK && rc != Z_STREAM_END && rc != Z_BUF_ERROR) {
+        ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                      "deflate() failed: %d, %d", ctx->flush, rc);
+        return NGX_ERROR;
+@@ -818,8 +819,6 @@ ngx_http_gzip_filter_deflate(ngx_http_re
+
+    if (ctx->flush == Z_SYNC_FLUSH) {
+
+-        ctx->zstream.avail_out = 0;
+-        ctx->out_buf->flush = 1;
+        ctx->flush = Z_NO_FLUSH;
+
+        cl = ngx_alloc_chain_link(r->pool);
+@@ -827,7 +826,22 @@ ngx_http_gzip_filter_deflate(ngx_http_re
+            return NGX_ERROR;
+        }
+
+-        cl->buf = ctx->out_buf;
++        b = ctx->out_buf;
++
++        if (ngx_buf_size(b) == 0) {
++
++            b = ngx_calloc_buf(ctx->request->pool);
++            if (b == NULL) {
++                return NGX_ERROR;
++            }
++
++        } else {
++            ctx->zstream.avail_out = 0;
++        }
++
++        b->flush = 1;
++
++        cl->buf = b;
+        cl->next = NULL;
+        *ctx->last_out = cl;
+        ctx->last_out = &cl->next;

patches/nginx-1.0.9-log_escape_non_ascii.patch

@@ -0,0 +1,115 @@
+--- nginx-1.0.9/src/http/modules/ngx_http_log_module.c	2011-11-01 21:24:50.000000000 +0800
++++ nginx-1.0.9-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.0.9-named_location_clear_mods_ctx.patch

@@ -0,0 +1,12 @@
+--- nginx-1.0.9/src/http/ngx_http_core_module.c	2011-09-27 19:14:02.000000000 +0800
++++ nginx-1.0.9-patched/src/http/ngx_http_core_module.c	2011-10-13 15:02:24.414550532 +0800
+@@ -2542,6 +2542,9 @@
+             r->content_handler = NULL;
+             r->loc_conf = (*clcfp)->loc_conf;
+ 
++            /* clear the modules contexts */
++            ngx_memzero(r->ctx, sizeof(void *) * ngx_http_max_module);
++
+             ngx_http_update_location_config(r);
+ 
+             cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);

patches/nginx-1.0.9-no_Werror.patch

@@ -0,0 +1,24 @@
+diff -ur nginx-1.0.9/auto/cc/gcc nginx-1.0.9-patched/auto/cc/gcc
+--- nginx-1.0.9/auto/cc/gcc	2011-06-27 19:53:00.205737804 +0800
++++ nginx-1.0.9-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.0.9/auto/cc/icc nginx-1.0.9-patched/auto/cc/icc
+--- nginx-1.0.9/auto/cc/icc	2011-06-27 19:52:56.370157068 +0800
++++ nginx-1.0.9-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.0.9-no_error_pages.patch

@@ -0,0 +1,90 @@
+--- nginx-1.0.9/src/http/ngx_http_core_module.c	2010-12-14 18:38:42.000000000 +0800
++++ nginx-1.0.9-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.0.9-no_pool.patch

@@ -0,0 +1,504 @@
+diff -ur nginx-1.0.9/src/core/nginx.h nginx-1.0.9-patched/src/core/nginx.h
+--- nginx-1.0.9/src/core/nginx.h	2011-08-29 17:30:22.000000000 +0800
++++ nginx-1.0.9-patched/src/core/nginx.h	2011-09-13 12:11:03.135622101 +0800
+@@ -10,7 +10,7 @@
+ 
+ 
+ #define nginx_version      1000009
+ #define NGINX_VERSION      "1.0.9"
+-#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown"
++#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
+ 
+ #define NGINX_VAR          "NGINX"
+diff -ur nginx-1.0.9/src/core/ngx_array.c nginx-1.0.9-patched/src/core/ngx_array.c
+--- nginx-1.0.9/src/core/ngx_array.c	2008-06-17 23:00:30.000000000 +0800
++++ nginx-1.0.9-patched/src/core/ngx_array.c	2011-09-14 12:02:56.263128538 +0800
+@@ -39,13 +39,7 @@
+ 
+     p = a->pool;
+ 
+-    if ((u_char *) a->elts + a->size * a->nalloc == p->d.last) {
+-        p->d.last -= a->size * a->nalloc;
+-    }
+-
+-    if ((u_char *) a + sizeof(ngx_array_t) == p->d.last) {
+-        p->d.last = (u_char *) a;
+-    }
++    ngx_pfree(p, a);
+ }
+ 
+ 
+@@ -64,29 +58,17 @@
+ 
+         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);
++        a->elts = new;
++        a->nalloc *= 2;
++
+     }
+ 
+     elt = (u_char *) a->elts + a->size * a->nelts;
+@@ -100,43 +82,25 @@
+ 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;
+-
+     if (a->nelts + n > a->nalloc) {
+ 
+         /* the array is full */
+ 
+         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);
++        a->elts = new;
++        a->nalloc = nalloc;
+     }
+ 
+     elt = (u_char *) a->elts + a->size * a->nelts;
+diff -ur nginx-1.0.9/src/core/ngx_palloc.c nginx-1.0.9-patched/src/core/ngx_palloc.c
+--- nginx-1.0.9/src/core/ngx_palloc.c	2009-12-17 20:25:46.000000000 +0800
++++ nginx-1.0.9-patched/src/core/ngx_palloc.c	2011-09-14 12:03:41.663126519 +0800
+@@ -8,24 +8,31 @@
+ #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;
++    ngx_pool_data_t     *d;
+ 
+-    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;
++    d = ngx_alloc(sizeof(ngx_pool_data_t), log);
++	
++    if (d == NULL) {
++	return NULL;
++    }
++
++    d->next = d;
++    d->prev = d;
++    d->alloc = NULL;
++    p->d = d;
+ 
+     size = size - sizeof(ngx_pool_t);
+     p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
+@@ -43,7 +50,7 @@
+ void
+ ngx_destroy_pool(ngx_pool_t *pool)
+ {
+-    ngx_pool_t          *p, *n;
++    ngx_pool_data_t     *d, *n;
+     ngx_pool_large_t    *l;
+     ngx_pool_cleanup_t  *c;
+ 
+@@ -55,7 +62,7 @@
+         }
+     }
+ 
+-    for (l = pool->large; l; l = l->next) {
++    for (l = pool->large; l ; l = l->next) {
+ 
+         ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+ 
+@@ -71,34 +78,45 @@
+      * so we can not use this log while the 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", d);
+ 
+-        if (n == NULL) {
++        if (n == pool->d) {
+             break;
+         }
+     }
+ 
+ #endif
++    if (pool->d->next == pool->d) {
++    	ngx_free(pool->d);
++    } else {
++        for (d = pool->d, n = d->next; ; d = n, n = n->next) {
++            if (d->alloc) {
++    	        ngx_free(d->alloc);
++            }
++            ngx_free(d);
+ 
+-    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
+-        ngx_free(p);
+-
+-        if (n == NULL) {
+-            break;
++            if (n == pool->d) {
++                break;
++            }
+         }
+     }
++
++    ngx_free(pool);
+ }
+ 
+ 
+ void
+ ngx_reset_pool(ngx_pool_t *pool)
+ {
+-    ngx_pool_t        *p;
+-    ngx_pool_large_t  *l;
++    ngx_pool_data_t     *p, *tmp;
++    ngx_pool_large_t    *l;
++
++    for (l = pool->large; l ; l = l->next) {
++
++        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+ 
+-    for (l = pool->large; l; l = l->next) {
+         if (l->alloc) {
+             ngx_free(l->alloc);
+         }
+@@ -106,109 +124,65 @@
+ 
+     pool->large = NULL;
+ 
+-    for (p = pool; p; p = p->d.next) {
+-        p->d.last = (u_char *) p + sizeof(ngx_pool_t);
++    p = pool->d->next;
++    while (p != pool->d) {
++        tmp = p;
++        ngx_free(p->alloc);
++        p->prev->next = p->next;
++        p->next->prev = p->prev;
++        p = p->next;
++        ngx_free(tmp);
+     }
+-}
+ 
++    ngx_free(pool->d->alloc);
++    pool->d->alloc = NULL;
++
++}
+ 
+ void *
+-ngx_palloc(ngx_pool_t *pool, size_t size)
++ngx_malloc(ngx_pool_t *pool, size_t size)
+ {
+-    u_char      *m;
+-    ngx_pool_t  *p;
+-
+-    if (size <= pool->max) {
++    ngx_pool_data_t     *new;
++    void        	*m;
+ 
+-        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;
+-            }
+-
+-            p = p->d.next;
+-
+-        } while (p);
++    m = ngx_alloc(size, pool->log);
++    if (m == NULL) {
++	return NULL;
++    }
+ 
+-        return ngx_palloc_block(pool, size);
++    new = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
++    if (new == NULL){
++        ngx_free(m);
++	return NULL;
+     }
+ 
+-    return ngx_palloc_large(pool, size);
++    new->alloc = m;
++    new->next = pool->d;
++    new->prev = pool->d->prev;
++    pool->d->prev->next = new;
++    pool->d->prev = new;
++    return m;	
+ }
+ 
+-
+ void *
+-ngx_pnalloc(ngx_pool_t *pool, size_t size)
++ngx_palloc(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;
+-            }
+-
+-            p = p->d.next;
+-
+-        } while (p);
+-
+-        return ngx_palloc_block(pool, size);
++    if (size <= 1024) {
++        return ngx_malloc(pool, size);
+     }
+ 
+     return ngx_palloc_large(pool, size);
+ }
+ 
+ 
+-static void *
+-ngx_palloc_block(ngx_pool_t *pool, size_t size)
++void *
++ngx_pnalloc(ngx_pool_t *pool, size_t size)
+ {
+-    u_char      *m;
+-    size_t       psize;
+-    ngx_pool_t  *p, *new, *current;
+-
+-    psize = (size_t) (pool->d.end - (u_char *) pool);
+-
+-    m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
+-    if (m == 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;
+-        }
++    if (size <= 1024) {
++        return ngx_malloc(pool, size);
+     }
+ 
+-    p->d.next = new;
+-
+-    pool->current = current ? current : new;
+-
+-    return m;
++    return ngx_palloc_large(pool, size);
+ }
+ 
+ 
+@@ -216,7 +190,6 @@
+ ngx_palloc_large(ngx_pool_t *pool, size_t size)
+ {
+     void              *p;
+-    ngx_uint_t         n;
+     ngx_pool_large_t  *large;
+ 
+     p = ngx_alloc(size, pool->log);
+@@ -224,20 +197,7 @@
+         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));
++    large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
+     if (large == NULL) {
+         ngx_free(p);
+         return NULL;
+@@ -262,7 +222,7 @@
+         return NULL;
+     }
+ 
+-    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
++    large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
+     if (large == NULL) {
+         ngx_free(p);
+         return NULL;
+@@ -279,17 +239,41 @@
+ ngx_int_t
+ ngx_pfree(ngx_pool_t *pool, void *p)
+ {
+-    ngx_pool_large_t  *l;
++    ngx_pool_large_t    *l;
++    ngx_pool_large_t    *ll;
++    ngx_pool_data_t     *d, *n;
+ 
+-    for (l = pool->large; l; l = l->next) {
++    for (l = pool->large, ll = l; l; ll = 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;
++	    if (l == pool->large) {
++		pool->large = NULL;
++	    }
++
++            ll->next = l->next;
++	    p = l;
++	    break;
++        }
++    }
+ 
++    for (d = pool->d, n = d->next; ; d = n, n = d->next) {
++        if (p == d->alloc) {
++            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
++            if (d->alloc) {
++                ngx_free(d->alloc);
++            }
++            d->alloc = NULL;
++            d->prev->next = d->next;
++            d->next->prev = d->prev;
++            ngx_free(d);
+             return NGX_OK;
+         }
++        if (d->next == pool->d) {
++            break;
++        }
+     }
+ 
+     return NGX_DECLINED;
+diff -ur nginx-1.0.9/src/core/ngx_palloc.h nginx-1.0.9-patched/src/core/ngx_palloc.h
+--- nginx-1.0.9/src/core/ngx_palloc.h	2009-12-17 20:25:46.000000000 +0800
++++ nginx-1.0.9-patched/src/core/ngx_palloc.h	2011-09-13 12:11:03.155622101 +0800
+@@ -38,6 +38,7 @@
+ 
+ 
+ typedef struct ngx_pool_large_s  ngx_pool_large_t;
++typedef struct ngx_pool_data_s   ngx_pool_data_t;
+ 
+ struct ngx_pool_large_s {
+     ngx_pool_large_t     *next;
+@@ -45,16 +46,15 @@
+ };
+ 
+ 
+-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;
++    ngx_pool_data_t		*prev;
++	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;

patches/nginx-1.0.9-request_body_in_single_buf.patch

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

patches/nginx-1.0.9-request_body_preread_fix.patch

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

patches/nginx-1.0.9-server_header.patch

@@ -0,0 +1,26 @@
+diff -ur lz-nginx-1.0.9/nginx-1.0.9/src/core/nginx.h lz-nginx-1.0.9-patched/nginx-1.0.9/src/core/nginx.h
+--- lz-nginx-1.0.9/nginx-1.0.9/src/core/nginx.h	2010-02-12 17:31:01.000000000 +0800
++++ lz-nginx-1.0.9-patched/nginx-1.0.9/src/core/nginx.h	2010-03-30 10:52:13.240702627 +0800
+@@ -10,7 +10,7 @@
+ 
+ #define nginx_version         1000009
+ #define NGINX_VERSION      "1.0.9"
+-#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.0.9-patched/nginx-1.0.9/src/core: nginx.h.orig
+Only in lz-nginx-1.0.9-patched/nginx-1.0.9/src/core: nginx.h.rej
+diff -ur lz-nginx-1.0.9/nginx-1.0.9/src/http/ngx_http_header_filter_module.c lz-nginx-1.0.9-patched/nginx-1.0.9/src/http/ngx_http_header_filter_module.c
+--- lz-nginx-1.0.9/nginx-1.0.9/src/http/ngx_http_header_filter_module.c	2010-03-03 23:14:04.000000000 +0800
++++ lz-nginx-1.0.9-patched/nginx-1.0.9/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.0.9-subrequest_loop.patch

@@ -0,0 +1,40 @@
+# HG changeset patch
+# User Maxim Dounin <mdounin@mdounin.ru>
+# Date 1309187571 -14400
+# Node ID 283a416b2235d5383c12a975edc8866f007fb628
+# Parent  f5fc40783ddcbf4db33859ee2a9bce54cf32c350
+Core: protect from subrequest loops.
+
+Without protection subrequest loop results in r->count overflow and
+SIGSEGV.  Protection was broken in 0.7.25.
+
+Note that this also limits number of parallel subrequests.  This
+wasn't exactly the case before 0.7.25 as local subrequests were
+completed directly.
+
+See here for details:
+
+http://nginx.org/pipermail/nginx-ru/2010-February/032184.html
+
+diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
+--- a/src/http/ngx_http_core_module.c
++++ b/src/http/ngx_http_core_module.c
+@@ -2287,7 +2287,6 @@ ngx_http_subrequest(ngx_http_request_t *
+    sr->start_sec = tp->sec;
+    sr->start_msec = tp->msec;
+ 
+-    r->main->subrequests++;
+    r->main->count++;
+ 
+    *psr = sr;
+diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
+--- a/src/http/ngx_http_request.c
++++ b/src/http/ngx_http_request.c
+@@ -1981,6 +1981,7 @@ ngx_http_finalize_request(ngx_http_reque
+        if (r == c->data) {
+ 
+            r->main->count--;
++            r->main->subrequests++;
+ 
+            if (!r->logged) {
+

patches/nginx-1.0.9-variable_header_ignore_no_hash.patch

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

patches/nginx-1.1.2-no_error_pages.patch

@@ -0,0 +1,90 @@
+--- nginx-1.1.2/src/http/ngx_http_core_module.c	2010-12-14 18:38:42.000000000 +0800
++++ nginx-1.1.2-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.1.4-variable_header_ignore_no_hash.patch

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

patches/nginx-1.1.5-named_location_clear_mods_ctx.patch

@@ -0,0 +1,12 @@
+--- nginx-1.1.5/src/http/ngx_http_core_module.c	2011-09-27 19:14:02.000000000 +0800
++++ nginx-1.1.5-patched/src/http/ngx_http_core_module.c	2011-10-13 15:02:24.414550532 +0800
+@@ -2542,6 +2542,9 @@
+             r->content_handler = NULL;
+             r->loc_conf = (*clcfp)->loc_conf;
+ 
++            /* clear the modules contexts */
++            ngx_memzero(r->ctx, sizeof(void *) * ngx_http_max_module);
++
+             ngx_http_update_location_config(r);
+ 
+             cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);

specs/ngx_openresty.spec

@@ -0,0 +1,68 @@
+%define         resty_prefix     /opt/
+%define         resty_user       nobody
+%define         resty_group      nobody
+
+%define         dir_name      openresty
+
+Name:		ngx_openresty
+
+Version:	1.0.5.1
+Release:	5
+Summary:	nginx for openresty
+
+Group:		Productivity/Networking/Web/Servers
+License:	BSD
+URL:		http://www.openresty.org/
+
+Source0:	ngx_openresty-%{version}rc%{release}.tar.gz
+
+BuildRoot:	%{build_root}
+
+AutoReqProv:    no
+BuildRequires:	gcc >= 3.0, openssl-devel, pcre-devel, readline-devel
+Requires:	openssl, pcre, readline
+
+%description
+OpenResty (aka. ngx_openresty) is a full-fledged web application server by bundling the standard Nginx core, lots of 3rd-party Nginx modules, as well as most of their external dependencie
+
+%prep
+#%setup -q -n ngx_openresty-%{version}
+%setup -q -n ngx_openresty-%{version}rc%{release}
+
+%build
+            #--with-pg_config=opt/pg90/bin/pg_config \
+            #--with-luajit \
+./configure --prefix=%{resty_prefix}/%{dir_name} \
+            --with-http_postgres_module
+
+make %{?_smp_mflags}
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+cur_dir=`pwd`
+
+cd $RPM_BUILD_ROOT%{resty_prefix}/%{dir_name}/nginx/ && \
+    mkdir client_body_temp fastcgi_temp proxy_temp
+
+cd $RPM_BUILD_ROOT && (find . -type f | sed -e 's|^./|/|g' > $cur_dir/%{name}.manifest)
+cd $RPM_BUILD_ROOT && (find . -type l | sed -e 's|^./|/|g' >> $cur_dir/%{name}.manifest)
+
+echo %{resty_prefix}/%{dir_name}/nginx/logs >> $cur_dir/%{name}.manifest
+echo %{resty_prefix}/%{dir_name}/nginx/client_body_temp >> $cur_dir/%{name}.manifest
+echo %{resty_prefix}/%{dir_name}/nginx/fastcgi_temp >> $cur_dir/%{name}.manifest
+echo %{resty_prefix}/%{dir_name}/nginx/proxy_temp >> $cur_dir/%{name}.manifest
+
+#echo %{resty_prefix}/%{dir_name}/nginx/proxy_temp >> $cur_dir/%{name}.manifest
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f %{name}.manifest
+%defattr(-,%{resty_user},%{resty_group},-)
+#%doc
+
+%changelog
+* Wed Aug 24 2011 liseen <liseen.wan@gmail.com>
+- initial packaging
+

t/Config.pm

@@ -2,6 +2,7 @@ package t::Config;
 
 use Test::Base -Base;
 use IPC::Run3 qw( run3 );
+use Cwd qw( cwd );
 
 our @EXPORT = qw(
     run_tests
@@ -13,6 +14,10 @@ sub shell (@);
 sub cd ($);
 
 our $BuildRoot;
+our $DistRoot;
+our @SavedTests;
+our $RootDir = `pwd`;
+chomp $RootDir;
 
 sub run_tests {
     my $ver = `bash util/ver`;
@@ -20,6 +25,7 @@ sub run_tests {
 
     cd "ngx_openresty-$ver";
 
+    $DistRoot = cwd();
     $BuildRoot = File::Spec->rel2abs("./build");
 
     for my $block (blocks()) {
@@ -29,6 +35,7 @@ sub run_tests {
 
 sub run_test ($) {
     my $block = shift;
+
     my $name = $block->name;
     my $cmd = $block->cmd or
         die "No --- cmd defined for $name\n";
@@ -48,30 +55,133 @@ sub run_test ($) {
         $expected_err = '';
     } else {
         $expected_err =~ s/\$OPENRESTY_BUILD_DIR\b/$BuildRoot/gs;
+        $expected_err =~ s/\$OPENRESTY_DIR\b/$DistRoot/gs;
     }
 
     my $expected_out = $block->out;
     if (!defined $expected_out) {
         $expected_out = '';
     } else {
-        $expected_out =~ s/\$OPENRESTY_BUILD_DIR\b/$BuildRoot/gs;
+        #$expected_out =~ s/\$OPENRESTY_BUILD_DIR\b/$BuildRoot/gs;
     }
 
+    #die $BuildRoot;
+
+    $stdout =~ s/\Q$BuildRoot\E/\$OPENRESTY_BUILD_DIR/g;
+    $stdout =~ s/\Q$DistRoot\E/\$OPENRESTY_DIR/g;
+
     is($stdout, $expected_out, "$name - stdout ok");
     is($stderr, $expected_err, "$name - stderr ok");
     is($retval >> 8, $expected_exit, "$name - exit code ok");
 
+    my $makefile;
+
     if (defined $block->makefile) {
         open my $in, "Makefile" or
             die "cannot open Makefile for reading: $!";
-        my $got = do { local $/; <$in> };
+        $makefile = do { local $/; <$in> };
         close $in;
 
         my $expected_makefile = $block->makefile;
-        $expected_makefile =~ s/\$OPENRESTY_BUILD_DIR\b/$BuildRoot/gs;
+        #$expected_makefile =~ s/\$OPENRESTY_BUILD_DIR\b/$BuildRoot/gs;
 
-        is($got, $expected_makefile, "$name - Makefile ok");
+        $makefile =~ s/\Q$BuildRoot\E/\$OPENRESTY_BUILD_DIR/g;
+
+        is($makefile, $expected_makefile, "$name - Makefile ok");
     }
+
+    push @SavedTests, {
+        cmd => $cmd,
+        name => $name,
+        exit => $retval >> 8,
+        err => $stderr,
+        out => $stdout,
+        makefile => $makefile,
+    };
+}
+
+END {
+    if ($0 =~ /_$/) {
+        return;
+    }
+
+    chdir "$RootDir";
+    #warn `pwd`;
+
+    my $outfile = $0 . '_';
+    if (-f $outfile) {
+        unlink $outfile;
+    }
+
+    open my $in, $0 or
+        die "cannot open $0 for reading: $!\n";
+
+    while (<$in>) {
+        if (/^--- (?:ONLY|LAST)$/) {
+            return;
+        }
+    }
+
+    close $in;
+
+    open my $out, ">$outfile" or
+        die "cannot open $outfile for writing: $!\n";
+
+    open $in, $0 or
+        die "cannot open $0 for reading: $!\n";
+    while (<$in>) {
+        print $out $_;
+        if (/^__DATA__$/) {
+            last;
+        }
+    }
+    close $in;
+
+    print $out "\n";
+
+    my $n = @SavedTests;
+
+    my $i = 0;
+    for my $block (@SavedTests) {
+        my $name = $block->{name};
+        my $cmd = $block->{cmd};
+        my $stdout = $block->{out};
+        my $makefile = $block->{makefile};
+        my $exit = $block->{exit};
+        my $err = $block->{err};
+
+        #$stdout =~ s/$BuildRoot/\$OPENRESTY_BUILD_DIR/g;
+
+        print $out <<"_EOC_";
+=== $name
+--- cmd: $cmd
+--- out
+$stdout
+_EOC_
+
+        if ($makefile) {
+            #$makefile =~ s/$BuildRoot\b/\$OPENRESTY_BUILD_DIR/g;
+            print $out "--- makefile\n$makefile";
+        }
+
+        if ($err) {
+            print $out "--- err\n$err";
+        }
+
+        if ($exit) {
+            print $out "--- exit: $exit\n";
+        }
+
+        if ($i++ < $n - 1) {
+            print $out "\n\n\n";
+        }
+    }
+
+    print $out "\n";
+
+    close $out;
+
+    warn "wrote $outfile\n";
 }
 
 sub shell (@) {

util/configure

@@ -11,9 +11,13 @@ sub env ($$);
 sub cd ($);
 sub auto_complete ($);
 sub usage ($);
+sub trim ($);
 
 my (@make_cmds, @make_install_cmds);
 
+my $root_dir = `pwd`;
+chomp $root_dir;
+
 my $OS = $^O;
 
 my $ngx_dir;
@@ -51,14 +55,14 @@ if ($OS =~ /solaris|sunos/i) {
 }
 
 my @modules = (
+    [ndk => 'ngx_devel_kit'],
     [http_iconv => 'iconv-nginx-module', 'disabled'],
     [http_echo => 'echo-nginx-module'],
     [http_xss => 'xss-nginx-module'],
-    [ndk => 'ngx_devel_kit'],
     [http_set_misc => 'set-misc-nginx-module'],
     [http_form_input => 'form-input-nginx-module'],
     [http_encrypted_session => 'encrypted-session-nginx-module'],
-    [http_drizzle => 'drizzle-nginx-module', $on_solaris ? 'disabled' : () ],
+    [http_drizzle => 'drizzle-nginx-module', 'disabled'],
     [http_postgres => 'ngx_postgres', 'disabled'],
     [http_lua => 'ngx_lua'],
     [http_headers_more => 'headers-more-nginx-module'],
@@ -69,6 +73,7 @@ my @modules = (
     [http_upstream_keepalive => 'upstream-keepalive-nginx-module'],
     [http_auth_request => 'auth-request-nginx-module'],
     [http_rds_json => 'rds-json-nginx-module'],
+    [http_rds_csv => 'rds-csv-nginx-module'],
 );
 
 my $without_resty_mods_regex;
@@ -105,23 +110,53 @@ my $prefix = '/usr/local/openresty';
 my %resty_opts;
 my $dry_run;
 my @ngx_rpaths;
+my $cc;
+my $cores;
 
 my (@ngx_opts, @ngx_cc_opts, @ngx_ld_opts);
 
 for my $opt (@ARGV) {
     next unless defined $opt;
 
+    if ($opt =~ /^-j(\d+)/) {
+        $cores = $1;
+        next;
+    }
+
+    if ($opt =~ /^--with-cc=(.+)/) {
+        $cc = $1;
+        push @ngx_opts, $opt;
+        next;
+    }
+
     if ($opt eq '--dry-run') {
         $dry_run = 1;
         next;
     }
 
+    if ($opt =~ /^--with-make=(.*)/) {
+        $resty_opts{make} = $1;
+        next;
+    }
+
     if ($opt =~ /^--prefix=(.*)/) {
         $prefix = $1;
 
     } elsif ($opt eq '--without-lua51') {
         $resty_opts{no_lua} = 1;
 
+    } elsif ($opt =~ /^--with-lua51=(.*)/) {
+        $resty_opts{lua_path} = $1;
+
+    } elsif ($opt eq '--without-lua_cjson') {
+        $resty_opts{no_lua_cjson} = 1;
+
+    } elsif ($opt eq '--without-lua_redis_parser') {
+        $resty_opts{no_lua_redis_parser} = 1;
+
+    } elsif ($opt eq '--without-lua_rds_parser') {
+        $resty_opts{no_lua_rds_parser} = 1;
+
     } elsif ($opt eq '--with-debug') {
         $resty_opts{debug} = 1;
 
@@ -147,6 +182,29 @@ for my $opt (@ARGV) {
     } elsif ($opt eq '--with-luajit') {
         $resty_opts{luajit} = 1;
 
+    } elsif ($opt =~ /^--with-luajit=(.*)/) {
+        $resty_opts{luajit_path} = $1;
+
+    } elsif ($opt =~ /^--with-libdrizzle=(.*)/) {
+        $resty_opts{libdrizzle} = $1;
+
+    } elsif ($opt =~ /^--with-libpq=(.*)/) {
+        $resty_opts{libpq} = $1;
+        if ($resty_opts{pg_config}) {
+            die "--with-libpq is not allowed when ",
+                "--with-pg_config is already specified.\n";
+        }
+
+    } elsif ($opt =~ /^--with-pg_config=(.*)/) {
+        $resty_opts{pg_config} = $1;
+        if ($resty_opts{libpq}) {
+            die "--with-pg_config is not allowed when ",
+                "--with-libpq is already specified.\n";
+        }
+
+    } elsif ($opt eq '--with-no-pool-patch') {
+        $resty_opts{no_pool} = 1;
+
     } elsif ($opt eq '--with-http_ssl_module') {
         $resty_opts{http_ssl} = 1;
         push @ngx_opts, $opt;
@@ -154,6 +212,11 @@ for my $opt (@ARGV) {
     } elsif ($opt eq '--without-http_ssl_module') {
         $resty_opts{no_http_ssl} = 1;
 
+    } elsif ($opt =~ /^--add-module=(.*)/) {
+
+        my $mod_path = File::Spec->rel2abs($1);
+        push @ngx_opts, "--add-module=$mod_path";
+
     } elsif ($opt =~ /^--\w.*/) {
         push @ngx_opts, $opt;
 
@@ -166,6 +229,8 @@ print "platform: $platform ($OS)\n";
 
 my $ngx_prefix = "$prefix/nginx";
 
+my $postamble = '';
+
 my $resty_opts = build_resty_opts(\%resty_opts);
 
 if (@ngx_rpaths) {
@@ -185,10 +250,10 @@ my $cmd = "./configure --prefix=$ngx_prefix"
 
 shell $cmd, $dry_run;
 
-push @make_cmds, "cd build/$ngx_dir && "
+push @make_cmds, "cd $root_dir/build/$ngx_dir && "
     . "\$(MAKE)";
 
-push @make_install_cmds, "cd build/$ngx_dir && "
+push @make_install_cmds, "cd $root_dir/build/$ngx_dir && "
     . "\$(MAKE) install DESTDIR=\$(DESTDIR)";
 
 cd '../..'; # to the root
@@ -196,6 +261,10 @@ cd '../..'; # to the root
 
 gen_makefile();
 
+if ($postamble) {
+    print $postamble;
+}
+
 sub env ($$) {
     my ($name, $val) = @_;
     print "export $name='$val'\n";
@@ -209,10 +278,16 @@ sub shell ($@) {
 
     unless ($dry_run) {
         system($cmd) == 0 or
-            die "failed to run command: $cmd\n";
+            die "failed to run command: ", trim($cmd), "\n";
     }
 }
 
+sub trim ($) {
+    my $cmd = shift;
+    $cmd =~ s/\n.*/.../s;
+    $cmd;
+}
+
 sub auto_complete ($) {
     my $name = shift;
     my @dirs = glob "$name-[0-9]*" or
@@ -234,6 +309,42 @@ sub cd ($) {
 sub build_resty_opts {
     my $opts = shift;
 
+    my $make;
+
+    if ($opts->{make}) {
+        $make = $opts->{make};
+        if (! can_run($make)) {
+            die "make utility $make cannot be run.\n";
+        }
+
+    } else {
+        if (can_run("gmake")) {
+            $make = 'gmake';
+
+        } else {
+            # no gmake found
+
+            if ($platform =~ /bsd/i) {
+                die "error: I cannot find \"gmake\" (Gnu make) in your PATH ".
+                    "envirnonment. You can also specify your make by the ".
+                    "--with-make=PATH option\n";
+            }
+
+            if (can_run("make")) {
+                $make = "make";
+
+            } else {
+                die "No gmake nor make found in PATH.\n";
+            }
+        }
+    }
+
+    $postamble .= <<"_END_";
+Type the following commands to build and install:
+    $make
+    $make install
+_END_
+
     if ($opts->{no_ndk}) {
         for my $name (qw(lua set_misc iconv lz_session form_input array_var)) {
             if (! $opts->{"no_http_$name"}) {
@@ -244,21 +355,19 @@ sub build_resty_opts {
         }
     }
 
-    if (! $opts->{luajit} && ! $opts->{no_http_lua} && ! $opts->{no_lua}) {
+    if (! $opts->{luajit} && ! $opts->{luajit_path}
+        && ! $opts->{no_http_lua} && ! $opts->{no_lua}
+        && ! $opts->{lua_path})
+    {
         $opts->{lua} = 1;
     }
 
-    if ($on_solaris) {
-        if ($opts->{http_drizzle}) {
-            $opts->{libdrizzle} = 1;
-        }
-
-    } elsif (! $opts->{no_http_drizzle}) {
-        $opts->{libdrizzle} = 1;
+    if ($opts->{luajit} && $opts->{luajit_path}) {
+        die "--with-luajit and --with-luajit=PATH are mutually exclusive.\n";
     }
 
     if ($opts->{no_http_ssl} && $opts->{http_ssl}) {
-        die "--with-http_ssl_module conflicts with --without-http_ssl_module\n";
+        die "--with-http_ssl_module conflicts with --without-http_ssl_module.\n";
     }
 
     if (! $opts->{no_http_ssl} && ! $opts->{http_ssl}) {
@@ -266,6 +375,22 @@ sub build_resty_opts {
         push @ngx_opts, '--with-http_ssl_module';
     }
 
+    if (! $opts->{http_drizzle} && $opts->{libdrizzle}) {
+        die "The http_drizzle_module is not enabled while --with-libdrizzle is specified.\n";
+    }
+
+    if (! $opts->{http_postgres} && $opts->{libpq}) {
+        die "The http_postgres_module is not enabled while --with-libpq is specified.\n";
+    }
+
+    if (! $opts->{http_postgres} && $opts->{pg_config}) {
+        die "The http_postgres_module is not enabled while --with-pg_config is specified.\n";
+    }
+
+    if ($platform eq 'linux' && $opts->{luajit} && ! can_run("ldconfig")) {
+        die "you need to have ldconfig in your PATH env when enabling luajit.\n";
+    }
+
     my $opts_line = '';
 
     if ($opts->{debug}) {
@@ -273,57 +398,81 @@ sub build_resty_opts {
         $opts_line .= " \\\n  --with-debug";
 
     } else {
-        unshift @ngx_cc_opts, '-O2';
+        #unshift @ngx_cc_opts, '-O2';
     }
 
-    $opts_line .= " \\\n  --with-cc-opt='@ngx_cc_opts'";
+    if (@ngx_cc_opts) {
+        $opts_line .= " \\\n  --with-cc-opt='@ngx_cc_opts'";
+    }
 
     if (-d 'build') {
-        system("rm -rf build");
+        system("rm -rf build") == 0 or
+            die "failed to remove directory build/.\n";
     }
 
     if (-f 'build') {
-        die "build/ directory already exists\n";
+        die "file \"build\" already exists. please remove it first.\n";
     }
-
-    shell "cp -r bundle/ build/";
+    shell "cp -rp bundle/ build";
 
     cd 'build';
 
     # build 3rd-party C libraries if required
 
-    if ($opts->{libdrizzle}) {
-        my $libdrizzle_src = auto_complete 'libdrizzle';
-        my $libdrizzle_prefix = "$prefix/libdrizzle";
-        my $libdrizzle_root = File::Spec->rel2abs("libdrizzle-root");
-
-        if (-d $libdrizzle_root) {
-            shell "rm -rf $libdrizzle_root";
+    if ($opts->{no_pool}) {
+        if (! can_run("patch")) {
+            die "no \"patch\" utility found in your PATH environment.\n";
         }
 
-        mkdir $libdrizzle_root or
-            die "create create directory libdrizzle-root: $!\n";
-
-        cd $libdrizzle_src;
-
-        shell "./configure --prefix=$libdrizzle_prefix", $dry_run;
-        shell "make", $dry_run;
-        shell "make install DESTDIR=$libdrizzle_root", $dry_run;
-
-        push @make_cmds, "cd build/$libdrizzle_src && \$(MAKE)";
-
-        push @make_install_cmds, "cd build/$libdrizzle_src && "
-            . "\$(MAKE) install DESTDIR=\$(DESTDIR)";
-
-        env LIBDRIZZLE_LIB => "$libdrizzle_root$libdrizzle_prefix/lib";
-        env LIBDRIZZLE_INC => "$libdrizzle_root$libdrizzle_prefix/include";
-
-        push @ngx_rpaths, "$libdrizzle_prefix/lib";
-
-        cd '..';
+        shell "patch -p0 < nginx-no_pool.patch";
     }
 
-    if ($opts->{luajit}) {
+    if (my $drizzle_prefix = $opts->{libdrizzle}) {
+        my $drizzle_lib = "$drizzle_prefix/lib";
+        env LIBDRIZZLE_LIB => $drizzle_lib;
+        env LIBDRIZZLE_INC => "$drizzle_prefix/include/libdrizzle-1.0";
+        push @ngx_rpaths, $drizzle_lib;
+    }
+
+    if (my $pg_prefix = $opts->{libpq}) {
+        my $pg_lib = "$pg_prefix/lib";
+        env LIBPQ_LIB => $pg_lib;
+        env LIBPQ_INC => "$pg_prefix/include";
+        push @ngx_rpaths, $pg_lib;
+    }
+
+    if (my $pg_config = $opts->{pg_config}) {
+        if (!can_run($pg_config)) {
+            die "pg_config is not runnable.\n";
+        }
+
+        my $cmd = "$pg_config --libdir";
+        my $pg_lib = `$cmd`;
+        chomp $pg_lib;
+        if (!defined $pg_lib) {
+            die "Failed to run command $cmd\n";
+        }
+
+        $cmd = "$pg_config --includedir";
+        my $pg_inc = `$cmd`;
+        chomp $pg_inc;
+        if (!defined $pg_inc) {
+            die "Failed to run command $cmd\n";
+        }
+
+        env LIBPQ_LIB => $pg_lib;
+        env LIBPQ_INC => $pg_inc;
+        push @ngx_rpaths, $pg_lib;
+    }
+
+    if ($opts->{luajit_path}) {
+        my $luajit_prefix = $opts->{luajit_path};
+        env LUAJIT_LIB => "$luajit_prefix/lib";
+        env LUAJIT_INC => "$luajit_prefix/include/luajit-2.0";
+
+        push @ngx_rpaths, "$luajit_prefix/lib";
+
+    } elsif ($opts->{luajit}) {
         my $luajit_src = auto_complete 'LuaJIT';
         my $luajit_prefix = "$prefix/luajit";
         my $luajit_root = File::Spec->rel2abs("luajit-root");
@@ -337,14 +486,38 @@ sub build_resty_opts {
 
         cd $luajit_src;
 
-        shell "make PREFIX=$luajit_prefix", $dry_run;
-        shell "make install PREFIX=$luajit_prefix DESTDIR=$luajit_root", $dry_run;
+        my $extra_opts = ' TARGET_STRIP=@:';
 
-        push @make_cmds, "cd build/$luajit_src && "
-            . "\$(MAKE) PREFIX=$luajit_prefix";
+        if ($opts->{debug}) {
+            $extra_opts = ' CCDEBUG=-g Q=';
+        }
 
-        push @make_install_cmds, "cd build/$luajit_src && "
-            . "\$(MAKE) install PREFIX=$luajit_prefix DESTDIR=\$(DESTDIR)";
+        if ($platform =~ /bsd/i) {
+            $extra_opts .= ' CFLAGS=-I..';
+        }
+
+        if ($on_solaris) {
+            $extra_opts .= " INSTALL_X='$root_dir/build/install -m 0755' " .
+                    "INSTALL_F='$root_dir/build/install -m 0644'";
+        }
+
+        if (defined $cc) {
+            $extra_opts .= " CC=$cc";
+        }
+
+        if (defined $cores) {
+            shell "${make} -j$cores$extra_opts PREFIX=$luajit_prefix", $dry_run;
+        } else {
+            shell "${make}$extra_opts PREFIX=$luajit_prefix", $dry_run;
+        }
+
+        shell "${make} install$extra_opts PREFIX=$luajit_prefix DESTDIR=$luajit_root", $dry_run;
+
+        push @make_cmds, "cd $root_dir/build/$luajit_src && "
+            . "\$(MAKE)$extra_opts PREFIX=$luajit_prefix";
+
+        push @make_install_cmds, "cd $root_dir/build/$luajit_src && "
+            . "\$(MAKE) install$extra_opts PREFIX=$luajit_prefix DESTDIR=\$(DESTDIR)";
 
         env LUAJIT_LIB => "$luajit_root$luajit_prefix/lib";
         env LUAJIT_INC => "$luajit_root$luajit_prefix/include/luajit-2.0";
@@ -353,6 +526,13 @@ sub build_resty_opts {
 
         cd '..';
 
+    } elsif ($opts->{lua_path}) {
+        my $lua_prefix = $opts->{lua_path};
+        env LUA_LIB => "$lua_prefix/lib";
+        env LUA_INC => "$lua_prefix/include";
+
+        push @ngx_rpaths, "$lua_prefix/lib";
+
     } elsif ($opts->{lua}) {
         # build stdandard lua
 
@@ -374,20 +554,195 @@ sub build_resty_opts {
 
         cd $lua_src;
 
-        shell "make $platform", $dry_run;
-        shell "make install INSTALL_TOP=$lua_root$lua_prefix", $dry_run;
+        my $extra_opts = '';
+        if (defined $cc) {
+            $extra_opts .= " CC=$cc";
+        }
+
+        if (defined $cores) {
+            shell "${make} -j$cores$extra_opts $platform", $dry_run;
+        } else {
+            shell "${make}$extra_opts $platform", $dry_run;
+        }
+
+        shell "${make} install$extra_opts INSTALL_TOP=$lua_root$lua_prefix", $dry_run;
 
         env LUA_LIB => "$lua_root$lua_prefix/lib";
         env LUA_INC => "$lua_root$lua_prefix/include";
 
-        push @make_cmds, "cd build/$lua_src && \$(MAKE) $platform";
+        push @make_cmds, "cd $root_dir/build/$lua_src && \$(MAKE)$extra_opts $platform";
 
-        push @make_install_cmds, "cd build/$lua_src && "
-            . "\$(MAKE) install INSTALL_TOP=\$(DESTDIR)$lua_prefix";
+        push @make_install_cmds, "cd $root_dir/build/$lua_src && "
+            . "\$(MAKE) install$extra_opts INSTALL_TOP=\$(DESTDIR)$lua_prefix";
 
         cd '..';
     }
 
+    if ($opts->{lua} || $opts->{lua_path}
+        || $opts->{luajit} || $opts->{luajit_path})
+    {
+        # build lua modules
+
+        my $lualib_prefix = "$prefix/lualib";
+
+        my $ngx_lua_dir = auto_complete 'ngx_lua';
+
+        open my $in, ">>$ngx_lua_dir/config" or
+            die "Cannot open $ngx_lua_dir/config for appending: $!\n";
+
+        print $in <<"_EOC_";
+
+ngx_lua_dquote='"'
+CFLAGS="\$CFLAGS -DLUA_DEFAULT_PATH='\$ngx_lua_dquote$lualib_prefix/?.lua\$ngx_lua_dquote'"
+CFLAGS="\$CFLAGS -DLUA_DEFAULT_CPATH='\$ngx_lua_dquote$lualib_prefix/?.so\$ngx_lua_dquote'"
+_EOC_
+
+        close $in;
+
+        unless ($opts->{no_lua_cjson}) {
+            my $dir = auto_complete 'lua-cjson';
+            if (!defined $dir) {
+                die "No lua-cjson found";
+            }
+
+            my $lua_inc;
+            if ($opts->{luajit} || $opts->{luajit_path}) {
+                $lua_inc = $ENV{LUAJIT_INC};
+
+            } else {
+                $lua_inc = $ENV{LUA_INC};
+            }
+
+            my $extra_opts = " DESTDIR=\$(DESTDIR) LUA_INCLUDE_DIR=$lua_inc " .
+                "LUA_LIB_DIR=$lualib_prefix";
+
+            if ($on_solaris) {
+                $extra_opts .= " INSTALL=$root_dir/build/install";
+                if ($opts->{debug}) {
+                    $extra_opts .= " CFLAGS=\"-g -O0 -Wall -pedantic -DMISSING_ISINF\"";
+
+                } else {
+                    $extra_opts .= " CFLAGS=\"-g -O3 -Wall -pedantic -DMISSING_ISINF\"";
+                }
+
+            } else {
+                if ($opts->{debug}) {
+                    $extra_opts .= " CFLAGS=\"-g -O0 -Wall -pedantic\"";
+                }
+            }
+
+            if ($platform eq 'macosx') {
+                $extra_opts .= " LDFLAGS='-bundle -undefined dynamic_lookup'";
+            }
+
+            if (defined $cc) {
+                $extra_opts .= " CC=$cc";
+            } else {
+                $extra_opts .= " CC=gcc";
+            }
+
+            push @make_cmds, "cd $root_dir/build/$dir && ".
+                "\$(MAKE)$extra_opts";
+
+            push @make_install_cmds, "cd $root_dir/build/$dir && " .
+                "\$(MAKE) install$extra_opts";
+        }
+
+        unless ($opts->{no_lua_redis_parser}) {
+            my $dir = auto_complete 'lua-redis-parser';
+            if (!defined $dir) {
+                die "No lua-redis-parser found";
+            }
+
+            my $lua_inc;
+            if ($opts->{luajit} || $opts->{luajit_path}) {
+                $lua_inc = $ENV{LUAJIT_INC};
+
+            } else {
+                $lua_inc = $ENV{LUA_INC};
+            }
+
+            my $extra_opts = " DESTDIR=\$(DESTDIR) LUA_INCLUDE_DIR=$lua_inc " .
+                "LUA_LIB_DIR=$lualib_prefix";
+
+            if ($on_solaris) {
+                $extra_opts .= " INSTALL=$root_dir/build/install";
+                if ($opts->{debug}) {
+                    $extra_opts .= " CFLAGS=\"-g -O0 -Wall\"";
+
+                }
+
+            } else {
+                if ($opts->{debug}) {
+                    $extra_opts .= " CFLAGS=\"-g -O0 -Wall\"";
+                }
+            }
+
+            if ($platform eq 'macosx') {
+                $extra_opts .= " LDFLAGS='-bundle -undefined dynamic_lookup'";
+            }
+
+            if (defined $cc) {
+                $extra_opts .= " CC=$cc";
+            } else {
+                $extra_opts .= " CC=gcc";
+            }
+
+            push @make_cmds, "cd $root_dir/build/$dir && ".
+                "\$(MAKE)$extra_opts";
+
+            push @make_install_cmds, "cd $root_dir/build/$dir && " .
+                "\$(MAKE) install$extra_opts";
+        }
+
+        unless ($opts->{no_lua_rds_parser}) {
+            my $dir = auto_complete 'lua-rds-parser';
+            if (!defined $dir) {
+                die "No lua-rds-parser found";
+            }
+
+            my $lua_inc;
+            if ($opts->{luajit} || $opts->{luajit_path}) {
+                $lua_inc = $ENV{LUAJIT_INC};
+
+            } else {
+                $lua_inc = $ENV{LUA_INC};
+            }
+
+            my $extra_opts = " DESTDIR=\$(DESTDIR) LUA_INCLUDE_DIR=$lua_inc " .
+                "LUA_LIB_DIR=$lualib_prefix";
+
+            if ($on_solaris) {
+                $extra_opts .= " INSTALL=$root_dir/build/install";
+                if ($opts->{debug}) {
+                    $extra_opts .= " CFLAGS=\"-g -O0 -Wall\"";
+
+                }
+
+            } else {
+                if ($opts->{debug}) {
+                    $extra_opts .= " CFLAGS=\"-g -O0 -Wall\"";
+                }
+            }
+
+            if ($platform eq 'macosx') {
+                $extra_opts .= " LDFLAGS='-bundle -undefined dynamic_lookup'";
+            }
+
+            if (defined $cc) {
+                $extra_opts .= " CC=$cc";
+            } else {
+                $extra_opts .= " CC=gcc";
+            }
+
+            push @make_cmds, "cd $root_dir/build/$dir && ".
+                "\$(MAKE)$extra_opts";
+
+            push @make_install_cmds, "cd $root_dir/build/$dir && " .
+                "\$(MAKE) install$extra_opts";
+        }
+    }
+
     # prepare nginx configure line
 
     $ngx_dir = auto_complete "nginx";
@@ -419,7 +774,13 @@ sub usage ($) {
 
   --prefix=PATH                      set the installation prefix
 
-  --with-debug                       enable the debugging logging and also enable -O0
+  --with-debug                       enable the debugging logging and also enable -O0 -g for gcc.
+                                     this not only affects nginx, but also other components.
+
+  --with-no-pool-patch               enable the no-pool patch for debugging memory issues.
+
+  -jN                                pass -jN option to make while building the bundled
+                                     Lua 5.1 interpreter or LuaJIT 2.0.
 
 _EOC_
 
@@ -475,8 +836,17 @@ _EOC_
 
     $msg .= <<'_EOC_';
 
+  --without-lua_cjson                disable the lua-cjson library
+  --without-lua_redis_parser         disable the lua-redis-parser library
+  --without-lua_rds_parser           disable the lua-rds-parser library
+
   --without-lua51                    disable the bundled Lua 5.1 interpreter
-  --with-luajit                      enable LuaJIT 2.0
+  --with-lua51=PATH                  specify the external installation of Lua 5.1 by PATH
+  --with-luajit                      enable and build LuaJIT 2.0
+  --with-luajit=PATH                 use the external LuaJIT 2.0 installation specified by PATH
+  --with-libdrizzle=DIR              specify the libdrizzle 1.0 (or drizzle) installation prefix
+  --with-libpq=DIR                   specify the libpq (or postgresql) installation prefix
+  --with-pg_config=PATH              specify the path of the pg_config utility
 
 Options directly inherited from nginx
 
@@ -575,6 +945,8 @@ Options directly inherited from nginx
                                      pentium, pentiumpro, pentium3, pentium4,
                                      athlon, opteron, sparc32, sparc64, ppc64
 
+  --with-make=PATH                   specify the default make utility to be used
+
   --without-pcre                     disable PCRE library usage
   --with-pcre                        force PCRE library usage
   --with-pcre=DIR                    set path to PCRE library sources
@@ -617,14 +989,36 @@ sub gen_makefile {
     open my $out, ">Makefile" or
         die "Cannot open Makefile for writing: $!\n";
 
-    print $out ".PHONY: all install\n\n";
+    print $out ".PHONY: all install clean\n\n";
 
-    print $out "all:\n\t" . join("\n\t", @make_cmds) . "\n\n";
+        print $out "all:\n\t" . join("\n\t", @make_cmds) . "\n\n";
 
-    print $out "install:\n\t" . join("\n\t", @make_install_cmds) . "\n\n";
+    print $out "install: all\n\t" . join("\n\t", @make_install_cmds) . "\n\n";
 
     print $out "clean:\n\trm -rf build\n";
 
     close $out;
 }
 
+# check if we can run some command
+sub can_run {
+    my ($cmd) = @_;
+
+    #warn "can run: @_\n";
+    my $_cmd = $cmd;
+    return $_cmd if -x $_cmd;
+
+    return undef if $_cmd =~ m{[\\/]};
+
+    # FIXME: this is a hack; MSWin32 is not supported anyway
+    my $path_sep = ':';
+
+    for my $dir ((split /$path_sep/, $ENV{PATH}), '.') {
+        next if $dir eq '';
+        my $abs = File::Spec->catfile($dir, $_[0]);
+        return $abs if -x $abs;
+    }
+
+    return undef;
+}
+

util/fix-tests

@@ -44,12 +44,19 @@ for my $t_file (@t_files) {
 
                 warn "\n- $orig";
                 warn "+ $_";
-            } elsif (s{\bbuild/$pat\S+}{build/$dir}g && $orig ne $_) {
+
+            } elsif (s{ngx_openresty-\d+\.\d+\.\d+\.\d+(?:rc\d+)?}{ngx_openresty-$ver} && $orig ne $_) {
                 $changed++;
 
                 warn "\n- $orig";
                 warn "+ $_";
-            } elsif (s{^cd $pat\S+}{cd $dir}g && $orig ne $_) {
+
+            } elsif (s{OPENRESTY_BUILD_DIR/$pat[^/ \t\n\w]*\d[^/ \t\n]*}{OPENRESTY_BUILD_DIR/$dir}g && $orig ne $_) {
+                $changed++;
+
+                warn "\n- $orig";
+                warn "+ $_";
+            } elsif (s{^cd $pat[^/ \t\n]+}{cd $dir}g && $orig ne $_) {
                 $changed++;
 
                 warn "\n- $orig";
@@ -68,7 +75,7 @@ for my $t_file (@t_files) {
     close $in;
 }
 
-print join("\n", map { "    $_" } sort @dirs), "\n";
+print join("\n", map { /^LuaJIT/ ? "* ~$_" : "* $_" } sort @dirs), "\n";
 
 sub cd ($) {
     my $dir = shift;

util/get-tarball

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-root=$(readlink -f -- "$(dirname -- "$0")/..")
+#root=$(readlink -f -- "$(dirname -- "$0")/..")
+root=`perl -MCwd -e'print Cwd::abs_path(shift)' $(dirname -- "$0")/..`
 work=$root/work
 
 if [ ! -d $work ]; then

util/install

@@ -0,0 +1,82 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+use Getopt::Std qw(getopts);
+
+my %opts;
+getopts("dm:", \%opts) or usage();
+
+my $mode = $opts{m};
+
+if ($opts{d}) {
+    shell("mkdir -p @ARGV");
+    exit;
+}
+
+if (@ARGV < 2) {
+    usage();
+}
+
+my $dst = pop;
+
+my @src = @ARGV;
+
+my $target_dir;
+
+if (@src > 1 || $dst =~ m{/$}) {
+    $target_dir = $dst;
+
+} elsif (-d $dst) {
+    $target_dir = $dst;
+
+} elsif ($dst =~ m{(.+)/}) {
+    $target_dir = $1;
+
+} else {
+    $target_dir = '.';
+}
+
+if (!-d $target_dir) {
+    shell("mkdir -p $target_dir");
+}
+
+shell("cp @src $dst");
+
+if (-f $dst) {
+    if (defined $mode) {
+        chmod oct($mode), $dst or
+            die "failed to change mode of $dst to $mode.\n";
+    }
+
+    exit;
+}
+
+for my $src (@src) {
+    my $name;
+
+    if ($src =~ m{/([^/]+)$}) {
+        $name = $1;
+
+    } else {
+        $name = $src;
+    }
+
+    if (defined $mode) {
+        my $target = "$target_dir/$name";
+        chmod oct($mode), $target or
+            die "failed to change mode of $target to $mode.\n";
+    }
+}
+
+sub usage {
+    die "Usage: install [-d] [-m <attrs>] <src>... <dst>\n";
+}
+
+sub shell {
+    my $cmd = shift;
+    system($cmd) == 0 or
+        die "failed to run command $cmd\n";
+}
+

util/mirror-tarballs

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-root=$(readlink -f -- "$(dirname -- "$0")/..")
+#root=$(readlink -f -- "$(dirname -- "$0")/..")
+root=`perl -MCwd -e'print Cwd::abs_path(shift)' $(dirname -- "$0")/..`
 
 . util/ver
 
@@ -31,20 +32,45 @@ sed -i $"s/NGINX_VERSION \".unknown\"/NGINX_VERSION \".$minor_ver\"/" \
 
 patch -p2 < server_header.patch || exit 1
 
-patch -p1 < $root/patches/nginx-$main_ver-redirect_memcpy_overlap.patch || exit 1
+#patch -p1 < $root/patches/nginx-$main_ver-redirect_memcpy_overlap.patch || exit 1
 
 patch -p1 < $root/patches/nginx-$main_ver-no_error_pages.patch || exit 1
 
+patch -p1 < $root/patches/nginx-$main_ver-no_Werror.patch || exit 1
+
+patch -p1 < $root/patches/nginx-$main_ver-epoll_check_stale_wev.patch || exit 1
+
+#patch -p1 < $root/patches/nginx-$main_ver-request_body_in_single_buf.patch || exit 1
+
+patch -p1 -l < $root/patches/nginx-$main_ver-subrequest_loop.patch || exit 1
+
+patch -p1 -l < $root/patches/nginx-$main_ver-gzip_empty_flush_buf.patch || exit 1
+
+patch -p1 < $root/patches/nginx-$main_ver-variable_header_ignore_no_hash.patch || exit 1
+
+patch -p1 < $root/patches/nginx-$main_ver-named_location_clear_mods_ctx.patch || exit 1
+
+patch -p1 < $root/patches/nginx-$main_ver-allow_request_body_updating.patch || exit 1
+
+patch -p1 < $root/patches/nginx-$main_ver-log_escape_non_ascii.patch || exit 1
+
+#patch -p1 < $root/patches/nginx-$main_ver-gzip_ok_invalid_read_fix.patch || exit 1
+
 rm -f *.patch || exit 1
 
 cd .. || exit 1
 
-ver=0.36rc3
-$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
-mv agentzh-echo-nginx-module-* echo-nginx-module-$ver
+cp $root/patches/nginx-$main_ver-no_pool.patch ./nginx-no_pool.patch || exit 1
+sed -i $"s/NGINX_VERSION \".unknown/NGINX_VERSION \".$minor_ver/" \
+    ./nginx-no_pool.patch || exit 1
+rm -rf no-pool-nginx-$ver
 
-ver=0.03rc2
+ver=0.37rc8
+$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
+
+ver=0.03rc8
 $root/util/get-tarball "http://github.com/agentzh/xss-nginx-module/tarball/v$ver" -O xss-nginx-module-$ver.tar.gz || exit 1
 tar -xzf xss-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-xss-nginx-module-* xss-nginx-module-$ver || exit 1
@@ -54,66 +80,71 @@ $root/util/get-tarball "http://github.com/simpl/ngx_devel_kit/tarball/v$ver" -O
 tar -xzf ngx_devel_kit-$ver.tar.gz || exit 1
 mv simpl-ngx_devel_kit-* ngx_devel_kit-$ver || exit 1
 
-ver=0.21
+ver=0.22rc4
 $root/util/get-tarball "http://github.com/agentzh/set-misc-nginx-module/tarball/v$ver" -O set-misc-nginx-module-$ver.tar.gz || exit 1
 tar -xzf set-misc-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-set-misc-nginx-module-* set-misc-nginx-module-$ver || exit 1
 
-ver=0.11rc2
+ver=0.12rc7
 $root/util/get-tarball "http://github.com/agentzh/rds-json-nginx-module/tarball/v$ver" -O rds-json-nginx-module-$ver.tar.gz || exit 1
 tar -xzf rds-json-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-rds-json-nginx-module-* rds-json-nginx-module-$ver || exit 1
 
-ver=0.15rc1
+ver=0.04
+$root/util/get-tarball "http://github.com/agentzh/rds-csv-nginx-module/tarball/v$ver" -O rds-csv-nginx-module-$ver.tar.gz || exit 1
+tar -xzf rds-csv-nginx-module-$ver.tar.gz || exit 1
+mv agentzh-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1
+
+ver=0.16rc7
 $root/util/get-tarball "http://github.com/agentzh/headers-more-nginx-module/tarball/v$ver" -O headers-more-nginx-module-$ver.tar.gz || exit 1
 tar -xzf headers-more-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-headers-more-nginx-module-* headers-more-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.0.15rc9
+ver=0.1.2rc4
 $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.1.6rc9
+ver=0.3.1rc45
 $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
 
 #################################
 
-ver=0.02
+ver=0.03rc1
 $root/util/get-tarball "http://github.com/agentzh/array-var-nginx-module/tarball/v$ver" -O array-var-nginx-module-$ver.tar.gz || exit 1
 tar -xzf array-var-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-array-var-nginx-module-* array-var-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.12rc1
+ver=0.13rc2
 $root/util/get-tarball "http://github.com/agentzh/memc-nginx-module/tarball/v$ver" -O memc-nginx-module-$ver.tar.gz || exit 1
 tar -xzf memc-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-memc-nginx-module-* memc-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.12rc4
+ver=0.13rc3
 $root/util/get-tarball "http://github.com/agentzh/srcache-nginx-module/tarball/v$ver" -O srcache-nginx-module-$ver.tar.gz || exit 1
 tar -xzf srcache-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.07rc4
+ver=0.07rc5
 $root/util/get-tarball "http://github.com/calio/form-input-nginx-module/tarball/v$ver" -O form-input-nginx-module-$ver.tar.gz || exit 1
 tar -xzf form-input-nginx-module-$ver.tar.gz || exit 1
 mv calio-form-input-nginx-module-* form-input-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.10rc3
+ver=0.10rc5
 $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
@@ -128,7 +159,7 @@ mv agentzh-encrypted-session-nginx-module-* encrypted-session-nginx-module-$ver
 #################################
 
 
-ver=0.3
+ver=0.7
 $root/util/get-tarball "http://mdounin.ru/files/ngx_http_upstream_keepalive-$ver.tar.gz" -O upstream_keepalive-$ver.tar.gz || exit 1
 tar -xzf upstream_keepalive-$ver.tar.gz || exit 1
 mv ngx_http_upstream_keepalive-* upstream-keepalive-nginx-module-$ver || exit 1
@@ -142,14 +173,14 @@ mv ngx_http_auth_request_module-* auth-request-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.8
+ver=0.9rc2
 $root/util/get-tarball "https://github.com/FRiCKLE/ngx_postgres/tarball/$ver" -O ngx_postgres-$ver.tar.gz || exit 1
 tar -xzf ngx_postgres-$ver.tar.gz || exit 1
 mv FRiCKLE-ngx_postgres-* ngx_postgres-$ver || exit 1
 
 #################################
 
-ver=0.07rc1
+ver=0.08rc2
 $root/util/get-tarball "http://github.com/agentzh/redis2-nginx-module/tarball/v$ver" -O redis2-nginx-module-$ver.tar.gz || exit 1
 tar -xzf redis2-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-redis2-nginx-module-* redis2-nginx-module-$ver || exit 1
@@ -160,37 +191,55 @@ ver=5.1.4
 $root/util/get-tarball "http://www.lua.org/ftp/lua-$ver.tar.gz" -O "lua-$ver.tar.gz" || exit 1
 tar -xzf lua-$ver.tar.gz || exit 1
 
-$root/util/get-tarball "http://www.lua.org/ftp/patch-lua-$ver-3" -O "patch-lua-$ver-3" || exit 1
+$root/util/get-tarball "http://www.lua.org/ftp/patch-lua-$ver-4" -O "patch-lua-$ver-4" || exit 1
 
 cd lua-$ver/src || exit 1
-patch -p0 < ../../patch-lua-$ver-3 || exit 1
+patch -p0 < ../../patch-lua-$ver-4 || exit 1
 cd ../.. || exit 1
 
-rm "patch-lua-$ver-3" || exit 1
+rm "patch-lua-$ver-4" || exit 1
 
 cp $root/patches/lua-$ver-makefile_install_fix.patch lua-makefile-fix.patch || exit 1
 
 patch -p0 < lua-makefile-fix.patch || exit 1
 
-rm lua-makefile-fix.patch
+rm lua-makefile-fix.patch || exit 1
 
 #################################
 
-ver=2.0.0-beta7
+ver=2.0.0-beta9
 $root/util/get-tarball "http://luajit.org/download/LuaJIT-$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
 tar -xzf LuaJIT-$ver.tar.gz || exit 1
 
+cd LuaJIT-$ver || exit 1;
+#$root/util/get-tarball http://luajit.org/download/beta8_hotfix1.patch -O beta8_hotfix1.patch
+#patch -p1 < beta8_hotfix1.patch || exit 1
+#rm beta8_hotfix1.patch || exit 1
+cp $root/misc/unwind-generic.h ./unwind.h || exit 1
+cd ..
+
 #################################
 
-ver=0.8
-$root/util/get-tarball "http://launchpad.net/libdrizzle/trunk/0.8/+download/libdrizzle-0.8.tar.gz" -O "libdrizzle-$ver.tar.gz" || exit 1
-tar -xzf libdrizzle-$ver.tar.gz || exit 1
+ver=1.0.3
+$root/util/get-tarball "http://www.kyne.com.au/~mark/software/old/lua-cjson-$ver.tar.gz" -O "lua-cjson-$ver.tar.gz" || exit 1
+tar -xzf lua-cjson-$ver.tar.gz || exit 1
+cd lua-cjson-$ver || exit 1
+#patch -p1 < $root/patches/lua_cjson-$ver-array_detection_fix.patch || exit 1
+cd ..
 
-$root/util/get-tarball "http://agentzh.org/misc/nginx/libdrizzle-0.8-parsebug_and_mac_fixes.patch" -O "parsebug_and_mac_fixes.patch" || exit 1
+#################################
 
-patch -p0 < parsebug_and_mac_fixes.patch
+ver=0.09rc5
+$root/util/get-tarball "http://github.com/agentzh/lua-redis-parser/tarball/v$ver" -O "lua-redis-parser-$ver.tar.gz" || exit 1
+tar -xzf lua-redis-parser-$ver.tar.gz || exit 1
+mv agentzh-lua-redis-parser-* lua-redis-parser-$ver || exit 1
 
-rm parsebug_and_mac_fixes.patch || exit 1
+#################################
+
+ver=0.04
+$root/util/get-tarball "http://github.com/agentzh/lua-rds-parser/tarball/v$ver" -O "lua-rds-parser-$ver.tar.gz" || exit 1
+tar -xzf lua-rds-parser-$ver.tar.gz || exit 1
+mv agentzh-lua-rds-parser-* lua-rds-parser-$ver || exit 1
 
 #################################
 
@@ -199,6 +248,7 @@ rm *.tar.gz
 cd ..
 cp $root/util/configure ./
 cp $root/README ./
+cp $root/util/install bundle/
 
 cd $root
 

util/upgrade-patches.pl

@@ -0,0 +1,49 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $ver = shift or usage();
+my $newver = shift or usage();
+
+my @files = `find patches -name '*.patch'`;
+for my $file (@files) {
+    chomp $file;
+    next unless $file =~ m{^patches/nginx-(?:$ver|$newver)-};
+    (my $newfile = $file) =~ s/nginx-$ver-/nginx-$newver-/g;
+    if ($newfile ne $file && !-f $newfile) {
+        my $cmd = "cp $file $newfile";
+        system($cmd) == 0
+            or die "failed run command $cmd.\n";
+
+        $cmd = "git add $newfile";
+        system($cmd) == 0
+            or die "failed run command $cmd.\n";
+    }
+
+    my $cmd = "sed -i 's/\Q$ver\E/$newver/g' $newfile";
+    system($cmd) == 0
+            or die "failed to run command $cmd.\n";
+
+    my $oldver_int = version_to_int($ver);
+    my $newver_int = version_to_int($newver);
+
+    warn "$oldver_int => $newver_int\n";
+
+    $cmd = "sed -i 's/$oldver_int/$newver_int/g' $newfile";
+    system($cmd) == 0
+            or die "failed to run command $cmd.\n";
+
+    print "$file => $newfile\n";
+}
+
+sub usage {
+    die "Usage: $0 <old-version> <new-version>\n";
+}
+
+sub version_to_int {
+    my $ver = shift;
+    $ver =~ s/\.(\d+)/sprintf("%03d", $1)/eg;
+    $ver
+}
+

util/ver

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