From 8ffd932b20b8fa84788b601cbb293bb61c408c6f Mon Sep 17 00:00:00 2001 From: "Yichun Zhang (agentzh)" Date: Fri, 4 Nov 2016 15:00:22 -0700 Subject: [PATCH] added lua-resty-limit-traffic. --- util/configure | 6 +++++- util/mirror-tarballs | 12 ++++++++++++ util/ver | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/util/configure b/util/configure index 45d786a..eb8f65b 100755 --- a/util/configure +++ b/util/configure @@ -203,6 +203,9 @@ for my $opt (@ARGV) { } elsif ($opt eq '--without-lua_resty_string') { $resty_opts{no_lua_resty_string} = 1; + } elsif ($opt eq '--without-lua_resty_limit_traffic') { + $resty_opts{no_lua_resty_limit_traffic} = 1; + } elsif ($opt eq '--without-lua_resty_websocket') { $resty_opts{no_lua_resty_websocket} = 1; @@ -936,7 +939,7 @@ _EOC_ } for my $key (qw(dns memcached redis mysql string upload websocket - lock lrucache core upstream_healthcheck)) + lock lrucache core upstream_healthcheck limit_traffic)) { unless ($opts->{"no_lua_resty_$key"}) { (my $key2 = $key) =~ s/_/-/g; @@ -1084,6 +1087,7 @@ _EOC_ disable the lua-resty-upstream-healthcheck library --without-lua_resty_string disable the lua-resty-string library --without-lua_resty_websocket disable the lua-resty-websocket library + --without-lua_resty_limit_traffic disable the lua-resty-limit-traffic library --without-lua_resty_lock disable the lua-resty-lock library --without-lua_resty_lrucache disable the lua-resty-lrucache library --without-lua_resty_core disable the lua-resty-core library diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 19aebb8..d222f25 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -643,6 +643,18 @@ cd .. ################################# +ver=0.01 +$root/util/get-tarball "https://github.com/openresty/lua-resty-limit-traffic/tarball/v$ver" -O "lua-resty-limit-traffic-$ver.tar.gz" || exit 1 +tar -xzf lua-resty-limit-traffic-$ver.tar.gz || exit 1 +mv openresty-lua-resty-limit-traffic-* lua-resty-limit-traffic-$ver || exit 1 +cd lua-resty-limit-traffic-$ver || exit 1 +#patch -p1 < $root/patches/lua_cjson-$ver-array_detection_fix.patch || exit 1 +sed 's/\$(DESTDIR)\//$(DESTDIR)/g' Makefile > mk || exit 1 +mv mk Makefile || exit 1 +cd .. + +################################# + ver=0.10 $root/util/get-tarball "https://github.com/openresty/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 diff --git a/util/ver b/util/ver index afe5de5..fe8e7c5 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash main_ver=1.11.2 -minor_ver=1 +minor_ver=2rc1 version=$main_ver.$minor_ver echo $version