agentzh (章亦春) e48b3196fe resolved conflicts while merging "master" to "nginx-1.1.x".

2011-10-13 21:27:14 +08:00

..

configure

added new option -jN (e.g., -j8, -j10, and etc.) to ./configure; thanks @Lance.

2011-09-23 16:45:42 +08:00

fix-tests

now we bundle the lua-redis-parser library with us and it is enabled by default. tested on Linux i386, Linux x86_64, Mac OS X, FreeBSD 8.2 i386, and Solaris 11; added the new option --without-lua_redis_parser to the ./configure script; made the test scaffold emit .t_ file with actual outputs as the expected outputs; released ngx_openresty 1.0.5.0rc3.

2011-08-11 10:04:13 +08:00

get-tarball

ensure that ldconfig is in PATH on linux *and* luajit is enabled.

2011-06-10 21:31:20 +08:00

import-model.pl

various fixes of the blog demo.

2010-04-12 18:57:03 +08:00

install

added -d option to util/install and also made the -m option optional. fixed compatibility issue on Solaris with lua-cjson: there is no isinf on Solaris 11.

2011-08-10 14:59:16 +08:00

mirror-tarballs

upgraded ngx_lua to v0.3.1rc11 and ngx_echo to 0.37rc6; also applied the named_location_clear_mods_ctx patch; also released ngx_openresty 1.0.8.5.

2011-10-13 21:25:15 +08:00

upgrade-patches.pl

initial work for migrating to the 1.0.8.1 release; applied the variable-header-ignore-no-hash patch.

2011-10-07 13:44:20 +08:00

ver

upgraded ngx_lua to v0.3.1rc11 and ngx_echo to 0.37rc6; also applied the named_location_clear_mods_ctx patch; also released ngx_openresty 1.0.8.5.

2011-10-13 21:25:15 +08:00