186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

resolved conflicts while merging from master.

Browse Source
This commit is contained in:
agentzh (章亦春)
2011-11-08 22:03:43 +08:00
parent e48b3196fe 98893fe49c
commit bf26312dc0
20 changed files with 1634 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/configure vendored
View File

@ -312,8 +312,8 @@ sub build_resty_opts {
} else {
# no gmake found
if ($platform =~ /bsd/i && $opts->{luajit}) {
die "you need to install gmake to build LuaJIT.\n";
if ($platform =~ /bsd/i) {
die "error: you need to install gmake (Gnu make) to build LuaJIT.\n";
}
if (can_run("make")) {

22
util/mirror-tarballs
View File

@ -38,7 +38,7 @@ patch -p1 < $root/patches/nginx-$main_ver-no_error_pages.patch || exit 1
patch -p1 < $root/patches/nginx-$main_ver-no_Werror.patch || exit 1
#patch -p1 < $root/patches/nginx-$main_ver-request_body_preread_fix.patch || exit 1
patch -p1 < $root/patches/nginx-$main_ver-epoll_check_stale_wev.patch || exit 1
#patch -p1 < $root/patches/nginx-$main_ver-request_body_in_single_buf.patch || exit 1
@ -50,6 +50,8 @@ patch -p1 < $root/patches/nginx-$main_ver-variable_header_ignore_no_hash.patch |
patch -p1 < $root/patches/nginx-$main_ver-named_location_clear_mods_ctx.patch || exit 1
patch -p1 < $root/patches/nginx-$main_ver-allow_request_body_updating.patch || exit 1
rm -f *.patch || exit 1
cd .. || exit 1
@ -59,12 +61,12 @@ sed -i $"s/NGINX_VERSION \".unknown/NGINX_VERSION \".$minor_ver/" \
./nginx-no_pool.patch || exit 1
rm -rf no-pool-nginx-$ver
ver=0.37rc6
ver=0.37rc7
$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.03rc3
ver=0.03rc5
$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
@ -103,7 +105,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
#################################
ver=0.3.1rc11
ver=0.3.1rc26
$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
@ -124,7 +126,7 @@ mv agentzh-memc-nginx-module-* memc-nginx-module-$ver || exit 1
#################################
ver=0.13rc1
ver=0.13rc2
$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
@ -167,7 +169,7 @@ mv ngx_http_auth_request_module-* auth-request-nginx-module-$ver || exit 1
#################################
ver=0.9rc1
ver=0.9rc2
$root/util/get-tarball "https://github.com/FRiCKLE/ngx_postgres/tarball/$ver" -O ngx_postgres-$ver.tar.gz || exit 1
tar -xzf ngx_postgres-$ver.tar.gz || exit 1
mv FRiCKLE-ngx_postgres-* ngx_postgres-$ver || exit 1
@ -185,13 +187,13 @@ ver=5.1.4
$root/util/get-tarball "http://www.lua.org/ftp/lua-$ver.tar.gz" -O "lua-$ver.tar.gz" || exit 1
tar -xzf lua-$ver.tar.gz || exit 1
$root/util/get-tarball "http://www.lua.org/ftp/patch-lua-$ver-3" -O "patch-lua-$ver-3" || exit 1
$root/util/get-tarball "http://www.lua.org/ftp/patch-lua-$ver-4" -O "patch-lua-$ver-4" || exit 1
cd lua-$ver/src || exit 1
patch -p0 < ../../patch-lua-$ver-3 || exit 1
patch -p0 < ../../patch-lua-$ver-4 || exit 1
cd ../.. || exit 1
rm "patch-lua-$ver-3" || exit 1
rm "patch-lua-$ver-4" || exit 1
cp $root/patches/lua-$ver-makefile_install_fix.patch lua-makefile-fix.patch || exit 1
@ -230,7 +232,7 @@ mv agentzh-lua-redis-parser-* lua-redis-parser-$ver || exit 1
#################################
ver=0.03
ver=0.04
$root/util/get-tarball "http://github.com/agentzh/lua-rds-parser/tarball/v$ver" -O "lua-rds-parser-$ver.tar.gz" || exit 1
tar -xzf lua-rds-parser-$ver.tar.gz || exit 1
mv agentzh-lua-rds-parser-* lua-rds-parser-$ver || exit 1