fixed the tests to reflect recent changes.

upgraded ngx_lua to 0.5.13, ngx_echo to 0.41, and lua-resty-dns to 0.05.
[FreeBSD]: first step of port
2024-10-13 00:29:41 +00:00 · 2012-08-12 11:42:11 -07:00 · 2012-08-12 11:41:38 -07:00 · 2012-08-09 22:41:37 +04:00 · 2012-08-05 23:49:20 -07:00 · 2012-08-05 23:48:01 -07:00
40 changed files with 3841 additions and 1345 deletions
--- a/FreeBSD/www/openresty/Makefile
+++ b/FreeBSD/www/openresty/Makefile
@ -0,0 +1,233 @@
+# New ports collection makefile for:	openresty
+# Date created:		2012-08-07
+# Whom:			Gvozdikov Veniamin <g.veniamin@googlemail.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	openresty
+PORTVERSION=	1.2.1.11
+CATEGORIES=	www
+MASTER_SITES=	http://agentzh.org/misc/nginx/
+DISTNAME=	ngx_${PORTNAME}-${PORTVERSION}
+
+MAINTAINER=	g.veniamin@googlemail.com
+COMMENT=	OpenResty a powerful web app server by extending nginx
+
+LICENSE=	BSD
+
+LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
+
+HAS_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_PERL5=	yes
+
+CONFIGURE_ARGS=	--prefix=${PREFIX}\
+		--with-cc-opt="-I ${LOCALBASE}/include" \
+		--with-ld-opt="-L ${LOCALBASE}/lib" \
+		--user=${WWWOWN} --group=${WWWGRP}
+
+OPTIONS_DEFINE=	LUACJSON LUAREDISPARS LUARDS LUARESTYDNS LUARESTYMEM \
+		LUARESTYREDIS LUARESTYMYSQL LUARESTYUPLOAD LUARESTYSTRING \
+		ECHO XSS COOLKIT MISC ENCSESSION HEADERSMORE SRCACHE \
+		ARRAYVAR MEMC REDIS REDIS2 AUTHREQ RDSJSON RDSCVS \
+		ICONV NDK DRIZZLE POSTGRES
+OPTIONS_SINGLE=		GLUA
+OPTIONS_SINGLE_GLUA=	LUA LUAJIT DLUA
+
+LUACJSON_DESC=		Lua cjson library
+LUAREDISPARS_DESC=	Lua redis parser library
+LUARDS_DESC=		Lua rds library
+LUARESTYDNS_DESC=	Lua resty dns library
+LUARESTYMEM_DESC=	Lua resty memcached library
+LUARESTYREDIS_DESC=	Lua resty redis library
+LUARESTYMYSQL_DESC=	Lua resty mysql library
+LUARESTYUPLOAD_DESC=	Lua resty upload library
+LUARESTYSTRING_DESC=	Lua resty string library
+
+ECHO_DESC=		Brings echo/sleep/time and more shell-style
+XSS_DESC=		Native cross-site scripting support in nginx
+COOLKIT_DESC=		Collection of small and useful nginx add-ons
+MISC_DESC=		Various set_xxx directives added
+ENCSESSION_DESC=	Encrypt and decrypt nginx variable values
+HEADERSMORE_DESC=	Set and clear input and output headers
+SRCACHE_DESC=		Transparent subrequest-based caching layout
+ARRAYVAR_DESC=		Add support for array variables to config
+MEMC_DESC=		An extended memcached module
+REDIS_DESC=		HTTP redis module
+REDIS2_DESC=		Module for the Redis 2.0 protocol
+AUTHREQ_DESC=		Auth request module
+RDSJSON_DESC=		An output filter that formats Resty
+RDSCVS_DESC=		Output filter module to convert CVS
+NDK_DESC=		Nginx Development Kit
+ICONV_DESC=		Iconv support
+DRIZZLE_DESC=		Module for talking to MySQL and Drizzle
+POSTGRES_DESC=		Module for talking to Postgeres
+
+DLUA_DESC=		Disable Lua
+LUA_DESC=		Use LUA 5.1
+LUAJIT_DESC=		Use LuaJIT 2.0
+
+OPTIONS_DEFAULT=	MISC XSS ECHO COOLKIT ENCSESSION HEADERMORE LUA \
+			SRCACHE ARRAYVAR MEMC REDIS REDIS2 AUTHREQ RDSJSON \
+			RDSCVS NDK ICONV PORTGRES
+
+.include <bsd.port.options.mk>
+
+.if empty(${PORT_OPTIONS:MAUTHREQ})
+CONFIGURE_ARGS+=	--without-http_auth_request_module
+.endif
+
+.if empty(${PORT_OPTIONS:MRDSJSON})
+CONFIGURE_ARGS+=	--without-http_rds_json_module
+.endif
+
+.if empty(${PORT_OPTIONS:MRDSCVS})
+CONFIGURE_ARGS+=	--without-http_rds_csv_module
+.endif
+
+.if ${PORT_OPTIONS:MICONV}
+CONFIGURE_ARGS+=	--with-http_iconv_module
+.endif
+
+.if ${PORT_OPTIONS:MNDK}
+.else
+CONFIGURE_ARGS+=	--without-ngx_devel_kit_module
+.endif
+
+.if ${PORT_OPTIONS:MDRIZZLE}
+CONFIGURE_ARGS+=	--with-http_drizzle_module \
+			--with-libdrizzle=${LOCALBASE}
+LIB_DEPENDS+=		drizzle:${PORTSDIR}/databases/libdrizzle
+.endif
+
+.if ${PORT_OPTIONS:MPOSTGRES}
+CONFIGURE_ARGS+=	--with-http_postgres_module
+.endif
+
+.if empty(${PORT_OPTIONS:MREDIS})
+CONFIGURE_ARGS+=	--without-http_redis_module
+.endif
+
+.if empty(${PORT_OPTIONS:MREDIS2})
+CONFIGURE_ARGS+=	--without-http_redis2_module
+.endif
+
+.if empty(${PORT_OPTIONS:MMEMC})
+CONFIGURE_ARGS+=	--without-http_memc_module
+.endif
+
+.if empty(${PORT_OPTIONS:MARRAYVAR})
+CONFIGURE_ARGS+=	--without-http_array_var_module
+.endif
+
+.if empty(${PORT_OPTIONS:MSRCACHE})
+CONFIGURE_ARGS+=	--without-http_srcache_module
+.endif
+
+.if empty(${PORT_OPTIONS:MENCSESSION})
+CONFIGURE_ARGS+=	--without-http_encrypted_session_module
+.endif
+
+.if empty(${PORT_OPTIONS:MHEADERSMORE})
+CONFIGURE_ARGS+=	--without-http_headers_more_module
+.endif
+
+.if empty(${PORT_OPTIONS:MMISC})
+CONFIGURE_ARGS+=	--without-http_set_misc_module
+.endif
+
+.if empty(${PORT_OPTIONS:MXSS})
+CONFIGURE_ARGS+=	--without-http_xss_module
+.endif
+
+.if empty(${PORT_OPTIONS:MCOOLKIT})
+CONFIGURE_ARGS+=	--without-http_coolkit_module
+.endif
+
+.if empty(${PORT_OPTIONS:MECHO})
+CONFIGURE_ARGS+=	--without-http_echo_module
+.endif
+
+.if ${PORT_OPTIONS:MLUAJIT}
+CONFIGURE_ARGS+=	--with-luajit
+PLIST_SUB+=		LUAJIT=""
+.else
+PLIST_SUB+=		LUAJIT="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MLUA}
+PLIST_SUB+=		LUA=""
+.else
+CONFIGURE_ARGS+=	--without-lua51
+PLIST_SUB+=		LUA="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MDLUA}
+CONFIGURE_ARGS+=	--without-http_lua_module
+.endif
+
+.if ${PORT_OPTIONS:MLUACJSON}
+PLIST_SUB+=		LUACJSON=""
+.else
+CONFIGURE_ARGS+=	--without-lua_cjson
+PLIST_SUB+=		LUACJSON="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MLUAREDISPARS}
+PLIST_SUB+=		LUAREDISPARS=""
+.else
+CONFIGURE_ARGS+=	--without-lua_redis_parser
+PLIST_SUB+=		LUAREDISPARS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MLUARDS}
+PLIST_SUB+=		LUARDS=""
+.else
+CONFIGURE_ARGS+=	--without-lua_rds_parser
+PLIST_SUB+=		LUARDS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MLUARESTYDNS}
+PLIST_SUB+=		LUARESTYDNS=""
+.else
+PLIST_SUB+=		LUARESTYDNS="@comment "
+CONFIGURE_ARGS+=	--without-lua_resty_dns
+.endif
+
+.if ${PORT_OPTIONS:MLUARESTYMEM}
+PLIST_SUB+=		LUARESTYMEM=""
+.else
+PLIST_SUB+=		LUARESTYMEM="@comment "
+CONFIGURE_ARGS+=	--without-lua_resty_memcached
+.endif
+
+.if ${PORT_OPTIONS:MLUARESTYREDIS}
+PLIST_SUB+=		LUARESTYREDIS=""
+.else
+CONFIGURE_ARGS+=	--without-lua_resty_redis
+PLIST_SUB+=		LUARESTYREDIS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MLUARESTYMYSQL}
+PLIST_SUB+=		LUARESTYMYSQL=""
+.else
+CONFIGURE_ARGS+=	--without-lua_resty_mysql
+PLIST_SUB+=		LUARESTYMYSQL="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MLUARESTYUPLOAD}
+PLIST_SUB+=		LUARESTYUPLOAD=""
+.else
+CONFIGURE_ARGS+=	--without-lua_resty_upload
+PLIST_SUB+=		LUARESTYUPLOAD="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MLUARESTYSTRING}
+PLIST_SUB+=		LUARESTYSTRING=""
+.else
+CONFIGURE_ARGS+=	--without-lua_resty_string
+PLIST_SUB+=		LUARESTYSTRING="@comment "
+.endif
+
+.include <bsd.port.mk>
--- a/FreeBSD/www/openresty/distinfo
+++ b/FreeBSD/www/openresty/distinfo
@ -0,0 +1,2 @@
+SHA256 (ngx_openresty-1.2.1.11.tar.gz) = 212c3ba07d94b17fcbd4d60054bd8457fa18de3264381e8449074c78aa05f9f5
+SIZE (ngx_openresty-1.2.1.11.tar.gz) = 2950664
--- a/FreeBSD/www/openresty/files/patch-bundleLuaJIT-2.0.0-beta10Makefile
+++ b/FreeBSD/www/openresty/files/patch-bundleLuaJIT-2.0.0-beta10Makefile
@ -0,0 +1,36 @@
+--- bundle/LuaJIT-2.0.0-beta10/Makefile.orig	2012-05-09 20:00:00.000000000 +0400
+++ bundle/LuaJIT-2.0.0-beta10/Makefile	2012-08-07 23:26:28.853477336 +0400
+@@ -38,8 +38,6 @@
+ INSTALL_JITLIB= $(INSTALL_SHARE)/luajit-$(VERSION)/jit
+ INSTALL_LMOD= $(INSTALL_SHARE)/lua/$(ABIVER)
+ INSTALL_CMOD= $(INSTALL_LIB)/lua/$(ABIVER)
+-INSTALL_MAN= $(INSTALL_SHARE)/man/man1
+-INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
+ 
+ INSTALL_TNAME= luajit-$(VERSION)
+ INSTALL_TSYMNAME= luajit
+@@ -59,7 +57,7 @@
+ INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
+ INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
+ 
+-INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
+INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) \
+   $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD)
+ 
+ RM= rm -f
+@@ -73,7 +71,6 @@
+ FILE_T= luajit
+ FILE_A= libluajit.a
+ FILE_SO= libluajit.so
+-FILE_MAN= luajit.1
+ FILE_PC= luajit.pc
+ FILES_INC= lua.h lualib.h lauxlib.h luaconf.h lua.hpp luajit.h
+ FILES_JITLIB= bc.lua v.lua dump.lua dis_x86.lua dis_x64.lua dis_arm.lua \
+@@ -108,7 +105,6 @@
+ 	  $(LDCONFIG) $(INSTALL_LIB) && \
+ 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
+ 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
+-	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
+ 	cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
+ 	  $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
+ 	  $(RM) $(FILE_PC).tmp
--- a/FreeBSD/www/openresty/files/patch-bundlelua-5.1.5Makefile
+++ b/FreeBSD/www/openresty/files/patch-bundlelua-5.1.5Makefile
@ -0,0 +1,47 @@
+--- bundle/lua-5.1.5/Makefile.orig	2012-08-07 14:56:49.606517458 +0400
+++ bundle/lua-5.1.5/Makefile	2012-08-07 14:57:31.325545994 +0400
+@@ -13,7 +13,6 @@
+ INSTALL_BIN= $(INSTALL_TOP)/bin
+ INSTALL_INC= $(INSTALL_TOP)/include
+ INSTALL_LIB= $(INSTALL_TOP)/lib
+-INSTALL_MAN= $(INSTALL_TOP)/man/man1
+ #
+ # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
+ # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
+@@ -44,7 +43,6 @@
+ TO_BIN= lua luac
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
+ TO_LIB= liblua.a
+-TO_MAN= lua.1 luac.1
+ 
+ # Lua version and release.
+ V= 5.1
+@@ -59,11 +57,10 @@
+ 	src/lua test/hello.lua
+ 
+ install: dummy
+-	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
+	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_LMOD) $(INSTALL_CMOD)
+ 	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
+ 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
+ 	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
+-	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
+ 
+ ranlib:
+ 	cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
+@@ -95,7 +92,6 @@
+ 	@echo "INSTALL_BIN = $(INSTALL_BIN)"
+ 	@echo "INSTALL_INC = $(INSTALL_INC)"
+ 	@echo "INSTALL_LIB = $(INSTALL_LIB)"
+-	@echo "INSTALL_MAN = $(INSTALL_MAN)"
+ 	@echo "INSTALL_LMOD = $(INSTALL_LMOD)"
+ 	@echo "INSTALL_CMOD = $(INSTALL_CMOD)"
+ 	@echo "INSTALL_EXEC = $(INSTALL_EXEC)"
+@@ -111,7 +107,6 @@
+ 	@echo "TO_BIN = $(TO_BIN)"
+ 	@echo "TO_INC = $(TO_INC)"
+ 	@echo "TO_LIB = $(TO_LIB)"
+-	@echo "TO_MAN = $(TO_MAN)"
+ 
+ # echo config parameters as Lua code
+ # uncomment the last sed expression if you want nil instead of empty strings
--- a/FreeBSD/www/openresty/files/patch-configure
+++ b/FreeBSD/www/openresty/files/patch-configure
@ -0,0 +1,12 @@
+--- configure.orig	2012-08-08 11:10:58.575960219 +0400
+++ configure	2012-08-08 11:11:38.950486311 +0400
+@@ -157,6 +157,9 @@
+     } elsif ($opt eq '--without-lua_redis_parser') {
+         $resty_opts{no_lua_redis_parser} = 1;
+ 
+    } elsif ($opt eq '--without-lua_resty_dns') {
+        $resty_opts{no_lua_resty_dns} = 1;
+
+     } elsif ($opt eq '--without-lua_resty_memcached') {
+         $resty_opts{no_lua_resty_memcached} = 1;
+ 
--- a/FreeBSD/www/openresty/pkg-descr
+++ b/FreeBSD/www/openresty/pkg-descr
@ -0,0 +1,6 @@
+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.
+
+
+WWW:	http://openresty.org
--- a/FreeBSD/www/openresty/pkg-plist
+++ b/FreeBSD/www/openresty/pkg-plist
@ -0,0 +1,95 @@
+%%LUA%%lua/bin/luac
+%%LUA%%lua/bin/lua
+%%LUA%%lua/lib/liblua.a
+%%LUA%%lua/include/luaconf.h
+%%LUA%%lua/include/lauxlib.h
+%%LUA%%lua/include/lua.h
+%%LUA%%lua/include/lua.hpp
+%%LUA%%lua/include/lualib.h
+%%LUAJIT%%luajit/include/luajit-2.0/luaconf.h
+%%LUAJIT%%luajit/include/luajit-2.0/lua.hpp
+%%LUAJIT%%luajit/include/luajit-2.0/lualib.h
+%%LUAJIT%%luajit/include/luajit-2.0/luajit.h
+%%LUAJIT%%luajit/include/luajit-2.0/lauxlib.h
+%%LUAJIT%%luajit/include/luajit-2.0/lua.h
+%%LUAJIT%%luajit/lib/libluajit-5.1.a
+%%LUAJIT%%luajit/lib/libluajit-5.1.so.2.0.0
+%%LUAJIT%%luajit/share/luajit-2.0.0-beta10/jit/dump.lua
+%%LUAJIT%%luajit/share/luajit-2.0.0-beta10/jit/dis_mipsel.lua
+%%LUAJIT%%luajit/share/luajit-2.0.0-beta10/jit/bc.lua
+%%LUAJIT%%luajit/share/luajit-2.0.0-beta10/jit/dis_mips.lua
+%%LUAJIT%%luajit/share/luajit-2.0.0-beta10/jit/dis_x64.lua
+%%LUAJIT%%luajit/share/luajit-2.0.0-beta10/jit/v.lua
+%%LUAJIT%%luajit/share/luajit-2.0.0-beta10/jit/dis_ppc.lua
+%%LUAJIT%%luajit/share/luajit-2.0.0-beta10/jit/dis_arm.lua
+%%LUAJIT%%luajit/share/luajit-2.0.0-beta10/jit/vmdef.lua
+%%LUAJIT%%luajit/share/luajit-2.0.0-beta10/jit/dis_x86.lua
+%%LUAJIT%%luajit/share/luajit-2.0.0-beta10/jit/bcsave.lua
+%%LUAJIT%%luajit/bin/luajit-2.0.0-beta10
+nginx/html/index.html
+nginx/html/50x.html
+nginx/conf/koi-win
+nginx/conf/koi-utf
+nginx/conf/fastcgi_params
+nginx/conf/nginx.conf.default
+nginx/conf/fastcgi.conf
+nginx/conf/win-utf
+nginx/conf/fastcgi.conf.default
+nginx/conf/scgi_params
+nginx/conf/uwsgi_params
+nginx/conf/mime.types
+nginx/conf/scgi_params.default
+nginx/conf/nginx.conf
+nginx/conf/uwsgi_params.default
+nginx/conf/mime.types.default
+nginx/conf/fastcgi_params.default
+nginx/sbin/nginx
+%%LUARESTYDNS%%lualib/resty/dns/resolver.lua
+%%LUARESTYUPLOAD%%lualib/resty/upload.lua
+%%LUARESTYSTRING%%lualib/resty/sha1.lua
+%%LUARESTYSTRING%%lualib/resty/random.lua
+%%LUARESTYSTRING%%lualib/resty/md5.lua
+%%LUARESTYSTRING%%lualib/resty/aes.lua
+%%LUARESTYSTRING%%lualib/resty/sha384.lua
+%%LUARESTYMYSQL%%lualib/resty/mysql.lua
+%%LUARESTYMEM%%lualib/resty/memcached.lua
+%%LUARESTYREDIS%%lualib/resty/redis.lua
+%%LUARESTYSTRING%%lualib/resty/sha512.lua
+%%LUARESTYSTRING%%lualib/resty/sha256.lua
+%%LUARESTYSTRING%%lualib/resty/string.lua
+%%LUARESTYSTRING%%lualib/resty/sha224.lua
+%%LUARESTYSTRING%%lualib/resty/sha.lua
+%%LUARDS%%lualib/rds/parser.so
+%%LUACJSON%%lualib/cjson.so
+%%LUAREDISPARS%%lualib/redis/parser.so
+@dirrmtry nginx/sbin
+@dirrmtry nginx/logs
+@dirrmtry nginx/html
+@dirrmtry nginx/conf
+@dirrmtry nginx
+%%LUARESTYDNS%%@dirrm lualib/resty/dns
+@dirrmtry lualib/resty
+%%LUAREDISPARS%%@dirrmtry lualib/redis
+%%LUARDS%%@dirrmtry lualib/rds
+@dirrmtry lualib
+%%LUA%%@dirrm lua/share/lua/5.1
+%%LUA%%@dirrm lua/share/lua
+%%LUA%%@dirrm lua/share
+%%LUA%%@dirrm lua/lib/lua/5.1
+%%LUA%%@dirrm lua/lib/lua
+%%LUA%%@dirrm lua/lib
+%%LUA%%@dirrm lua/include
+%%LUA%%@dirrm lua/bin
+%%LUA%%@dirrm lua
+%%LUAJIT%%@dirrm luajit/share/luajit-2.0.0-beta10/jit
+%%LUAJIT%%@dirrm luajit/share/luajit-2.0.0-beta10
+%%LUAJIT%%@dirrm luajit/include/luajit-2.0
+%%LUAJIT%%@dirrm luajit/include
+%%LUAJIT%%@dirrm luajit/share/lua/5.1
+%%LUAJIT%%@dirrm luajit/share/lua
+%%LUAJIT%%@dirrm luajit/share
+%%LUAJIT%%@dirrm luajit/lib/lua/5.1
+%%LUAJIT%%@dirrm luajit/lib/lua
+%%LUAJIT%%@dirrm luajit/lib
+%%LUAJIT%%@dirrm luajit/bin
+%%LUAJIT%%@dirrm luajit
--- a/10
+++ b/10
@ -27,6 +27,16 @@ For bundle maintainers:

    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:
--- a/patches/lua-5.1.5-disable_lua50_compat.patch
+++ b/patches/lua-5.1.5-disable_lua50_compat.patch
@ -0,0 +1,14 @@
+--- lua-5.1.5/src/luaconf.h	2008-02-11 08:25:08.000000000 -0800
+++ lua-5.1.5-patched/src/luaconf.h	2012-07-04 18:36:05.700067698 -0700
+@@ -757,6 +757,11 @@
+ ** without modifying the main part of the file.
+ */
+ 
+#undef LUA_COMPAT_VARARG
+#undef LUA_COMPAT_MOD
+#undef LUA_COMPAT_LSTR
+#undef LUA_COMPAT_GFIND
+#undef LUA_COMPAT_OPENLIB
+ 
+ 
+ #endif
--- a/patches/lua-5.1.5-makefile_install_fix.patch
+++ b/patches/lua-5.1.5-makefile_install_fix.patch
@ -0,0 +1,23 @@
+--- lua-5.1.5/Makefile	2008-08-12 08:40:48.000000000 +0800
+++ lua-5.1.5-patched/Makefile	2011-03-09 20:56:47.603422483 +0800
+@@ -22,14 +22,14 @@
+ 
+ # How to install. If your install program does not support "-p", then you
+ # may have to run ranlib on the installed liblua.a (do "make ranlib").
+-INSTALL= install -p
+-INSTALL_EXEC= $(INSTALL) -m 0755
+-INSTALL_DATA= $(INSTALL) -m 0644
+#INSTALL= install -p
+#INSTALL_EXEC= $(INSTALL) -m 0755
+#INSTALL_DATA= $(INSTALL) -m 0644
+ #
+ # If you don't have install you can use cp instead.
+-# INSTALL= cp -p
+-# INSTALL_EXEC= $(INSTALL)
+-# INSTALL_DATA= $(INSTALL)
+INSTALL= cp -p
+INSTALL_EXEC= $(INSTALL)
+INSTALL_DATA= $(INSTALL)
+ 
+ # Utilities.
+ MKDIR= mkdir -p
--- a/patches/nginx-1.0.15-add_core_vars_polluting_globals.patch
+++ b/patches/nginx-1.0.15-add_core_vars_polluting_globals.patch
@ -0,0 +1,26 @@
+--- nginx-1.0.15/src/http/ngx_http_variables.c	2012-03-05 20:36:51.000000000 +0800
+++ nginx-1.0.15-patched/src/http/ngx_http_variables.c	2012-05-17 16:21:42.120968722 +0800
+@@ -1898,6 +1898,7 @@
+ {
+     ngx_int_t                   rc;
+     ngx_http_variable_t        *v;
+    ngx_http_variable_t        *value;
+     ngx_http_core_main_conf_t  *cmcf;
+ 
+     cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
+@@ -1918,7 +1919,14 @@
+     }
+ 
+     for (v = ngx_http_core_variables; v->name.len; v++) {
+-        rc = ngx_hash_add_key(cmcf->variables_keys, &v->name, v,
+        value = ngx_palloc(cf->pool, sizeof(ngx_http_variable_t));
+        if (value == NULL) {
+            return NGX_ERROR;
+        }
+
+        *value = *v;
+
+        rc = ngx_hash_add_key(cmcf->variables_keys, &value->name, value,
+                               NGX_HASH_READONLY_KEY);
+ 
+         if (rc == NGX_OK) {
--- a/patches/nginx-1.0.15-epoll_check_stale_wev.patch
+++ b/patches/nginx-1.0.15-epoll_check_stale_wev.patch
@ -1,20 +0,0 @@
--- nginx-1.0.15/src/event/modules/ngx_epoll_module.c	2011-09-30 22:12:53.000000000 +0800
-+++ nginx-1.0.15-patched/src/event/modules/ngx_epoll_module.c	2011-11-30 11:08:46.775817019 +0800
-@@ -682,6 +682,17 @@
-         wev = c->write;
- 
-         if ((revents & EPOLLOUT) && wev->active) {
-+            if (c->fd == -1 || wev->instance != instance) {
-+
-+                /*
-+                 * the stale event from a file descriptor
-+                 * that was just closed in this iteration
-+                 */
-+
-+                ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
-+                               "epoll: stale event %p", c);
-+                continue;
-+            }
- 
-             if (flags & NGX_POST_THREAD_EVENTS) {
-                 wev->posted_ready = 1;
--- a/patches/nginx-1.0.15-filter_finalize_hang.patch
+++ b/patches/nginx-1.0.15-filter_finalize_hang.patch
@ -0,0 +1,10 @@
+--- nginx-1.0.15/src/http/ngx_http_request.c	2012-03-05 20:49:32.000000000 +0800
+++ nginx-1.0.15-patched/src/http/ngx_http_request.c	2012-05-22 20:46:57.000000000 +0800
+@@ -1900,7 +1900,6 @@
+ 
+     if (rc == NGX_OK && r->filter_finalize) {
+         c->error = 1;
+-        return;
+     }
+ 
+     if (rc == NGX_DECLINED) {
--- a/patches/nginx-1.0.15-no_pool.patch
+++ b/patches/nginx-1.0.15-no_pool.patch
@ -10,17 +10,19 @@ diff -ur nginx-1.0.15/src/core/nginx.h nginx-1.0.15-patched/src/core/nginx.h
 +#define NGINX_VER          "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
 
 #define NGINX_VAR          "NGINX"
-diff -ur nginx-1.0.15/src/core/ngx_array.c nginx-1.0.15-patched/src/core/ngx_array.c
--- nginx-1.0.15/src/core/ngx_array.c	2008-06-17 23:00:30.000000000 +0800
-+++ nginx-1.0.15-patched/src/core/ngx_array.c	2011-09-14 12:02:56.263128538 +0800
-@@ -39,13 +39,7 @@
+diff -urx '*~' -x '*.swp' nginx-1.0.15/src/core/ngx_array.c nginx-1.0.15-patched/src/core/ngx_array.c
+--- nginx-1.0.15/src/core/ngx_array.c	2012-02-06 04:02:59.000000000 +0800
+++ nginx-1.0.15-patched/src/core/ngx_array.c	2012-06-04 20:11:32.494144287 +0800
+@@ -40,13 +40,11 @@
 
     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;
 -    }
@ -28,7 +30,7 @@ diff -ur nginx-1.0.15/src/core/ngx_array.c nginx-1.0.15-patched/src/core/ngx_arr
 }
 
 
-@@ -64,29 +58,17 @@
+@@ -65,29 +63,19 @@
 
         p = a->pool;
 
@ -62,13 +64,15 @@ diff -ur nginx-1.0.15/src/core/ngx_array.c nginx-1.0.15-patched/src/core/ngx_arr
         }
 +
 +        ngx_memcpy(new, a->elts, size);
+
+        ngx_pfree(p, a->elts);
+
 +        a->elts = new;
 +        a->nalloc *= 2;
-+
     }
 
     elt = (u_char *) a->elts + a->size * a->nelts;
-@@ -100,43 +82,25 @@
+@@ -101,43 +89,28 @@
 ngx_array_push_n(ngx_array_t *a, ngx_uint_t n)
 {
     void        *elt, *new;
@ -116,28 +120,30 @@ diff -ur nginx-1.0.15/src/core/ngx_array.c nginx-1.0.15-patched/src/core/ngx_arr
         }
 +
 +        ngx_memcpy(new, a->elts, a->nelts * a->size);
+
+        ngx_pfree(p, a->elts);
+
 +        a->elts = new;
 +        a->nalloc = nalloc;
     }
 
     elt = (u_char *) a->elts + a->size * a->nelts;
-diff -ur nginx-1.0.15/src/core/ngx_palloc.c nginx-1.0.15-patched/src/core/ngx_palloc.c
--- nginx-1.0.15/src/core/ngx_palloc.c	2009-12-17 20:25:46.000000000 +0800
-+++ nginx-1.0.15-patched/src/core/ngx_palloc.c	2011-09-14 12:03:41.663126519 +0800
-@@ -8,24 +8,31 @@
+diff -urx '*~' -x '*.swp' nginx-1.0.15/src/core/ngx_palloc.c nginx-1.0.15-patched/src/core/ngx_palloc.c
+--- nginx-1.0.15/src/core/ngx_palloc.c	2012-02-06 04:02:59.000000000 +0800
+++ nginx-1.0.15-patched/src/core/ngx_palloc.c	2012-06-04 20:02:26.667925891 +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);
- 
- 
+-static void *ngx_palloc_large(ngx_pool_t *pool, size_t size);
+-
+-
 ngx_pool_t *
 ngx_create_pool(size_t size, ngx_log_t *log)
 {
 -    ngx_pool_t  *p;
 +    ngx_pool_t        *p;
-+    ngx_pool_data_t     *d;
 
 -    p = ngx_memalign(NGX_POOL_ALIGNMENT, size, log);
 +    size = sizeof(ngx_pool_t);
@ -150,126 +156,107 @@ diff -ur nginx-1.0.15/src/core/ngx_palloc.c nginx-1.0.15-patched/src/core/ngx_pa
 -    p->d.end = (u_char *) p + size;
 -    p->d.next = NULL;
 -    p->d.failed = 0;
-+    d = ngx_alloc(sizeof(ngx_pool_data_t), log);
-+	
-+    if (d == NULL) {
-+	return NULL;
-+    }
-+
-+    d->next = d;
-+    d->prev = d;
-+    d->alloc = NULL;
-+    p->d = d;
+    ngx_memzero(p, size);
 
     size = size - sizeof(ngx_pool_t);
     p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
-@@ -43,7 +50,7 @@
+ 
+     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_large_t    *l;
     ngx_pool_cleanup_t  *c;
 
-@@ -55,7 +62,7 @@
+     for (c = pool->cleanup; c; c = c->next) {
+@@ -56,13 +46,9 @@
         }
     }
 
 -    for (l = pool->large; l; l = l->next) {
-+    for (l = pool->large; l ; l = l->next) {
+-
+-        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+-
+-        if (l->alloc) {
+-            ngx_free(l->alloc);
+-        }
+    if (pool->d == NULL) {
+        ngx_free(pool);
+        return;
+     }
 
-         ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
- 
-@@ -71,34 +78,45 @@
-      * so we can not use this log while the free()ing the pool
+ #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", d);
+                       "free: %p, unused: %d", d, 0);
 
-        if (n == NULL) {
-+        if (n == pool->d) {
+         if (n == NULL) {
             break;
-         }
-     }
+@@ -83,172 +69,82 @@
 
 #endif
-+    if (pool->d->next == pool->d) {
-+    	ngx_free(pool->d);
-+    } else {
-+        for (d = pool->d, n = d->next; ; d = n, n = n->next) {
-+            if (d->alloc) {
-+    	        ngx_free(d->alloc);
-+            }
-+            ngx_free(d);
 
 -    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
 -        ngx_free(p);
+    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;
 -
-        if (n == NULL) {
-            break;
-+            if (n == pool->d) {
-+                break;
-+            }
-         }
-     }
-+
+-    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_reset_pool(ngx_pool_t *pool)
- {
-    ngx_pool_t        *p;
-    ngx_pool_large_t  *l;
-+    ngx_pool_data_t     *p, *tmp;
-+    ngx_pool_large_t    *l;
-+
-+    for (l = pool->large; l ; l = l->next) {
-+
-+        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
- 
-    for (l = pool->large; l; l = l->next) {
-         if (l->alloc) {
-             ngx_free(l->alloc);
-         }
-@@ -106,109 +124,65 @@
- 
-     pool->large = NULL;
- 
-    for (p = pool; p; p = p->d.next) {
-        p->d.last = (u_char *) p + sizeof(ngx_pool_t);
-+    p = pool->d->next;
-+    while (p != pool->d) {
-+        tmp = p;
-+        ngx_free(p->alloc);
-+        p->prev->next = p->next;
-+        p->next->prev = p->prev;
-+        p = p->next;
-+        ngx_free(tmp);
-     }
-}
- 
-+    ngx_free(pool->d->alloc);
-+    pool->d->alloc = NULL;
-+
-+}
- 
- void *
+-void *
 -ngx_palloc(ngx_pool_t *pool, size_t size)
-+ngx_malloc(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     *new;
-+    void        	*m;
+    ngx_pool_data_t     *d, *n;
+    ngx_pool_data_t     *saved = NULL;
 
 -        p = pool->current;
 -
@ -280,37 +267,29 @@ diff -ur nginx-1.0.15/src/core/ngx_palloc.c nginx-1.0.15-patched/src/core/ngx_pa
 -                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);
-+    m = ngx_alloc(size, pool->log);
-+    if (m == NULL) {
-+	return NULL;
-+    }
- 
-        return ngx_palloc_block(pool, size);
-+    new = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
-+    if (new == NULL){
-+        ngx_free(m);
-+	return NULL;
-     }
- 
-    return ngx_palloc_large(pool, size);
-+    new->alloc = m;
-+    new->next = pool->d;
-+    new->prev = pool->d->prev;
-+    pool->d->prev->next = new;
-+    pool->d->prev = new;
-+    return m;	
- }
- 
 -
- void *
+-        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)
-+ngx_palloc(ngx_pool_t *pool, size_t size)
- {
+-{
 -    u_char      *m;
 -    ngx_pool_t  *p;
 -
@ -325,37 +304,42 @@ diff -ur nginx-1.0.15/src/core/ngx_palloc.c nginx-1.0.15-patched/src/core/ngx_pa
 -                p->d.last = m + size;
 -
 -                return m;
-            }
-
+            if (n == NULL) {
+                break;
+             }
+        }
+ 
 -            p = p->d.next;
 -
 -        } while (p);
 -
 -        return ngx_palloc_block(pool, size);
-+    if (size <= 1024) {
-+        return ngx_malloc(pool, size);
+        pool->d = saved;
     }
- 
-     return ngx_palloc_large(pool, size);
+-
+-    return ngx_palloc_large(pool, size);
 }
 
 
 -static void *
 -ngx_palloc_block(ngx_pool_t *pool, size_t size)
 +void *
-+ngx_pnalloc(ngx_pool_t *pool, size_t size)
+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     *new;
+    void                *m;
+ 
 -    psize = (size_t) (pool->d.end - (u_char *) pool);
 -
 -    m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
-    if (m == NULL) {
-        return NULL;
-    }
-
+    m = ngx_alloc(size, pool->log);
+     if (m == NULL) {
+         return NULL;
+     }
+ 
 -    new = (ngx_pool_t *) m;
 -
 -    new->d.end = m + psize;
@ -372,31 +356,37 @@ diff -ur nginx-1.0.15/src/core/ngx_palloc.c nginx-1.0.15-patched/src/core/ngx_pa
 -        if (p->d.failed++ > 4) {
 -            current = p->d.next;
 -        }
-+    if (size <= 1024) {
-+        return ngx_malloc(pool, size);
+    new = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
+    if (new == NULL){
+        ngx_free(m);
+        return NULL;
     }
 
 -    p->d.next = new;
 -
 -    pool->current = current ? current : new;
 -
-    return m;
-+    return ngx_palloc_large(pool, size);
+    new->alloc = m;
+    new->next = pool->d;
+    pool->d = new;
+     return m;
 }
 
 
-@@ -216,7 +190,6 @@
- ngx_palloc_large(ngx_pool_t *pool, size_t size)
+-static void *
+-ngx_palloc_large(ngx_pool_t *pool, size_t size)
+void *
+ngx_palloc(ngx_pool_t *pool, size_t size)
 {
-     void              *p;
+-    void              *p;
 -    ngx_uint_t         n;
-     ngx_pool_large_t  *large;
- 
-     p = ngx_alloc(size, pool->log);
-@@ -224,20 +197,7 @@
-         return NULL;
-     }
- 
+-    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) {
@ -411,11 +401,26 @@ diff -ur nginx-1.0.15/src/core/ngx_palloc.c nginx-1.0.15-patched/src/core/ngx_pa
 -    }
 -
 -    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
