applied the official patch for the nginx core to address the recent nginx security vulnerability CVE-2013-2070.

.gitattributes

@@ -1,4 +0,0 @@
-*.t linguist-language=Text
-demo/* linguist-language=Text
-clients/* linguist-language=Text
-* linguist-language=C

.gitignore

@@ -70,6 +70,3 @@ work/
 reindex
 t/*.t_
 upload
-upload-win32
-html_out/
-TODO

COPYRIGHT

@@ -1,237 +0,0 @@
-Copyright (C) 2009-2015, by Yichun "agentzh" Zhang, CloudFlare Inc.
-
-Copyright (C) 2009-2014, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
-
-Copyright (C) 2010-2014, by FRiCKLE Piotr Sikora <info@frickle.com>.
-
-Copyright (C) 2015, by Shuxin Yang.
-
-Copyright (c) 2010, 2011, Jiale "calio" Zhi <vipcalio@gmail.com>.
-
-Copyright (C) Guanlan Dai
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Copyright (c) 2010, Marcus Clyne, Simpl (simpl.it)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the organization (Simpl) nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL MARCUS CLYNE OR SIMPL BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
------------------------------------------------------------------------------
-
-Copyright (C) 2002-2015 Igor Sysoev
-Copyright (C) 2011-2015 Nginx, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
------------------------------------------------------------------------------
-
-NGINX License
-
-Copyright (C) 2002-2009 Igor Sysoev
-Copyright (C) 2009-2013 Sergey A. Osokin
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
------------------------------------------------------------------------------
-
-LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/
-
-Copyright (C) 2005-2015 Mike Pall. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-[ MIT license: http://www.opensource.org/licenses/mit-license.php ]
-
------------------------------------------------------------------------------
-
-Lua License
-
-Copyright (C) 1994-2012 Lua.org, PUC-Rio.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
------------------------------------------------------------------------------
-
-Lua-cjson License
-
-Copyright (c) 2010-2012  Mark Pulford <mark@kyne.com.au>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
------------------------------------------------------------------------------
-
-SHA-1 implementation in NDK
-
-Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-All rights reserved.
-
-This package is an SSL implementation written
-by Eric Young (eay@cryptsoft.com).
-The implementation was written so as to conform with Netscapes SSL.
-
-This library is free for commercial and non-commercial use as long as
-the following conditions are aheared to.  The following conditions
-apply to all code found in this distribution, be it the RC4, RSA,
-lhash, DES, etc., code; not just the SSL code.  The SSL documentation
-included with this distribution is covered by the same copyright terms
-except that the holder is Tim Hudson (tjh@cryptsoft.com).
-
-Copyright remains Eric Young's, and as such any Copyright notices in
-the code are not to be removed.
-If this package is used in a product, Eric Young should be given attribution
-as the author of the parts of the library used.
-This can be in the form of a textual message at program startup or
-in documentation (online or textual) provided with the package.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-   "This product includes cryptographic software written by
-    Eric Young (eay@cryptsoft.com)"
-   The word 'cryptographic' can be left out if the rouines from the library
-   being used are not cryptographic related :-).
-4. If you include any Windows specific code (or a derivative thereof) from
-   the apps directory (application code) you must include an acknowledgement:
-   "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
-
-THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-The licence and distribution terms for any publically available version or
-derivative of this code cannot be changed.  i.e. this code cannot simply be
-copied and put under another distribution licence

README

@@ -0,0 +1,83 @@
+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 dependencies.
+
+This bundle is maintained by us, agentzh and chaoslawful, and sponsored by
+Taobao.com, Alibaba Group.
+
+Because most of the nginx modules are developed by the bundle maintainers, it can ensure
+that all these modules are played well together.
+
+The bundled software components are copyrighted by the respective copyright holders.
+
+The homepage for this project is http://openresty.org.
+
+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:
+
+    The bundle's source is at the following git repository:
+
+        https://github.com/agentzh/ngx_openresty
+
+    To reproduce the bundle tarball, just do
+
+        make
+
+    at the top of the bundle source tree.
+
+MAILING LIST
+    You're very welcome to join the English OpenResty mailing list hosted on
+    Google Groups:
+
+        https://groups.google.com/group/openresty-en
+
+    The Chinese mailing list is here:
+
+        https://groups.google.com/group/openresty
+
+REPORT BUGS
+
+You're very welcome to report issues on GitHub:
+
+    https://github.com/agentzh/ngx_openresty/issues
+
+COPYRIGHT & LICENSE
+
+The bundle itself is licensed under the 2-clause BSD license.
+
+    Copyright (c) 2011, Taobao Inc., Alibaba Group (
+    http://www.taobao.com ).
+
+    Copyright (c) 2011, Yichun "agentzh" Zhang (章亦春)
+    <agentzh@gmail.com>.
+
+    Copyright (c) 2011, Xiaozhe "chaoslawful" Wang (王晓哲)
+    <chaoslawful@gmail.com>.
+
+    This module is licensed under the terms of the BSD license.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+    *   Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+    IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+    PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+    TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

README.markdown

@@ -1,115 +0,0 @@
-Name
-====
-
-ngx_openresty - Turning Nginx into a Full-Fledged Scriptable Web Platform
-
-Table of Contents
-=================
-
-* [Name](#name)
-* [Description](#description)
-    * [For Users](#for-users)
-    * [For Bundle Maintainers](#for-bundle-maintainers)
-* [Mailing List](#mailing-list)
-* [Report Bugs](#report-bugs)
-* [Copyright & License](#copyright--license)
-
-Description
-===========
-
-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 dependencies.
-
-This bundle is maintained Yichun Zhang (agentzh).
-
-Because most of the nginx modules are developed by the bundle maintainers, it can ensure
-that all these modules are played well together.
-
-The bundled software components are copyrighted by the respective copyright holders.
-
-The homepage for this project is http://openresty.org.
-
-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
-----------------------
-
-The bundle's source is at the following git repository:
-
-https://github.com/openresty/ngx_openresty
-
-To reproduce the bundle tarball, just do
-
-```bash
-make
-```
-
-at the top of the bundle source tree.
-
-Please note that you may need to install some extra dependencies, like `perl`, `dos2unix` and
-the Perl CPAN mdoule `Markdown::Pod`. On Fedora 22, for example, installing the dependencies
-is as simple as running the following commands:
-
-```bash
-sudo dnf install perl dos2unix
-sudo cpan Markdown::Pod
-```
-
-[Back to TOC](#table-of-contents)
-
-Mailing List
-============
-
-You're very welcome to join the English OpenResty mailing list hosted on Google Groups:
-
-https://groups.google.com/group/openresty-en
-
-The Chinese mailing list is here:
-
-https://groups.google.com/group/openresty
-
-[Back to TOC](#table-of-contents)
-
-Report Bugs
-===========
-
-You're very welcome to report issues on GitHub:
-
-https://github.com/agentzh/ngx_openresty/issues
-
-[Back to TOC](#table-of-contents)
-
-Copyright & License
-===================
-
-The bundle itself is licensed under the 2-clause BSD license.
-
-Copyright (c) 2011-2015, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
-
-This module is licensed under the terms of the BSD license.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-[Back to TOC](#table-of-contents)
-

doc/README-win32.md

@@ -1,182 +0,0 @@
-Name
-====
-
-README-win32 - README for the Windows 32-bit build of OpenResty
-
-Description
-===========
-
-The binary distributions of OpenResty can be downloaded from the following web page:
-
-https://openresty.org/#Download
-
-To start the NGINX server of the nginx server of the Win32 binary distribution of OpenResty:
-
-```bash
-start nginx
-```
-
-You can also specify the `-p PATH/` option to override the default server prefix, as in
-
-```bash
-cd /path/to/my/openresty/app/
-start nginx -p $PWD
-```
-
-Then you can use the `tasklist` command to check the nginx processes running in the background:
-
-```console
-C:\> tasklist /fi "imagename eq nginx.exe"
-
-Image Name                     PID Session Name        Session#    Mem Usage
-========================= ======== ================ =========== ============
-nginx.exe                     4616 Console                    1      7,412 K
-nginx.exe                     5836 Console                    1      7,800 K
-
-```
-
-One of the two processes is the master process while the other is the worker.
-
-If you are using the MSYS bash instead of the `cmd.exe` console, then you should replace the `/fi` option
-with `-fi` in the command above instead.
-
-You can quickly shut down the server like this:
-
-```bash
-nginx -s stop
-```
-
-or gracefully shut it down like this:
-
-```bash
-nginx -s quit
-```
-
-You can also forcibly kill the nginx processes via their PIDs with `taskkill`, as in
-
-```console
-C:\> taskkill /pid 5488 /F
-```
-
-where the PID (5488 in this example) can be found via the aforementioned `tasklist` command.
-
-Again, you should use the form `-pid` and `-F` for the options if you are in an MSYS bash
-session.
-
-Similarly, you can use the `nginx -s reload` command to reload nginx configurations without
-stopping the server. And you can use `nginx -s reopen` to instruct nginx to re-open
-all the log files.
-
-You can run the `resty` script like this:
-
-```console
-C:\> resty -e "ngx.say('Hello, OpenResty!')"
-Hello, OpenResty!
-```
-
-The `resty` command-line utility requires a Perl interpreter installed in your
-system and visible to your PATH environment. Any perl distributions should
-work, including StrawberryPerl, ActivePerl, and MSYS perl (the former two are
-recommended though).
-
-Debugging
-=========
-
-Debug symbosl are enabled even in release builds. So that when things go very wrong,
-one can still debug things with tools like MSYS GDB.
-
-Inclusion of debug symbols make the binary files (`.exe` and `.dll` files) much larger,
-but it generally will not load into memory during normal execution on a modern operating
-system.
-
-Caveats
-=======
-
-The Win32 port of the NGINX core supports the good old `select` IO multiplexing mechanism
-only.
-The I/O Completion Ports (IOCP) feature is *not* supported (yet). So do not use this build
-for production environments with very high concurrency levels.
-
-This Win32 build of OpenResty is mainly for developers who want to develop their applications
-in native Windows environment (though they eventually push the finished work onto a Linux or *BSD box, most of the time).
-
-TODO
-====
-
-* Add support for more than one NGINX worker processes.
-* Add support for concurrent connections more than 1024.
-* Switch to the Microsoft Visual Studio compiler toolchain for better performance and easier binary
-package redistribution.
-* Bundle StrawberryPerl to make command-line utilities like `resty` work out of the box (without
-manually installing a Perl).
-* Deliver an alternative Win32 binary package built with best debuggin capabilities (like enabling
-NGINX debugging logs, disabling C compiler optimizations, and enabling all the assertions and checks).
-* Deliver binary packages for 64-bit Windows (Win64).
-
-Details About The Building Process
-==================================
-
-Usually you do not need to worry about how the Win32 binaries were built on the maintainers''
-side. But if you do, please read on.
-
-The Win32 build of OpenResty is currently built via the MinGW/MSYS toolchain, including
-MinGW gcc 4.8.1, MSYS perl, MSYS bash, MSYS make, and etc. Basically, it is currently built via
- the following cmmands:
-
-```bash
-mkdir -p objs/lib || exit 1
-cd objs/lib || exit 1
-ls ../../..
-tar -xf ../../../openssl-1.0.2d.tar.gz
-tar -xf ../../../zlib-1.2.8.tar.gz
-tar -xf ../../../pcre-8.37.tar.gz
-cd ../..
-./configure --with-cc=gcc \
-    --prefix= \
-    --with-cc-opt='-DFD_SETSIZE=1024' \
-    --with-select_module \
-    --with-ipv6 \
-    --sbin-path=nginx.exe \
-    --with-pcre-jit \
-    --with-luajit-xcflags="-DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT" \
-    --with-pcre=objs/lib/pcre-8.37 \
-    --with-zlib=objs/lib/zlib-1.2.8 \
-    --with-openssl=objs/lib/openssl-1.0.2d \
-    -j5
-make
-make install
-```
-
-where the dependency library source tarballs for OpenSSL, Zlib, and PCRE are downloaded
-from their official sites, respectively.
-
-We automate these commands in a dedicated shell script named [build-win32.sh](https://github.com/openresty/ngx_openresty/blob/master/util/build-win32.sh).
-
-Furthermore, we automate the packaging process of the resulting binaries and supporting files
-with this [package-win32.sh](https://github.com/openresty/ngx_openresty/blob/master/util/package-win32.sh)
-script.
-
-Usually you can just download and use the binary distribution of OpenResty without
-installing the build toolchain.
-
-Author
-======
-
-Yichun "agentzh" Zhang <agentzh@gmail.com>, CloudFlare Inc.
-
-Copyright & License
-===================
-
-This module is licensed under the BSD license.
-
-Copyright (C) 2015, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

patches/lua-5.1.5-enable_debug_info.patch

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

patches/luajit-win32-default-paths.patch

@@ -1,14 +0,0 @@
---- LuaJIT-2.1-20151028/src/luaconf.h	2015-10-12 20:28:56.000000000 +0800
-+++ LuaJIT-2.1-20151028.patched/src/luaconf.h	2015-11-01 20:31:28.358507706 +0800
-@@ -21,9 +21,9 @@
- #define LUA_LDIR	"!\\lua\\"
- #define LUA_CDIR	"!\\"
- #define LUA_PATH_DEFAULT \
--  ".\\?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;"
-+  ".\\?.lua;" "!\\lualib\\?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;"
- #define LUA_CPATH_DEFAULT \
--  ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
-+  ".\\?.dll;" "!\\lualib\\?.so;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
- #else
- /*
- ** Note to distribution maintainers: do NOT patch the following lines!

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

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

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

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

patches/nginx-1.2.8-invalid_referer_hash.patch

@@ -1,12 +0,0 @@
---- nginx-1.2.8/src/http/modules/ngx_http_referer_module.c	2013-05-06 03:27:10.000000000 -0700
-+++ nginx-1.2.8-patched/src/http/modules/ngx_http_referer_module.c	2013-05-21 16:04:49.340286168 -0700
-@@ -396,8 +396,7 @@ ngx_http_valid_referers(ngx_conf_t *cf,
- 
-     ngx_str_set(&name, "invalid_referer");
- 
--    var = ngx_http_add_variable(cf, &name,
--                                NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOHASH);
-+    var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE);
-     if (var == NULL) {
-         return NGX_CONF_ERROR;
-     }

patches/nginx-1.2.8-location_if_inherits_proxy.patch

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

patches/nginx-1.2.8-log_escape_non_ascii.patch

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

patches/nginx-1.2.8-no_Werror.patch

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

patches/nginx-1.2.8-no_error_pages.patch

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

patches/nginx-1.2.8-no_pool.patch

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

patches/nginx-1.2.8-server_header.patch

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

patches/nginx-1.2.8-slab_alloc_no_memory_as_info.patch

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

patches/nginx-1.2.8-upstream_pipelining.patch

@@ -1,40 +0,0 @@
-diff -rudp nginx-1.2.8/src/http/ngx_http_upstream.c nginx-1.2.8-patched/src/http/ngx_http_upstream.c
---- nginx-1.2.8/src/http/ngx_http_upstream.c	2012-08-06 10:34:08.000000000 -0700
-+++ nginx-1.2.8-patched/src/http/ngx_http_upstream.c	2012-12-05 14:46:41.741173058 -0800
-@@ -1216,6 +1216,7 @@ ngx_http_upstream_connect(ngx_http_reque
-     }
- 
-     u->request_sent = 0;
-+    u->request_all_sent = 0;
- 
-     if (rc == NGX_AGAIN) {
-         ngx_add_timer(c->write, u->conf->connect_timeout);
-@@ -1418,6 +1419,8 @@ ngx_http_upstream_send_request(ngx_http_
- 
-     /* rc == NGX_OK */
- 
-+    u->request_all_sent = 1;
-+
-     if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
-         if (ngx_tcp_push(c->fd) == NGX_ERROR) {
-             ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno,
-@@ -1484,7 +1487,7 @@ ngx_http_upstream_send_request_handler(n
- 
- #endif
- 
--    if (u->header_sent) {
-+    if (u->request_all_sent) {
-         u->write_event_handler = ngx_http_upstream_dummy_handler;
- 
-         (void) ngx_handle_write_event(c->write, 0);
-diff -rudp nginx-1.2.8/src/http/ngx_http_upstream.h nginx-1.2.8-patched/src/http/ngx_http_upstream.h
---- nginx-1.2.8/src/http/ngx_http_upstream.h	2012-02-13 03:01:58.000000000 -0800
-+++ nginx-1.2.8-patched/src/http/ngx_http_upstream.h	2012-12-05 14:41:09.763514741 -0800
-@@ -324,6 +324,7 @@ struct ngx_http_upstream_s {
-     unsigned                         keepalive:1;
- 
-     unsigned                         request_sent:1;
-+    unsigned                         request_all_sent:1;
-     unsigned                         header_sent:1;
- };
- 

patches/nginx-1.2.8-upstream_truncation.patch

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

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

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

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

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

patches/nginx-1.4.1-gcc-maybe-uninitialized-warning.patch

@@ -1,11 +0,0 @@
---- nginx-1.4.1/src/http/ngx_http_request.c	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.1-patched/src/http/ngx_http_request.c	2013-06-11 12:59:48.008321688 -0700
-@@ -1951,7 +1951,7 @@
-     ngx_int_t                  rc;
-     ngx_http_connection_t     *hc;
-     ngx_http_core_loc_conf_t  *clcf;
--    ngx_http_core_srv_conf_t  *cscf;
-+    ngx_http_core_srv_conf_t  *cscf = NULL;
- 
-     hc = r->http_connection;
- 

patches/nginx-1.4.1-invalid_referer_hash.patch

@@ -1,12 +0,0 @@
---- nginx-1.4.1/src/http/modules/ngx_http_referer_module.c	2013-05-06 03:27:10.000000000 -0700
-+++ nginx-1.4.1-patched/src/http/modules/ngx_http_referer_module.c	2013-05-21 16:04:49.340286168 -0700
-@@ -396,8 +396,7 @@ ngx_http_valid_referers(ngx_conf_t *cf,
- 
-     ngx_str_set(&name, "invalid_referer");
- 
--    var = ngx_http_add_variable(cf, &name,
--                                NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOHASH);
-+    var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE);
-     if (var == NULL) {
-         return NGX_CONF_ERROR;
-     }

patches/nginx-1.4.1-location_if_inherits_proxy.patch

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

patches/nginx-1.4.1-log_escape_non_ascii.patch

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

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

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

@@ -1,607 +0,0 @@
-diff -upr nginx-1.4.1/src/core/nginx.h nginx-1.4.1-patched/src/core/nginx.h
---- nginx-1.4.1/src/core/nginx.h	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.1-patched/src/core/nginx.h	2013-06-10 16:12:23.691136795 -0700
-@@ -10,7 +10,7 @@
- 
- 
- #define nginx_version      1004001
- #define NGINX_VERSION      "1.4.1"
--#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown"
-+#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
- 
- #define NGINX_VAR          "NGINX"
-Only in nginx-1.4.1-patched/src/core: nginx.h.orig
-Only in nginx-1.4.1-patched/src/core: nginx.h.rej
-diff -upr nginx-1.4.1/src/core/ngx_array.c nginx-1.4.1-patched/src/core/ngx_array.c
---- nginx-1.4.1/src/core/ngx_array.c	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.1-patched/src/core/ngx_array.c	2013-06-10 16:12:23.692136802 -0700
-@@ -30,26 +30,30 @@ ngx_array_create(ngx_pool_t *p, ngx_uint
- void
- ngx_array_destroy(ngx_array_t *a)
- {
--    ngx_pool_t  *p;
-+    ngx_pool_t          *p;
-+    ngx_array_link_t    *link;
- 
-     p = a->pool;
- 
--    if ((u_char *) a->elts + a->size * a->nalloc == p->d.last) {
--        p->d.last -= a->size * a->nalloc;
-+    if (a->elts) {
-+        ngx_pfree(p, a->elts);
-     }
- 
--    if ((u_char *) a + sizeof(ngx_array_t) == p->d.last) {
--        p->d.last = (u_char *) a;
-+    for (link = a->old_elts; link; link = link->next) {
-+        ngx_pfree(p, link->elts);
-     }
-+
-+    ngx_pfree(p, a);
- }
- 
- 
- void *
- ngx_array_push(ngx_array_t *a)
- {
--    void        *elt, *new;
--    size_t       size;
--    ngx_pool_t  *p;
-+    void                *elt, *new;
-+    size_t               size;
-+    ngx_pool_t          *p;
-+    ngx_array_link_t    *link;
- 
-     if (a->nelts == a->nalloc) {
- 
-@@ -59,29 +63,27 @@ ngx_array_push(ngx_array_t *a)
- 
-         p = a->pool;
- 
--        if ((u_char *) a->elts + size == p->d.last
--            && p->d.last + a->size <= p->d.end)
--        {
--            /*
--             * the array allocation is the last in the pool
--             * and there is space for new allocation
--             */
--
--            p->d.last += a->size;
--            a->nalloc++;
--
--        } else {
--            /* allocate a new array */
--
--            new = ngx_palloc(p, 2 * size);
--            if (new == NULL) {
--                return NULL;
--            }
--
--            ngx_memcpy(new, a->elts, size);
--            a->elts = new;
--            a->nalloc *= 2;
-+        /* allocate a new array */
-+
-+        new = ngx_palloc(p, 2 * size);
-+        if (new == NULL) {
-+            return NULL;
-+        }
-+
-+        ngx_memcpy(new, a->elts, size);
-+
-+        link = ngx_palloc(p, sizeof(ngx_array_link_t));
-+        if (link == NULL) {
-+            ngx_pfree(p, new);
-+            return NULL;
-         }
-+
-+        link->next = a->old_elts;
-+        link->elts = a->elts;
-+        a->old_elts = link;
-+
-+        a->elts = new;
-+        a->nalloc *= 2;
-     }
- 
-     elt = (u_char *) a->elts + a->size * a->nelts;
-@@ -95,11 +97,10 @@ void *
- ngx_array_push_n(ngx_array_t *a, ngx_uint_t n)
- {
-     void        *elt, *new;
--    size_t       size;
-     ngx_uint_t   nalloc;
-     ngx_pool_t  *p;
- 
--    size = n * a->size;
-+    ngx_array_link_t    *link;
- 
-     if (a->nelts + n > a->nalloc) {
- 
-@@ -107,31 +108,27 @@ ngx_array_push_n(ngx_array_t *a, ngx_uin
- 
-         p = a->pool;
- 
--        if ((u_char *) a->elts + a->size * a->nalloc == p->d.last
--            && p->d.last + size <= p->d.end)
--        {
--            /*
--             * the array allocation is the last in the pool
--             * and there is space for new allocation
--             */
--
--            p->d.last += size;
--            a->nalloc += n;
--
--        } else {
--            /* allocate a new array */
--
--            nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc);
--
--            new = ngx_palloc(p, nalloc * a->size);
--            if (new == NULL) {
--                return NULL;
--            }
--
--            ngx_memcpy(new, a->elts, a->nelts * a->size);
--            a->elts = new;
--            a->nalloc = nalloc;
-+        nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc);
-+
-+        new = ngx_palloc(p, nalloc * a->size);
-+        if (new == NULL) {
-+            return NULL;
-+        }
-+
-+        ngx_memcpy(new, a->elts, a->nelts * a->size);
-+
-+        link = ngx_palloc(p, sizeof(ngx_array_link_t));
-+        if (link == NULL) {
-+            ngx_pfree(p, new);
-+            return NULL;
-         }
-+
-+        link->next = a->old_elts;
-+        link->elts = a->elts;
-+        a->old_elts = link;
-+
-+        a->elts = new;
-+        a->nalloc = nalloc;
-     }
- 
-     elt = (u_char *) a->elts + a->size * a->nelts;
-Only in nginx-1.4.1-patched/src/core: ngx_array.c.orig
-Only in nginx-1.4.1-patched/src/core: ngx_array.c.rej
-diff -upr nginx-1.4.1/src/core/ngx_array.h nginx-1.4.1-patched/src/core/ngx_array.h
---- nginx-1.4.1/src/core/ngx_array.h	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.1-patched/src/core/ngx_array.h	2013-06-10 16:15:08.314275482 -0700
-@@ -13,12 +13,23 @@
- #include <ngx_core.h>
- 
- 
-+typedef struct ngx_array_link_s ngx_array_link_t;
-+
-+
-+struct ngx_array_link_s {
-+    void                    *elts;
-+    ngx_array_link_t        *next;
-+};
-+
-+
- typedef struct {
-     void        *elts;
-     ngx_uint_t   nelts;
-     size_t       size;
-     ngx_uint_t   nalloc;
-     ngx_pool_t  *pool;
-+
-+    ngx_array_link_t *old_elts;
- } ngx_array_t;
- 
- 
-@@ -40,6 +51,7 @@ ngx_array_init(ngx_array_t *array, ngx_p
-     array->size = size;
-     array->nalloc = n;
-     array->pool = pool;
-+    array->old_elts = NULL;
- 
-     array->elts = ngx_palloc(pool, n * size);
-     if (array->elts == NULL) {
-Only in nginx-1.4.1-patched/src/core: ngx_array.h.orig
-Only in nginx-1.4.1-patched/src/core: ngx_array.h.rej
-diff -upr nginx-1.4.1/src/core/ngx_palloc.c nginx-1.4.1-patched/src/core/ngx_palloc.c
---- nginx-1.4.1/src/core/ngx_palloc.c	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.1-patched/src/core/ngx_palloc.c	2013-06-10 16:12:23.718136984 -0700
-@@ -9,32 +9,23 @@
- #include <ngx_core.h>
- 
- 
--static void *ngx_palloc_block(ngx_pool_t *pool, size_t size);
--static void *ngx_palloc_large(ngx_pool_t *pool, size_t size);
--
--
- ngx_pool_t *
- ngx_create_pool(size_t size, ngx_log_t *log)
- {
--    ngx_pool_t  *p;
-+    ngx_pool_t        *p;
- 
--    p = ngx_memalign(NGX_POOL_ALIGNMENT, size, log);
-+    size = sizeof(ngx_pool_t);
-+    p = ngx_alloc(size, log);
-     if (p == NULL) {
-         return NULL;
-     }
- 
--    p->d.last = (u_char *) p + sizeof(ngx_pool_t);
--    p->d.end = (u_char *) p + size;
--    p->d.next = NULL;
--    p->d.failed = 0;
-+    ngx_memzero(p, size);
- 
-     size = size - sizeof(ngx_pool_t);
-     p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
- 
-     p->current = p;
--    p->chain = NULL;
--    p->large = NULL;
--    p->cleanup = NULL;
-     p->log = log;
- 
-     return p;
-@@ -44,8 +35,7 @@ ngx_create_pool(size_t size, ngx_log_t *
- void
- ngx_destroy_pool(ngx_pool_t *pool)
- {
--    ngx_pool_t          *p, *n;
--    ngx_pool_large_t    *l;
-+    ngx_pool_data_t     *d, *n;
-     ngx_pool_cleanup_t  *c;
- 
-     for (c = pool->cleanup; c; c = c->next) {
-@@ -56,13 +46,9 @@ ngx_destroy_pool(ngx_pool_t *pool)
-         }
-     }
- 
--    for (l = pool->large; l; l = l->next) {
--
--        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
--
--        if (l->alloc) {
--            ngx_free(l->alloc);
--        }
-+    if (pool->d == NULL) {
-+        ngx_free(pool);
-+        return;
-     }
- 
- #if (NGX_DEBUG)
-@@ -72,9 +58,9 @@ ngx_destroy_pool(ngx_pool_t *pool)
-      * so we cannot use this log while free()ing the pool
-      */
- 
--    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
-+    for (d = pool->d, n = d->next; ; d = n, n = n->next) {
-         ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
--                       "free: %p, unused: %uz", p, p->d.end - p->d.last);
-+                       "free: %p, unused: %d", d, 0);
- 
-         if (n == NULL) {
-             break;
-@@ -83,172 +69,82 @@ ngx_destroy_pool(ngx_pool_t *pool)
- 
- #endif
- 
--    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
--        ngx_free(p);
-+    for (d = pool->d, n = d->next; ; d = n, n = n->next) {
-+        ngx_free(d->alloc);
-+        ngx_free(d);
- 
-         if (n == NULL) {
-             break;
-         }
-     }
--}
- 
-+    pool->d = NULL;
- 
--void
--ngx_reset_pool(ngx_pool_t *pool)
--{
--    ngx_pool_t        *p;
--    ngx_pool_large_t  *l;
--
--    for (l = pool->large; l; l = l->next) {
--        if (l->alloc) {
--            ngx_free(l->alloc);
--        }
--    }
--
--    pool->large = NULL;
--
--    for (p = pool; p; p = p->d.next) {
--        p->d.last = (u_char *) p + sizeof(ngx_pool_t);
--    }
-+    ngx_free(pool);
- }
- 
- 
--void *
--ngx_palloc(ngx_pool_t *pool, size_t size)
-+void
-+ngx_reset_pool(ngx_pool_t *pool)
- {
--    u_char      *m;
--    ngx_pool_t  *p;
--
--    if (size <= pool->max) {
-+    ngx_pool_data_t     *d, *n;
-+    ngx_pool_data_t     *saved = NULL;
- 
--        p = pool->current;
--
--        do {
--            m = ngx_align_ptr(p->d.last, NGX_ALIGNMENT);
--
--            if ((size_t) (p->d.end - m) >= size) {
--                p->d.last = m + size;
--
--                return m;
-+    if (pool->d) {
-+        for (d = pool->d, n = d->next; ; d = n, n = n->next) {
-+            if (d->alloc == pool->log) {
-+                saved = d;
-+                continue;
-             }
- 
--            p = p->d.next;
--
--        } while (p);
--
--        return ngx_palloc_block(pool, size);
--    }
--
--    return ngx_palloc_large(pool, size);
--}
--
--
--void *
--ngx_pnalloc(ngx_pool_t *pool, size_t size)
--{
--    u_char      *m;
--    ngx_pool_t  *p;
--
--    if (size <= pool->max) {
--
--        p = pool->current;
--
--        do {
--            m = p->d.last;
--
--            if ((size_t) (p->d.end - m) >= size) {
--                p->d.last = m + size;
-+            ngx_free(d->alloc);
-+            ngx_free(d);
- 
--                return m;
-+            if (n == NULL) {
-+                break;
-             }
-+        }
- 
--            p = p->d.next;
--
--        } while (p);
--
--        return ngx_palloc_block(pool, size);
-+        pool->d = saved;
-     }
--
--    return ngx_palloc_large(pool, size);
- }
- 
- 
--static void *
--ngx_palloc_block(ngx_pool_t *pool, size_t size)
-+void *
-+ngx_malloc(ngx_pool_t *pool, size_t size)
- {
--    u_char      *m;
--    size_t       psize;
--    ngx_pool_t  *p, *new, *current;
-+    ngx_pool_data_t     *d;
-+    void                *p;
- 
--    psize = (size_t) (pool->d.end - (u_char *) pool);
--
--    m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
--    if (m == NULL) {
-+    p = ngx_alloc(size, pool->log);
-+    if (p == NULL) {
-         return NULL;
-     }
- 
--    new = (ngx_pool_t *) m;
--
--    new->d.end = m + psize;
--    new->d.next = NULL;
--    new->d.failed = 0;
--
--    m += sizeof(ngx_pool_data_t);
--    m = ngx_align_ptr(m, NGX_ALIGNMENT);
--    new->d.last = m + size;
--
--    current = pool->current;
--
--    for (p = current; p->d.next; p = p->d.next) {
--        if (p->d.failed++ > 4) {
--            current = p->d.next;
--        }
-+    d = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
-+    if (d == NULL){
-+        ngx_free(p);
-+        return NULL;
-     }
- 
--    p->d.next = new;
--
--    pool->current = current ? current : new;
--
--    return m;
-+    d->alloc = p;
-+    d->next = pool->d;
-+    pool->d = d;
-+    return p;
- }
- 
- 
--static void *
--ngx_palloc_large(ngx_pool_t *pool, size_t size)
-+void *
-+ngx_palloc(ngx_pool_t *pool, size_t size)
- {
--    void              *p;
--    ngx_uint_t         n;
--    ngx_pool_large_t  *large;
--
--    p = ngx_alloc(size, pool->log);
--    if (p == NULL) {
--        return NULL;
--    }
--
--    n = 0;
--
--    for (large = pool->large; large; large = large->next) {
--        if (large->alloc == NULL) {
--            large->alloc = p;
--            return p;
--        }
--
--        if (n++ > 3) {
--            break;
--        }
--    }
--
--    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
--    if (large == NULL) {
--        ngx_free(p);
--        return NULL;
--    }
-+    return ngx_malloc(pool, size);
-+}
- 
--    large->alloc = p;
--    large->next = pool->large;
--    pool->large = large;
- 
--    return p;
-+void *
-+ngx_pnalloc(ngx_pool_t *pool, size_t size)
-+{
-+    return ngx_malloc(pool, size);
- }
- 
- 
-@@ -256,38 +152,48 @@ void *
- ngx_pmemalign(ngx_pool_t *pool, size_t size, size_t alignment)
- {
-     void              *p;
--    ngx_pool_large_t  *large;
-+    ngx_pool_data_t   *d;
- 
-     p = ngx_memalign(alignment, size, pool->log);
-     if (p == NULL) {
-         return NULL;
-     }
- 
--    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
--    if (large == NULL) {
-+    d = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
-+    if (d == NULL){
-         ngx_free(p);
-         return NULL;
-     }
- 
--    large->alloc = p;
--    large->next = pool->large;
--    pool->large = large;
--
-+    d->alloc = p;
-+    d->next = pool->d;
-+    pool->d = d;
-     return p;
- }
- 
- 
- ngx_int_t
--ngx_pfree(ngx_pool_t *pool, void *p)
-+ngx_pfree(ngx_pool_t *pool, void *data)
- {
--    ngx_pool_large_t  *l;
-+    ngx_pool_data_t     *p, *d;
- 
--    for (l = pool->large; l; l = l->next) {
--        if (p == l->alloc) {
--            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
--                           "free: %p", l->alloc);
--            ngx_free(l->alloc);
--            l->alloc = NULL;
-+    p = NULL;
-+    for (d = pool->d; d; p = d, d = d->next) {
-+        if (data == d->alloc) {
-+
-+            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
-+
-+            ngx_free(d->alloc);
-+            d->alloc = NULL;
-+
-+            if (p) {
-+                p->next = d->next;
-+
-+            } else {
-+                pool->d = d->next;
-+            }
-+
-+            ngx_free(d);
- 
-             return NGX_OK;
-         }
-diff -upr nginx-1.4.1/src/core/ngx_palloc.h nginx-1.4.1-patched/src/core/ngx_palloc.h
---- nginx-1.4.1/src/core/ngx_palloc.h	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.1-patched/src/core/ngx_palloc.h	2013-06-10 16:12:23.720136999 -0700
-@@ -38,28 +38,21 @@ struct ngx_pool_cleanup_s {
- };
- 
- 
--typedef struct ngx_pool_large_s  ngx_pool_large_t;
--
--struct ngx_pool_large_s {
--    ngx_pool_large_t     *next;
--    void                 *alloc;
--};
-+typedef struct ngx_pool_data_s   ngx_pool_large_t;
-+typedef struct ngx_pool_data_s   ngx_pool_data_t;
- 
- 
--typedef struct {
--    u_char               *last;
--    u_char               *end;
--    ngx_pool_t           *next;
--    ngx_uint_t            failed;
--} ngx_pool_data_t;
-+struct ngx_pool_data_s {
-+    ngx_pool_data_t        *next;
-+    void                   *alloc;
-+};
- 
- 
- struct ngx_pool_s {
--    ngx_pool_data_t       d;
-+    ngx_pool_data_t      *d;
-     size_t                max;
-     ngx_pool_t           *current;
-     ngx_chain_t          *chain;
--    ngx_pool_large_t     *large;
-     ngx_pool_cleanup_t   *cleanup;
-     ngx_log_t            *log;
- };

patches/nginx-1.4.1-server_header.patch

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

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

patches/nginx-1.4.1-unix_socket_accept_over_read.patch

@@ -1,41 +0,0 @@
---- nginx-1.4.1/src/event/ngx_event_accept.c	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.1-patched/src/event/ngx_event_accept.c	2013-07-10 13:05:02.001249099 -0700
-@@ -269,17 +269,28 @@ ngx_event_accept(ngx_event_t *ev)
- #endif
- 
-         if (ls->addr_ntop) {
--            c->addr_text.data = ngx_pnalloc(c->pool, ls->addr_text_max_len);
--            if (c->addr_text.data == NULL) {
--                ngx_close_accepted_connection(c);
--                return;
--            }
-+            if (socklen > sizeof(c->sockaddr->sa_family)) {
-+                c->addr_text.data = ngx_pnalloc(c->pool, ls->addr_text_max_len);
-+                if (c->addr_text.data == NULL) {
-+                    ngx_close_accepted_connection(c);
-+                    return;
-+                }
-+
-+                c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->addr_text.data,
-+                                                 ls->addr_text_max_len, 0);
-+                if (c->addr_text.len == 0) {
-+                    ngx_close_accepted_connection(c);
-+                    return;
-+                }
-+
-+            } else {
-+                /*
-+                 * Linux accept/accept4 syscalls, for example, do not return
-+                 * address data upon unix domain sockets
-+                 */
- 
--            c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->addr_text.data,
--                                             ls->addr_text_max_len, 0);
--            if (c->addr_text.len == 0) {
--                ngx_close_accepted_connection(c);
--                return;
-+                c->addr_text.data = NULL;
-+                c->addr_text.len = 0;
-             }
-         }
- 

patches/nginx-1.4.1-upstream_pipelining.patch

@@ -1,40 +0,0 @@
-diff -rudp nginx-1.4.1/src/http/ngx_http_upstream.c nginx-1.4.1-patched/src/http/ngx_http_upstream.c
---- nginx-1.4.1/src/http/ngx_http_upstream.c	2012-08-06 10:34:08.000000000 -0700
-+++ nginx-1.4.1-patched/src/http/ngx_http_upstream.c	2012-12-05 14:46:41.741173058 -0800
-@@ -1216,6 +1216,7 @@ ngx_http_upstream_connect(ngx_http_reque
-     }
- 
-     u->request_sent = 0;
-+    u->request_all_sent = 0;
- 
-     if (rc == NGX_AGAIN) {
-         ngx_add_timer(c->write, u->conf->connect_timeout);
-@@ -1418,6 +1419,8 @@ ngx_http_upstream_send_request(ngx_http_
- 
-     /* rc == NGX_OK */
- 
-+    u->request_all_sent = 1;
-+
-     if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
-         if (ngx_tcp_push(c->fd) == NGX_ERROR) {
-             ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno,
-@@ -1484,7 +1487,7 @@ ngx_http_upstream_send_request_handler(n
- 
- #endif
- 
--    if (u->header_sent) {
-+    if (u->request_all_sent) {
-         u->write_event_handler = ngx_http_upstream_dummy_handler;
- 
-         (void) ngx_handle_write_event(c->write, 0);
-diff -rudp nginx-1.4.1/src/http/ngx_http_upstream.h nginx-1.4.1-patched/src/http/ngx_http_upstream.h
---- nginx-1.4.1/src/http/ngx_http_upstream.h	2012-02-13 03:01:58.000000000 -0800
-+++ nginx-1.4.1-patched/src/http/ngx_http_upstream.h	2012-12-05 14:41:09.763514741 -0800
-@@ -324,6 +324,7 @@ struct ngx_http_upstream_s {
-     unsigned                         keepalive:1;
- 
-     unsigned                         request_sent:1;
-+    unsigned                         request_all_sent:1;
-     unsigned                         header_sent:1;
- };
- 

patches/nginx-1.4.1-upstream_truncation.patch

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

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

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

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

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

patches/nginx-1.4.2-gcc-maybe-uninitialized-warning.patch

@@ -1,11 +0,0 @@
---- nginx-1.4.2/src/http/ngx_http_request.c	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.2-patched/src/http/ngx_http_request.c	2013-06-11 12:59:48.008321688 -0700
-@@ -1951,7 +1951,7 @@
-     ngx_int_t                  rc;
-     ngx_http_connection_t     *hc;
-     ngx_http_core_loc_conf_t  *clcf;
--    ngx_http_core_srv_conf_t  *cscf;
-+    ngx_http_core_srv_conf_t  *cscf = NULL;
- 
-     hc = r->http_connection;
- 

patches/nginx-1.4.2-invalid_referer_hash.patch

@@ -1,12 +0,0 @@
---- nginx-1.4.2/src/http/modules/ngx_http_referer_module.c	2013-05-06 03:27:10.000000000 -0700
-+++ nginx-1.4.2-patched/src/http/modules/ngx_http_referer_module.c	2013-05-21 16:04:49.340286168 -0700
-@@ -396,8 +396,7 @@ ngx_http_valid_referers(ngx_conf_t *cf,
- 
-     ngx_str_set(&name, "invalid_referer");
- 
--    var = ngx_http_add_variable(cf, &name,
--                                NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOHASH);
-+    var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE);
-     if (var == NULL) {
-         return NGX_CONF_ERROR;
-     }

patches/nginx-1.4.2-location_if_inherits_proxy.patch

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

patches/nginx-1.4.2-log_escape_non_ascii.patch

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

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

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

@@ -1,607 +0,0 @@
-diff -upr nginx-1.4.2/src/core/nginx.h nginx-1.4.2-patched/src/core/nginx.h
---- nginx-1.4.2/src/core/nginx.h	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.2-patched/src/core/nginx.h	2013-06-10 16:12:23.691136795 -0700
-@@ -10,7 +10,7 @@
- 
- 
- #define nginx_version      1004002
- #define NGINX_VERSION      "1.4.2"
--#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown"
-+#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
- 
- #define NGINX_VAR          "NGINX"
-Only in nginx-1.4.2-patched/src/core: nginx.h.orig
-Only in nginx-1.4.2-patched/src/core: nginx.h.rej
-diff -upr nginx-1.4.2/src/core/ngx_array.c nginx-1.4.2-patched/src/core/ngx_array.c
---- nginx-1.4.2/src/core/ngx_array.c	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.2-patched/src/core/ngx_array.c	2013-06-10 16:12:23.692136802 -0700
-@@ -30,26 +30,30 @@ ngx_array_create(ngx_pool_t *p, ngx_uint
- void
- ngx_array_destroy(ngx_array_t *a)
- {
--    ngx_pool_t  *p;
-+    ngx_pool_t          *p;
-+    ngx_array_link_t    *link;
- 
-     p = a->pool;
- 
--    if ((u_char *) a->elts + a->size * a->nalloc == p->d.last) {
--        p->d.last -= a->size * a->nalloc;
-+    if (a->elts) {
-+        ngx_pfree(p, a->elts);
-     }
- 
--    if ((u_char *) a + sizeof(ngx_array_t) == p->d.last) {
--        p->d.last = (u_char *) a;
-+    for (link = a->old_elts; link; link = link->next) {
-+        ngx_pfree(p, link->elts);
-     }
-+
-+    ngx_pfree(p, a);
- }
- 
- 
- void *
- ngx_array_push(ngx_array_t *a)
- {
--    void        *elt, *new;
--    size_t       size;
--    ngx_pool_t  *p;
-+    void                *elt, *new;
-+    size_t               size;
-+    ngx_pool_t          *p;
-+    ngx_array_link_t    *link;
- 
-     if (a->nelts == a->nalloc) {
- 
-@@ -59,29 +63,27 @@ ngx_array_push(ngx_array_t *a)
- 
-         p = a->pool;
- 
--        if ((u_char *) a->elts + size == p->d.last
--            && p->d.last + a->size <= p->d.end)
--        {
--            /*
--             * the array allocation is the last in the pool
--             * and there is space for new allocation
--             */
--
--            p->d.last += a->size;
--            a->nalloc++;
--
--        } else {
--            /* allocate a new array */
--
--            new = ngx_palloc(p, 2 * size);
--            if (new == NULL) {
--                return NULL;
--            }
--
--            ngx_memcpy(new, a->elts, size);
--            a->elts = new;
--            a->nalloc *= 2;
-+        /* allocate a new array */
-+
-+        new = ngx_palloc(p, 2 * size);
-+        if (new == NULL) {
-+            return NULL;
-+        }
-+
-+        ngx_memcpy(new, a->elts, size);
-+
-+        link = ngx_palloc(p, sizeof(ngx_array_link_t));
-+        if (link == NULL) {
-+            ngx_pfree(p, new);
-+            return NULL;
-         }
-+
-+        link->next = a->old_elts;
-+        link->elts = a->elts;
-+        a->old_elts = link;
-+
-+        a->elts = new;
-+        a->nalloc *= 2;
-     }
- 
-     elt = (u_char *) a->elts + a->size * a->nelts;
-@@ -95,11 +97,10 @@ void *
- ngx_array_push_n(ngx_array_t *a, ngx_uint_t n)
- {
-     void        *elt, *new;
--    size_t       size;
-     ngx_uint_t   nalloc;
-     ngx_pool_t  *p;
- 
--    size = n * a->size;
-+    ngx_array_link_t    *link;
- 
-     if (a->nelts + n > a->nalloc) {
- 
-@@ -107,31 +108,27 @@ ngx_array_push_n(ngx_array_t *a, ngx_uin
- 
-         p = a->pool;
- 
--        if ((u_char *) a->elts + a->size * a->nalloc == p->d.last
--            && p->d.last + size <= p->d.end)
--        {
--            /*
--             * the array allocation is the last in the pool
--             * and there is space for new allocation
--             */
--
--            p->d.last += size;
--            a->nalloc += n;
--
--        } else {
--            /* allocate a new array */
--
--            nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc);
--
--            new = ngx_palloc(p, nalloc * a->size);
--            if (new == NULL) {
--                return NULL;
--            }
--
--            ngx_memcpy(new, a->elts, a->nelts * a->size);
--            a->elts = new;
--            a->nalloc = nalloc;
-+        nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc);
-+
-+        new = ngx_palloc(p, nalloc * a->size);
-+        if (new == NULL) {
-+            return NULL;
-+        }
-+
-+        ngx_memcpy(new, a->elts, a->nelts * a->size);
-+
-+        link = ngx_palloc(p, sizeof(ngx_array_link_t));
-+        if (link == NULL) {
-+            ngx_pfree(p, new);
-+            return NULL;
-         }
-+
-+        link->next = a->old_elts;
-+        link->elts = a->elts;
-+        a->old_elts = link;
-+
-+        a->elts = new;
-+        a->nalloc = nalloc;
-     }
- 
-     elt = (u_char *) a->elts + a->size * a->nelts;
-Only in nginx-1.4.2-patched/src/core: ngx_array.c.orig
-Only in nginx-1.4.2-patched/src/core: ngx_array.c.rej
-diff -upr nginx-1.4.2/src/core/ngx_array.h nginx-1.4.2-patched/src/core/ngx_array.h
---- nginx-1.4.2/src/core/ngx_array.h	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.2-patched/src/core/ngx_array.h	2013-06-10 16:15:08.314275482 -0700
-@@ -13,12 +13,23 @@
- #include <ngx_core.h>
- 
- 
-+typedef struct ngx_array_link_s ngx_array_link_t;
-+
-+
-+struct ngx_array_link_s {
-+    void                    *elts;
-+    ngx_array_link_t        *next;
-+};
-+
-+
- typedef struct {
-     void        *elts;
-     ngx_uint_t   nelts;
-     size_t       size;
-     ngx_uint_t   nalloc;
-     ngx_pool_t  *pool;
-+
-+    ngx_array_link_t *old_elts;
- } ngx_array_t;
- 
- 
-@@ -40,6 +51,7 @@ ngx_array_init(ngx_array_t *array, ngx_p
-     array->size = size;
-     array->nalloc = n;
-     array->pool = pool;
-+    array->old_elts = NULL;
- 
-     array->elts = ngx_palloc(pool, n * size);
-     if (array->elts == NULL) {
-Only in nginx-1.4.2-patched/src/core: ngx_array.h.orig
-Only in nginx-1.4.2-patched/src/core: ngx_array.h.rej
-diff -upr nginx-1.4.2/src/core/ngx_palloc.c nginx-1.4.2-patched/src/core/ngx_palloc.c
---- nginx-1.4.2/src/core/ngx_palloc.c	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.2-patched/src/core/ngx_palloc.c	2013-06-10 16:12:23.718136984 -0700
-@@ -9,32 +9,23 @@
- #include <ngx_core.h>
- 
- 
--static void *ngx_palloc_block(ngx_pool_t *pool, size_t size);
--static void *ngx_palloc_large(ngx_pool_t *pool, size_t size);
--
--
- ngx_pool_t *
- ngx_create_pool(size_t size, ngx_log_t *log)
- {
--    ngx_pool_t  *p;
-+    ngx_pool_t        *p;
- 
--    p = ngx_memalign(NGX_POOL_ALIGNMENT, size, log);
-+    size = sizeof(ngx_pool_t);
-+    p = ngx_alloc(size, log);
-     if (p == NULL) {
-         return NULL;
-     }
- 
--    p->d.last = (u_char *) p + sizeof(ngx_pool_t);
--    p->d.end = (u_char *) p + size;
--    p->d.next = NULL;
--    p->d.failed = 0;
-+    ngx_memzero(p, size);
- 
-     size = size - sizeof(ngx_pool_t);
-     p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
- 
-     p->current = p;
--    p->chain = NULL;
--    p->large = NULL;
--    p->cleanup = NULL;
-     p->log = log;
- 
-     return p;
-@@ -44,8 +35,7 @@ ngx_create_pool(size_t size, ngx_log_t *
- void
- ngx_destroy_pool(ngx_pool_t *pool)
- {
--    ngx_pool_t          *p, *n;
--    ngx_pool_large_t    *l;
-+    ngx_pool_data_t     *d, *n;
-     ngx_pool_cleanup_t  *c;
- 
-     for (c = pool->cleanup; c; c = c->next) {
-@@ -56,13 +46,9 @@ ngx_destroy_pool(ngx_pool_t *pool)
-         }
-     }
- 
--    for (l = pool->large; l; l = l->next) {
--
--        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
--
--        if (l->alloc) {
--            ngx_free(l->alloc);
--        }
-+    if (pool->d == NULL) {
-+        ngx_free(pool);
-+        return;
-     }
- 
- #if (NGX_DEBUG)
-@@ -72,9 +58,9 @@ ngx_destroy_pool(ngx_pool_t *pool)
-      * so we cannot use this log while free()ing the pool
-      */
- 
--    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
-+    for (d = pool->d, n = d->next; ; d = n, n = n->next) {
-         ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
--                       "free: %p, unused: %uz", p, p->d.end - p->d.last);
-+                       "free: %p, unused: %d", d, 0);
- 
-         if (n == NULL) {
-             break;
-@@ -83,172 +69,82 @@ ngx_destroy_pool(ngx_pool_t *pool)
- 
- #endif
- 
--    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
--        ngx_free(p);
-+    for (d = pool->d, n = d->next; ; d = n, n = n->next) {
-+        ngx_free(d->alloc);
-+        ngx_free(d);
- 
-         if (n == NULL) {
-             break;
-         }
-     }
--}
- 
-+    pool->d = NULL;
- 
--void
--ngx_reset_pool(ngx_pool_t *pool)
--{
--    ngx_pool_t        *p;
--    ngx_pool_large_t  *l;
--
--    for (l = pool->large; l; l = l->next) {
--        if (l->alloc) {
--            ngx_free(l->alloc);
--        }
--    }
--
--    pool->large = NULL;
--
--    for (p = pool; p; p = p->d.next) {
--        p->d.last = (u_char *) p + sizeof(ngx_pool_t);
--    }
-+    ngx_free(pool);
- }
- 
- 
--void *
--ngx_palloc(ngx_pool_t *pool, size_t size)
-+void
-+ngx_reset_pool(ngx_pool_t *pool)
- {
--    u_char      *m;
--    ngx_pool_t  *p;
--
--    if (size <= pool->max) {
-+    ngx_pool_data_t     *d, *n;
-+    ngx_pool_data_t     *saved = NULL;
- 
--        p = pool->current;
--
--        do {
--            m = ngx_align_ptr(p->d.last, NGX_ALIGNMENT);
--
--            if ((size_t) (p->d.end - m) >= size) {
--                p->d.last = m + size;
--
--                return m;
-+    if (pool->d) {
-+        for (d = pool->d, n = d->next; ; d = n, n = n->next) {
-+            if (d->alloc == pool->log) {
-+                saved = d;
-+                continue;
-             }
- 
--            p = p->d.next;
--
--        } while (p);
--
--        return ngx_palloc_block(pool, size);
--    }
--
--    return ngx_palloc_large(pool, size);
--}
--
--
--void *
--ngx_pnalloc(ngx_pool_t *pool, size_t size)
--{
--    u_char      *m;
--    ngx_pool_t  *p;
--
--    if (size <= pool->max) {
--
--        p = pool->current;
--
--        do {
--            m = p->d.last;
--
--            if ((size_t) (p->d.end - m) >= size) {
--                p->d.last = m + size;
-+            ngx_free(d->alloc);
-+            ngx_free(d);
- 
--                return m;
-+            if (n == NULL) {
-+                break;
-             }
-+        }
- 
--            p = p->d.next;
--
--        } while (p);
--
--        return ngx_palloc_block(pool, size);
-+        pool->d = saved;
-     }
--
--    return ngx_palloc_large(pool, size);
- }
- 
- 
--static void *
--ngx_palloc_block(ngx_pool_t *pool, size_t size)
-+void *
-+ngx_malloc(ngx_pool_t *pool, size_t size)
- {
--    u_char      *m;
--    size_t       psize;
--    ngx_pool_t  *p, *new, *current;
-+    ngx_pool_data_t     *d;
-+    void                *p;
- 
--    psize = (size_t) (pool->d.end - (u_char *) pool);
--
--    m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
--    if (m == NULL) {
-+    p = ngx_alloc(size, pool->log);
-+    if (p == NULL) {
-         return NULL;
-     }
- 
--    new = (ngx_pool_t *) m;
--
--    new->d.end = m + psize;
--    new->d.next = NULL;
--    new->d.failed = 0;
--
--    m += sizeof(ngx_pool_data_t);
--    m = ngx_align_ptr(m, NGX_ALIGNMENT);
--    new->d.last = m + size;
--
--    current = pool->current;
--
--    for (p = current; p->d.next; p = p->d.next) {
--        if (p->d.failed++ > 4) {
--            current = p->d.next;
--        }
-+    d = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
-+    if (d == NULL){
-+        ngx_free(p);
-+        return NULL;
-     }
- 
--    p->d.next = new;
--
--    pool->current = current ? current : new;
--
--    return m;
-+    d->alloc = p;
-+    d->next = pool->d;
-+    pool->d = d;
-+    return p;
- }
- 
- 
--static void *
--ngx_palloc_large(ngx_pool_t *pool, size_t size)
-+void *
-+ngx_palloc(ngx_pool_t *pool, size_t size)
- {
--    void              *p;
--    ngx_uint_t         n;
--    ngx_pool_large_t  *large;
--
--    p = ngx_alloc(size, pool->log);
--    if (p == NULL) {
--        return NULL;
--    }
--
--    n = 0;
--
--    for (large = pool->large; large; large = large->next) {
--        if (large->alloc == NULL) {
--            large->alloc = p;
--            return p;
--        }
--
--        if (n++ > 3) {
--            break;
--        }
--    }
--
--    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
--    if (large == NULL) {
--        ngx_free(p);
--        return NULL;
--    }
-+    return ngx_malloc(pool, size);
-+}
- 
--    large->alloc = p;
--    large->next = pool->large;
--    pool->large = large;
- 
--    return p;
-+void *
-+ngx_pnalloc(ngx_pool_t *pool, size_t size)
-+{
-+    return ngx_malloc(pool, size);
- }
- 
- 
-@@ -256,38 +152,48 @@ void *
- ngx_pmemalign(ngx_pool_t *pool, size_t size, size_t alignment)
- {
-     void              *p;
--    ngx_pool_large_t  *large;
-+    ngx_pool_data_t   *d;
- 
-     p = ngx_memalign(alignment, size, pool->log);
-     if (p == NULL) {
-         return NULL;
-     }
- 
--    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
--    if (large == NULL) {
-+    d = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
-+    if (d == NULL){
-         ngx_free(p);
-         return NULL;
-     }
- 
--    large->alloc = p;
--    large->next = pool->large;
--    pool->large = large;
--
-+    d->alloc = p;
-+    d->next = pool->d;
-+    pool->d = d;
-     return p;
- }
- 
- 
- ngx_int_t
--ngx_pfree(ngx_pool_t *pool, void *p)
-+ngx_pfree(ngx_pool_t *pool, void *data)
- {
--    ngx_pool_large_t  *l;
-+    ngx_pool_data_t     *p, *d;
- 
--    for (l = pool->large; l; l = l->next) {
--        if (p == l->alloc) {
--            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
--                           "free: %p", l->alloc);
--            ngx_free(l->alloc);
--            l->alloc = NULL;
-+    p = NULL;
-+    for (d = pool->d; d; p = d, d = d->next) {
-+        if (data == d->alloc) {
-+
-+            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
-+
-+            ngx_free(d->alloc);
-+            d->alloc = NULL;
-+
-+            if (p) {
-+                p->next = d->next;
-+
-+            } else {
-+                pool->d = d->next;
-+            }
-+
-+            ngx_free(d);
- 
-             return NGX_OK;
-         }
-diff -upr nginx-1.4.2/src/core/ngx_palloc.h nginx-1.4.2-patched/src/core/ngx_palloc.h
---- nginx-1.4.2/src/core/ngx_palloc.h	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.2-patched/src/core/ngx_palloc.h	2013-06-10 16:12:23.720136999 -0700
-@@ -38,28 +38,21 @@ struct ngx_pool_cleanup_s {
- };
- 
- 
--typedef struct ngx_pool_large_s  ngx_pool_large_t;
--
--struct ngx_pool_large_s {
--    ngx_pool_large_t     *next;
--    void                 *alloc;
--};
-+typedef struct ngx_pool_data_s   ngx_pool_large_t;
-+typedef struct ngx_pool_data_s   ngx_pool_data_t;
- 
- 
--typedef struct {
--    u_char               *last;
--    u_char               *end;
--    ngx_pool_t           *next;
--    ngx_uint_t            failed;
--} ngx_pool_data_t;
-+struct ngx_pool_data_s {
-+    ngx_pool_data_t        *next;
-+    void                   *alloc;
-+};
- 
- 
- struct ngx_pool_s {
--    ngx_pool_data_t       d;
-+    ngx_pool_data_t      *d;
-     size_t                max;
-     ngx_pool_t           *current;
-     ngx_chain_t          *chain;
--    ngx_pool_large_t     *large;
-     ngx_pool_cleanup_t   *cleanup;
-     ngx_log_t            *log;
- };

patches/nginx-1.4.2-server_header.patch

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

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

patches/nginx-1.4.2-unix_socket_accept_over_read.patch

@@ -1,41 +0,0 @@
---- nginx-1.4.2/src/event/ngx_event_accept.c	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.2-patched/src/event/ngx_event_accept.c	2013-07-10 13:05:02.001249099 -0700
-@@ -269,17 +269,28 @@ ngx_event_accept(ngx_event_t *ev)
- #endif
- 
-         if (ls->addr_ntop) {
--            c->addr_text.data = ngx_pnalloc(c->pool, ls->addr_text_max_len);
--            if (c->addr_text.data == NULL) {
--                ngx_close_accepted_connection(c);
--                return;
--            }
-+            if (socklen > sizeof(c->sockaddr->sa_family)) {
-+                c->addr_text.data = ngx_pnalloc(c->pool, ls->addr_text_max_len);
-+                if (c->addr_text.data == NULL) {
-+                    ngx_close_accepted_connection(c);
-+                    return;
-+                }
-+
-+                c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->addr_text.data,
-+                                                 ls->addr_text_max_len, 0);
-+                if (c->addr_text.len == 0) {
-+                    ngx_close_accepted_connection(c);
-+                    return;
-+                }
-+
-+            } else {
-+                /*
-+                 * Linux accept/accept4 syscalls, for example, do not return
-+                 * address data upon unix domain sockets
-+                 */
- 
--            c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->addr_text.data,
--                                             ls->addr_text_max_len, 0);
--            if (c->addr_text.len == 0) {
--                ngx_close_accepted_connection(c);
--                return;
-+                c->addr_text.data = NULL;
-+                c->addr_text.len = 0;
-             }
-         }
- 

patches/nginx-1.4.2-upstream_pipelining.patch

@@ -1,40 +0,0 @@
-diff -rudp nginx-1.4.2/src/http/ngx_http_upstream.c nginx-1.4.2-patched/src/http/ngx_http_upstream.c
---- nginx-1.4.2/src/http/ngx_http_upstream.c	2012-08-06 10:34:08.000000000 -0700
-+++ nginx-1.4.2-patched/src/http/ngx_http_upstream.c	2012-12-05 14:46:41.741173058 -0800
-@@ -1216,6 +1216,7 @@ ngx_http_upstream_connect(ngx_http_reque
-     }
- 
-     u->request_sent = 0;
-+    u->request_all_sent = 0;
- 
-     if (rc == NGX_AGAIN) {
-         ngx_add_timer(c->write, u->conf->connect_timeout);
-@@ -1418,6 +1419,8 @@ ngx_http_upstream_send_request(ngx_http_
- 
-     /* rc == NGX_OK */
- 
-+    u->request_all_sent = 1;
-+
-     if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
-         if (ngx_tcp_push(c->fd) == NGX_ERROR) {
-             ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno,
-@@ -1484,7 +1487,7 @@ ngx_http_upstream_send_request_handler(n
- 
- #endif
- 
--    if (u->header_sent) {
-+    if (u->request_all_sent) {
-         u->write_event_handler = ngx_http_upstream_dummy_handler;
- 
-         (void) ngx_handle_write_event(c->write, 0);
-diff -rudp nginx-1.4.2/src/http/ngx_http_upstream.h nginx-1.4.2-patched/src/http/ngx_http_upstream.h
---- nginx-1.4.2/src/http/ngx_http_upstream.h	2012-02-13 03:01:58.000000000 -0800
-+++ nginx-1.4.2-patched/src/http/ngx_http_upstream.h	2012-12-05 14:41:09.763514741 -0800
-@@ -324,6 +324,7 @@ struct ngx_http_upstream_s {
-     unsigned                         keepalive:1;
- 
-     unsigned                         request_sent:1;
-+    unsigned                         request_all_sent:1;
-     unsigned                         header_sent:1;
- };
- 

patches/nginx-1.4.2-upstream_truncation.patch

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

patches/nginx-1.4.3-cache_lock_hang_in_subreq.patch

@@ -1,22 +0,0 @@
---- nginx-1.4.3/src/http/ngx_http_file_cache.c	2013-10-08 05:07:14.000000000 -0700
-+++ nginx-1.4.3-patched/src/http/ngx_http_file_cache.c	2013-10-26 14:47:56.184041728 -0700
-@@ -432,6 +432,7 @@ ngx_http_file_cache_lock_wait_handler(ng
-     ngx_uint_t                 wait;
-     ngx_msec_t                 timer;
-     ngx_http_cache_t          *c;
-+    ngx_connection_t          *conn;
-     ngx_http_request_t        *r;
-     ngx_http_file_cache_t     *cache;
- 
-@@ -471,7 +472,10 @@ wakeup:
- 
-     c->waiting = 0;
-     r->main->blocked--;
--    r->connection->write->handler(r->connection->write);
-+
-+    conn = r->connection;
-+    r->write_event_handler(r);
-+    ngx_http_run_posted_requests(conn);
- }
- 
- 

patches/nginx-1.4.3-cache_manager_exit.patch

@@ -1,19 +0,0 @@
-# HG changeset patch
-# User Yichun Zhang <agentzh@gmail.com>
-# Date 1383598130 28800
-# Node ID f64218e1ac963337d84092536f588b8e0d99bbaa
-# Parent  dea321e5c0216efccbb23e84bbce7cf3e28f130c
-Cache: gracefully exit the cache manager process.
-
-diff -r dea321e5c021 -r f64218e1ac96 src/os/unix/ngx_process_cycle.c
---- a/src/os/unix/ngx_process_cycle.c	Thu Oct 31 18:23:49 2013 +0400
-+++ b/src/os/unix/ngx_process_cycle.c	Mon Nov 04 12:48:50 2013 -0800
-@@ -1335,7 +1335,7 @@
- 
-         if (ngx_terminate || ngx_quit) {
-             ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
--            exit(0);
-+            ngx_worker_process_exit(cycle);
-         }
- 
-         if (ngx_reopen) {

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

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

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

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

patches/nginx-1.4.3-gcc-maybe-uninitialized-warning.patch

@@ -1,11 +0,0 @@
---- nginx-1.4.3/src/http/ngx_http_request.c	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.3-patched/src/http/ngx_http_request.c	2013-06-11 12:59:48.008321688 -0700
-@@ -1951,7 +1951,7 @@
-     ngx_int_t                  rc;
-     ngx_http_connection_t     *hc;
-     ngx_http_core_loc_conf_t  *clcf;
--    ngx_http_core_srv_conf_t  *cscf;
-+    ngx_http_core_srv_conf_t  *cscf = NULL;
- 
-     hc = r->http_connection;
- 

patches/nginx-1.4.3-gzip_buffered_bug.patch

@@ -1,42 +0,0 @@
-
-# HG changeset patch
-# User Maxim Dounin <mdounin@mdounin.ru>
-# Date 1374749732 -14400
-# Node ID 84155a389bcc249138e18546134cfbff1931013b
-# Parent  355779f81491a78f3fe79e4a1eb5036c3882b441
-Gzip: clearing of c->buffered if all data are flushed.
-
-This allows to finalize unfinished responses while still sending as
-much data as available.
-
-diff -r 355779f81491 -r 84155a389bcc src/http/modules/ngx_http_gzip_filter_module.c
---- a/src/http/modules/ngx_http_gzip_filter_module.c	Thu Jul 25 14:55:09 2013 +0400
-+++ b/src/http/modules/ngx_http_gzip_filter_module.c	Thu Jul 25 14:55:32 2013 +0400
-@@ -368,6 +368,8 @@
-         if (ngx_chain_add_copy(r->pool, &ctx->in, in) != NGX_OK) {
-             goto failed;
-         }
-+
-+        r->connection->buffered |= NGX_HTTP_GZIP_BUFFERED;
-     }
- 
-     if (ctx->nomem) {
-@@ -620,8 +622,6 @@
-         return NGX_ERROR;
-     }
- 
--    r->connection->buffered |= NGX_HTTP_GZIP_BUFFERED;
--
-     ctx->last_out = &ctx->out;
-     ctx->crc32 = crc32(0L, Z_NULL, 0);
-     ctx->flush = Z_NO_FLUSH;
-@@ -854,6 +854,8 @@
-         *ctx->last_out = cl;
-         ctx->last_out = &cl->next;
- 
-+        r->connection->buffered &= ~NGX_HTTP_GZIP_BUFFERED;
-+
-         return NGX_OK;
-     }
- 
-

patches/nginx-1.4.3-gzip_flush_bug.patch

@@ -1,32 +0,0 @@
-# HG changeset patch
-# User Yichun Zhang <agentzh@gmail.com>
-# Date 1382997696 25200
-# Branch gzip-flush
-# Node ID 8985d6cc9a4334e954909c130e6204c6fc673d7e
-# Parent  e6a1623f87bc96d5ec62b6d77356aa47dbc60756
-Flush pending data when incoming chain is NULL in gzip and gunzip modules
-
-diff -r e6a1623f87bc -r 8985d6cc9a43 src/http/modules/ngx_http_gunzip_filter_module.c
---- a/src/http/modules/ngx_http_gunzip_filter_module.c	Mon Oct 21 18:20:32 2013 +0800
-+++ b/src/http/modules/ngx_http_gunzip_filter_module.c	Mon Oct 28 15:01:36 2013 -0700
-@@ -199,7 +199,7 @@
-         }
-     }
- 
--    if (ctx->nomem) {
-+    if (ctx->nomem || in == NULL) {
- 
-         /* flush busy buffers */
- 
-diff -r e6a1623f87bc -r 8985d6cc9a43 src/http/modules/ngx_http_gzip_filter_module.c
---- a/src/http/modules/ngx_http_gzip_filter_module.c	Mon Oct 21 18:20:32 2013 +0800
-+++ b/src/http/modules/ngx_http_gzip_filter_module.c	Mon Oct 28 15:01:36 2013 -0700
-@@ -372,7 +372,7 @@
-         r->connection->buffered |= NGX_HTTP_GZIP_BUFFERED;
-     }
- 
--    if (ctx->nomem) {
-+    if (ctx->nomem || in == NULL) {
- 
-         /* flush busy buffers */
- 

patches/nginx-1.4.3-invalid_referer_hash.patch

@@ -1,12 +0,0 @@
---- nginx-1.4.3/src/http/modules/ngx_http_referer_module.c	2013-05-06 03:27:10.000000000 -0700
-+++ nginx-1.4.3-patched/src/http/modules/ngx_http_referer_module.c	2013-05-21 16:04:49.340286168 -0700
-@@ -396,8 +396,7 @@ ngx_http_valid_referers(ngx_conf_t *cf,
- 
-     ngx_str_set(&name, "invalid_referer");
- 
--    var = ngx_http_add_variable(cf, &name,
--                                NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOHASH);
-+    var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE);
-     if (var == NULL) {
-         return NGX_CONF_ERROR;
-     }

patches/nginx-1.4.3-larger_max_error_str.patch

@@ -1,13 +0,0 @@
---- nginx-1.4.3/src/core/ngx_log.h	2013-10-08 05:07:14.000000000 -0700
-+++ nginx-1.4.3-patched/src/core/ngx_log.h	2013-12-05 20:35:35.996236720 -0800
-@@ -64,7 +64,9 @@ struct ngx_log_s {
- };
- 
- 
--#define NGX_MAX_ERROR_STR   2048
-+#ifndef NGX_MAX_ERROR_STR
-+#define NGX_MAX_ERROR_STR   4096
-+#endif
- 
- 
- /*********************************/

patches/nginx-1.4.3-location_if_inherits_proxy.patch

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

patches/nginx-1.4.3-log_escape_non_ascii.patch

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

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

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

@@ -1,607 +0,0 @@
-diff -upr nginx-1.4.3/src/core/nginx.h nginx-1.4.3-patched/src/core/nginx.h
---- nginx-1.4.3/src/core/nginx.h	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.3-patched/src/core/nginx.h	2013-06-10 16:12:23.691136795 -0700
-@@ -10,7 +10,7 @@
- 
- 
- #define nginx_version      1004003
- #define NGINX_VERSION      "1.4.3"
--#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown"
-+#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
- 
- #define NGINX_VAR          "NGINX"
-Only in nginx-1.4.3-patched/src/core: nginx.h.orig
-Only in nginx-1.4.3-patched/src/core: nginx.h.rej
-diff -upr nginx-1.4.3/src/core/ngx_array.c nginx-1.4.3-patched/src/core/ngx_array.c
---- nginx-1.4.3/src/core/ngx_array.c	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.3-patched/src/core/ngx_array.c	2013-06-10 16:12:23.692136802 -0700
-@@ -30,26 +30,30 @@ ngx_array_create(ngx_pool_t *p, ngx_uint
- void
- ngx_array_destroy(ngx_array_t *a)
- {
--    ngx_pool_t  *p;
-+    ngx_pool_t          *p;
-+    ngx_array_link_t    *link;
- 
-     p = a->pool;
- 
--    if ((u_char *) a->elts + a->size * a->nalloc == p->d.last) {
--        p->d.last -= a->size * a->nalloc;
-+    if (a->elts) {
-+        ngx_pfree(p, a->elts);
-     }
- 
--    if ((u_char *) a + sizeof(ngx_array_t) == p->d.last) {
--        p->d.last = (u_char *) a;
-+    for (link = a->old_elts; link; link = link->next) {
-+        ngx_pfree(p, link->elts);
-     }
-+
-+    ngx_pfree(p, a);
- }
- 
- 
- void *
- ngx_array_push(ngx_array_t *a)
- {
--    void        *elt, *new;
--    size_t       size;
--    ngx_pool_t  *p;
-+    void                *elt, *new;
-+    size_t               size;
-+    ngx_pool_t          *p;
-+    ngx_array_link_t    *link;
- 
-     if (a->nelts == a->nalloc) {
- 
-@@ -59,29 +63,27 @@ ngx_array_push(ngx_array_t *a)
- 
-         p = a->pool;
- 
--        if ((u_char *) a->elts + size == p->d.last
--            && p->d.last + a->size <= p->d.end)
--        {
--            /*
--             * the array allocation is the last in the pool
--             * and there is space for new allocation
--             */
--
--            p->d.last += a->size;
--            a->nalloc++;
--
--        } else {
--            /* allocate a new array */
--
--            new = ngx_palloc(p, 2 * size);
--            if (new == NULL) {
--                return NULL;
--            }
--
--            ngx_memcpy(new, a->elts, size);
--            a->elts = new;
--            a->nalloc *= 2;
-+        /* allocate a new array */
-+
-+        new = ngx_palloc(p, 2 * size);
-+        if (new == NULL) {
-+            return NULL;
-+        }
-+
-+        ngx_memcpy(new, a->elts, size);
-+
-+        link = ngx_palloc(p, sizeof(ngx_array_link_t));
-+        if (link == NULL) {
-+            ngx_pfree(p, new);
-+            return NULL;
-         }
-+
-+        link->next = a->old_elts;
-+        link->elts = a->elts;
-+        a->old_elts = link;
-+
-+        a->elts = new;
-+        a->nalloc *= 2;
-     }
- 
-     elt = (u_char *) a->elts + a->size * a->nelts;
-@@ -95,11 +97,10 @@ void *
- ngx_array_push_n(ngx_array_t *a, ngx_uint_t n)
- {
-     void        *elt, *new;
--    size_t       size;
-     ngx_uint_t   nalloc;
-     ngx_pool_t  *p;
- 
--    size = n * a->size;
-+    ngx_array_link_t    *link;
- 
-     if (a->nelts + n > a->nalloc) {
- 
-@@ -107,31 +108,27 @@ ngx_array_push_n(ngx_array_t *a, ngx_uin
- 
-         p = a->pool;
- 
--        if ((u_char *) a->elts + a->size * a->nalloc == p->d.last
--            && p->d.last + size <= p->d.end)
--        {
--            /*
--             * the array allocation is the last in the pool
--             * and there is space for new allocation
--             */
--
--            p->d.last += size;
--            a->nalloc += n;
--
--        } else {
--            /* allocate a new array */
--
--            nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc);
--
--            new = ngx_palloc(p, nalloc * a->size);
--            if (new == NULL) {
--                return NULL;
--            }
--
--            ngx_memcpy(new, a->elts, a->nelts * a->size);
--            a->elts = new;
--            a->nalloc = nalloc;
-+        nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc);
-+
-+        new = ngx_palloc(p, nalloc * a->size);
-+        if (new == NULL) {
-+            return NULL;
-+        }
-+
-+        ngx_memcpy(new, a->elts, a->nelts * a->size);
-+
-+        link = ngx_palloc(p, sizeof(ngx_array_link_t));
-+        if (link == NULL) {
-+            ngx_pfree(p, new);
-+            return NULL;
-         }
-+
-+        link->next = a->old_elts;
-+        link->elts = a->elts;
-+        a->old_elts = link;
-+
-+        a->elts = new;
-+        a->nalloc = nalloc;
-     }
- 
-     elt = (u_char *) a->elts + a->size * a->nelts;
-Only in nginx-1.4.3-patched/src/core: ngx_array.c.orig
-Only in nginx-1.4.3-patched/src/core: ngx_array.c.rej
-diff -upr nginx-1.4.3/src/core/ngx_array.h nginx-1.4.3-patched/src/core/ngx_array.h
---- nginx-1.4.3/src/core/ngx_array.h	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.3-patched/src/core/ngx_array.h	2013-06-10 16:15:08.314275482 -0700
-@@ -13,12 +13,23 @@
- #include <ngx_core.h>
- 
- 
-+typedef struct ngx_array_link_s ngx_array_link_t;
-+
-+
-+struct ngx_array_link_s {
-+    void                    *elts;
-+    ngx_array_link_t        *next;
-+};
-+
-+
- typedef struct {
-     void        *elts;
-     ngx_uint_t   nelts;
-     size_t       size;
-     ngx_uint_t   nalloc;
-     ngx_pool_t  *pool;
-+
-+    ngx_array_link_t *old_elts;
- } ngx_array_t;
- 
- 
-@@ -40,6 +51,7 @@ ngx_array_init(ngx_array_t *array, ngx_p
-     array->size = size;
-     array->nalloc = n;
-     array->pool = pool;
-+    array->old_elts = NULL;
- 
-     array->elts = ngx_palloc(pool, n * size);
-     if (array->elts == NULL) {
-Only in nginx-1.4.3-patched/src/core: ngx_array.h.orig
-Only in nginx-1.4.3-patched/src/core: ngx_array.h.rej
-diff -upr nginx-1.4.3/src/core/ngx_palloc.c nginx-1.4.3-patched/src/core/ngx_palloc.c
---- nginx-1.4.3/src/core/ngx_palloc.c	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.3-patched/src/core/ngx_palloc.c	2013-06-10 16:12:23.718136984 -0700
-@@ -9,32 +9,23 @@
- #include <ngx_core.h>
- 
- 
--static void *ngx_palloc_block(ngx_pool_t *pool, size_t size);
--static void *ngx_palloc_large(ngx_pool_t *pool, size_t size);
--
--
- ngx_pool_t *
- ngx_create_pool(size_t size, ngx_log_t *log)
- {
--    ngx_pool_t  *p;
-+    ngx_pool_t        *p;
- 
--    p = ngx_memalign(NGX_POOL_ALIGNMENT, size, log);
-+    size = sizeof(ngx_pool_t);
-+    p = ngx_alloc(size, log);
-     if (p == NULL) {
-         return NULL;
-     }
- 
--    p->d.last = (u_char *) p + sizeof(ngx_pool_t);
--    p->d.end = (u_char *) p + size;
--    p->d.next = NULL;
--    p->d.failed = 0;
-+    ngx_memzero(p, size);
- 
-     size = size - sizeof(ngx_pool_t);
-     p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
- 
-     p->current = p;
--    p->chain = NULL;
--    p->large = NULL;
--    p->cleanup = NULL;
-     p->log = log;
- 
-     return p;
-@@ -44,8 +35,7 @@ ngx_create_pool(size_t size, ngx_log_t *
- void
- ngx_destroy_pool(ngx_pool_t *pool)
- {
--    ngx_pool_t          *p, *n;
--    ngx_pool_large_t    *l;
-+    ngx_pool_data_t     *d, *n;
-     ngx_pool_cleanup_t  *c;
- 
-     for (c = pool->cleanup; c; c = c->next) {
-@@ -56,13 +46,9 @@ ngx_destroy_pool(ngx_pool_t *pool)
-         }
-     }
- 
--    for (l = pool->large; l; l = l->next) {
--
--        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
--
--        if (l->alloc) {
--            ngx_free(l->alloc);
--        }
-+    if (pool->d == NULL) {
-+        ngx_free(pool);
-+        return;
-     }
- 
- #if (NGX_DEBUG)
-@@ -72,9 +58,9 @@ ngx_destroy_pool(ngx_pool_t *pool)
-      * so we cannot use this log while free()ing the pool
-      */
- 
--    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
-+    for (d = pool->d, n = d->next; ; d = n, n = n->next) {
-         ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
--                       "free: %p, unused: %uz", p, p->d.end - p->d.last);
-+                       "free: %p, unused: %d", d, 0);
- 
-         if (n == NULL) {
-             break;
-@@ -83,172 +69,82 @@ ngx_destroy_pool(ngx_pool_t *pool)
- 
- #endif
- 
--    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
--        ngx_free(p);
-+    for (d = pool->d, n = d->next; ; d = n, n = n->next) {
-+        ngx_free(d->alloc);
-+        ngx_free(d);
- 
-         if (n == NULL) {
-             break;
-         }
-     }
--}
- 
-+    pool->d = NULL;
- 
--void
--ngx_reset_pool(ngx_pool_t *pool)
--{
--    ngx_pool_t        *p;
--    ngx_pool_large_t  *l;
--
--    for (l = pool->large; l; l = l->next) {
--        if (l->alloc) {
--            ngx_free(l->alloc);
--        }
--    }
--
--    pool->large = NULL;
--
--    for (p = pool; p; p = p->d.next) {
--        p->d.last = (u_char *) p + sizeof(ngx_pool_t);
--    }
-+    ngx_free(pool);
- }
- 
- 
--void *
--ngx_palloc(ngx_pool_t *pool, size_t size)
-+void
-+ngx_reset_pool(ngx_pool_t *pool)
- {
--    u_char      *m;
--    ngx_pool_t  *p;
--
--    if (size <= pool->max) {
-+    ngx_pool_data_t     *d, *n;
-+    ngx_pool_data_t     *saved = NULL;
- 
--        p = pool->current;
--
--        do {
--            m = ngx_align_ptr(p->d.last, NGX_ALIGNMENT);
--
--            if ((size_t) (p->d.end - m) >= size) {
--                p->d.last = m + size;
--
--                return m;
-+    if (pool->d) {
-+        for (d = pool->d, n = d->next; ; d = n, n = n->next) {
-+            if (d->alloc == pool->log) {
-+                saved = d;
-+                continue;
-             }
- 
--            p = p->d.next;
--
--        } while (p);
--
--        return ngx_palloc_block(pool, size);
--    }
--
--    return ngx_palloc_large(pool, size);
--}
--
--
--void *
--ngx_pnalloc(ngx_pool_t *pool, size_t size)
--{
--    u_char      *m;
--    ngx_pool_t  *p;
--
--    if (size <= pool->max) {
--
--        p = pool->current;
--
--        do {
--            m = p->d.last;
--
--            if ((size_t) (p->d.end - m) >= size) {
--                p->d.last = m + size;
-+            ngx_free(d->alloc);
-+            ngx_free(d);
- 
--                return m;
-+            if (n == NULL) {
-+                break;
-             }
-+        }
- 
--            p = p->d.next;
--
--        } while (p);
--
--        return ngx_palloc_block(pool, size);
-+        pool->d = saved;
-     }
--
--    return ngx_palloc_large(pool, size);
- }
- 
- 
--static void *
--ngx_palloc_block(ngx_pool_t *pool, size_t size)
-+void *
-+ngx_malloc(ngx_pool_t *pool, size_t size)
- {
--    u_char      *m;
--    size_t       psize;
--    ngx_pool_t  *p, *new, *current;
-+    ngx_pool_data_t     *d;
-+    void                *p;
- 
--    psize = (size_t) (pool->d.end - (u_char *) pool);
--
--    m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
--    if (m == NULL) {
-+    p = ngx_alloc(size, pool->log);
-+    if (p == NULL) {
-         return NULL;
-     }
- 
--    new = (ngx_pool_t *) m;
--
--    new->d.end = m + psize;
--    new->d.next = NULL;
--    new->d.failed = 0;
--
--    m += sizeof(ngx_pool_data_t);
--    m = ngx_align_ptr(m, NGX_ALIGNMENT);
--    new->d.last = m + size;
--
--    current = pool->current;
--
--    for (p = current; p->d.next; p = p->d.next) {
--        if (p->d.failed++ > 4) {
--            current = p->d.next;
--        }
-+    d = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
-+    if (d == NULL){
-+        ngx_free(p);
-+        return NULL;
-     }
- 
--    p->d.next = new;
--
--    pool->current = current ? current : new;
--
--    return m;
-+    d->alloc = p;
-+    d->next = pool->d;
-+    pool->d = d;
-+    return p;
- }
- 
- 
--static void *
--ngx_palloc_large(ngx_pool_t *pool, size_t size)
-+void *
-+ngx_palloc(ngx_pool_t *pool, size_t size)
- {
--    void              *p;
--    ngx_uint_t         n;
--    ngx_pool_large_t  *large;
--
--    p = ngx_alloc(size, pool->log);
--    if (p == NULL) {
--        return NULL;
--    }
--
--    n = 0;
--
--    for (large = pool->large; large; large = large->next) {
--        if (large->alloc == NULL) {
--            large->alloc = p;
--            return p;
--        }
--
--        if (n++ > 3) {
--            break;
--        }
--    }
--
--    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
--    if (large == NULL) {
--        ngx_free(p);
--        return NULL;
--    }
-+    return ngx_malloc(pool, size);
-+}
- 
--    large->alloc = p;
--    large->next = pool->large;
--    pool->large = large;
- 
--    return p;
-+void *
-+ngx_pnalloc(ngx_pool_t *pool, size_t size)
-+{
-+    return ngx_malloc(pool, size);
- }
- 
- 
-@@ -256,38 +152,48 @@ void *
- ngx_pmemalign(ngx_pool_t *pool, size_t size, size_t alignment)
- {
-     void              *p;
--    ngx_pool_large_t  *large;
-+    ngx_pool_data_t   *d;
- 
-     p = ngx_memalign(alignment, size, pool->log);
-     if (p == NULL) {
-         return NULL;
-     }
- 
--    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
--    if (large == NULL) {
-+    d = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
-+    if (d == NULL){
-         ngx_free(p);
-         return NULL;
-     }
- 
--    large->alloc = p;
--    large->next = pool->large;
--    pool->large = large;
--
-+    d->alloc = p;
-+    d->next = pool->d;
-+    pool->d = d;
-     return p;
- }
- 
- 
- ngx_int_t
--ngx_pfree(ngx_pool_t *pool, void *p)
-+ngx_pfree(ngx_pool_t *pool, void *data)
- {
--    ngx_pool_large_t  *l;
-+    ngx_pool_data_t     *p, *d;
- 
--    for (l = pool->large; l; l = l->next) {
--        if (p == l->alloc) {
--            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
--                           "free: %p", l->alloc);
--            ngx_free(l->alloc);
--            l->alloc = NULL;
-+    p = NULL;
-+    for (d = pool->d; d; p = d, d = d->next) {
-+        if (data == d->alloc) {
-+
-+            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
-+
-+            ngx_free(d->alloc);
-+            d->alloc = NULL;
-+
-+            if (p) {
-+                p->next = d->next;
-+
-+            } else {
-+                pool->d = d->next;
-+            }
-+
-+            ngx_free(d);
- 
-             return NGX_OK;
-         }
-diff -upr nginx-1.4.3/src/core/ngx_palloc.h nginx-1.4.3-patched/src/core/ngx_palloc.h
---- nginx-1.4.3/src/core/ngx_palloc.h	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.3-patched/src/core/ngx_palloc.h	2013-06-10 16:12:23.720136999 -0700
-@@ -38,28 +38,21 @@ struct ngx_pool_cleanup_s {
- };
- 
- 
--typedef struct ngx_pool_large_s  ngx_pool_large_t;
--
--struct ngx_pool_large_s {
--    ngx_pool_large_t     *next;
--    void                 *alloc;
--};
-+typedef struct ngx_pool_data_s   ngx_pool_large_t;
-+typedef struct ngx_pool_data_s   ngx_pool_data_t;
- 
- 
--typedef struct {
--    u_char               *last;
--    u_char               *end;
--    ngx_pool_t           *next;
--    ngx_uint_t            failed;
--} ngx_pool_data_t;
-+struct ngx_pool_data_s {
-+    ngx_pool_data_t        *next;
-+    void                   *alloc;
-+};
- 
- 
- struct ngx_pool_s {
--    ngx_pool_data_t       d;
-+    ngx_pool_data_t      *d;
-     size_t                max;
-     ngx_pool_t           *current;
-     ngx_chain_t          *chain;
--    ngx_pool_large_t     *large;
-     ngx_pool_cleanup_t   *cleanup;
-     ngx_log_t            *log;
- };

patches/nginx-1.4.3-pcre_conf_opt.patch

@@ -1,26 +0,0 @@
-# HG changeset patch
-# User Yichun Zhang <agentzh@gmail.com>
-# Date 1386694955 28800
-# Node ID 9ba6b149669f1f02eeb4cdc0ebd364a949b5c469
-# Parent  30e806b8636af5fd3f03ec17df24801f390f7511
-Configure: added new option --with-pcre-conf-opt=OPTIONS.
-
-diff -r 30e806b8636a -r 9ba6b149669f auto/options
---- a/auto/options	Mon Dec 09 10:16:44 2013 +0400
-+++ b/auto/options	Tue Dec 10 09:02:35 2013 -0800
-@@ -286,6 +286,7 @@
-         --with-pcre)                     USE_PCRE=YES               ;;
-         --with-pcre=*)                   PCRE="$value"              ;;
-         --with-pcre-opt=*)               PCRE_OPT="$value"          ;;
-+        --with-pcre-conf-opt=*)          PCRE_CONF_OPT="$value"     ;;
-         --with-pcre-jit)                 PCRE_JIT=YES               ;;
- 
-         --with-openssl=*)                OPENSSL="$value"           ;;
-@@ -441,6 +442,7 @@
-   --with-pcre                        force PCRE library usage
-   --with-pcre=DIR                    set path to PCRE library sources
-   --with-pcre-opt=OPTIONS            set additional build options for PCRE
-+  --with-pcre-conf-opt=OPTIONS       set additional configure options for PCRE
-   --with-pcre-jit                    build PCRE with JIT compilation support
- 
-   --with-md5=DIR                     set path to md5 library sources

patches/nginx-1.4.3-proxy_host_port_vars.patch

@@ -1,15 +0,0 @@
---- nginx-1.4.3/src/http/modules/ngx_http_proxy_module.c	2013-10-08 05:07:14.000000000 -0700
-+++ nginx-1.4.3-patched/src/http/modules/ngx_http_proxy_module.c	2013-10-27 15:29:41.619378592 -0700
-@@ -602,10 +602,10 @@ static ngx_keyval_t  ngx_http_proxy_cach
- static ngx_http_variable_t  ngx_http_proxy_vars[] = {
- 
-     { ngx_string("proxy_host"), NULL, ngx_http_proxy_host_variable, 0,
--      NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
-+      NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 },
- 
-     { ngx_string("proxy_port"), NULL, ngx_http_proxy_port_variable, 0,
--      NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
-+      NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 },
- 
-     { ngx_string("proxy_add_x_forwarded_for"), NULL,
-       ngx_http_proxy_add_x_forwarded_for_variable, 0, NGX_HTTP_VAR_NOHASH, 0 },

patches/nginx-1.4.3-server_header.patch

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

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

patches/nginx-1.4.3-unix_socket_accept_over_read.patch

@@ -1,41 +0,0 @@
---- nginx-1.4.3/src/event/ngx_event_accept.c	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.4.3-patched/src/event/ngx_event_accept.c	2013-07-10 13:05:02.001249099 -0700
-@@ -269,17 +269,28 @@ ngx_event_accept(ngx_event_t *ev)
- #endif
- 
-         if (ls->addr_ntop) {
--            c->addr_text.data = ngx_pnalloc(c->pool, ls->addr_text_max_len);
--            if (c->addr_text.data == NULL) {
--                ngx_close_accepted_connection(c);
--                return;
--            }
-+            if (socklen > sizeof(c->sockaddr->sa_family)) {
-+                c->addr_text.data = ngx_pnalloc(c->pool, ls->addr_text_max_len);
-+                if (c->addr_text.data == NULL) {
-+                    ngx_close_accepted_connection(c);
-+                    return;
-+                }
-+
-+                c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->addr_text.data,
-+                                                 ls->addr_text_max_len, 0);
-+                if (c->addr_text.len == 0) {
-+                    ngx_close_accepted_connection(c);
-+                    return;
-+                }
-+
-+            } else {
-+                /*
-+                 * Linux accept/accept4 syscalls, for example, do not return
-+                 * address data upon unix domain sockets
-+                 */
- 
--            c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->addr_text.data,
--                                             ls->addr_text_max_len, 0);
--            if (c->addr_text.len == 0) {
--                ngx_close_accepted_connection(c);
--                return;
-+                c->addr_text.data = NULL;
-+                c->addr_text.len = 0;
-             }
-         }
- 

patches/nginx-1.4.3-upstream_pipelining.patch

@@ -1,40 +0,0 @@
-diff -rudp nginx-1.4.3/src/http/ngx_http_upstream.c nginx-1.4.3-patched/src/http/ngx_http_upstream.c
---- nginx-1.4.3/src/http/ngx_http_upstream.c	2012-08-06 10:34:08.000000000 -0700
-+++ nginx-1.4.3-patched/src/http/ngx_http_upstream.c	2012-12-05 14:46:41.741173058 -0800
-@@ -1216,6 +1216,7 @@ ngx_http_upstream_connect(ngx_http_reque
-     }
- 
-     u->request_sent = 0;
-+    u->request_all_sent = 0;
- 
-     if (rc == NGX_AGAIN) {
-         ngx_add_timer(c->write, u->conf->connect_timeout);
-@@ -1418,6 +1419,8 @@ ngx_http_upstream_send_request(ngx_http_
- 
-     /* rc == NGX_OK */
- 
-+    u->request_all_sent = 1;
-+
-     if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
-         if (ngx_tcp_push(c->fd) == NGX_ERROR) {
-             ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno,
-@@ -1484,7 +1487,7 @@ ngx_http_upstream_send_request_handler(n
- 
- #endif
- 
--    if (u->header_sent) {
-+    if (u->request_all_sent) {
-         u->write_event_handler = ngx_http_upstream_dummy_handler;
- 
-         (void) ngx_handle_write_event(c->write, 0);
-diff -rudp nginx-1.4.3/src/http/ngx_http_upstream.h nginx-1.4.3-patched/src/http/ngx_http_upstream.h
---- nginx-1.4.3/src/http/ngx_http_upstream.h	2012-02-13 03:01:58.000000000 -0800
-+++ nginx-1.4.3-patched/src/http/ngx_http_upstream.h	2012-12-05 14:41:09.763514741 -0800
-@@ -324,6 +324,7 @@ struct ngx_http_upstream_s {
-     unsigned                         keepalive:1;
- 
-     unsigned                         request_sent:1;
-+    unsigned                         request_all_sent:1;
-     unsigned                         header_sent:1;
- };
- 

patches/nginx-1.4.3-upstream_truncation.patch

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

patches/nginx-1.5.11-cache_lock_hang_in_subreq.patch

@@ -1,22 +0,0 @@
---- nginx-1.5.11/src/http/ngx_http_file_cache.c	2013-10-08 05:07:14.000000000 -0700
-+++ nginx-1.5.11-patched/src/http/ngx_http_file_cache.c	2013-10-26 14:47:56.184041728 -0700
-@@ -432,6 +432,7 @@ ngx_http_file_cache_lock_wait_handler(ng
-     ngx_uint_t                 wait;
-     ngx_msec_t                 timer;
-     ngx_http_cache_t          *c;
-+    ngx_connection_t          *conn;
-     ngx_http_request_t        *r;
-     ngx_http_file_cache_t     *cache;
- 
-@@ -471,7 +472,10 @@ wakeup:
- 
-     c->waiting = 0;
-     r->main->blocked--;
--    r->connection->write->handler(r->connection->write);
-+
-+    conn = r->connection;
-+    r->write_event_handler(r);
-+    ngx_http_run_posted_requests(conn);
- }
- 
- 

patches/nginx-1.5.11-cache_manager_exit.patch

@@ -1,19 +0,0 @@
-# HG changeset patch
-# User Yichun Zhang <agentzh@gmail.com>
-# Date 1383598130 28800
-# Node ID f64218e1ac963337d84092536f588b8e0d99bbaa
-# Parent  dea321e5c0216efccbb23e84bbce7cf3e28f130c
-Cache: gracefully exit the cache manager process.
-
-diff -r dea321e5c021 -r f64218e1ac96 src/os/unix/ngx_process_cycle.c
---- a/src/os/unix/ngx_process_cycle.c	Thu Oct 31 18:23:49 2013 +0400
-+++ b/src/os/unix/ngx_process_cycle.c	Mon Nov 04 12:48:50 2013 -0800
-@@ -1335,7 +1335,7 @@
- 
-         if (ngx_terminate || ngx_quit) {
-             ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
--            exit(0);
-+            ngx_worker_process_exit(cycle);
-         }
- 
-         if (ngx_reopen) {

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

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

patches/nginx-1.5.11-gcc-maybe-uninitialized-warning.patch

@@ -1,11 +0,0 @@
---- nginx-1.5.11/src/http/ngx_http_request.c	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.5.11-patched/src/http/ngx_http_request.c	2013-06-11 12:59:48.008321688 -0700
-@@ -1951,7 +1951,7 @@
-     ngx_int_t                  rc;
-     ngx_http_connection_t     *hc;
-     ngx_http_core_loc_conf_t  *clcf;
--    ngx_http_core_srv_conf_t  *cscf;
-+    ngx_http_core_srv_conf_t  *cscf = NULL;
- 
-     hc = r->http_connection;
- 

patches/nginx-1.5.11-larger_max_error_str.patch

@@ -1,13 +0,0 @@
---- nginx-1.5.11/src/core/ngx_log.h	2013-10-08 05:07:14.000000000 -0700
-+++ nginx-1.5.11-patched/src/core/ngx_log.h	2013-12-05 20:35:35.996236720 -0800
-@@ -64,7 +64,9 @@ struct ngx_log_s {
- };
- 
- 
--#define NGX_MAX_ERROR_STR   2048
-+#ifndef NGX_MAX_ERROR_STR
-+#define NGX_MAX_ERROR_STR   4096
-+#endif
- 
- 
- /*********************************/

patches/nginx-1.5.11-location_if_inherits_proxy.patch

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

patches/nginx-1.5.11-log_escape_non_ascii.patch

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

@@ -1,36 +0,0 @@
-diff -urp nginx-1.5.11/auto/cc/clang nginx-1.5.11-patched/auto/cc/clang
---- nginx-1.5.11/auto/cc/clang	2014-03-04 03:39:24.000000000 -0800
-+++ nginx-1.5.11-patched/auto/cc/clang	2014-03-13 20:54:26.241413360 -0700
-@@ -89,7 +89,7 @@ CFLAGS="$CFLAGS -Wconditional-uninitiali
- CFLAGS="$CFLAGS -Wno-unused-parameter"
- 
- # stop on warning
--CFLAGS="$CFLAGS -Werror"
-+#CFLAGS="$CFLAGS -Werror"
- 
- # debug
- CFLAGS="$CFLAGS -g"
-diff -urp nginx-1.5.11/auto/cc/gcc nginx-1.5.11-patched/auto/cc/gcc
---- nginx-1.5.11/auto/cc/gcc	2014-03-04 03:39:24.000000000 -0800
-+++ nginx-1.5.11-patched/auto/cc/gcc	2014-03-13 20:54:13.301355329 -0700
-@@ -168,7 +168,7 @@ esac
- 
- 
- # stop on warning
--CFLAGS="$CFLAGS -Werror"
-+#CFLAGS="$CFLAGS -Werror"
- 
- # debug
- CFLAGS="$CFLAGS -g"
-diff -urp nginx-1.5.11/auto/cc/icc nginx-1.5.11-patched/auto/cc/icc
---- nginx-1.5.11/auto/cc/icc	2014-03-04 03:39:24.000000000 -0800
-+++ nginx-1.5.11-patched/auto/cc/icc	2014-03-13 20:54:13.301355329 -0700
-@@ -115,7 +115,7 @@ case "$NGX_ICC_VER" in
- esac
- 
- # stop on warning
--CFLAGS="$CFLAGS -Werror"
-+#CFLAGS="$CFLAGS -Werror"
- 
- # debug
- CFLAGS="$CFLAGS -g"

patches/nginx-1.5.11-no_error_pages.patch

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

@@ -1,606 +0,0 @@
-diff -upr nginx-1.5.11/src/core/nginx.h nginx-1.5.11-patched/src/core/nginx.h
---- nginx-1.5.11/src/core/nginx.h	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.5.11-patched/src/core/nginx.h	2013-06-10 16:12:23.691136795 -0700
-@@ -10,7 +10,7 @@
- 
- 
- #define nginx_version      1005011
- #define NGINX_VERSION      "1.5.11"
--#define NGINX_VER          "openresty/" NGINX_VERSION ".unknown"
-+#define NGINX_VER          "openresty/" NGINX_VERSION ".unknown (no pool)"
- 
- #define NGINX_VAR          "NGINX"
-diff -urp nginx-1.5.11/src/core/ngx_array.c nginx-1.5.11-patched/src/core/ngx_array.c
---- nginx-1.5.11/src/core/ngx_array.c	2014-01-22 05:43:00.000000000 -0800
-+++ nginx-1.5.11-patched/src/core/ngx_array.c	2014-01-27 21:25:14.887049509 -0800
-@@ -30,26 +30,30 @@ ngx_array_create(ngx_pool_t *p, ngx_uint
- void
- ngx_array_destroy(ngx_array_t *a)
- {
--    ngx_pool_t  *p;
-+    ngx_pool_t          *p;
-+    ngx_array_link_t    *link;
- 
-     p = a->pool;
- 
--    if ((u_char *) a->elts + a->size * a->nalloc == p->d.last) {
--        p->d.last -= a->size * a->nalloc;
-+    if (a->elts) {
-+        ngx_pfree(p, a->elts);
-     }
- 
--    if ((u_char *) a + sizeof(ngx_array_t) == p->d.last) {
--        p->d.last = (u_char *) a;
-+    for (link = a->old_elts; link; link = link->next) {
-+        ngx_pfree(p, link->elts);
-     }
-+
-+    ngx_pfree(p, a);
- }
- 
- 
- void *
- ngx_array_push(ngx_array_t *a)
- {
--    void        *elt, *new;
--    size_t       size;
--    ngx_pool_t  *p;
-+    void                *elt, *new;
-+    size_t               size;
-+    ngx_pool_t          *p;
-+    ngx_array_link_t    *link;
- 
-     if (a->nelts == a->nalloc) {
- 
-@@ -59,29 +63,27 @@ ngx_array_push(ngx_array_t *a)
- 
-         p = a->pool;
- 
--        if ((u_char *) a->elts + size == p->d.last
--            && p->d.last + a->size <= p->d.end)
--        {
--            /*
--             * the array allocation is the last in the pool
--             * and there is space for new allocation
--             */
--
--            p->d.last += a->size;
--            a->nalloc++;
--
--        } else {
--            /* allocate a new array */
--
--            new = ngx_palloc(p, 2 * size);
--            if (new == NULL) {
--                return NULL;
--            }
--
--            ngx_memcpy(new, a->elts, size);
--            a->elts = new;
--            a->nalloc *= 2;
-+        /* allocate a new array */
-+
-+        new = ngx_palloc(p, 2 * size);
-+        if (new == NULL) {
-+            return NULL;
-+        }
-+
-+        ngx_memcpy(new, a->elts, size);
-+
-+        link = ngx_palloc(p, sizeof(ngx_array_link_t));
-+        if (link == NULL) {
-+            ngx_pfree(p, new);
-+            return NULL;
-         }
-+
-+        link->next = a->old_elts;
-+        link->elts = a->elts;
-+        a->old_elts = link;
-+
-+        a->elts = new;
-+        a->nalloc *= 2;
-     }
- 
-     elt = (u_char *) a->elts + a->size * a->nelts;
-@@ -95,11 +97,10 @@ void *
- ngx_array_push_n(ngx_array_t *a, ngx_uint_t n)
- {
-     void        *elt, *new;
--    size_t       size;
-     ngx_uint_t   nalloc;
-     ngx_pool_t  *p;
- 
--    size = n * a->size;
-+    ngx_array_link_t    *link;
- 
-     if (a->nelts + n > a->nalloc) {
- 
-@@ -107,31 +108,27 @@ ngx_array_push_n(ngx_array_t *a, ngx_uin
- 
-         p = a->pool;
- 
--        if ((u_char *) a->elts + a->size * a->nalloc == p->d.last
--            && p->d.last + size <= p->d.end)
--        {
--            /*
--             * the array allocation is the last in the pool
--             * and there is space for new allocation
--             */
--
--            p->d.last += size;
--            a->nalloc += n;
--
--        } else {
--            /* allocate a new array */
--
--            nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc);
--
--            new = ngx_palloc(p, nalloc * a->size);
--            if (new == NULL) {
--                return NULL;
--            }
--
--            ngx_memcpy(new, a->elts, a->nelts * a->size);
--            a->elts = new;
--            a->nalloc = nalloc;
-+        nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc);
-+
-+        new = ngx_palloc(p, nalloc * a->size);
-+        if (new == NULL) {
-+            return NULL;
-+        }
-+
-+        ngx_memcpy(new, a->elts, a->nelts * a->size);
-+
-+        link = ngx_palloc(p, sizeof(ngx_array_link_t));
-+        if (link == NULL) {
-+            ngx_pfree(p, new);
-+            return NULL;
-         }
-+
-+        link->next = a->old_elts;
-+        link->elts = a->elts;
-+        a->old_elts = link;
-+
-+        a->elts = new;
-+        a->nalloc = nalloc;
-     }
- 
-     elt = (u_char *) a->elts + a->size * a->nelts;
-diff -urp nginx-1.5.11/src/core/ngx_array.h nginx-1.5.11-patched/src/core/ngx_array.h
---- nginx-1.5.11/src/core/ngx_array.h	2014-01-22 05:43:00.000000000 -0800
-+++ nginx-1.5.11-patched/src/core/ngx_array.h	2014-01-27 21:25:14.888049518 -0800
-@@ -13,12 +13,23 @@
- #include <ngx_core.h>
- 
- 
-+typedef struct ngx_array_link_s ngx_array_link_t;
-+
-+
-+struct ngx_array_link_s {
-+    void                    *elts;
-+    ngx_array_link_t        *next;
-+};
-+
-+
- typedef struct {
-     void        *elts;
-     ngx_uint_t   nelts;
-     size_t       size;
-     ngx_uint_t   nalloc;
-     ngx_pool_t  *pool;
-+
-+    ngx_array_link_t *old_elts;
- } ngx_array_t;
- 
- 
-@@ -40,6 +51,7 @@ ngx_array_init(ngx_array_t *array, ngx_p
-     array->size = size;
-     array->nalloc = n;
-     array->pool = pool;
-+    array->old_elts = NULL;
- 
-     array->elts = ngx_palloc(pool, n * size);
-     if (array->elts == NULL) {
-diff -urp nginx-1.5.11/src/core/ngx_palloc.c nginx-1.5.11-patched/src/core/ngx_palloc.c
---- nginx-1.5.11/src/core/ngx_palloc.c	2014-01-22 05:43:00.000000000 -0800
-+++ nginx-1.5.11-patched/src/core/ngx_palloc.c	2014-01-27 21:42:30.905552064 -0800
-@@ -9,32 +9,23 @@
- #include <ngx_core.h>
- 
- 
--static void *ngx_palloc_block(ngx_pool_t *pool, size_t size);
--static void *ngx_palloc_large(ngx_pool_t *pool, size_t size);
--
--
- ngx_pool_t *
- ngx_create_pool(size_t size, ngx_log_t *log)
- {
--    ngx_pool_t  *p;
-+    ngx_pool_t        *p;
- 
--    p = ngx_memalign(NGX_POOL_ALIGNMENT, size, log);
-+    size = sizeof(ngx_pool_t);
-+    p = ngx_alloc(size, log);
-     if (p == NULL) {
-         return NULL;
-     }
- 
--    p->d.last = (u_char *) p + sizeof(ngx_pool_t);
--    p->d.end = (u_char *) p + size;
--    p->d.next = NULL;
--    p->d.failed = 0;
-+    ngx_memzero(p, size);
- 
-     size = size - sizeof(ngx_pool_t);
-     p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
- 
-     p->current = p;
--    p->chain = NULL;
--    p->large = NULL;
--    p->cleanup = NULL;
-     p->log = log;
- 
-     return p;
-@@ -44,8 +35,7 @@ ngx_create_pool(size_t size, ngx_log_t *
- void
- ngx_destroy_pool(ngx_pool_t *pool)
- {
--    ngx_pool_t          *p, *n;
--    ngx_pool_large_t    *l;
-+    ngx_pool_data_t     *d, *n;
-     ngx_pool_cleanup_t  *c;
- 
-     for (c = pool->cleanup; c; c = c->next) {
-@@ -56,13 +46,9 @@ ngx_destroy_pool(ngx_pool_t *pool)
-         }
-     }
- 
--    for (l = pool->large; l; l = l->next) {
--
--        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
--
--        if (l->alloc) {
--            ngx_free(l->alloc);
--        }
-+    if (pool->d == NULL) {
-+        ngx_free(pool);
-+        return;
-     }
- 
- #if (NGX_DEBUG)
-@@ -72,9 +58,9 @@ ngx_destroy_pool(ngx_pool_t *pool)
-      * so we cannot use this log while free()ing the pool
-      */
- 
--    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
-+    for (d = pool->d, n = d->next; ; d = n, n = n->next) {
-         ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
--                       "free: %p, unused: %uz", p, p->d.end - p->d.last);
-+                       "free: %p, unused: %d", d, 0);
- 
-         if (n == NULL) {
-             break;
-@@ -83,175 +69,84 @@ ngx_destroy_pool(ngx_pool_t *pool)
- 
- #endif
- 
--    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
--        ngx_free(p);
-+    for (d = pool->d, n = d->next; ; d = n, n = n->next) {
-+        ngx_free(d->alloc);
-+        ngx_free(d);
- 
-         if (n == NULL) {
-             break;
-         }
-     }
--}
- 
-+    pool->d = NULL;
- 
--void
--ngx_reset_pool(ngx_pool_t *pool)
--{
--    ngx_pool_t        *p;
--    ngx_pool_large_t  *l;
--
--    for (l = pool->large; l; l = l->next) {
--        if (l->alloc) {
--            ngx_free(l->alloc);
--        }
--    }
--
--    for (p = pool; p; p = p->d.next) {
--        p->d.last = (u_char *) p + sizeof(ngx_pool_t);
--        p->d.failed = 0;
--    }
--
--    pool->current = pool;
--    pool->chain = NULL;
--    pool->large = NULL;
-+    ngx_free(pool);
- }
- 
- 
--void *
--ngx_palloc(ngx_pool_t *pool, size_t size)
-+void
-+ngx_reset_pool(ngx_pool_t *pool)
- {
--    u_char      *m;
--    ngx_pool_t  *p;
--
--    if (size <= pool->max) {
-+    ngx_pool_data_t     *d, *n;
-+    ngx_pool_data_t     *saved = NULL;
- 
--        p = pool->current;
--
--        do {
--            m = ngx_align_ptr(p->d.last, NGX_ALIGNMENT);
--
--            if ((size_t) (p->d.end - m) >= size) {
--                p->d.last = m + size;
--
--                return m;
-+    if (pool->d) {
-+        for (d = pool->d, n = d->next; ; d = n, n = n->next) {
-+            if (d->alloc == pool->log) {
-+                saved = d;
-+                continue;
-             }
- 
--            p = p->d.next;
--
--        } while (p);
--
--        return ngx_palloc_block(pool, size);
--    }
--
--    return ngx_palloc_large(pool, size);
--}
--
--
--void *
--ngx_pnalloc(ngx_pool_t *pool, size_t size)
--{
--    u_char      *m;
--    ngx_pool_t  *p;
--
--    if (size <= pool->max) {
--
--        p = pool->current;
--
--        do {
--            m = p->d.last;
--
--            if ((size_t) (p->d.end - m) >= size) {
--                p->d.last = m + size;
-+            ngx_free(d->alloc);
-+            ngx_free(d);
- 
--                return m;
-+            if (n == NULL) {
-+                break;
-             }
-+        }
- 
--            p = p->d.next;
--
--        } while (p);
--
--        return ngx_palloc_block(pool, size);
-+        pool->d = saved;
-+        pool->current = pool;
-+        pool->chain = NULL;
-     }
--
--    return ngx_palloc_large(pool, size);
- }
- 
- 
--static void *
--ngx_palloc_block(ngx_pool_t *pool, size_t size)
-+void *
-+ngx_malloc(ngx_pool_t *pool, size_t size)
- {
--    u_char      *m;
--    size_t       psize;
--    ngx_pool_t  *p, *new, *current;
-+    ngx_pool_data_t     *d;
-+    void                *p;
- 
--    psize = (size_t) (pool->d.end - (u_char *) pool);
--
--    m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
--    if (m == NULL) {
-+    p = ngx_alloc(size, pool->log);
-+    if (p == NULL) {
-         return NULL;
-     }
- 
--    new = (ngx_pool_t *) m;
--
--    new->d.end = m + psize;
--    new->d.next = NULL;
--    new->d.failed = 0;
--
--    m += sizeof(ngx_pool_data_t);
--    m = ngx_align_ptr(m, NGX_ALIGNMENT);
--    new->d.last = m + size;
--
--    current = pool->current;
--
--    for (p = current; p->d.next; p = p->d.next) {
--        if (p->d.failed++ > 4) {
--            current = p->d.next;
--        }
-+    d = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
-+    if (d == NULL){
-+        ngx_free(p);
-+        return NULL;
-     }
- 
--    p->d.next = new;
--
--    pool->current = current ? current : new;
--
--    return m;
-+    d->alloc = p;
-+    d->next = pool->d;
-+    pool->d = d;
-+    return p;
- }
- 
- 
--static void *
--ngx_palloc_large(ngx_pool_t *pool, size_t size)
-+void *
-+ngx_palloc(ngx_pool_t *pool, size_t size)
- {
--    void              *p;
--    ngx_uint_t         n;
--    ngx_pool_large_t  *large;
--
--    p = ngx_alloc(size, pool->log);
--    if (p == NULL) {
--        return NULL;
--    }
--
--    n = 0;
--
--    for (large = pool->large; large; large = large->next) {
--        if (large->alloc == NULL) {
--            large->alloc = p;
--            return p;
--        }
--
--        if (n++ > 3) {
--            break;
--        }
--    }
--
--    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
--    if (large == NULL) {
--        ngx_free(p);
--        return NULL;
--    }
-+    return ngx_malloc(pool, size);
-+}
- 
--    large->alloc = p;
--    large->next = pool->large;
--    pool->large = large;
- 
--    return p;
-+void *
-+ngx_pnalloc(ngx_pool_t *pool, size_t size)
-+{
-+    return ngx_malloc(pool, size);
- }
- 
- 
-@@ -259,38 +154,48 @@ void *
- ngx_pmemalign(ngx_pool_t *pool, size_t size, size_t alignment)
- {
-     void              *p;
--    ngx_pool_large_t  *large;
-+    ngx_pool_data_t   *d;
- 
-     p = ngx_memalign(alignment, size, pool->log);
-     if (p == NULL) {
-         return NULL;
-     }
- 
--    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
--    if (large == NULL) {
-+    d = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
-+    if (d == NULL){
-         ngx_free(p);
-         return NULL;
-     }
- 
--    large->alloc = p;
--    large->next = pool->large;
--    pool->large = large;
--
-+    d->alloc = p;
-+    d->next = pool->d;
-+    pool->d = d;
-     return p;
- }
- 
- 
- ngx_int_t
--ngx_pfree(ngx_pool_t *pool, void *p)
-+ngx_pfree(ngx_pool_t *pool, void *data)
- {
--    ngx_pool_large_t  *l;
-+    ngx_pool_data_t     *p, *d;
- 
--    for (l = pool->large; l; l = l->next) {
--        if (p == l->alloc) {
--            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
--                           "free: %p", l->alloc);
--            ngx_free(l->alloc);
--            l->alloc = NULL;
-+    p = NULL;
-+    for (d = pool->d; d; p = d, d = d->next) {
-+        if (data == d->alloc) {
-+
-+            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
-+
-+            ngx_free(d->alloc);
-+            d->alloc = NULL;
-+
-+            if (p) {
-+                p->next = d->next;
-+
-+            } else {
-+                pool->d = d->next;
-+            }
-+
-+            ngx_free(d);
- 
-             return NGX_OK;
-         }
-diff -urp nginx-1.5.11/src/core/ngx_palloc.h nginx-1.5.11-patched/src/core/ngx_palloc.h
---- nginx-1.5.11/src/core/ngx_palloc.h	2014-01-22 05:43:00.000000000 -0800
-+++ nginx-1.5.11-patched/src/core/ngx_palloc.h	2014-01-27 21:25:14.911049721 -0800
-@@ -38,28 +38,21 @@ struct ngx_pool_cleanup_s {
- };
- 
- 
--typedef struct ngx_pool_large_s  ngx_pool_large_t;
--
--struct ngx_pool_large_s {
--    ngx_pool_large_t     *next;
--    void                 *alloc;
--};
-+typedef struct ngx_pool_data_s   ngx_pool_large_t;
-+typedef struct ngx_pool_data_s   ngx_pool_data_t;
- 
- 
--typedef struct {
--    u_char               *last;
--    u_char               *end;
--    ngx_pool_t           *next;
--    ngx_uint_t            failed;
--} ngx_pool_data_t;
-+struct ngx_pool_data_s {
-+    ngx_pool_data_t        *next;
-+    void                   *alloc;
-+};
- 
- 
- struct ngx_pool_s {
--    ngx_pool_data_t       d;
-+    ngx_pool_data_t      *d;
-     size_t                max;
-     ngx_pool_t           *current;
-     ngx_chain_t          *chain;
--    ngx_pool_large_t     *large;
-     ngx_pool_cleanup_t   *cleanup;
-     ngx_log_t            *log;
- };

patches/nginx-1.5.11-pcre_conf_opt.patch

@@ -1,26 +0,0 @@
-# HG changeset patch
-# User Yichun Zhang <agentzh@gmail.com>
-# Date 1386694955 28800
-# Node ID 9ba6b149669f1f02eeb4cdc0ebd364a949b5c469
-# Parent  30e806b8636af5fd3f03ec17df24801f390f7511
-Configure: added new option --with-pcre-conf-opt=OPTIONS.
-
-diff -r 30e806b8636a -r 9ba6b149669f auto/options
---- a/auto/options	Mon Dec 09 10:16:44 2013 +0400
-+++ b/auto/options	Tue Dec 10 09:02:35 2013 -0800
-@@ -286,6 +286,7 @@
-         --with-pcre)                     USE_PCRE=YES               ;;
-         --with-pcre=*)                   PCRE="$value"              ;;
-         --with-pcre-opt=*)               PCRE_OPT="$value"          ;;
-+        --with-pcre-conf-opt=*)          PCRE_CONF_OPT="$value"     ;;
-         --with-pcre-jit)                 PCRE_JIT=YES               ;;
- 
-         --with-openssl=*)                OPENSSL="$value"           ;;
-@@ -441,6 +442,7 @@
-   --with-pcre                        force PCRE library usage
-   --with-pcre=DIR                    set path to PCRE library sources
-   --with-pcre-opt=OPTIONS            set additional build options for PCRE
-+  --with-pcre-conf-opt=OPTIONS       set additional configure options for PCRE
-   --with-pcre-jit                    build PCRE with JIT compilation support
- 
-   --with-md5=DIR                     set path to md5 library sources

patches/nginx-1.5.11-proxy_host_port_vars.patch

@@ -1,15 +0,0 @@
---- nginx-1.5.11/src/http/modules/ngx_http_proxy_module.c	2013-10-08 05:07:14.000000000 -0700
-+++ nginx-1.5.11-patched/src/http/modules/ngx_http_proxy_module.c	2013-10-27 15:29:41.619378592 -0700
-@@ -602,10 +602,10 @@ static ngx_keyval_t  ngx_http_proxy_cach
- static ngx_http_variable_t  ngx_http_proxy_vars[] = {
- 
-     { ngx_string("proxy_host"), NULL, ngx_http_proxy_host_variable, 0,
--      NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
-+      NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 },
- 
-     { ngx_string("proxy_port"), NULL, ngx_http_proxy_port_variable, 0,
--      NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
-+      NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 },
- 
-     { ngx_string("proxy_add_x_forwarded_for"), NULL,
-       ngx_http_proxy_add_x_forwarded_for_variable, 0, NGX_HTTP_VAR_NOHASH, 0 },

patches/nginx-1.5.11-server_header.patch

@@ -1,24 +0,0 @@
-diff -ur nginx-1.5.11/src/core/nginx.h nginx-1.5.11-patched/src/core/nginx.h
---- nginx-1.5.11/src/core/nginx.h	2010-02-12 17:31:01.000000000 +0800
-+++ nginx-1.5.11-patched/src/core/nginx.h	2010-03-30 10:52:13.240702627 +0800
-@@ -10,7 +10,7 @@
- 
- #define nginx_version         1005011
- #define NGINX_VERSION      "1.5.11"
--#define NGINX_VER          "nginx/" NGINX_VERSION
-+#define NGINX_VER          "openresty/" NGINX_VERSION ".unknown"
- 
- #define NGINX_VAR          "NGINX"
- #define NGX_OLDPID_EXT     ".oldbin"
-diff -ur nginx-1.5.11/src/http/ngx_http_header_filter_module.c nginx-1.5.11-patched/src/http/ngx_http_header_filter_module.c
---- nginx-1.5.11/src/http/ngx_http_header_filter_module.c	2010-03-03 23:14:04.000000000 +0800
-+++ nginx-1.5.11-patched/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: openresty" CRLF;
- static char ngx_http_server_full_string[] = "Server: " NGINX_VER CRLF;
- 
- 

patches/nginx-1.5.11-setting_args_invalidates_uri.patch

@@ -1,44 +0,0 @@
-# HG changeset patch
-# User Yichun Zhang <agentzh@gmail.com>
-# Date 1390506359 28800
-# Node ID 17186b98c235c07e94c64e5853689f790f173756
-# Parent  4b50d1f299d8a69f3e3f7975132e1490352642fe
-Variable: setting $args should invalidate unparsed uri.
-
-diff -r 4b50d1f299d8 -r 17186b98c235 src/http/ngx_http_variables.c
---- a/src/http/ngx_http_variables.c	Fri Jan 10 11:22:14 2014 -0800
-+++ b/src/http/ngx_http_variables.c	Thu Jan 23 11:45:59 2014 -0800
-@@ -15,6 +15,8 @@
-     ngx_http_variable_value_t *v, uintptr_t data);
- static void ngx_http_variable_request_set(ngx_http_request_t *r,
-     ngx_http_variable_value_t *v, uintptr_t data);
-+static void ngx_http_variable_request_args_set(ngx_http_request_t *r,
-+    ngx_http_variable_value_t *v, uintptr_t data);
- static ngx_int_t ngx_http_variable_request_get_size(ngx_http_request_t *r,
-     ngx_http_variable_value_t *v, uintptr_t data);
- static void ngx_http_variable_request_set_size(ngx_http_request_t *r,
-@@ -218,7 +220,7 @@
-       NGX_HTTP_VAR_NOCACHEABLE, 0 },
- 
-     { ngx_string("args"),
--      ngx_http_variable_request_set,
-+      ngx_http_variable_request_args_set,
-       ngx_http_variable_request,
-       offsetof(ngx_http_request_t, args),
-       NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 },
-@@ -647,6 +649,15 @@
- 
- 
- static void
-+ngx_http_variable_request_args_set(ngx_http_request_t *r,
-+    ngx_http_variable_value_t *v, uintptr_t data)
-+{
-+    r->valid_unparsed_uri = 0;
-+    ngx_http_variable_request_set(r, v, data);
-+}
-+
-+
-+static void
- ngx_http_variable_request_set(ngx_http_request_t *r,
-     ngx_http_variable_value_t *v, uintptr_t data)
- {

patches/nginx-1.5.11-slab_alloc_no_memory_as_info.patch

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

patches/nginx-1.5.11-upstream_pipelining.patch

@@ -1,40 +0,0 @@
-diff -rudp nginx-1.5.11/src/http/ngx_http_upstream.c nginx-1.5.11-patched/src/http/ngx_http_upstream.c
---- nginx-1.5.11/src/http/ngx_http_upstream.c	2012-08-06 10:34:08.000000000 -0700
-+++ nginx-1.5.11-patched/src/http/ngx_http_upstream.c	2012-12-05 14:46:41.741173058 -0800
-@@ -1216,6 +1216,7 @@ ngx_http_upstream_connect(ngx_http_reque
-     }
- 
-     u->request_sent = 0;
-+    u->request_all_sent = 0;
- 
-     if (rc == NGX_AGAIN) {
-         ngx_add_timer(c->write, u->conf->connect_timeout);
-@@ -1418,6 +1419,8 @@ ngx_http_upstream_send_request(ngx_http_
- 
-     /* rc == NGX_OK */
- 
-+    u->request_all_sent = 1;
-+
-     if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
-         if (ngx_tcp_push(c->fd) == NGX_ERROR) {
-             ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno,
-@@ -1484,7 +1487,7 @@ ngx_http_upstream_send_request_handler(n
- 
- #endif
- 
--    if (u->header_sent) {
-+    if (u->request_all_sent) {
-         u->write_event_handler = ngx_http_upstream_dummy_handler;
- 
-         (void) ngx_handle_write_event(c->write, 0);
-diff -rudp nginx-1.5.11/src/http/ngx_http_upstream.h nginx-1.5.11-patched/src/http/ngx_http_upstream.h
---- nginx-1.5.11/src/http/ngx_http_upstream.h	2012-02-13 03:01:58.000000000 -0800
-+++ nginx-1.5.11-patched/src/http/ngx_http_upstream.h	2012-12-05 14:41:09.763514741 -0800
-@@ -324,6 +324,7 @@ struct ngx_http_upstream_s {
-     unsigned                         keepalive:1;
- 
-     unsigned                         request_sent:1;
-+    unsigned                         request_all_sent:1;
-     unsigned                         header_sent:1;
- };
- 

patches/nginx-1.5.12-cache_lock_hang_in_subreq.patch

@@ -1,22 +0,0 @@
---- nginx-1.5.12/src/http/ngx_http_file_cache.c	2013-10-08 05:07:14.000000000 -0700
-+++ nginx-1.5.12-patched/src/http/ngx_http_file_cache.c	2013-10-26 14:47:56.184041728 -0700
-@@ -432,6 +432,7 @@ ngx_http_file_cache_lock_wait_handler(ng
-     ngx_uint_t                 wait;
-     ngx_msec_t                 timer;
-     ngx_http_cache_t          *c;
-+    ngx_connection_t          *conn;
-     ngx_http_request_t        *r;
-     ngx_http_file_cache_t     *cache;
- 
-@@ -471,7 +472,10 @@ wakeup:
- 
-     c->waiting = 0;
-     r->main->blocked--;
--    r->connection->write->handler(r->connection->write);
-+
-+    conn = r->connection;
-+    r->write_event_handler(r);
-+    ngx_http_run_posted_requests(conn);
- }
- 
- 

patches/nginx-1.5.12-cache_manager_exit.patch

@@ -1,19 +0,0 @@
-# HG changeset patch
-# User Yichun Zhang <agentzh@gmail.com>
-# Date 1383598130 28800
-# Node ID f64218e1ac963337d84092536f588b8e0d99bbaa
-# Parent  dea321e5c0216efccbb23e84bbce7cf3e28f130c
-Cache: gracefully exit the cache manager process.
-
-diff -r dea321e5c021 -r f64218e1ac96 src/os/unix/ngx_process_cycle.c
---- a/src/os/unix/ngx_process_cycle.c	Thu Oct 31 18:23:49 2013 +0400
-+++ b/src/os/unix/ngx_process_cycle.c	Mon Nov 04 12:48:50 2013 -0800
-@@ -1335,7 +1335,7 @@
- 
-         if (ngx_terminate || ngx_quit) {
-             ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
--            exit(0);
-+            ngx_worker_process_exit(cycle);
-         }
- 
-         if (ngx_reopen) {

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

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

patches/nginx-1.5.12-gcc-maybe-uninitialized-warning.patch

@@ -1,11 +0,0 @@
---- nginx-1.5.12/src/http/ngx_http_request.c	2013-05-06 03:26:50.000000000 -0700
-+++ nginx-1.5.12-patched/src/http/ngx_http_request.c	2013-06-11 12:59:48.008321688 -0700
-@@ -1951,7 +1951,7 @@
-     ngx_int_t                  rc;
-     ngx_http_connection_t     *hc;
-     ngx_http_core_loc_conf_t  *clcf;
--    ngx_http_core_srv_conf_t  *cscf;
-+    ngx_http_core_srv_conf_t  *cscf = NULL;
- 
-     hc = r->http_connection;
- 

patches/nginx-1.5.12-larger_max_error_str.patch

@@ -1,13 +0,0 @@
---- nginx-1.5.12/src/core/ngx_log.h	2013-10-08 05:07:14.000000000 -0700
-+++ nginx-1.5.12-patched/src/core/ngx_log.h	2013-12-05 20:35:35.996236720 -0800
-@@ -64,7 +64,9 @@ struct ngx_log_s {
- };
- 
- 
--#define NGX_MAX_ERROR_STR   2048
-+#ifndef NGX_MAX_ERROR_STR
-+#define NGX_MAX_ERROR_STR   4096
-+#endif
- 
- 
- /*********************************/

patches/nginx-1.5.12-location_if_inherits_proxy.patch

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

patches/nginx-1.5.12-log_escape_non_ascii.patch

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

@@ -1,36 +0,0 @@
-diff -urp nginx-1.5.12/auto/cc/clang nginx-1.5.12-patched/auto/cc/clang
---- nginx-1.5.12/auto/cc/clang	2014-03-04 03:39:24.000000000 -0800
-+++ nginx-1.5.12-patched/auto/cc/clang	2014-03-13 20:54:26.241413360 -0700
-@@ -89,7 +89,7 @@ CFLAGS="$CFLAGS -Wconditional-uninitiali
- CFLAGS="$CFLAGS -Wno-unused-parameter"
- 
- # stop on warning
--CFLAGS="$CFLAGS -Werror"
-+#CFLAGS="$CFLAGS -Werror"
- 
- # debug
- CFLAGS="$CFLAGS -g"
-diff -urp nginx-1.5.12/auto/cc/gcc nginx-1.5.12-patched/auto/cc/gcc
---- nginx-1.5.12/auto/cc/gcc	2014-03-04 03:39:24.000000000 -0800
-+++ nginx-1.5.12-patched/auto/cc/gcc	2014-03-13 20:54:13.301355329 -0700
-@@ -168,7 +168,7 @@ esac
- 
- 
- # stop on warning
--CFLAGS="$CFLAGS -Werror"
-+#CFLAGS="$CFLAGS -Werror"
- 
- # debug
- CFLAGS="$CFLAGS -g"
-diff -urp nginx-1.5.12/auto/cc/icc nginx-1.5.12-patched/auto/cc/icc
---- nginx-1.5.12/auto/cc/icc	2014-03-04 03:39:24.000000000 -0800
-+++ nginx-1.5.12-patched/auto/cc/icc	2014-03-13 20:54:13.301355329 -0700
-@@ -115,7 +115,7 @@ case "$NGX_ICC_VER" in
- esac
- 
- # stop on warning
--CFLAGS="$CFLAGS -Werror"
-+#CFLAGS="$CFLAGS -Werror"
- 
- # debug
- CFLAGS="$CFLAGS -g"

patches/nginx-1.5.12-no_error_pages.patch

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