mainline version 1.4.2.9.

util/configure

@@ -22,6 +22,10 @@ my $OS = $^O;
 
 my $ngx_dir;
 
+if (-f 'Makefile') {
+    unlink 'Makefile' or die "ERROR: failed to remove existing Makefile: $!\n";
+}
+
 for my $opt (@ARGV) {
     if ($opt =~ /^--platform=(.*)/) {
         $OS = $1;
@@ -172,6 +176,12 @@ for my $opt (@ARGV) {
     } elsif ($opt eq '--without-lua_resty_string') {
         $resty_opts{no_lua_resty_string} = 1;
 
+    } elsif ($opt eq '--without-lua_resty_websocket') {
+        $resty_opts{no_lua_resty_websocket} = 1;
+
+    } elsif ($opt eq '--without-lua_resty_lock') {
+        $resty_opts{no_lua_resty_lock} = 1;
+
     } elsif ($opt eq '--without-lua_rds_parser') {
         $resty_opts{no_lua_rds_parser} = 1;
 
@@ -304,7 +314,7 @@ sub shell ($@) {
 
     unless ($dry_run) {
         system($cmd) == 0 or
-            die "failed to run command: ", trim($cmd), "\n";
+            die "ERROR: failed to run command: ", trim($cmd), "\n";
     }
 }
 
@@ -776,7 +786,9 @@ _EOC_
                 "\$(MAKE) install$extra_opts";
         }
 
-        for my $key (qw(dns memcached redis mysql string upload)) {
+        for my $key (qw(dns memcached redis mysql string upload websocket
+                        lock))
+        {
             unless ($opts->{"no_lua_resty_$key"}) {
                 my $name = "lua-resty-$key";
                 my $dir = auto_complete $name;
@@ -897,6 +909,8 @@ _EOC_
   --without-lua_resty_mysql          disable the lua-resty-mysql library
   --without-lua_resty_upload         disable the lua-resty-upload library
   --without-lua_resty_string         disable the lua-resty-string library
+  --without-lua_resty_websocket      disable the lua-resty-websocket library
+  --without-lua_resty_lock           disable the lua-resty-lock library
 
   --without-lua51                    disable the bundled Lua 5.1 interpreter
   --with-lua51=PATH                  specify the external installation of Lua 5.1 by PATH

util/mirror-tarballs

@@ -193,7 +193,7 @@ rm -rf no-pool-nginx-$ver
 
 #################################
 
-ver=0.47
+ver=0.48
 $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
@@ -207,7 +207,7 @@ mv agentzh-xss-nginx-module-* xss-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.2.18
+ver=0.2.19
 $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
@@ -249,7 +249,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.8.8
+ver=0.9.0
 $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
@@ -422,14 +422,14 @@ mv agentzh-lua-resty-dns-* lua-resty-dns-$ver || exit 1
 
 #################################
 
-ver=0.11
+ver=0.12
 $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.15
+ver=0.16
 $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
@@ -457,6 +457,20 @@ mv agentzh-lua-resty-string-* lua-resty-string-$ver || exit 1
 
 #################################
 
+ver=0.01
+$root/util/get-tarball "http://github.com/agentzh/lua-resty-websocket/tarball/v$ver" -O "lua-resty-websocket-$ver.tar.gz" || exit 1
+tar -xzf lua-resty-websocket-$ver.tar.gz || exit 1
+mv agentzh-lua-resty-websocket-* lua-resty-websocket-$ver || exit 1
+
+#################################
+
+ver=0.01
+$root/util/get-tarball "http://github.com/agentzh/lua-resty-lock/tarball/v$ver" -O "lua-resty-lock-$ver.tar.gz" || exit 1
+tar -xzf lua-resty-lock-$ver.tar.gz || exit 1
+mv agentzh-lua-resty-lock-* lua-resty-lock-$ver || exit 1
+
+#################################
+
 rm *.tar.gz
 
 cd ..

util/ver

@@ -2,7 +2,7 @@
 
 #main_ver=1.5.4
 main_ver=1.4.2
-minor_ver=5
+minor_ver=9
 version=$main_ver.$minor_ver
 echo $version