-+    large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
-     if (large == NULL) {
-         ngx_free(p);
-         return NULL;
-@@ -262,7 +222,7 @@
+-    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);
+ }
+ 
+ 
+@@ -263,7 +159,7 @@
         return NULL;
     }
 
@ -424,62 +429,55 @@ diff -ur nginx-1.0.15/src/core/ngx_palloc.c nginx-1.0.15-patched/src/core/ngx_pa
     if (large == NULL) {
         ngx_free(p);
         return NULL;
-@@ -279,17 +239,41 @@
+@@ -278,16 +174,27 @@
+ 
+ 
 ngx_int_t
- ngx_pfree(ngx_pool_t *pool, void *p)
+-ngx_pfree(ngx_pool_t *pool, void *p)
+ngx_pfree(ngx_pool_t *pool, void *data)
 {
 -    ngx_pool_large_t  *l;
-+    ngx_pool_large_t    *l;
-+    ngx_pool_large_t    *ll;
-+    ngx_pool_data_t     *d, *n;
+    ngx_pool_data_t     *p, *d;
 
 -    for (l = pool->large; l; l = l->next) {
-+    for (l = pool->large, ll = l; l; ll = l, l = l->next) {
-         if (p == l->alloc) {
-             ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
-                            "free: %p", l->alloc);
-             ngx_free(l->alloc);
-             l->alloc = NULL;
-+	    if (l == pool->large) {
-+		pool->large = NULL;
+-        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;
 +            }
 +
-+            ll->next = l->next;
-+	    p = l;
-+	    break;
-+        }
-+    }
- 
-+    for (d = pool->d, n = d->next; ; d = n, n = d->next) {
-+        if (p == d->alloc) {
-+            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
-+            if (d->alloc) {
-+                ngx_free(d->alloc);
-+            }
-+            d->alloc = NULL;
-+            d->prev->next = d->next;
-+            d->next->prev = d->prev;
 +            ngx_free(d);
+ 
             return NGX_OK;
         }
-+        if (d->next == pool->d) {
-+            break;
-+        }
-     }
- 
-     return NGX_DECLINED;
-diff -ur nginx-1.0.15/src/core/ngx_palloc.h nginx-1.0.15-patched/src/core/ngx_palloc.h
--- nginx-1.0.15/src/core/ngx_palloc.h	2009-12-17 20:25:46.000000000 +0800
-+++ nginx-1.0.15-patched/src/core/ngx_palloc.h	2011-09-13 12:11:03.155622101 +0800
-@@ -38,6 +38,7 @@
+diff -urx '*~' -x '*.swp' nginx-1.0.15/src/core/ngx_palloc.h nginx-1.0.15-patched/src/core/ngx_palloc.h
+--- nginx-1.0.15/src/core/ngx_palloc.h	2012-02-06 04:02:59.000000000 +0800
+++ nginx-1.0.15-patched/src/core/ngx_palloc.h	2012-06-04 19:39:32.803578356 +0800
+@@ -39,6 +39,8 @@
 
 
 typedef struct ngx_pool_large_s  ngx_pool_large_t;
 +typedef struct ngx_pool_data_s   ngx_pool_data_t;
+
 
 struct ngx_pool_large_s {
     ngx_pool_large_t     *next;
-@@ -45,16 +46,15 @@
+@@ -46,16 +48,14 @@
 };
 
 
@ -489,9 +487,8 @@ diff -ur nginx-1.0.15/src/core/ngx_palloc.h nginx-1.0.15-patched/src/core/ngx_pa
 -    ngx_pool_t           *next;
 -    ngx_uint_t            failed;
 -} ngx_pool_data_t;
-+struct ngx_pool_data_s{
+struct ngx_pool_data_s {
 +    ngx_pool_data_t        *next;
-+    ngx_pool_data_t		*prev;
 +    void                   *alloc;
 +};
 
--- a/patches/nginx-1.0.15-poll_del_event_at_exit.patch
+++ b/patches/nginx-1.0.15-poll_del_event_at_exit.patch
@ -0,0 +1,20 @@
+--- nginx-1.0.15/src/os/unix/ngx_process_cycle.c	2012-02-06 04:02:59.000000000 +0800
+++ nginx-1.0.15-patched/src/os/unix/ngx_process_cycle.c	2012-06-15 11:39:11.234286287 +0800
+@@ -707,6 +707,8 @@
+     ngx_exit_log.file = &ngx_exit_log_file;
+ 
+     ngx_exit_cycle.log = &ngx_exit_log;
+    ngx_exit_cycle.files = ngx_cycle->files;
+    ngx_exit_cycle.files_n = ngx_cycle->files_n;
+     ngx_cycle = &ngx_exit_cycle;
+ 
+     ngx_destroy_pool(cycle->pool);
+@@ -1063,6 +1065,8 @@
+     ngx_exit_log.file = &ngx_exit_log_file;
+ 
+     ngx_exit_cycle.log = &ngx_exit_log;
+    ngx_exit_cycle.files = ngx_cycle->files;
+    ngx_exit_cycle.files_n = ngx_cycle->files_n;
+     ngx_cycle = &ngx_exit_cycle;
+ 
+     ngx_destroy_pool(cycle->pool);
--- a/patches/nginx-1.0.15-reset_wev_handler_in_named_locations.patch
+++ b/patches/nginx-1.0.15-reset_wev_handler_in_named_locations.patch
@ -0,0 +1,11 @@
+--- nginx-1.0.15/src/http/ngx_http_core_module.c	2012-03-05 21:03:39.000000000 +0800
+++ nginx-1.0.15-patched/src/http/ngx_http_core_module.c	2012-05-02 21:57:40.624937882 +0800
+@@ -2567,6 +2567,8 @@
+ 
+             r->phase_handler = cmcf->phase_engine.location_rewrite_index;
+ 
+            r->write_event_handler = ngx_http_core_run_phases;
+
+             ngx_http_core_run_phases(r);
+ 
+             return NGX_DONE;
--- a/patches/nginx-1.0.15-resolver_debug_log_overflow.patch
+++ b/patches/nginx-1.0.15-resolver_debug_log_overflow.patch
@ -0,0 +1,11 @@
+--- nginx-1.0.15/src/core/ngx_resolver.c	2012-03-05 21:17:56.000000000 +0800
+++ nginx-1.0.15-patched/src/core/ngx_resolver.c	2012-06-01 17:55:55.861130605 +0800
+@@ -987,7 +987,7 @@
+     nan = (query->nan_hi << 8) + query->nan_lo;
+ 
+     ngx_log_debug6(NGX_LOG_DEBUG_CORE, r->log, 0,
+-                   "resolver DNS response %ui fl:%04Xui %ui/%ui/%ui/%ui",
+                   "resolver DNS response %ui fl:%04Xui %ui/%ui/%ud/%ud",
+                    ident, flags, nqs, nan,
+                    (query->nns_hi << 8) + query->nns_lo,
+                    (query->nar_hi << 8) + query->nar_lo);
--- a/patches/nginx-1.1.15-epoll_check_stale_wev.patch
+++ b/patches/nginx-1.1.15-epoll_check_stale_wev.patch
@ -1,20 +0,0 @@
--- nginx-1.1.15/src/event/modules/ngx_epoll_module.c	2011-09-30 22:12:53.000000000 +0800
-+++ nginx-1.1.15-patched/src/event/modules/ngx_epoll_module.c	2011-11-30 11:08:46.775817019 +0800
-@@ -682,6 +682,17 @@
-         wev = c->write;
- 
-         if ((revents & EPOLLOUT) && wev->active) {
-+            if (c->fd == -1 || wev->instance != instance) {
-+
-+                /*
-+                 * the stale event from a file descriptor
-+                 * that was just closed in this iteration
-+                 */
-+
-+                ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
-+                               "epoll: stale event %p", c);
-+                continue;
-+            }
- 
-             if (flags & NGX_POST_THREAD_EVENTS) {
-                 wev->posted_ready = 1;
--- a/patches/nginx-1.1.15-null_character_fixes.patch
+++ b/patches/nginx-1.1.15-null_character_fixes.patch
@ -1,113 +0,0 @@
--- src/http/modules/ngx_http_fastcgi_module.c
-+++ src/http/modules/ngx_http_fastcgi_module.c
-@@ -1501,10 +1501,10 @@ ngx_http_fastcgi_process_header(ngx_http
-                     h->lowcase_key = h->key.data + h->key.len + 1
-                                      + h->value.len + 1;
- 
-                    ngx_cpystrn(h->key.data, r->header_name_start,
-                                h->key.len + 1);
-                    ngx_cpystrn(h->value.data, r->header_start,
-                                h->value.len + 1);
-+                    ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
-+                    h->key.data[h->key.len] = '\0';
-+                    ngx_memcpy(h->value.data, r->header_start, h->value.len);
-+                    h->value.data[h->value.len] = '\0';
-                 }
- 
-                 h->hash = r->header_hash;
--- src/http/modules/ngx_http_proxy_module.c
-+++ src/http/modules/ngx_http_proxy_module.c
-@@ -1381,8 +1381,10 @@ ngx_http_proxy_process_header(ngx_http_r
-             h->value.data = h->key.data + h->key.len + 1;
-             h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
- 
-            ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1);
-            ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1);
-+            ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
-+            h->key.data[h->key.len] = '\0';
-+            ngx_memcpy(h->value.data, r->header_start, h->value.len);
-+            h->value.data[h->value.len] = '\0';
- 
-             if (h->key.len == r->lowcase_index) {
-                 ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
--- src/http/modules/ngx_http_scgi_module.c
-+++ src/http/modules/ngx_http_scgi_module.c
-@@ -941,8 +941,10 @@ ngx_http_scgi_process_header(ngx_http_re
-             h->value.data = h->key.data + h->key.len + 1;
-             h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
- 
-            ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1);
-            ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1);
-+            ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
-+            h->key.data[h->key.len] = '\0';
-+            ngx_memcpy(h->value.data, r->header_start, h->value.len);
-+            h->value.data[h->value.len] = '\0';
- 
-             if (h->key.len == r->lowcase_index) {
-                 ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
--- src/http/modules/ngx_http_uwsgi_module.c
-+++ src/http/modules/ngx_http_uwsgi_module.c
-@@ -985,8 +985,10 @@ ngx_http_uwsgi_process_header(ngx_http_r
-             h->value.data = h->key.data + h->key.len + 1;
-             h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
- 
-            ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1);
-            ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1);
-+            ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
-+            h->key.data[h->key.len] = '\0';
-+            ngx_memcpy(h->value.data, r->header_start, h->value.len);
-+            h->value.data[h->value.len] = '\0';
- 
-             if (h->key.len == r->lowcase_index) {
-                 ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
--- src/http/ngx_http_parse.c
-+++ src/http/ngx_http_parse.c
-@@ -874,6 +874,10 @@ ngx_http_parse_header_line(ngx_http_requ
-                     break;
-                 }
- 
-+                if (ch == '\0') {
-+                    return NGX_HTTP_PARSE_INVALID_HEADER;
-+                }
-+
-                 r->invalid_header = 1;
- 
-                 break;
-@@ -936,6 +940,10 @@ ngx_http_parse_header_line(ngx_http_requ
-                 break;
-             }
- 
-+            if (ch == '\0') {
-+                return NGX_HTTP_PARSE_INVALID_HEADER;
-+            }
-+
-             r->invalid_header = 1;
- 
-             break;
-@@ -954,6 +962,8 @@ ngx_http_parse_header_line(ngx_http_requ
-                 r->header_start = p;
-                 r->header_end = p;
-                 goto done;
-+            case '\0':
-+                return NGX_HTTP_PARSE_INVALID_HEADER;
-             default:
-                 r->header_start = p;
-                 state = sw_value;
-@@ -975,6 +985,8 @@ ngx_http_parse_header_line(ngx_http_requ
-             case LF:
-                 r->header_end = p;
-                 goto done;
-+            case '\0':
-+                return NGX_HTTP_PARSE_INVALID_HEADER;
-             }
-             break;
- 
-@@ -988,6 +1000,8 @@ ngx_http_parse_header_line(ngx_http_requ
-                 break;
-             case LF:
-                 goto done;
-+            case '\0':
-+                return NGX_HTTP_PARSE_INVALID_HEADER;
-             default:
-                 state = sw_value;
-                 break;
--- a/patches/nginx-1.1.15-request_body_in_single_buf.patch
+++ b/patches/nginx-1.1.15-request_body_in_single_buf.patch
@ -1,27 +0,0 @@
-# HG changeset patch
-# User Maxim Dounin <mdounin@mdounin.ru>
-# Date 1309799136 -14400
-# Node ID 99e276bba8596bc4df9e638482ee413f4c6bf700
-# Parent  e7b2f945d55ae44a2295facf9e3336dc4633e5b5
-Core: fix body with request_body_in_single_buf.
-
-If there were preread data and request body was big enough first part
-of request body was duplicated.
-
-See report here:
-http://nginx.org/pipermail/nginx/2011-July/027756.html
-
-diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
--- a/src/http/ngx_http_request_body.c
-+++ b/src/http/ngx_http_request_body.c
-@@ -372,7 +372,9 @@ ngx_http_do_read_client_request_body(ngx
-         }
-     }
- 
-    if (r->request_body_in_file_only && rb->bufs->next) {
-+    if (rb->bufs->next
-+        && (r->request_body_in_file_only || r->request_body_in_single_buf))
-+    {
-         rb->bufs = rb->bufs->next;
-     }
- 
--- a/patches/nginx-1.1.15-request_body_preread_fix.patch
+++ b/patches/nginx-1.1.15-request_body_preread_fix.patch
@ -1,17 +0,0 @@
-# HG changeset patch
-# User Maxim Dounin <mdounin@mdounin.ru>
-# Date 1309776931 -14400
-# Node ID e7b2f945d55ae44a2295facf9e3336dc4633e5b5
-# Parent  610e909bb9e29766188aa86fae3abe0bd3432940
-Core: fix body if it's preread and there are extra data.
-
--- nginx-1.1.15/src/http/ngx_http_request_body.c	2011-07-05 12:11:21.619264633 +0800
-+++ nginx-1.1.15-patched/src/http/ngx_http_request_body.c	2011-07-05 12:14:30.694321554 +0800
-@@ -141,6 +141,7 @@
- 
-             /* the whole request body was pre-read */
- 
-+            b->last = b->pos + r->headers_in.content_length_n;
-             r->header_in->pos += (size_t) r->headers_in.content_length_n;
-             r->request_length += r->headers_in.content_length_n;
- 
--- a/patches/nginx-1.1.15-variable_header_ignore_no_hash.patch
+++ b/patches/nginx-1.1.15-variable_header_ignore_no_hash.patch
@ -1,73 +0,0 @@
--- nginx-1.1.15/src/http/ngx_http_variables.c	2011-05-30 20:36:17.000000000 +0800
-+++ nginx-1.1.15-patched/src/http/ngx_http_variables.c	2011-11-08 22:21:55.229247198 +0800
-@@ -648,7 +648,17 @@
- 
-     a = (ngx_array_t *) ((char *) r + data);
- 
-    n = a->nelts;
-+    h = a->elts;
-+    n = 0;
-+
-+    for (i = 0; i < a->nelts; i++) {
-+
-+        if (h[i]->hash == 0) {
-+            continue;
-+        }
-+
-+        n++;
-+    }
- 
-     if (n == 0) {
-         v->not_found = 1;
-@@ -659,9 +669,7 @@
-     v->no_cacheable = 0;
-     v->not_found = 0;
- 
-    h = a->elts;
-
-    if (n == 1) {
-+    if (n == 1 && a->nelts == 1) {
-         v->len = (*h)->value.len;
-         v->data = (*h)->value.data;
- 
-@@ -670,7 +678,12 @@
- 
-     len = - (ssize_t) (sizeof("; ") - 1);
- 
-    for (i = 0; i < n; i++) {
-+    for (i = 0; i < a->nelts; i++) {
-+
-+        if (h[i]->hash == 0) {
-+            continue;
-+        }
-+
-         len += h[i]->value.len + sizeof("; ") - 1;
-     }
- 
-@@ -683,9 +696,14 @@
-     v->data = p;
- 
-     for (i = 0; /* void */ ; i++) {
-+
-+        if (h[i]->hash == 0) {
-+            continue;
-+        }
-+
-         p = ngx_copy(p, h[i]->value.data, h[i]->value.len);
- 
-        if (i == n - 1) {
-+        if (--n == 0) {
-             break;
-         }
- 
-@@ -738,6 +756,10 @@
-             i = 0;
-         }
- 
-+        if (header[i].hash == 0) {
-+            continue;
-+        }
-+
-         for (n = 0; n + prefix < var->len && n < header[i].key.len; n++) {
-             ch = header[i].key.data[n];
- 
--- a/patches/nginx-1.2.1-add_core_vars_polluting_globals.patch
+++ b/patches/nginx-1.2.1-add_core_vars_polluting_globals.patch
@ -0,0 +1,26 @@
+--- nginx-1.2.1/src/http/ngx_http_variables.c	2012-03-05 20:36:51.000000000 +0800
+++ nginx-1.2.1-patched/src/http/ngx_http_variables.c	2012-05-17 16:21:42.120968722 +0800
+@@ -1898,6 +1898,7 @@
+ {
+     ngx_int_t                   rc;
+     ngx_http_variable_t        *v;
+    ngx_http_variable_t        *value;
+     ngx_http_core_main_conf_t  *cmcf;
+ 
+     cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
+@@ -1918,7 +1919,14 @@
+     }
+ 
+     for (v = ngx_http_core_variables; v->name.len; v++) {
+-        rc = ngx_hash_add_key(cmcf->variables_keys, &v->name, v,
+        value = ngx_palloc(cf->pool, sizeof(ngx_http_variable_t));
+        if (value == NULL) {
+            return NGX_ERROR;
+        }
+
+        *value = *v;
+
+        rc = ngx_hash_add_key(cmcf->variables_keys, &value->name, value,
+                               NGX_HASH_READONLY_KEY);
+ 
+         if (rc == NGX_OK) {
--- a/patches/nginx-1.2.1-allow_request_body_updating.patch
+++ b/patches/nginx-1.2.1-allow_request_body_updating.patch
@ -0,0 +1,128 @@
+diff '--exclude=*~' -ur nginx-1.2.1/src/http/ngx_http_core_module.c nginx-1.2.1-patched/src/http/ngx_http_core_module.c
+--- nginx-1.2.1/src/http/ngx_http_core_module.c	2012-06-04 04:58:12.000000000 -0700
+++ nginx-1.2.1-patched/src/http/ngx_http_core_module.c	2012-07-21 12:09:17.468576485 -0700
+@@ -2420,6 +2420,8 @@
+ 
+     sr->request_body = r->request_body;
+ 
+    sr->content_length_n = -1;
+
+     sr->method = NGX_HTTP_GET;
+     sr->http_version = r->http_version;
+ 
+diff '--exclude=*~' -ur nginx-1.2.1/src/http/ngx_http_request_body.c nginx-1.2.1-patched/src/http/ngx_http_request_body.c
+--- nginx-1.2.1/src/http/ngx_http_request_body.c	2012-04-12 12:35:41.000000000 -0700
+++ nginx-1.2.1-patched/src/http/ngx_http_request_body.c	2012-07-21 12:08:30.655376967 -0700
+@@ -39,7 +39,7 @@
+ 
+     r->main->count++;
+ 
+-    if (r->request_body || r->discard_body) {
+    if (r->request_body || r->discard_body || r->content_length_n == 0) {
+         post_handler(r);
+         return NGX_OK;
+     }
+@@ -441,7 +441,7 @@
+     ssize_t       size;
+     ngx_event_t  *rev;
+ 
+-    if (r != r->main || r->discard_body) {
+    if (r != r->main || r->discard_body || r->content_length_n == 0) {
+         return NGX_OK;
+     }
+ 
+@@ -457,20 +457,22 @@
+         ngx_del_timer(rev);
+     }
+ 
+-    if (r->headers_in.content_length_n <= 0 || r->request_body) {
+    r->content_length_n = r->headers_in.content_length_n;
+
+    if (r->content_length_n <= 0 || r->request_body) {
+         return NGX_OK;
+     }
+ 
+     size = r->header_in->last - r->header_in->pos;
+ 
+     if (size) {
+-        if (r->headers_in.content_length_n > size) {
+        if (r->content_length_n > size) {
+             r->header_in->pos += size;
+-            r->headers_in.content_length_n -= size;
+            r->content_length_n -= size;
+ 
+         } else {
+-            r->header_in->pos += (size_t) r->headers_in.content_length_n;
+-            r->headers_in.content_length_n = 0;
+            r->header_in->pos += (size_t) r->content_length_n;
+            r->content_length_n = 0;
+             return NGX_OK;
+         }
+     }
+@@ -569,7 +571,7 @@
+                    "http read discarded body");
+ 
+     for ( ;; ) {
+-        if (r->headers_in.content_length_n == 0) {
+        if (r->content_length_n == 0) {
+             r->read_event_handler = ngx_http_block_reading;
+             return NGX_OK;
+         }
+@@ -578,9 +580,9 @@
+             return NGX_AGAIN;
+         }
+ 
+-        size = (r->headers_in.content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
+        size = (r->content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
+                    NGX_HTTP_DISCARD_BUFFER_SIZE:
+-                   (size_t) r->headers_in.content_length_n;
+                   (size_t) r->content_length_n;
+ 
+         n = r->connection->recv(r->connection, buffer, size);
+ 
+@@ -597,7 +599,7 @@
+             return NGX_OK;
+         }
+ 
+-        r->headers_in.content_length_n -= n;
+        r->content_length_n -= n;
+     }
+ }
+ 
+Only in nginx-1.2.1-patched/src/http: ngx_http_request_body.c.orig
+diff '--exclude=*~' -ur nginx-1.2.1/src/http/ngx_http_request.c nginx-1.2.1-patched/src/http/ngx_http_request.c
+--- nginx-1.2.1/src/http/ngx_http_request.c	2012-06-05 06:52:37.000000000 -0700
+++ nginx-1.2.1-patched/src/http/ngx_http_request.c	2012-07-21 12:08:30.656376973 -0700
+@@ -287,6 +287,8 @@
+ 
+         r->pipeline = hc->pipeline;
+ 
+        r->content_length_n = -1;
+
+         if (hc->nbusy) {
+             r->header_in = hc->busy[0];
+         }
+@@ -298,6 +300,8 @@
+             return;
+         }
+ 
+        r->content_length_n = -1;
+
+         hc->request = r;
+     }
+ 
+Only in nginx-1.2.1-patched/src/http: ngx_http_request.c.orig
+diff '--exclude=*~' -ur nginx-1.2.1/src/http/ngx_http_request.h nginx-1.2.1-patched/src/http/ngx_http_request.h
+--- nginx-1.2.1/src/http/ngx_http_request.h	2012-02-28 06:54:23.000000000 -0800
+++ nginx-1.2.1-patched/src/http/ngx_http_request.h	2012-07-21 12:08:30.657376978 -0700
+@@ -368,6 +368,9 @@
+     ngx_pool_t                       *pool;
+     ngx_buf_t                        *header_in;
+ 
+    off_t                             content_length_n;
+                                          /* for discarding request body */
+
+     ngx_http_headers_in_t             headers_in;
+     ngx_http_headers_out_t            headers_out;
+ 
+Only in nginx-1.2.1-patched/src/http: ngx_http_request.h.orig
--- a/patches/nginx-1.2.1-dtrace.patch
+++ b/patches/nginx-1.2.1-dtrace.patch
@ -0,0 +1,853 @@
+diff --git a/README b/README
+index 2f68e14..4f2c4a7 100644
+--- a/README
+++ b/README
+@@ -1,3 +1,40 @@
+This is an Nginx fork that adds dtrace USDT probes.
+ 
+-Documentation is available at http://nginx.org
+This is still under development and not usable yet.
+
+Installation:
+
+    ./configure --with-dtrace-probes \
+        --with-dtrace=/usr/sbin/dtrace \
+        ...
+    make
+    make install
+
+Usage on Linux (with systemtap):
+
+    # make the stap-nginx script visiable in your PATH
+    export PATH=/usr/local/nginx/sbin:$PATH
+
+    # list all the static probes available in your nginx
+    stap-nginx -L 'process("nginx").mark("*")'
+
+    # run the test.stp file
+    stap-nginx test.stp
+
+Sample test.stp file:
+
+    probe begin
+    {
+        print("Tracing.  Hit CTRL-C to stop.\n")
+    }
+
+    probe process("nginx").mark("http-subrequest-start")
+    {
+        printf("uri: %s?%s\n", ngx_http_req_uri($arg1),
+            ngx_http_req_args($arg1))
+    }
+
+For now, only tested on Solaris 11 Express and Fedora Linux 17.
+
+The original Nginx documentation is available at http://nginx.org
+ 
+diff --git a/auto/install b/auto/install
+index c2c0ade..8e43d11 100644
+--- a/auto/install
+++ b/auto/install
+@@ -16,6 +16,20 @@ END
+ fi
+ 
+ 
+case ".$NGX_STAP_NGX_PATH" in
+    ./*)
+    ;;
+
+    .)
+        NGX_STAP_NGX_PATH=$NGX_PREFIX/sbin/stap-nginx
+    ;;
+
+    *)
+        NGX_STAP_NGX_PATH=$NGX_PREFIX/$NGX_STAP_NGX_PATH
+    ;;
+esac
+
+
+ case ".$NGX_SBIN_PATH" in
+     ./*)
+     ;;
+@@ -53,6 +67,16 @@ case ".$NGX_PID_PATH" in
+ esac
+ 
+ 
+case ".$NGX_TAPSET_PREFIX" in
+    ./* | .)
+    ;;
+
+    *)
+        NGX_TAPSET_PREFIX=$NGX_PREFIX/$NGX_TAPSET_PREFIX
+    ;;
+esac
+
+
+ case ".$NGX_ERROR_LOG_PATH" in
+     ./* | .)
+     ;;
+@@ -151,6 +175,36 @@ install:	$NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
+ 		|| cp -R $NGX_HTML '\$(DESTDIR)$NGX_PREFIX'
+ END
+ 
+if [ $NGX_DTRACE = YES ]; then
+
+    ngx_tapset_srcs="$NGX_TAPSET_SRCS"
+
+        cat << END                                            >> $NGX_MAKEFILE
+	test -d '\$(DESTDIR)$NGX_TAPSET_PREFIX' || \
+		mkdir -p '\$(DESTDIR)$NGX_TAPSET_PREFIX'
+END
+
+    for ngx_tapset_src in $ngx_tapset_srcs
+    do
+        ngx_tapset_file=`basename $ngx_tapset_src`
+
+        cat << END                                            >> $NGX_MAKEFILE
+
+	sed -e "s|NGX_SBIN_PATH|$NGX_SBIN_PATH|g" $ngx_long_cont \
+                $ngx_tapset_src > '\$(DESTDIR)$NGX_TAPSET_PREFIX/$ngx_tapset_file'
+END
+
+    done
+
+    cat << END                                                >> $NGX_MAKEFILE
+
+	test -d '\$(DESTDIR)`dirname "$NGX_STAP_NGX_PATH"`' || \
+		mkdir -p '\$(DESTDIR)`dirname "$NGX_STAP_NGX_PATH"`'
+	cp $NGX_OBJS/stap-nginx '\$(DESTDIR)$NGX_STAP_NGX_PATH'
+	chmod 0755 '\$(DESTDIR)$NGX_STAP_NGX_PATH'
+END
+
+fi
+ 
+ if test -n "$NGX_ERROR_LOG_PATH"; then
+     cat << END                                                >> $NGX_MAKEFILE
+@@ -162,6 +216,18 @@ END
+ fi
+ 
+ 
+if [ $NGX_DTRACE = YES ]; then
+    cat << END                                                >> $NGX_MAKEFILE
+
+$NGX_OBJS${ngx_dirsep}stap-nginx: src/dtrace/stap-nginx
+	sed -e "s|NGX_TAPSET_PREFIX|$NGX_TAPSET_PREFIX|g" $ngx_long_cont \
+            -e "s|NGX_SBIN_DIR|`dirname $NGX_SBIN_PATH`|g" $ngx_long_cont \
+            -e "s|NGX_SBIN_PATH|$NGX_SBIN_PATH|g" $ngx_long_cont \
+            src/dtrace/stap-nginx > $NGX_OBJS${ngx_dirsep}stap-nginx
+END
+fi
+
+
+ # create Makefile
+ 
+ cat << END >> Makefile
+diff --git a/auto/make b/auto/make
+index e7f5490..ed2c098 100644
+--- a/auto/make
+++ b/auto/make
+@@ -26,6 +26,9 @@ LINK =	$LINK
+ 
+ END
+ 
+if [ $NGX_DTRACE = YES ]; then
+    echo DTRACE = $DTRACE                   >> $NGX_MAKEFILE
+fi
+ 
+ if test -n "$NGX_PERL_CFLAGS"; then
+     echo NGX_PERL_CFLAGS = $NGX_PERL_CFLAGS                   >> $NGX_MAKEFILE
+@@ -177,6 +180,36 @@ ngx_objs=`echo $ngx_all_objs $ngx_modules_obj \
+     | sed -e "s/  *\([^ ][^ ]*\)/$ngx_long_regex_cont\1/g" \
+           -e "s/\//$ngx_regex_dirsep/g"`
+ 
+if [ $NGX_DTRACE = YES ]; then
+
+    ngx_dtrace_obj=$NGX_OBJS${ngx_dirsep}ngx_dtrace_provider.$ngx_objext
+
+    ngx_dtrace_h=$NGX_OBJS${ngx_dirsep}ngx_dtrace_provider.h
+
+    ngx_dtrace_d=$NGX_OBJS${ngx_dirsep}dtrace_providers.d
+
+    ngx_dtrace_providers=`echo $NGX_DTRACE_PROVIDERS \
+        | sed -e "s/  *\([^ ][^ ]*\)/$ngx_long_regex_cont\1/g" \
+              -e "s/\//$ngx_regex_dirsep/g"`
+
+    cat << END                                                >> $NGX_MAKEFILE
+
+all: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext}
+
+$ngx_dtrace_d: $ngx_dtrace_providers
+	cat $ngx_dtrace_providers > $ngx_dtrace_d
+
+$ngx_dtrace_h: $ngx_dtrace_d
+	\$(DTRACE) -xnolibs -h -o $ngx_dtrace_h -s $ngx_dtrace_d
+
+$ngx_dtrace_obj: $ngx_dtrace_d $ngx_deps$ngx_spacer
+	\$(DTRACE) -xnolibs -G -o $ngx_dtrace_obj -s $ngx_dtrace_d $ngx_objs
+END
+
+    ngx_deps="$ngx_deps$ngx_long_cont$ngx_dtrace_obj$ngx_long_cont$NGX_OBJS${ngx_dirsep}stap-nginx"
+    ngx_objs="$ngx_objs$ngx_long_cont$ngx_dtrace_obj"
+fi
+
+ if test -n "$NGX_LD_OPT$CORE_LIBS"; then
+     ngx_libs=`echo $NGX_LD_OPT $CORE_LIBS \
+         | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`
+diff --git a/auto/options b/auto/options
+index 393be40..05609c6 100644
+--- a/auto/options
+++ b/auto/options
+@@ -12,6 +12,8 @@ NGX_CONF_PATH=
+ NGX_ERROR_LOG_PATH=
+ NGX_PID_PATH=
+ NGX_LOCK_PATH=
+NGX_TAPSET_PREFIX=
+NGX_STAP_NGX_PATH=
+ NGX_USER=
+ NGX_GROUP=
+ 
+@@ -20,6 +22,8 @@ CPP=
+ NGX_OBJS=objs
+ 
+ NGX_DEBUG=NO
+NGX_DTRACE=NO
+DTRACE=dtrace
+ NGX_CC_OPT=
+ NGX_LD_OPT=
+ CPU=NO
+@@ -169,6 +173,8 @@ do
+         --error-log-path=*)              NGX_ERROR_LOG_PATH="$value";;
+         --pid-path=*)                    NGX_PID_PATH="$value"      ;;
+         --lock-path=*)                   NGX_LOCK_PATH="$value"     ;;
+        --tapset-prefix=*)               NGX_TAPSET_PREFIX="$value" ;;
+        --stap-nginx-path=*)             NGX_STAP_NGX_PATH="$value" ;;
+         --user=*)                        NGX_USER="$value"          ;;
+         --group=*)                       NGX_GROUP="$value"         ;;
+ 
+@@ -272,7 +278,8 @@ use the \"--without-http_limit_conn_module\" option instead"
+         --with-ld-opt=*)                 NGX_LD_OPT="$value"        ;;
+         --with-cpu-opt=*)                CPU="$value"               ;;
+         --with-debug)                    NGX_DEBUG=YES              ;;
+-
+        --with-dtrace=*)                 DTRACE="$value"            ;;
+        --with-dtrace-probes)            NGX_DTRACE=YES             ;;
+         --without-pcre)                  USE_PCRE=DISABLED          ;;
+         --with-pcre)                     USE_PCRE=YES               ;;
+         --with-pcre=*)                   PCRE="$value"              ;;
+@@ -326,6 +333,8 @@ cat << END
+   --error-log-path=PATH              set error log pathname
+   --pid-path=PATH                    set nginx.pid pathname
+   --lock-path=PATH                   set nginx.lock pathname
+  --tapset-prefix=PATH               set systemtap tapset directory prefix
+  --stap-nginx-path=PATH             set stap-nginx pathname
+ 
+   --user=USER                        set non-privileged user for
+                                      worker processes
+@@ -448,6 +457,8 @@ cat << END
+   --with-openssl-opt=OPTIONS         set additional build options for OpenSSL
+ 
+   --with-debug                       enable debug logging
+  --with-dtrace-probes               enable dtrace USDT probes
+  --with-dtrace=PATH                 set dtrace utility pathname
+ 
+ END
+ 
+@@ -477,6 +488,7 @@ NGX_CONF_PATH=${NGX_CONF_PATH:-conf/nginx.conf}
+ NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH`
+ NGX_PID_PATH=${NGX_PID_PATH:-logs/nginx.pid}
+ NGX_LOCK_PATH=${NGX_LOCK_PATH:-logs/nginx.lock}
+NGX_TAPSET_PREFIX=${NGX_TAPSET_PREFIX:-tapset}
+ 
+ if [ ".$NGX_ERROR_LOG_PATH" = ".stderr" ]; then
+     NGX_ERROR_LOG_PATH=
+diff --git a/auto/sources b/auto/sources
+index 374ad66..72bb1b0 100644
+--- a/auto/sources
+++ b/auto/sources
+@@ -39,6 +39,11 @@ CORE_DEPS="src/core/nginx.h \
+            src/core/ngx_crypt.h"
+ 
+ 
+if [ $NGX_DTRACE = YES ]; then
+    CORE_DEPS="$CORE_DEPS objs/ngx_dtrace_provider.h"
+fi
+
+
+ CORE_SRCS="src/core/nginx.c \
+            src/core/ngx_log.c \
+            src/core/ngx_palloc.c \
+@@ -291,7 +296,8 @@ HTTP_DEPS="src/http/ngx_http.h \
+            src/http/ngx_http_script.h \
+            src/http/ngx_http_upstream.h \
+            src/http/ngx_http_upstream_round_robin.h \
+-           src/http/ngx_http_busy_lock.h"
+           src/http/ngx_http_busy_lock.h \
+           src/http/ngx_http_probe.h"
+ 
+ HTTP_SRCS="src/http/ngx_http.c \
+            src/http/ngx_http_core_module.c \
+@@ -524,3 +530,8 @@ NGX_GOOGLE_PERFTOOLS_MODULE=ngx_google_perftools_module
+ NGX_GOOGLE_PERFTOOLS_SRCS=src/misc/ngx_google_perftools_module.c
+ 
+ NGX_CPP_TEST_SRCS=src/misc/ngx_cpp_test_module.cpp
+
+NGX_DTRACE_PROVIDERS=src/dtrace/nginx_provider.d
+
+NGX_TAPSET_SRCS=src/dtrace/nginx.stp
+
+diff --git a/auto/summary b/auto/summary
+index dcebec9..06c4aa9 100644
+--- a/auto/summary
+++ b/auto/summary
+@@ -92,6 +92,14 @@ else
+     echo "  nginx logs errors to stderr"
+ fi
+ 
+if [ $NGX_DTRACE = YES ]; then
+    cat << END
+  nginx dtrace static probes enabled
+  nginx systemtap tapset prefix: "$NGX_TAPSET_PREFIX"
+  nginx systemtap wrapper script: "$NGX_STAP_NGX_PATH"
+END
+fi
+
+ cat << END
+   nginx http access log file: "$NGX_HTTP_LOG_PATH"
+   nginx http client request body temporary files: "$NGX_HTTP_CLIENT_TEMP_PATH"
+diff --git a/configure b/configure
+index 45ea154..332c011 100755
+--- a/configure
+++ b/configure
+@@ -20,6 +20,9 @@ if [ $NGX_DEBUG = YES ]; then
+     have=NGX_DEBUG . auto/have
+ fi
+ 
+if [ $NGX_DTRACE = YES ]; then
+    have=NGX_DTRACE . auto/have
+fi
+ 
+ if test -z "$NGX_PLATFORM"; then
+     echo "checking for OS"
+diff --git a/src/dtrace/nginx.stp b/src/dtrace/nginx.stp
+new file mode 100644
+index 0000000..fccea2b
+--- /dev/null
+++ b/src/dtrace/nginx.stp
+@@ -0,0 +1,152 @@
+/* tapset for nginx */
+
+/* retrieve the request uri string from the ngx_http_request_t pointer */
+function ngx_http_req_uri(r)
+{
+    len = @cast(r, "ngx_http_request_s", "NGX_SBIN_PATH")->uri->len
+
+    if (len == 0) {
+        return ""
+    }
+
+    return user_string_n(@cast(r, "ngx_http_request_s", "NGX_SBIN_PATH")->uri->data, len)
+}
+
+
+/* retrieve the request query string from the ngx_http_request_t pointer */
+function ngx_http_req_args(r)
+{
+    len = @cast(r, "ngx_http_request_s", "NGX_SBIN_PATH")->args->len
+
+    if (len == 0) {
+        return ""
+    }
+
+    return user_string_n(@cast(r, "ngx_http_request_s", "NGX_SBIN_PATH")->args->data, len)
+}
+
+
+/* retrieve the first command name (or directive name) from
+ * the ngx_module_t pointer */
+function ngx_http_module_cmd(m)
+{
+    cmds = @cast(m, "ngx_module_t", "NGX_SBIN_PATH")->commands
+    if (cmds == 0) {
+        return ""
+    }
+
+    len = @cast(cmds, "ngx_command_t", "NGX_SBIN_PATH")->name->len
+
+    if (len == 0) {
+        return ""
+    }
+
+    return user_string_n(@cast(cmds, "ngx_command_t", "NGX_SBIN_PATH")->name->data, len)
+}
+
+
+function ngx_chain_buf(cl)
+{
+    return @cast(cl, "ngx_chain_t", "NGX_SBIN_PATH")->buf
+}
+
+
+function ngx_buf_in_memory(b)
+{
+    return @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->temporary
+        || @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->memory
+        || @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->mmap
+}
+
+
+function ngx_buf_pos(b)
+{
+    return @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->pos
+}
+
+
+function ngx_buf_file_pos(b)
+{
+    return @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->file_pos
+}
+
+
+function ngx_buf_last(b)
+{
+    return @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->last
+}
+
+
+function ngx_buf_file_last(b)
+{
+    return @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->file_last
+}
+
+
+function ngx_buf_end(b)
+{
+    return @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->end
+}
+
+
+function ngx_buf_size(b)
+{
+    if (ngx_buf_in_memory(b)) {
+        return ngx_buf_last(b) - ngx_buf_pos(b)
+    }
+
+    return ngx_buf_file_last(b) - ngx_buf_file_pos(b)
+}
+
+
+function ngx_buf_data(b)
+{
+    return user_string_n(ngx_buf_pos(b), ngx_buf_last(b) - ngx_buf_pos(b))
+}
+
+
+function ngx_pool_cleanup_file_name(c)
+{
+    return user_string(@cast(c, "ngx_pool_cleanup_file_t", "NGX_SBIN_PATH")->name)
+}
+
+
+function ngx_http_req_content_length(r)
+{
+    return @cast(r, "ngx_http_request_t", "NGX_SBIN_PATH")->headers_in->content_length_n
+}
+
+
+function ngx_http_req_body_temp_file_name(r)
+{
+    rb = @cast(r, "ngx_http_request_t", "NGX_SBIN_PATH")->request_body
+    if (!rb) {
+        return ""
+    }
+
+    tf = @cast(rb, "ngx_http_request_body_t", "NGX_SBIN_PATH")->temp_file
+    if (!tf) {
+        return ""
+    }
+
+    len = @cast(tf, "ngx_temp_file_t", "NGX_SBIN_PATH")->file->name->len
+
+    return user_string_n(@cast(tf, "ngx_temp_file_t", "NGX_SBIN_PATH")->file->name->data, len)
+}
+
+
+function ngx_table_elt_key(e)
+{
+    len = @cast(e, "ngx_table_elt_t", "NGX_SBIN_PATH")->key->len
+
+    return user_string_n(@cast(e, "ngx_table_elt_t", "NGX_SBIN_PATH")->key->data, len)
+}
+
+
+function ngx_table_elt_value(e)
+{
+    len = @cast(e, "ngx_table_elt_t", "NGX_SBIN_PATH")->value->len
+
+    return user_string_n(@cast(e, "ngx_table_elt_t", "NGX_SBIN_PATH")->value->data, len)
+}
+
+diff --git a/src/dtrace/nginx_provider.d b/src/dtrace/nginx_provider.d
+new file mode 100644
+index 0000000..6fcc994
+--- /dev/null
+++ b/src/dtrace/nginx_provider.d
+@@ -0,0 +1,32 @@
+typedef struct { int dummy; } ngx_http_request_t;
+typedef struct { int dummy; } ngx_str_t;
+typedef int64_t ngx_int_t;
+typedef struct { int dummy; } ngx_module_t;
+typedef struct { int dummy; } ngx_http_module_t;
+typedef struct { int dummy; } ngx_table_elt_t;
+
+
+provider nginx {
+    /* probes for subrequests */
+    probe http__subrequest__cycle(ngx_http_request_t *pr, ngx_str_t *uri, ngx_str_t *args);
+    probe http__subrequest__start(ngx_http_request_t *r);
+    probe http__subrequest__finalize_writing(ngx_http_request_t *r);
+    probe http__subrequest__finalize_nonactive(ngx_http_request_t *r);
+    probe http__subrequest__wake__parent(ngx_http_request_t *r);
+    probe http__subrequest__done(ngx_http_request_t *r);
+    probe http__subrequest__post__start(ngx_http_request_t *r, ngx_int_t rc);
+    probe http__subrequest__post__done(ngx_http_request_t *r, ngx_int_t rc);
+    probe http__module__post__config(ngx_module_t *m);
+    probe http__read__body__abort(ngx_request_t *r, char *reason);
+    probe http__read__body__done(ngx_request_t *r);
+    probe http__read__req__line__done(ngx_request_t *r);
+    probe http__read__req__header__done(ngx_request_t *r, ngx_table_elt_t *h);
+};
+
+
+#pragma D attributes Evolving/Evolving/Common      provider nginx provider
+#pragma D attributes Private/Private/Unknown       provider nginx module
+#pragma D attributes Private/Private/Unknown       provider nginx function
+#pragma D attributes Private/Private/Common        provider nginx name
+#pragma D attributes Evolving/Evolving/Common      provider nginx args
+
+diff --git a/src/dtrace/stap-nginx b/src/dtrace/stap-nginx
+new file mode 100755
+index 0000000..5127fbe
+--- /dev/null
+++ b/src/dtrace/stap-nginx
+@@ -0,0 +1,6 @@
+#!/bin/sh
+
+PATH="NGX_SBIN_DIR:$PATH"
+export PATH
+exec stap -d "NGX_SBIN_PATH" --ldd -I "NGX_TAPSET_PREFIX" "$@"
+
+diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
+index 3e077fb..b7edb7b 100644
+--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
+@@ -8,6 +8,7 @@
+ #include <ngx_config.h>
+ #include <ngx_core.h>
+ #include <ngx_http.h>
+#include <ngx_http_probe.h>
+ 
+ 
+ static char *ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+@@ -307,6 +308,9 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+         module = ngx_modules[m]->ctx;
+ 
+         if (module->postconfiguration) {
+
+            ngx_http_probe_module_post_config(ngx_modules[m]);
+
+             if (module->postconfiguration(cf) != NGX_OK) {
+                 return NGX_CONF_ERROR;
+             }
+diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
+index c5db18f..f23ba51 100644
+--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
+@@ -8,6 +8,7 @@
+ #include <ngx_config.h>
+ #include <ngx_core.h>
+ #include <ngx_http.h>
+#include <ngx_http_probe.h>
+ 
+ 
+ typedef struct {
+@@ -2377,6 +2378,8 @@ ngx_http_subrequest(ngx_http_request_t *r,
+     r->main->subrequests--;
+ 
+     if (r->main->subrequests == 0) {
+        ngx_http_probe_subrequest_cycle(r, &uri, &args);
+
+         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                       "subrequests cycle while processing \"%V\"", uri);
+         r->main->subrequests = 1;
+@@ -2491,6 +2494,8 @@ ngx_http_subrequest(ngx_http_request_t *r,
+ 
+     *psr = sr;
+ 
+    ngx_http_probe_subrequest_start(sr);
+
+     return ngx_http_post_request(sr, NULL);
+ }
+ 
+diff --git a/src/http/ngx_http_probe.h b/src/http/ngx_http_probe.h
+new file mode 100644
+index 0000000..d7d2d45
+--- /dev/null
+++ b/src/http/ngx_http_probe.h
+@@ -0,0 +1,75 @@
+#ifndef _NGX_HTTP_PROBE_H_INCLUDED_
+#define _NGX_HTTP_PROBE_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+#if (NGX_DTRACE)
+
+#include <ngx_dtrace_provider.h>
+
+#define ngx_http_probe_subrequest_cycle(pr, uri, args)                       \
+    NGINX_HTTP_SUBREQUEST_CYCLE(pr, uri, args)
+
+#define ngx_http_probe_subrequest_start(r)                                   \
+    NGINX_HTTP_SUBREQUEST_START(r)
+
+#define ngx_http_probe_subrequest_finalize_writing(r)                        \
+    NGINX_HTTP_SUBREQUEST_FINALIZE_WRITING(r)
+
+#define ngx_http_probe_subrequest_finalize_nonactive(r)                      \
+    NGINX_HTTP_SUBREQUEST_FINALIZE_NONACTIVE(r)
+
+#define ngx_http_probe_subrequest_finalize_nonactive(r)                      \
+    NGINX_HTTP_SUBREQUEST_FINALIZE_NONACTIVE(r)
+
+#define ngx_http_probe_subrequest_wake_parent(r)                             \
+    NGINX_HTTP_SUBREQUEST_WAKE_PARENT(r)
+
+#define ngx_http_probe_subrequest_done(r)                                    \
+    NGINX_HTTP_SUBREQUEST_DONE(r)
+
+#define ngx_http_probe_subrequest_post_start(r, rc)                          \
+    NGINX_HTTP_SUBREQUEST_POST_START(r, rc)
+
+#define ngx_http_probe_subrequest_post_done(r, rc)                           \
+    NGINX_HTTP_SUBREQUEST_POST_DONE(r, rc)
+
+#define ngx_http_probe_module_post_config(m)                                 \
+    NGINX_HTTP_MODULE_POST_CONFIG(m)
+
+#define ngx_http_probe_read_body_abort(r, reason)                            \
+    NGINX_HTTP_READ_BODY_ABORT(r, reason)
+
+#define ngx_http_probe_read_body_done(r)                                     \
+    NGINX_HTTP_READ_BODY_DONE(r)
+
+#define ngx_http_probe_read_req_line_done(r)                                 \
+    NGINX_HTTP_READ_REQ_LINE_DONE(r)
+
+#define ngx_http_probe_read_req_header_done(r, h)                               \
+    NGINX_HTTP_READ_REQ_HEADER_DONE(r, h)
+
+#else /* !(NGX_DTRACE) */
+
+#define ngx_http_probe_subrequest_cycle(pr, uri, args)
+#define ngx_http_probe_subrequest_start(r)
+#define ngx_http_probe_subrequest_finalize_writing(r)
+#define ngx_http_probe_subrequest_finalize_nonactive(r)
+#define ngx_http_probe_subrequest_wake_parent(r)
+#define ngx_http_probe_subrequest_done(r)
+#define ngx_http_probe_subrequest_post_start(r, rc)
+#define ngx_http_probe_subrequest_post_done(r, rc)
+#define ngx_http_probe_module_post_config(m)
+#define ngx_http_probe_read_body_abort(r, reason)
+#define ngx_http_probe_read_body_done(r)
+#define ngx_http_probe_read_req_line_done(r)
+#define ngx_http_probe_read_req_header_done(r, h)
+
+#endif /* NGX_DTRACE */
+
+
+#endif /* _NGX_HTTP_PROBE_H_INCLUDED_ */
+diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
+index 436e17d..6dc5cb2 100644
+--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
+@@ -8,6 +8,7 @@
+ #include <ngx_config.h>
+ #include <ngx_core.h>
+ #include <ngx_http.h>
+#include <ngx_http_probe.h>
+ 
+ 
+ static void ngx_http_init_request(ngx_event_t *ev);
+@@ -864,6 +865,8 @@ ngx_http_process_request_line(ngx_event_t *rev)
+             }
+ #endif
+ 
+            ngx_http_probe_read_req_line_done(r);
+
+             ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                            "http request line: \"%V\"", &r->request_line);
+ 
+@@ -1109,6 +1112,8 @@ ngx_http_process_request_headers(ngx_event_t *rev)
+                 return;
+             }
+ 
+            ngx_http_probe_read_req_header_done(r, h);
+
+             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                            "http header: \"%V: %V\"",
+                            &h->key, &h->value);
+@@ -1963,7 +1968,11 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
+     }
+ 
+     if (r != r->main && r->post_subrequest) {
+        ngx_http_probe_subrequest_post_start(r, rc);
+
+         rc = r->post_subrequest->handler(r, r->post_subrequest->data, rc);
+
+        ngx_http_probe_subrequest_post_done(r, rc);
+     }
+ 
+     if (rc == NGX_ERROR
+@@ -2013,6 +2022,8 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
+ 
+         if (r->buffered || r->postponed) {
+ 
+            ngx_http_probe_subrequest_finalize_writing(r);
+
+             if (ngx_http_set_write_handler(r) != NGX_OK) {
+                 ngx_http_terminate_request(r, 0);
+             }
+@@ -2049,10 +2060,14 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
+                 pr->postponed = pr->postponed->next;
+             }
+ 
+            ngx_http_probe_subrequest_done(r);
+
+             c->data = pr;
+ 
+         } else {
+ 
+            ngx_http_probe_subrequest_finalize_nonactive(r);
+
+             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                            "http finalize non-active request: \"%V?%V\"",
+                            &r->uri, &r->args);
+@@ -2064,6 +2079,8 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
+             }
+         }
+ 
+        ngx_http_probe_subrequest_wake_parent(r);
+
+         if (ngx_http_post_request(pr, NULL) != NGX_OK) {
+             r->main->count++;
+             ngx_http_terminate_request(r, 0);
+diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
+index f0e671a..37ec5d2 100644
+--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
+@@ -8,6 +8,7 @@
+ #include <ngx_config.h>
+ #include <ngx_core.h>
+ #include <ngx_http.h>
+#include <ngx_http_probe.h>
+ 
+ 
+ static void ngx_http_read_client_request_body_handler(ngx_http_request_t *r);
+@@ -40,11 +41,15 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
+     r->main->count++;
+ 
+     if (r->request_body || r->discard_body || r->content_length_n == 0) {
+        ngx_http_probe_read_body_abort(r,
+                                       r->request_body ? "body exists"
+                                                       : "body discarded");
+         post_handler(r);
+         return NGX_OK;
+     }
+ 
+     if (ngx_http_test_expect(r) != NGX_OK) {
+        ngx_http_probe_read_body_abort(r, "test expect failed");
+         return NGX_HTTP_INTERNAL_SERVER_ERROR;
+     }
+ 
+@@ -56,6 +61,7 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
+     r->request_body = rb;
+ 
+     if (r->headers_in.content_length_n < 0) {
+        ngx_http_probe_read_body_abort(r, "no content length");
+         post_handler(r);
+         return NGX_OK;
+     }
+@@ -89,10 +95,13 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
+                                      tf->persistent, tf->clean, tf->access)
+                 != NGX_OK)
+             {
+                ngx_http_probe_read_body_abort(r, "create temp file failed");
+                 return NGX_HTTP_INTERNAL_SERVER_ERROR;
+             }
+         }
+ 
+        ngx_http_probe_read_body_done(r);
+
+         post_handler(r);
+ 
+         return NGX_OK;
+@@ -148,10 +157,13 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
+ 
+             if (r->request_body_in_file_only) {
+                 if (ngx_http_write_request_body(r, rb->bufs) != NGX_OK) {
+                    ngx_http_probe_read_body_abort(r, "write temp file failed");
+                     return NGX_HTTP_INTERNAL_SERVER_ERROR;
+                 }
+             }
+ 
+            ngx_http_probe_read_body_done(r);
+
+             post_handler(r);
+ 
+             return NGX_OK;
+@@ -245,6 +257,7 @@ ngx_http_read_client_request_body_handler(ngx_http_request_t *r)
+     ngx_int_t  rc;
+ 
+     if (r->connection->read->timedout) {
+        ngx_http_probe_read_body_abort(r, "timed out");
+         r->connection->timedout = 1;
+         ngx_http_finalize_request(r, NGX_HTTP_REQUEST_TIME_OUT);
+         return;
+@@ -279,6 +292,7 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
+             if (rb->buf->last == rb->buf->end) {
+ 
+                 if (ngx_http_write_request_body(r, rb->to_write) != NGX_OK) {
+                    ngx_http_probe_read_body_abort(r, "write temp file failed");
+                     return NGX_HTTP_INTERNAL_SERVER_ERROR;
+                 }
+ 
+@@ -302,6 +316,9 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
+             }
+ 
+             if (n == 0) {
+
+                ngx_http_probe_read_body_abort(r, "connection closed");
+
+                 ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                               "client prematurely closed connection");
+             }
+@@ -352,6 +369,7 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
+         /* save the last part */
+ 
+         if (ngx_http_write_request_body(r, rb->to_write) != NGX_OK) {
+            ngx_http_probe_read_body_abort(r, "write temp file failed");
+             return NGX_HTTP_INTERNAL_SERVER_ERROR;
+         }
+ 
+@@ -381,6 +399,8 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
+ 
+     r->read_event_handler = ngx_http_block_reading;
+ 
+    ngx_http_probe_read_body_done(r);
+
+     rb->post_handler(r);
+ 
+     return NGX_OK;
--- a/patches/nginx-1.2.1-location_if_inherits_proxy.patch
+++ b/patches/nginx-1.2.1-location_if_inherits_proxy.patch
@ -0,0 +1,15 @@
+--- nginx-1.2.1/src/http/modules/ngx_http_proxy_module.c	2012-04-23 18:40:01.000000000 +0800
+++ nginx-1.2.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;
+         }
+     }
--- a/patches/nginx-1.2.1-log_escape_non_ascii.patch
+++ b/patches/nginx-1.2.1-log_escape_non_ascii.patch
@ -0,0 +1,115 @@
+--- nginx-1.2.1/src/http/modules/ngx_http_log_module.c	2011-11-01 21:24:50.000000000 +0800
+++ nginx-1.2.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;
--- a/patches/nginx-1.2.1-no_Werror.patch
+++ b/patches/nginx-1.2.1-no_Werror.patch
@ -0,0 +1,24 @@
+diff -ur nginx-1.2.1/auto/cc/gcc nginx-1.2.1-patched/auto/cc/gcc
+--- nginx-1.2.1/auto/cc/gcc	2011-06-27 19:53:00.205737804 +0800
+++ nginx-1.2.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.2.1/auto/cc/icc nginx-1.2.1-patched/auto/cc/icc
+--- nginx-1.2.1/auto/cc/icc	2011-06-27 19:52:56.370157068 +0800
+++ nginx-1.2.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"
--- a/patches/nginx-1.2.1-no_error_pages.patch
+++ b/patches/nginx-1.2.1-no_error_pages.patch
@ -0,0 +1,90 @@
+--- nginx-1.2.1/src/http/ngx_http_core_module.c	2010-12-14 18:38:42.000000000 +0800
+++ nginx-1.2.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;
--- a/patches/nginx-1.2.1-no_pool.patch
+++ b/patches/nginx-1.2.1-no_pool.patch
@ -0,0 +1,609 @@
+diff -ur nginx-1.2.1/src/core/nginx.h nginx-1.2.1-patched/src/core/nginx.h
+--- nginx-1.2.1/src/core/nginx.h	2011-08-29 17:30:22.000000000 +0800
+++ nginx-1.2.1-patched/src/core/nginx.h	2011-09-13 12:11:03.135622101 +0800
+@@ -10,7 +10,7 @@
+ 
+ 
+ #define nginx_version      1002001
+ #define NGINX_VERSION      "1.2.1"
+-#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.1/src/core/ngx_array.c nginx-1.2.1-patched/src/core/ngx_array.c
+--- nginx-1.2.1/src/core/ngx_array.c	2012-02-06 04:02:59.000000000 +0800
+++ nginx-1.2.1-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.1/src/core/ngx_array.h nginx-1.2.1-patched/src/core/ngx_array.h
+--- nginx-1.2.1/src/core/ngx_array.h	2012-02-06 04:02:59.000000000 +0800
+++ nginx-1.2.1-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.1/src/core/ngx_palloc.c nginx-1.2.1-patched/src/core/ngx_palloc.c
+--- nginx-1.2.1/src/core/ngx_palloc.c	2012-02-06 04:02:59.000000000 +0800
+++ nginx-1.2.1-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.1/src/core/ngx_palloc.h nginx-1.2.1-patched/src/core/ngx_palloc.h
+--- nginx-1.2.1/src/core/ngx_palloc.h	2012-02-06 04:02:59.000000000 +0800
+++ nginx-1.2.1-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;
+ };
--- a/patches/nginx-1.2.1-poll_del_event_at_exit.patch
+++ b/patches/nginx-1.2.1-poll_del_event_at_exit.patch
@ -0,0 +1,20 @@
+--- nginx-1.2.1/src/os/unix/ngx_process_cycle.c	2012-02-06 04:02:59.000000000 +0800
+++ nginx-1.2.1-patched/src/os/unix/ngx_process_cycle.c	2012-06-15 11:39:11.234286287 +0800
+@@ -707,6 +707,8 @@
+     ngx_exit_log.file = &ngx_exit_log_file;
+ 
+     ngx_exit_cycle.log = &ngx_exit_log;
+    ngx_exit_cycle.files = ngx_cycle->files;
+    ngx_exit_cycle.files_n = ngx_cycle->files_n;
+     ngx_cycle = &ngx_exit_cycle;
+ 
+     ngx_destroy_pool(cycle->pool);
+@@ -1063,6 +1065,8 @@
+     ngx_exit_log.file = &ngx_exit_log_file;
+ 
+     ngx_exit_cycle.log = &ngx_exit_log;
+    ngx_exit_cycle.files = ngx_cycle->files;
+    ngx_exit_cycle.files_n = ngx_cycle->files_n;
+     ngx_cycle = &ngx_exit_cycle;
+ 
+     ngx_destroy_pool(cycle->pool);
--- a/patches/nginx-1.2.1-resolver_debug_log_overflow.patch
+++ b/patches/nginx-1.2.1-resolver_debug_log_overflow.patch
@ -0,0 +1,11 @@
+--- nginx-1.2.1/src/core/ngx_resolver.c	2012-03-05 21:17:56.000000000 +0800
+++ nginx-1.2.1-patched/src/core/ngx_resolver.c	2012-06-01 17:55:55.861130605 +0800
+@@ -987,7 +987,7 @@
+     nan = (query->nan_hi << 8) + query->nan_lo;
+ 
+     ngx_log_debug6(NGX_LOG_DEBUG_CORE, r->log, 0,
+-                   "resolver DNS response %ui fl:%04Xui %ui/%ui/%ui/%ui",
+                   "resolver DNS response %ui fl:%04Xui %ui/%ui/%ud/%ud",
+                    ident, flags, nqs, nan,
+                    (query->nns_hi << 8) + query->nns_lo,
+                    (query->nar_hi << 8) + query->nar_lo);
--- a/patches/nginx-1.2.1-server_header.patch
+++ b/patches/nginx-1.2.1-server_header.patch
@ -0,0 +1,26 @@
+diff -ur lz-nginx-1.2.1/nginx-1.2.1/src/core/nginx.h lz-nginx-1.2.1-patched/nginx-1.2.1/src/core/nginx.h
+--- lz-nginx-1.2.1/nginx-1.2.1/src/core/nginx.h	2010-02-12 17:31:01.000000000 +0800
+++ lz-nginx-1.2.1-patched/nginx-1.2.1/src/core/nginx.h	2010-03-30 10:52:13.240702627 +0800
+@@ -10,7 +10,7 @@
+ 
+ #define nginx_version         1002001
+ #define NGINX_VERSION      "1.2.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.2.1-patched/nginx-1.2.1/src/core: nginx.h.orig
+Only in lz-nginx-1.2.1-patched/nginx-1.2.1/src/core: nginx.h.rej
+diff -ur lz-nginx-1.2.1/nginx-1.2.1/src/http/ngx_http_header_filter_module.c lz-nginx-1.2.1-patched/nginx-1.2.1/src/http/ngx_http_header_filter_module.c
+--- lz-nginx-1.2.1/nginx-1.2.1/src/http/ngx_http_header_filter_module.c	2010-03-03 23:14:04.000000000 +0800
+++ lz-nginx-1.2.1-patched/nginx-1.2.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;
+ 
+ 
--- a/patches/nginx-1.2.1-upstream_pipelining.patch
+++ b/patches/nginx-1.2.1-upstream_pipelining.patch
@ -0,0 +1,32 @@
+diff -ur nginx-1.2.1/src/http/ngx_http_upstream.c nginx-1.2.1-patched/src/http/ngx_http_upstream.c
+--- nginx-1.2.1/src/http/ngx_http_upstream.c	2011-12-14 02:34:34.000000000 +0800
+++ nginx-1.2.1-patched/src/http/ngx_http_upstream.c	2012-03-21 21:20:17.333111806 +0800
+@@ -1385,6 +1385,8 @@
+ 
+     /* 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,
+@@ -1451,7 +1453,7 @@
+ 
+ #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 -ur nginx-1.2.1/src/http/ngx_http_upstream.h nginx-1.2.1-patched/src/http/ngx_http_upstream.h
+--- nginx-1.2.1/src/http/ngx_http_upstream.h	2011-11-01 22:18:10.000000000 +0800
+++ nginx-1.2.1-patched/src/http/ngx_http_upstream.h	2012-03-21 21:18:21.041237173 +0800
+@@ -313,6 +313,7 @@
+     unsigned                         buffering:1;
+ 
+     unsigned                         request_sent:1;
+    unsigned                         request_all_sent:1;
+     unsigned                         header_sent:1;
+ };
+ 
--- a/patches/nginx-1.3.0-resolver_debug_log_overflow.patch
+++ b/patches/nginx-1.3.0-resolver_debug_log_overflow.patch
@ -0,0 +1,11 @@
+--- nginx-1.3.0/src/core/ngx_resolver.c	2012-05-14 17:13:45.000000000 +0800
+++ nginx-1.3.0-patched/src/core/ngx_resolver.c	2012-06-01 18:08:06.512047421 +0800
+@@ -1035,7 +1035,7 @@
+     nan = (query->nan_hi << 8) + query->nan_lo;
+ 
+     ngx_log_debug6(NGX_LOG_DEBUG_CORE, r->log, 0,
+-                   "resolver DNS response %ui fl:%04Xui %ui/%ui/%ui/%ui",
+                   "resolver DNS response %ui fl:%04Xui %ui/%ui/%ud/%ud",
+                    ident, flags, nqs, nan,
+                    (query->nns_hi << 8) + query->nns_lo,
+                    (query->nar_hi << 8) + query->nar_lo);
--- a/t/sanity.t
+++ b/t/sanity.t
--- a/util/configure
+++ b/util/configure
@ -71,7 +71,8 @@ my @modules = (
    [http_array_var => 'array-var-nginx-module'],
    [http_memc => 'memc-nginx-module'],
    [http_redis2 => 'redis2-nginx-module'],
-    [http_upstream_keepalive => 'upstream-keepalive-nginx-module'],
+    [http_redis => 'redis-nginx-module'],
+    #[http_upstream_keepalive => 'upstream-keepalive-nginx-module'],
    [http_auth_request => 'auth-request-nginx-module'],
    [http_rds_json => 'rds-json-nginx-module'],
    [http_rds_csv => 'rds-csv-nginx-module'],
@ -113,6 +114,7 @@ my $dry_run;
 my @ngx_rpaths;
 my $cc;
 my $cores;
+my $luajit_xcflags = '';

 my (@ngx_opts, @ngx_cc_opts, @ngx_ld_opts);

@ -201,6 +203,9 @@ for my $opt (@ARGV) {
    } elsif ($opt =~ /^--with-luajit=(.*)/) {
        $resty_opts{luajit_path} = $1;

+    } elsif ($opt =~ /^--with-luajit-xcflags=(.*)/) {
+        $luajit_xcflags .= " $1";
+
    } elsif ($opt =~ /^--with-libdrizzle=(.*)/) {
        $resty_opts{libdrizzle} = $1;

@ -510,13 +515,20 @@ _END_
        my $extra_opts = ' TARGET_STRIP=@:';

        if ($opts->{debug}) {
-            $extra_opts = q{ CCDEBUG=-g Q= XCFLAGS='-DLUA_USE_APICHECK}
-                .q{ -DLUA_USE_ASSERT'};
+            $luajit_xcflags .= " -DLUA_USE_APICHECK -DLUA_USE_ASSERT";
+            $luajit_xcflags =~ s/^ +//;
+            $extra_opts .= qq{ CCDEBUG=-g Q= XCFLAGS='$luajit_xcflags'};
+
+        } else {
+            if ($luajit_xcflags) {
+                $luajit_xcflags =~ s/^ +//;
+                $extra_opts .= qq{ XCFLAGS='$luajit_xcflags'};
+            }
        }

-        if ($platform =~ /bsd/i) {
-            $extra_opts .= ' CFLAGS=-I..';
-        }
+        #if ($platform =~ /bsd/i) {
+        #$extra_opts .= ' CFLAGS=-I..';
+        #}

        if ($on_solaris) {
            $extra_opts .= " INSTALL_X='$root_dir/build/install -m 0755' " .
@ -764,7 +776,7 @@ _EOC_
                "\$(MAKE) install$extra_opts";
        }

-        for my $key (qw(memcached redis mysql string upload)) {
+        for my $key (qw(dns memcached redis mysql string upload)) {
            unless ($opts->{"no_lua_resty_$key"}) {
                my $name = "lua-resty-$key";
                my $dir = auto_complete $name;
@ -814,6 +826,8 @@ sub usage ($) {

  --with-debug                       enable the debugging logging and also enable -O0 -g for gcc.
                                     this not only affects nginx, but also other components.
+  --with-dtrace-probes               enable dtrace USDT probes
+  --with-dtrace=PATH                 set dtrace utility pathname

  --with-no-pool-patch               enable the no-pool patch for debugging memory issues.

@ -877,6 +891,7 @@ _EOC_
  --without-lua_cjson                disable the lua-cjson library
  --without-lua_redis_parser         disable the lua-redis-parser library
  --without-lua_rds_parser           disable the lua-rds-parser library
+  --without-lua_resty_dns            disable the lua-resty-dns library
  --without-lua_resty_memcached      disable the lua-resty-memcached library
  --without-lua_resty_redis          disable the lua-resty-redis library
  --without-lua_resty_mysql          disable the lua-resty-mysql library
@ -887,22 +902,25 @@ _EOC_
  --with-lua51=PATH                  specify the external installation of Lua 5.1 by PATH
  --with-luajit                      enable and build LuaJIT 2.0
  --with-luajit=PATH                 use the external LuaJIT 2.0 installation specified by PATH
+  --with-luajit-xcflags=FLAGS        Specify extra C compiler flags for LuaJIT 2.0
  --with-libdrizzle=DIR              specify the libdrizzle 1.0 (or drizzle) installation prefix
  --with-libpq=DIR                   specify the libpq (or postgresql) installation prefix
  --with-pg_config=PATH              specify the path of the pg_config utility

 Options directly inherited from nginx

-  --sbin-path=PATH                   set path to the nginx binary file
-  --conf-path=PATH                   set path to the nginx.conf file
-  --error-log-path=PATH              set path to the error log
-  --pid-path=PATH                    set path to nginx.pid file
-  --lock-path=PATH                   set path to nginx.lock file
+  --sbin-path=PATH                   set nginx binary pathname
+  --conf-path=PATH                   set nginx.conf pathname
+  --error-log-path=PATH              set error log pathname
+  --pid-path=PATH                    set nginx.pid pathname
+  --lock-path=PATH                   set nginx.lock pathname
+  --tapset-prefix=PATH               set systemtap tapset directory prefix
+  --stap-nginx-path=PATH             set stap-nginx pathname

-  --user=USER                        set non-privilege user
-                                     for the worker processes
-  --group=GROUP                      set non-privilege group
-                                     for the worker processes
+  --user=USER                        set non-privileged user for
+                                     worker processes
+  --group=GROUP                      set non-privileged group for
+                                     worker processes

  --builddir=DIR                     set the build directory

@ -994,6 +1012,7 @@ Options directly inherited from nginx
  --with-pcre                        force PCRE library usage
  --with-pcre=DIR                    set path to PCRE library sources
  --with-pcre-opt=OPTIONS            set additional options for PCRE building
+  --with-pcre-jit                    build PCRE with JIT compilation support

  --with-md5=DIR                     set path to md5 library sources
  --with-md5-opt=OPTIONS             set additional options for md5 building
--- a/util/fix-tests
+++ b/util/fix-tests
@ -37,7 +37,7 @@ for my $t_file (@t_files) {
    my $changed;
    while (<$in>) {
        for my $dir (@dirs) {
-            (my $pat = $dir) =~ s/\d.*//;
+            (my $pat = $dir) =~ s/-(\d+\..*)/-/;
            my $orig = $_;
            if (s{\.\./$pat\S+}{../$dir}g && $orig ne $_) {
                $changed++;
--- a/util/mirror-tarballs
+++ b/util/mirror-tarballs
@ -19,6 +19,8 @@ if [ ! -d $work ]; then
    mkdir $work || exit 1
 fi

+#################################
+
 ver="$main_ver"
 $root/util/get-tarball "http://nginx.org/download/nginx-$ver.tar.gz" -O nginx-$ver.tar.gz || exit 1
 tar -xzf nginx-$ver.tar.gz || exit 1
@ -45,26 +47,52 @@ patch -p1 < $root/patches/nginx-$main_ver-no_Werror.patch || exit 1

 #patch -p1 < $root/patches/nginx-$main_ver-request_body_in_single_buf.patch || exit 1

-echo "INFO: applying the max_subrequests patch...";
-patch -p1 < $root/patches/nginx-$main_ver-max_subrequests.patch || exit 1
+#echo "INFO: applying the max_subrequests patch...";
+#patch -p1 < $root/patches/nginx-$main_ver-max_subrequests.patch || exit 1

-patch -p1 -l < $root/patches/nginx-$main_ver-subrequest_loop.patch || exit 1
+#echo "INFO: applying the subrequst_loop patch...";
+#patch -p1 -l < $root/patches/nginx-$main_ver-subrequest_loop.patch || exit 1

-patch -p1 -l < $root/patches/nginx-$main_ver-gzip_empty_flush_buf.patch || exit 1
+#echo "INFO: applying the gzip_empty_flush_buf patch...";
+#patch -p1 -l < $root/patches/nginx-$main_ver-gzip_empty_flush_buf.patch || exit 1

 #patch -p1 < $root/patches/nginx-$main_ver-variable_header_ignore_no_hash.patch || exit 1

-patch -p1 < $root/patches/nginx-$main_ver-named_location_clear_mods_ctx.patch || exit 1
+#echo "applying the named_location_clear_mods_ctx patch"
+#patch -p1 < $root/patches/nginx-$main_ver-named_location_clear_mods_ctx.patch || exit 1

+echo "applying the allow_request_body_updating patch"
 patch -p1 < $root/patches/nginx-$main_ver-allow_request_body_updating.patch || exit 1

+echo "applying the log_escape_non_ascii patch"
 patch -p1 < $root/patches/nginx-$main_ver-log_escape_non_ascii.patch || exit 1

+#echo applying reset_wev_handler_in_named_locations.patch ...
+#patch -p1 < $root/patches/nginx-$main_ver-reset_wev_handler_in_named_locations.patch || exit 1
+
+#echo applying filter_finalize_hang.patch ...
+#patch -p1 < $root/patches/nginx-$main_ver-filter_finalize_hang.patch || exit 1
+
+echo applying add_core_vars_polluting_globals.patch ...
+patch -p1 < $root/patches/nginx-$main_ver-add_core_vars_polluting_globals.patch || exit 1
+
+echo applying resolver_debug_log_overflow.patch ...
+patch -p1 < $root/patches/nginx-$main_ver-resolver_debug_log_overflow.patch || exit 1
+
+echo applying poll_del_event_at_exit.patch ...
+patch -p1 < $root/patches/nginx-$main_ver-poll_del_event_at_exit.patch
+
 #echo "INFO: applying null-character-fixes patch"
 #patch -p0 < $root/patches/nginx-$main_ver-null_character_fixes.patch || exit 1

 #patch -p1 < $root/patches/nginx-$main_ver-gzip_ok_invalid_read_fix.patch || exit 1

+echo applying location_if_inherits_proxy.patch ...
+patch -p1 < $root/patches/nginx-$main_ver-location_if_inherits_proxy.patch
+
+echo applying dtrace.patch ...
+patch -p1 < $root/patches/nginx-$main_ver-dtrace.patch
+
 rm -f *.patch || exit 1

 cd .. || exit 1
@ -76,51 +104,65 @@ sed $"s/NGINX_VERSION \".unknown/NGINX_VERSION \".$minor_ver/" \
    || exit 1
 rm -rf no-pool-nginx-$ver

-ver=0.38rc2
+#################################
+
+ver=0.41
 $root/util/get-tarball "http://github.com/agentzh/echo-nginx-module/tarball/v$ver" -O echo-nginx-module-$ver.tar.gz || exit 1
 tar -xzf echo-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-echo-nginx-module-* echo-nginx-module-$ver || exit 1

+#################################
+
 ver=0.03rc9
 $root/util/get-tarball "http://github.com/agentzh/xss-nginx-module/tarball/v$ver" -O xss-nginx-module-$ver.tar.gz || exit 1
 tar -xzf xss-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-xss-nginx-module-* xss-nginx-module-$ver || exit 1

+#################################
+
 ver=0.2.17
 $root/util/get-tarball "http://github.com/simpl/ngx_devel_kit/tarball/v$ver" -O ngx_devel_kit-$ver.tar.gz
 tar -xzf ngx_devel_kit-$ver.tar.gz || exit 1
 mv simpl-ngx_devel_kit-* ngx_devel_kit-$ver || exit 1

-ver=0.22rc7
+#################################
+
+ver=0.22rc8
 $root/util/get-tarball "http://github.com/agentzh/set-misc-nginx-module/tarball/v$ver" -O set-misc-nginx-module-$ver.tar.gz || exit 1
 tar -xzf set-misc-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-set-misc-nginx-module-* set-misc-nginx-module-$ver || exit 1

-ver=0.12rc8
+#################################
+
+ver=0.12rc10
 $root/util/get-tarball "http://github.com/agentzh/rds-json-nginx-module/tarball/v$ver" -O rds-json-nginx-module-$ver.tar.gz || exit 1
 tar -xzf rds-json-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-rds-json-nginx-module-* rds-json-nginx-module-$ver || exit 1

-ver=0.05rc1
+#################################
+
+ver=0.05rc2
 $root/util/get-tarball "http://github.com/agentzh/rds-csv-nginx-module/tarball/v$ver" -O rds-csv-nginx-module-$ver.tar.gz || exit 1
 tar -xzf rds-csv-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1

-ver=0.17rc1
+#################################
+
+ver=0.18
 $root/util/get-tarball "http://github.com/agentzh/headers-more-nginx-module/tarball/v$ver" -O headers-more-nginx-module-$ver.tar.gz || exit 1
 tar -xzf headers-more-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-headers-more-nginx-module-* headers-more-nginx-module-$ver || exit 1

 #################################

-ver=0.1.2rc7
+ver=0.1.2
 $root/util/get-tarball "http://github.com/chaoslawful/drizzle-nginx-module/tarball/v$ver" -O drizzle-nginx-module-$ver.tar.gz || exit 1
 tar -xzf drizzle-nginx-module-$ver.tar.gz || exit 1
 mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1

 #################################

-ver=0.5.0rc25
+ver=0.5.13
 $root/util/get-tarball "http://github.com/chaoslawful/lua-nginx-module/tarball/v$ver" -O lua-nginx-module-$ver.tar.gz || exit 1
 tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
 mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1
@ -141,7 +183,7 @@ mv agentzh-memc-nginx-module-* memc-nginx-module-$ver || exit 1

 #################################

-ver=0.13rc6
+ver=0.14
 $root/util/get-tarball "http://github.com/agentzh/srcache-nginx-module/tarball/v$ver" -O srcache-nginx-module-$ver.tar.gz || exit 1
 tar -xzf srcache-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1
@ -170,10 +212,10 @@ mv agentzh-encrypted-session-nginx-module-* encrypted-session-nginx-module-$ver
 #################################


-ver=0.7
-$root/util/get-tarball "http://mdounin.ru/files/ngx_http_upstream_keepalive-$ver.tar.gz" -O upstream_keepalive-$ver.tar.gz || exit 1
-tar -xzf upstream_keepalive-$ver.tar.gz || exit 1
-mv ngx_http_upstream_keepalive-* upstream-keepalive-nginx-module-$ver || exit 1
+#ver=0.7
+#$root/util/get-tarball "http://mdounin.ru/files/ngx_http_upstream_keepalive-$ver.tar.gz" -O upstream_keepalive-$ver.tar.gz || exit 1
+#tar -xzf upstream_keepalive-$ver.tar.gz || exit 1
+#mv ngx_http_upstream_keepalive-* upstream-keepalive-nginx-module-$ver || exit 1

 #################################

@ -184,7 +226,14 @@ mv ngx_http_auth_request_module-* auth-request-nginx-module-$ver || exit 1

 #################################

-ver=0.9
+ver=0.3.6
+$root/util/get-tarball "http://people.freebsd.org/~osa/ngx_http_redis-$ver.tar.gz" -O redis-nginx-module-$ver.tar.gz || exit 1
+tar -xzf redis-nginx-module-$ver.tar.gz || exit 1
+mv ngx_http_redis-* redis-nginx-module-$ver || exit 1
+
+#################################
+
+ver=1.0rc1
 $root/util/get-tarball "https://github.com/FRiCKLE/ngx_postgres/tarball/$ver" -O ngx_postgres-$ver.tar.gz || exit 1
 tar -xzf ngx_postgres-$ver.tar.gz || exit 1
 mv FRiCKLE-ngx_postgres-* ngx_postgres-$ver || exit 1
@ -205,37 +254,34 @@ mv agentzh-redis2-nginx-module-* redis2-nginx-module-$ver || exit 1

 #################################

-ver=5.1.4
+ver=5.1.5
 $root/util/get-tarball "http://www.lua.org/ftp/lua-$ver.tar.gz" -O "lua-$ver.tar.gz" || exit 1
 tar -xzf lua-$ver.tar.gz || exit 1

-$root/util/get-tarball "http://agentzh.org/misc/nginx/patch-lua-$ver-4" -O "patch-lua-$ver-4" || exit 1
+#$root/util/get-tarball "http://agentzh.org/misc/nginx/patch-lua-$ver-4" -O "patch-lua-$ver-4" || exit 1

-cd lua-$ver/src || exit 1
-patch -p0 < ../../patch-lua-$ver-4 || exit 1
-cd ../.. || exit 1
+#cd lua-$ver/src || exit 1
+#patch -p0 < ../../patch-lua-$ver-4 || exit 1
+#cd ../.. || exit 1

-rm "patch-lua-$ver-4" || exit 1
+#rm "patch-lua-$ver-4" || exit 1

-cp $root/patches/lua-$ver-makefile_install_fix.patch lua-makefile-fix.patch || exit 1
-
-patch -p0 < lua-makefile-fix.patch || exit 1
-
-rm lua-makefile-fix.patch || exit 1
+patch -p0 < $root/patches/lua-$ver-makefile_install_fix.patch || exit 1
+patch -p0 < $root/patches/lua-$ver-disable_lua50_compat.patch || exit 1

 #################################

-ver=2.0.0-beta9
+ver=2.0.0-beta10
 $root/util/get-tarball "http://luajit.org/download/LuaJIT-$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
 tar -xzf LuaJIT-$ver.tar.gz || exit 1

-cd LuaJIT-$ver || exit 1;
-$root/util/get-tarball http://luajit.org/download/beta9_hotfix1.patch -O beta9_hotfix1.patch
-patch -p1 < beta9_hotfix1.patch || exit 1
-rm beta9_hotfix1.patch || exit 1
+#cd LuaJIT-$ver || exit 1;
+#$root/util/get-tarball http://luajit.org/download/beta9_hotfix1.patch -O beta9_hotfix1.patch
+#patch -p1 < beta9_hotfix1.patch || exit 1
+#rm beta9_hotfix1.patch || exit 1

-cp $root/misc/unwind-generic.h ./unwind.h || exit 1
-cd ..
+#cp $root/misc/unwind-generic.h ./unwind.h || exit 1
+#cd ..

 #################################

@ -248,49 +294,56 @@ cd ..

 #################################

-ver=0.09rc7
+ver=0.09
 $root/util/get-tarball "http://github.com/agentzh/lua-redis-parser/tarball/v$ver" -O "lua-redis-parser-$ver.tar.gz" || exit 1
 tar -xzf lua-redis-parser-$ver.tar.gz || exit 1
 mv agentzh-lua-redis-parser-* lua-redis-parser-$ver || exit 1

 #################################

-ver=0.04
+ver=0.05
 $root/util/get-tarball "http://github.com/agentzh/lua-rds-parser/tarball/v$ver" -O "lua-rds-parser-$ver.tar.gz" || exit 1
 tar -xzf lua-rds-parser-$ver.tar.gz || exit 1
 mv agentzh-lua-rds-parser-* lua-rds-parser-$ver || exit 1

 #################################

-ver=0.06
+ver=0.05
+$root/util/get-tarball "http://github.com/agentzh/lua-resty-dns/tarball/v$ver" -O "lua-resty-dns-$ver.tar.gz" || exit 1
+tar -xzf lua-resty-dns-$ver.tar.gz || exit 1
+mv agentzh-lua-resty-dns-* lua-resty-dns-$ver || exit 1
+
+#################################
+
+ver=0.07
 $root/util/get-tarball "http://github.com/agentzh/lua-resty-memcached/tarball/v$ver" -O "lua-resty-memcached-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-memcached-$ver.tar.gz || exit 1
 mv agentzh-lua-resty-memcached-* lua-resty-memcached-$ver || exit 1

 #################################

-ver=0.08
+ver=0.11
 $root/util/get-tarball "http://github.com/agentzh/lua-resty-redis/tarball/v$ver" -O "lua-resty-redis-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-redis-$ver.tar.gz || exit 1
 mv agentzh-lua-resty-redis-* lua-resty-redis-$ver || exit 1

 #################################

-ver=0.07
+ver=0.10
 $root/util/get-tarball "http://github.com/agentzh/lua-resty-mysql/tarball/v$ver" -O "lua-resty-mysql-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-mysql-$ver.tar.gz || exit 1
 mv agentzh-lua-resty-mysql-* lua-resty-mysql-$ver || exit 1

 #################################

-ver=0.02
+ver=0.03
 $root/util/get-tarball "http://github.com/agentzh/lua-resty-upload/tarball/v$ver" -O "lua-resty-upload-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-upload-$ver.tar.gz || exit 1
 mv agentzh-lua-resty-upload-* lua-resty-upload-$ver || exit 1

 #################################

-ver=0.05
+ver=0.06
 $root/util/get-tarball "http://github.com/agentzh/lua-resty-string/tarball/v$ver" -O "lua-resty-string-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-string-$ver.tar.gz || exit 1
 mv agentzh-lua-resty-string-* lua-resty-string-$ver || exit 1
@ -303,6 +356,7 @@ cd ..
 cp $root/util/configure ./
 cp $root/README ./
 cp $root/util/install bundle/
+find bundle -name '*~' -delete

 cd $root

--- a/util/ver
+++ b/util/ver
@ -1,7 +1,7 @@
 #!/bin/bash

-main_ver=1.0.15
-minor_ver=1
+main_ver=1.2.1
+minor_ver=13
 version=$main_ver.$minor_ver
 echo $version
Author	SHA1	Message	Date
agentzh (章亦春)	8faebfd44f	fixed the tests to reflect recent changes.	2012-08-12 11:42:11 -07:00
agentzh (章亦春)	655bf32451	upgraded ngx_lua to 0.5.13, ngx_echo to 0.41, and lua-resty-dns to 0.05.	2012-08-12 11:41:38 -07:00
Veniamin Gvozdikov	cef05fbb4b	[FreeBSD]: first step of port	2012-08-09 22:41:37 +04:00
agentzh (章亦春)	85b5caf105	updated the test suite to reflect recent changes.	2012-08-05 23:49:20 -07:00
agentzh (章亦春)	01a7c536a3	now we bundle and enable by default the new lua-resty-dns library.	2012-08-05 23:48:01 -07:00
agentzh (章亦春)	65237ea02f	bumped version to 1.2.1.11.	2012-08-05 21:56:42 -07:00
agentzh (章亦春)	6a805a1e28	upgraded ngx_lua to 0.5.12.	2012-08-04 16:57:27 -07:00
agentzh (章亦春)	51fff05213	added the new openresty-en mailing list to README.	2012-08-04 16:10:52 -07:00
agentzh (章亦春)	772dc15121	upgraded ngx_lua to 0.5.12rc1.	2012-08-03 11:39:33 -07:00
agentzh (章亦春)	4a24efa64f	upgraded ngx_headers_more to 0.18 and ngx_drizzle to 0.1.2.	2012-08-02 15:46:47 -07:00
agentzh (章亦春)	c885306e32	upgraded ngx_lua to 0.5.11.	2012-07-30 21:58:29 -07:00
agentzh (章亦春)	dcc95a3b33	updated tests to reflect recent changes.	2012-07-30 14:50:14 -07:00
agentzh (章亦春)	4367838ae4	added --with-dtrace-probes and --with-dtrace=PATH to the ./configure usgae output.	2012-07-30 14:48:13 -07:00
agentzh (章亦春)	4b236d13b0	bumped version to 1.2.1.9.	2012-07-30 12:57:58 -07:00
agentzh (章亦春)	b7ffa0d0e5	upgraded ngx_lua to 0.5.10.	2012-07-29 23:56:03 -07:00
agentzh (章亦春)	93a68930aa	updated the dtrace patch from the nginx-dtrace project.	2012-07-27 14:44:24 -07:00
agentzh (章亦春)	abc99a3610	updated the dtrace patch from the nginx-dtrace project.	2012-07-26 21:31:58 -07:00
agentzh (章亦春)	e5d8803af6	upgraded ngx_lua to 0.5.9.	2012-07-26 11:33:16 -07:00
agentzh (章亦春)	c21b63ea3f	now we apply the dtrace patch by default.	2012-07-26 10:59:33 -07:00
agentzh (章亦春)	e17fa45a12	synchronized the ./configure option list from the official nginx 1.2.1.	2012-07-25 22:18:42 -07:00
agentzh (章亦春)	c1d79abf0e	updated the dtrace patch from the nginx-dtrace project.	2012-07-25 21:50:19 -07:00
agentzh (章亦春)	0a1195e7a9	updated the dtrace patch from the dtrace-nginx project.	2012-07-24 21:32:37 -07:00
agentzh (章亦春)	0409ce05b8	added new patch for the nginx core, nginx-1.2.1-dtrace.patch.	2012-07-24 11:39:13 -07:00
agentzh (章亦春)	14167b6890	upgraded lua-resty-mysql to 0.10.	2012-07-22 11:29:13 -07:00
agentzh (章亦春)	ecc5816593	fixed an issue regarding subrequests in allow_request_body_updating.patch.	2012-07-22 10:06:40 -07:00
agentzh (章亦春)	1aae4c3350	removed nginx 1.2.1 patches that are not really used.	2012-07-21 12:01:22 -07:00
agentzh (章亦春)	d5fb61765f	upgraded ngx_lua to 0.5.8.	2012-07-21 11:17:11 -07:00
agentzh (章亦春)	fdfd34ccfd	upgraded ngx_lua to 0.5.8rc1.	2012-07-19 11:58:48 -07:00
agentzh (章亦春)	db1a5fce34	mentioned the openresty mailing list.	2012-07-18 15:20:13 -07:00
agentzh (章亦春)	4ae742cb70	upgraded ngx_lua to 0.5.7 and lua-resty-mysql to 0.09.	2012-07-14 12:34:18 -07:00
agentzh (章亦春)	77f94345d1	upgraded lua-resty-redis to 0.11.	2012-07-12 16:38:28 -07:00
agentzh (章亦春)	85b7fca736	minor style fixes.	2012-07-12 11:38:31 -07:00
agentzh (章亦春)	969d1d14ed	upgraded ngx_lua to 0.5.7rc1 and lua-resty-mysql to 0.08.	2012-07-12 11:07:27 -07:00
agentzh (章亦春)	efbc3cc213	upgraded ngx_lua to 0.5.6 and ngx_headers_more to 0.17.	2012-07-09 17:13:31 -07:00
agentzh (章亦春)	5b91b67796	committed patches that were not committed.	2012-07-04 22:02:36 -07:00
agentzh (章亦春)	ebed2ed1c2	upgraded the standard lua interpreter to 5.1.5; also disabled the Lua 5.0 compatibility in this Lua implementation.	2012-07-04 19:58:13 -07:00
agentzh (章亦春)	37bbfd4378	updated the tests to reflect recent changes.	2012-07-04 13:53:59 -07:00
agentzh (章亦春)	4118c23f95	upgraded ngx_lua to 0.5.5 and lua-resty-redis to 0.10.	2012-07-04 13:51:43 -07:00
agentzh (章亦春)	2d7a4ad019	upgraded ngx_lua to 0.5.4.	2012-06-28 16:08:04 -07:00
agentzh (章亦春)	28e127dd92	upgraded ngx_srcache to 0.14.	2012-06-27 20:52:22 -07:00
agentzh (章亦春)	21a9b100a1	upgraded ngx_echo to 0.40 and ngx_lua to 0.5.3.	2012-06-25 11:12:01 +08:00
agentzh (章亦春)	78e850f1b6	upgraded ngx_echo to 0.40rc1 and ngx_lua to 0.5.3rc1.	2012-06-24 22:56:27 +08:00
agentzh (章亦春)	3373388062	bumped version to 1.2.1.3rc1.	2012-06-24 20:44:16 +08:00
agentzh (章亦春)	1921477c18	applied nginx-1.2.1-location_if_inherits_proxy.patch to the nginx core. see http://mailman.nginx.org/pipermail/nginx-devel/2012-June/002374.html for details.	2012-06-24 20:43:10 +08:00
agentzh (章亦春)	8e363e3493	we no longer bundle ngx_http_upstream_keepalive_module because it is already part of the nginx 1.2.1 core. released ngx_openresty devel version 1.2.1.1.	2012-06-22 23:07:17 +08:00
agentzh (章亦春)	c74b535bb2	upgraded the (optional) no-pool patch to the latest version.	2012-06-22 15:33:35 +08:00
agentzh (章亦春)	e800242da6	upgraded ngx_echo to 0.39 and ngx_lua to 0.5.2.	2012-06-22 14:56:25 +08:00
agentzh (章亦春)	07a2a8d1c3	upgraded ngx_postgres to 1.0rc1.	2012-06-21 23:11:44 +08:00
agentzh (章亦春)	2a871e5740	upgraded the nginx core to 1.2.1. bumped the version of ngx_openresty to 1.2.1.1rc1.	2012-06-17 17:24:48 +08:00
agentzh (章亦春)	139b2911ea	upgraded ngx_lua to 0.5.1; bumped version number of ngx_openresty to 1.0.15.13rc1.	2012-06-17 15:23:11 +08:00
agentzh (章亦春)	1de4bb9338	bumped version number to 1.0.15.11.	2012-06-16 11:31:39 +08:00
agentzh (章亦春)	baefa9126e	upgraded ngx_lua to v0.5.0rc32; bumped version number of ngx_openresty to 1.0.15.11rc1.	2012-06-15 21:57:37 +08:00
agentzh (章亦春)	2ad1408ba9	updated nginx-1.0.15-poll_del_event_at_exit.patch. thanks Maxim Dounin.	2012-06-15 11:41:44 +08:00
agentzh (章亦春)	82a58c989f	releng work for the 1.0.15.10 release.	2012-06-13 18:41:27 +08:00
agentzh (章亦春)	3d4784c731	removed vim backup files from the source code distribution. thanks Xiaoyu Chen.	2012-06-11 10:54:02 +08:00
agentzh (章亦春)	a8a9c9577a	Revert "upgraded ngx_lua to 0.5.0rc31." This reverts commit `950eafe167`. We should prepare for a stable version 1.0.15.10 first :)	2012-06-11 10:48:12 +08:00
agentzh (章亦春)	950eafe167	upgraded ngx_lua to 0.5.0rc31.	2012-06-08 17:55:48 +08:00
agentzh (章亦春)	d93314a122	bumped version to 1.0.15.9.	2012-06-07 20:43:20 +08:00
agentzh (章亦春)	585a62afa6	upgraded ngx_rds_json to 0.12rc10.	2012-06-07 20:35:49 +08:00
agentzh (章亦春)	03451f5037	upgraded ngx_lua to 0.5.0rc30.	2012-06-07 20:34:09 +08:00
agentzh (章亦春)	bfe8fda504	bugfix: the no-pool patch might leak memory. now we have updated the no-pool patch to the latest version that is a thorough rewrite.	2012-06-07 19:42:07 +08:00
agentzh (章亦春)	914c4c5ac4	applied poll_del_event_at_exit.patch: http://mailman.nginx.org/pipermail/nginx-devel/2012-June/002328.html	2012-06-07 17:50:33 +08:00
agentzh (章亦春)	938d3731c8	applied the resolver_debug_log_overflow.patch: http://mailman.nginx.org/pipermail/nginx-devel/2012-June/002281.html	2012-06-01 18:21:55 +08:00
agentzh (章亦春)	99e1bd7079	bumped version to 1.0.15.7 and also updated the test suite to reflect recent changes.	2012-05-29 12:03:28 +08:00
agentzh (章亦春)	ba199714bc	upgraded lua-resty-redis to 0.09 and ngx_rds_json to 0.12rc9.	2012-05-28 11:24:44 +08:00
agentzh (章亦春)	281c06b2ed	upgraded ngx_lua to 0.5.0rc29.	2012-05-28 11:16:45 +08:00
agentzh (章亦春)	921603b036	fixed the filter_finalize_hang patch for a regression in the image filter.	2012-05-22 20:52:18 +08:00
agentzh (章亦春)	140c431a59	removed patches that have already been included in the official nginx core.	2012-05-21 13:58:45 +08:00
agentzh (章亦春)	0a0f70f4e8	applied the add_core_vars_polluting patch to fix a bug in the nginx core: http://mailman.nginx.org/pipermail/nginx-devel/2012-May/002231.html	2012-05-17 21:48:35 +08:00
agentzh (章亦春)	21f8910725	bumped version number to 1.0.15.5 and updated the test suite to reflect recent changes.	2012-05-16 17:58:16 +08:00
agentzh (章亦春)	1b11b4840f	upgraded ngx_lua to 0.5.0rc28.	2012-05-16 17:22:00 +08:00
agentzh (章亦春)	668c00fdb8	upgraded lua-resty-string to 0.06.	2012-05-14 15:09:50 +08:00
agentzh (章亦春)	3f8ad8af58	added some tests for the new option --with-luajit-xcflags.	2012-05-14 13:48:48 +08:00
agentzh (章亦春)	eecc5010eb	updated the tests for the new option --with-luajit-xcflags.	2012-05-14 13:37:53 +08:00
agentzh (章亦春)	2ee1f58571	updated tests to reflect recent changes.	2012-05-14 13:36:27 +08:00
agentzh (章亦春)	4145db0b35	feature: added --with-luajit-xcflags option to ./configure.	2012-05-14 13:36:06 +08:00
agentzh (章亦春)	88c1439437	bugfix: ./util/fix-tests could not distingish redis-nginx-module and redis2-nginx-module.	2012-05-14 13:35:04 +08:00
agentzh (章亦春)	e8990b7d03	upgraded LuaJIT to 2.0.0beta10.	2012-05-13 21:34:16 +08:00
agentzh (章亦春)	41d48ab573	upgraded ngx_rds_csv to 0.05rc2.	2012-05-13 21:05:08 +08:00
agentzh (章亦春)	ba7a3d6c44	releng for 1.0.15.3.	2012-05-13 11:55:52 +08:00
agentzh (章亦春)	8c5f23d79a	upgraded lua-redis-parser to 0.09 and lua-rds-parser to 0.05.	2012-05-13 10:46:38 +08:00
agentzh (章亦春)	a3cd675f1e	upgraded lua-redis-parser to 0.09rc8.	2012-05-12 23:23:38 +08:00
agentzh (章亦春)	a56bd55dac	bumped version number to 1.0.15.3rc3.	2012-05-12 15:05:06 +08:00
agentzh (章亦春)	7c0c2cb944	now we bundle Sergey A. Osokin's ngx_http_redis2 module into ngx_openresty.	2012-05-12 15:04:43 +08:00
agentzh (章亦春)	9b1da949a3	updated tests to reflect recent changes in version numbers.	2012-05-12 15:03:17 +08:00
agentzh (章亦春)	b76f452233	upgraded ngx_lua to 0.5.0rc27 and ngx_srcache to 0.13rc8.	2012-05-12 14:49:31 +08:00
agentzh (章亦春)	94f1718e8d	applied the filter_finalize_hang patch to the nginx core. see http://mailman.nginx.org/pipermail/nginx-devel/2012-May/002190.html for details.	2012-05-11 21:21:10 +08:00
agentzh (章亦春)	8294e9b37a	upgraded lua-resty-memcached to 0.07 and lua-resty-upload to 0.03.	2012-05-11 19:03:47 +08:00
agentzh (章亦春)	558cbf12fc	upgraded ngx_lua to 0.5.0rc26 and ngx_srcache to 0.13rc7.	2012-05-11 18:58:50 +08:00
agentzh (章亦春)	8439b517f3	upgraded ngx_set_misc to 0.22rc8.	2012-05-10 15:31:10 +08:00
agentzh (章亦春)	2762f39fc4	added the patch for a bug in ngx_http_named_location in the nginx core.	2012-05-02 22:11:27 +08:00