bumped version to 1.11.2.2.

doc/README-win32.md

@@ -124,25 +124,58 @@ MinGW gcc 4.8.1, MSYS perl, MSYS bash, MSYS make, and etc. Basically, it is curr
  the following cmmands:
 
 ```bash
+PCRE=pcre-8.39
+ZLIB=zlib-1.2.8
+OPENSSL=openssl-1.0.2h
+
 mkdir -p objs/lib || exit 1
 cd objs/lib || exit 1
 ls ../../..
-tar -xf ../../../openssl-1.0.2d.tar.gz
+tar -xf ../../../$OPENSSL.tar.gz || exit 1
-tar -xf ../../../zlib-1.2.8.tar.gz
+tar -xf ../../../$ZLIB.tar.gz || exit 1
-tar -xf ../../../pcre-8.37.tar.gz
+tar -xf ../../../$PCRE.tar.gz || exit 1
 cd ../..
-./configure --with-cc=gcc \
+
+cd objs/lib/$OPENSSL || exit 1
+patch -p1 < ../../../patches/$OPENSSL-sess_set_get_cb_yield.patch || exit 1
+cd ../../..
+
+./configure \
+    --with-cc=gcc \
+    --with-ipv6 \
     --prefix= \
     --with-cc-opt='-DFD_SETSIZE=1024' \
-    --with-select_module \
-    --with-ipv6 \
     --sbin-path=nginx.exe \
     --with-pcre-jit \
+    --without-http_rds_json_module \
+    --without-http_rds_csv_module \
+    --without-lua_rds_parser \
+    --with-ipv6 \
+    --with-stream \
+    --with-stream_ssl_module \
+    --with-http_v2_module \
+    --without-mail_pop3_module \
+    --without-mail_imap_module \
+    --without-mail_smtp_module \
+    --with-http_stub_status_module \
+    --with-http_realip_module \
+    --with-http_addition_module \
+    --with-http_auth_request_module \
+    --with-http_secure_link_module \
+    --with-http_random_index_module \
+    --with-http_gzip_static_module \
+    --with-http_sub_module \
+    --with-http_dav_module \
+    --with-http_flv_module \
+    --with-http_mp4_module \
+    --with-http_gunzip_module \
+    --with-select_module \
     --with-luajit-xcflags="-DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT" \
-    --with-pcre=objs/lib/pcre-8.37 \
+    --with-pcre=objs/lib/$PCRE \
-    --with-zlib=objs/lib/zlib-1.2.8 \
+    --with-zlib=objs/lib/$ZLIB \
-    --with-openssl=objs/lib/openssl-1.0.2d \
+    --with-openssl=objs/lib/$OPENSSL \
-    -j5
+    -j5 || exit 1
+
 make
 make install
 ```

util/build-win32.sh

@@ -2,7 +2,7 @@
 
 PCRE=pcre-8.39
 ZLIB=zlib-1.2.8
-OPENSSL=openssl-1.0.2h
+OPENSSL=openssl-1.0.2j
 
 rm -rf objs || exit 1
 mkdir -p objs/lib || exit 1
@@ -14,27 +14,46 @@ tar -xf ../../../$PCRE.tar.gz || exit 1
 cd ../..
 
 cd objs/lib/$OPENSSL || exit 1
-patch -p1 < ../../../patches/$OPENSSL-sess_set_get_cb_yield.patch || exit 1
+patch -p1 < ../../../patches/openssl-1.0.2h-sess_set_get_cb_yield.patch || exit 1
 cd ../../..
 
     #--with-openssl-opt="no-asm" \
 
-./configure --with-cc=gcc --with-ipv6 --prefix= \
+./configure \
+    --with-cc=gcc \
+    --with-ipv6 \
+    --prefix= \
     --with-cc-opt='-DFD_SETSIZE=1024' \
     --sbin-path=nginx.exe \
-    --with-ipv6 \
     --with-pcre-jit \
-    --with-http_stub_status_module \
+    --without-http_rds_json_module \
-    --with-http_realip_module \
+    --without-http_rds_csv_module \
+    --without-lua_rds_parser \
+    --with-ipv6 \
     --with-stream \
     --with-stream_ssl_module \
+    --with-http_v2_module \
+    --without-mail_pop3_module \
+    --without-mail_imap_module \
+    --without-mail_smtp_module \
+    --with-http_stub_status_module \
+    --with-http_realip_module \
     --with-http_addition_module \
+    --with-http_auth_request_module \
+    --with-http_secure_link_module \
+    --with-http_random_index_module \
+    --with-http_gzip_static_module \
     --with-http_sub_module \
+    --with-http_dav_module \
+    --with-http_flv_module \
+    --with-http_mp4_module \
+    --with-http_gunzip_module \
+    --with-select_module \
     --with-luajit-xcflags="-DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT" \
     --with-pcre=objs/lib/$PCRE \
     --with-zlib=objs/lib/$ZLIB \
     --with-openssl=objs/lib/$OPENSSL \
-    --with-select_module -j5 || exit 1
+    -j5 || exit 1
 #gmake -j5
 make || exit 1
 make install

util/configure

@@ -127,6 +127,7 @@ my @ngx_rpaths;
 my $cc;
 my $cores;
 my $luajit_xcflags = '';
+my $no_luajit_lua52;
 
 my (@ngx_opts, @ngx_cc_opts, @ngx_ld_opts);
 
@@ -203,6 +204,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;
 
@@ -252,6 +256,9 @@ for my $opt (@ARGV) {
     } elsif ($opt =~ /^--with-luajit-xcflags=(.*)/) {
         $luajit_xcflags .= " $1";
 
+    } elsif ($opt =~ /^--without-luajit-lua52/) {
+        $no_luajit_lua52 = 1;
+
     } elsif ($opt =~ /^--with-libdrizzle=(.*)/) {
         $resty_opts{libdrizzle} = $1;
 
@@ -341,7 +348,10 @@ push @make_cmds, "cd $root_dir/build/$ngx_dir && "
 push @make_install_cmds, "cd $root_dir/build/$ngx_dir && "
     . "\$(MAKE) install DESTDIR=\$(DESTDIR)";
 
-push @make_install_cmds, "mkdir -p \$(DESTDIR)$prefix/site/lualib";
+push @make_install_cmds,
+    "mkdir -p \$(DESTDIR)$prefix/site/lualib"
+    . " \$(DESTDIR)$prefix/site/pod"
+    . " \$(DESTDIR)$prefix/site/manifest";
 
 if ($platform ne 'msys') {
     push @make_install_cmds, "ln -sf $ngx_prefix/sbin/nginx \$(DESTDIR)$prefix/bin/openresty";
@@ -601,6 +611,12 @@ _END_
             }
         }
 
+        if (!$no_luajit_lua52
+            && (!$luajit_xcflags || $luajit_xcflags !~ /-DLUAJIT_ENABLE_LUA52COMPAT\b/))
+        {
+            $luajit_xcflags .= " -DLUAJIT_ENABLE_LUA52COMPAT";
+        }
+
         if ($opts->{debug}) {
             $luajit_xcflags .= " -DLUA_USE_APICHECK -DLUA_USE_ASSERT";
             $luajit_xcflags =~ s/^ +//;
@@ -933,7 +949,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;
@@ -952,6 +968,19 @@ _EOC_
         }
     }
 
+    # configure opm:
+    {
+        my $opm_dir = auto_complete 'opm';
+        my $target_dir;
+        if ($platform eq 'msys') {
+            $target_dir = "\$(DESTDIR)$prefix/";
+        } else {
+            $target_dir = "\$(DESTDIR)$prefix/bin/";
+        }
+        push @make_install_cmds, "cd $root_dir/build/$opm_dir && "
+             . "$root_dir/build/install bin/* $target_dir";
+    }
+
     # configure resty-cli:
 
     {
@@ -1081,6 +1110,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
@@ -1088,9 +1118,13 @@ _EOC_
   --with-lua51                       enable and build the bundled standard Lua 5.1 interpreter
   --without-lua51                    disable the bundled standard Lua 5.1 interpreter
   --with-lua51=DIR                   specify the external installation of Lua 5.1 by DIR
+
   --with-luajit                      enable and build the bundled LuaJIT 2.1 (the default)
   --with-luajit=DIR                  use the external LuaJIT 2.1 installation specified by DIR
   --with-luajit-xcflags=FLAGS        Specify extra C compiler flags for LuaJIT 2.1
+  --without-luajit-lua52             Turns off the LuaJIT extensions from Lua 5.2 that may break
+                                     backward compatibility.
+
   --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
@@ -1098,6 +1132,7 @@ _EOC_
 Options directly inherited from nginx
 
   --sbin-path=PATH                   set nginx binary pathname
+  --modules-path=PATH                set modules path
   --conf-path=PATH                   set nginx.conf pathname
   --error-log-path=PATH              set error log pathname
   --pid-path=PATH                    set nginx.pid pathname
@@ -1110,6 +1145,7 @@ Options directly inherited from nginx
   --group=GROUP                      set non-privileged group for
                                      worker processes
 
+  --build=NAME                       set build name
   --builddir=DIR                     set the build directory
 
   --with-select_module               enable select module
@@ -1119,22 +1155,30 @@ Options directly inherited from nginx
 
   --with-threads                     enable thread pool support
 
-  --with-file-aio                    enable file aio support
+  --with-file-aio                    enable file AIO support
-  --with-ipv6                        enable ipv6 support
+  --with-ipv6                        enable IPv6 support
 
+  --with-http_v2_module              enable ngx_http_v2_module
   --with-http_realip_module          enable ngx_http_realip_module
   --with-http_addition_module        enable ngx_http_addition_module
   --with-http_xslt_module            enable ngx_http_xslt_module
+  --with-http_xslt_module=dynamic    enable dynamic ngx_http_xslt_module
   --with-http_image_filter_module    enable ngx_http_image_filter_module
+  --with-http_image_filter_module=dynamic
+                                     enable dynamic ngx_http_image_filter_module
   --with-http_geoip_module           enable ngx_http_geoip_module
+  --with-http_geoip_module=dynamic   enable dynamic ngx_http_geoip_module
   --with-http_sub_module             enable ngx_http_sub_module
   --with-http_dav_module             enable ngx_http_dav_module
   --with-http_flv_module             enable ngx_http_flv_module
+  --with-http_mp4_module             enable ngx_http_mp4_module
+  --with-http_gunzip_module          enable ngx_http_gunzip_module
   --with-http_gzip_static_module     enable ngx_http_gzip_static_module
   --with-http_auth_request_module    enable ngx_http_auth_request_module
   --with-http_random_index_module    enable ngx_http_random_index_module
   --with-http_secure_link_module     enable ngx_http_secure_link_module
   --with-http_degradation_module     enable ngx_http_degradation_module
+  --with-http_slice_module           enable ngx_http_slice_module
   --with-http_stub_status_module     enable ngx_http_stub_status_module
 
   --without-http_charset_module      disable ngx_http_charset_module
@@ -1158,6 +1202,8 @@ Options directly inherited from nginx
   --without-http_limit_req_module    disable ngx_http_limit_req_module
   --without-http_empty_gif_module    disable ngx_http_empty_gif_module
   --without-http_browser_module      disable ngx_http_browser_module
+  --without-http_upstream_hash_module
+                                     disable ngx_http_upstream_hash_module
   --without-http_upstream_ip_hash_module
                                      disable ngx_http_upstream_ip_hash_module
   --without-http_upstream_least_conn_module
@@ -1165,43 +1211,63 @@ Options directly inherited from nginx
   --without-http_upstream_keepalive_module
                                      disable ngx_http_upstream_keepalive_module
 
+  --without-http_upstream_zone_module
+                                     disable ngx_http_upstream_zone_module
   --with-http_perl_module            enable ngx_http_perl_module
-  --with-perl_modules_path=PATH      set path to the perl modules
+  --with-http_perl_module=dynamic    enable dynamic ngx_http_perl_module
-  --with-perl=PATH                   set path to the perl binary
+  --with-perl_modules_path=PATH      set Perl modules path
+  --with-perl=PATH                   set perl binary pathname
 
-  --http-log-path=PATH               set path to the http access log
+  --http-log-path=PATH               set http access log pathname
-  --http-client-body-temp-path=PATH  set path to the http client request body
+  --http-client-body-temp-path=PATH  set path to store
-                                     temporary files
+                                     http client request body temporary files
-  --http-proxy-temp-path=PATH        set path to the http proxy temporary files
+  --http-proxy-temp-path=PATH        set path to store
-  --http-fastcgi-temp-path=PATH      set path to the http fastcgi temporary
+                                     http proxy temporary files
-                                     files
+  --http-fastcgi-temp-path=PATH      set path to store
-  --http-uwsgi-temp-path=PATH        set path to the http uwsgi temporary files
+                                     http fastcgi temporary files
-  --http-scgi-temp-path=PATH         set path to the http scgi temporary files
+  --http-uwsgi-temp-path=PATH        set path to store
+                                     http uwsgi temporary files
+  --http-scgi-temp-path=PATH         set path to store
+                                     http scgi temporary files
 
   --without-http                     disable HTTP server
   --without-http-cache               disable HTTP cache
 
   --with-mail                        enable POP3/IMAP4/SMTP proxy module
+  --with-mail=dynamic                enable dynamic POP3/IMAP4/SMTP proxy module
   --with-mail_ssl_module             enable ngx_mail_ssl_module
   --without-mail_pop3_module         disable ngx_mail_pop3_module
   --without-mail_imap_module         disable ngx_mail_imap_module
   --without-mail_smtp_module         disable ngx_mail_smtp_module
 
+  --with-stream                      enable TCP/UDP proxy module
+  --with-stream=dynamic              enable dynamic TCP/UDP proxy module
+  --with-stream_ssl_module           enable ngx_stream_ssl_module
+  --without-stream_limit_conn_module disable ngx_stream_limit_conn_module
+  --without-stream_access_module     disable ngx_stream_access_module
+  --without-stream_map_module        disable ngx_stream_map_module
+  --without-stream_return_module     disable ngx_stream_return_module
+  --without-stream_upstream_hash_module
+                                     disable ngx_stream_upstream_hash_module
+  --without-stream_upstream_least_conn_module
+                                     disable ngx_stream_upstream_least_conn_module
+  --without-stream_upstream_zone_module
+                                     disable ngx_stream_upstream_zone_module
+
   --with-google_perftools_module     enable ngx_google_perftools_module
   --with-cpp_test_module             enable ngx_cpp_test_module
 
-  --add-module=PATH                  enable an external module
+  --add-module=PATH                  enable external module
+  --add-dynamic-module=PATH          enable dynamic external module
 
-  --with-cc=PATH                     set path to C compiler
+  --with-cc=PATH                     set C compiler pathname
-  --with-cpp=PATH                    set path to C preprocessor
+  --with-cpp=PATH                    set C preprocessor pathname
-  --with-cc-opt=OPTIONS              set additional options for C compiler
+  --with-cc-opt=OPTIONS              set additional C compiler options
-  --with-ld-opt=OPTIONS              set additional options for linker
+  --with-ld-opt=OPTIONS              set additional linker options
-  --with-cpu-opt=CPU                 build for specified CPU, the valid values:
+  --with-cpu-opt=CPU                 build for the specified CPU, valid values:
                                      pentium, pentiumpro, pentium3, pentium4,
                                      athlon, opteron, sparc32, sparc64, ppc64
 
-  --with-make=PATH                   specify the default make utility to be used
-
   --without-pcre                     disable PCRE library usage
   --with-pcre                        force PCRE library usage
   --with-pcre=DIR                    set path to PCRE library sources
@@ -1209,25 +1275,17 @@ Options directly inherited from nginx
   --with-pcre-conf-opt=OPTIONS       set additional configure options for PCRE
   --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
-  --with-md5-asm                     use md5 assembler sources
-
-  --with-sha1=DIR                    set path to sha1 library sources
-  --with-sha1-opt=OPTIONS            set additional options for sha1 building
-  --with-sha1-asm                    use sha1 assembler sources
-
   --with-zlib=DIR                    set path to zlib library sources
-  --with-zlib-opt=OPTIONS            set additional options for zlib building
+  --with-zlib-opt=OPTIONS            set additional build options for zlib
   --with-zlib-asm=CPU                use zlib assembler sources optimized
-                                     for specified CPU, the valid values:
+                                     for the specified CPU, valid values:
                                      pentium, pentiumpro
 
   --with-libatomic                   force libatomic_ops library usage
   --with-libatomic=DIR               set path to libatomic_ops library sources
 
   --with-openssl=DIR                 set path to OpenSSL library sources
-  --with-openssl-opt=OPTIONS         set additional options for OpenSSL building
+  --with-openssl-opt=OPTIONS         set additional build options for OpenSSL
 
   --dry-run                          dry running the configure, for testing only
   --platform=PLATFORM                forcibly specify a platform name, for testing only

util/dist-check

@@ -7,6 +7,7 @@ use Getopt::Std qw(getopts);
 use Cwd qw/cwd/;
 
 sub sh ($);
+sub cleanup ();
 sub write_config_file ($);
 
 my %opts;
@@ -69,7 +70,7 @@ write_config_file "/tmp/nginx.conf";
 
 warn "=== Without FFI ===\n";
 $prefix = "/usr/local/openresty-noffi";
-sh "sudo rm -rf $prefix/lualib $prefix/luajit $prefix/bin $prefix/lua $prefix/nginx/sbin $prefix/nginx/html";
+cleanup();
 unless ($opts{f}) {
     sh "./configure $cfg_opts --with-cc-opt='-DNGX_LUA_NO_FFI_API' --prefix=$prefix -j$jobs > /dev/null";
 }
@@ -87,7 +88,7 @@ sh "sudo $prefix/nginx/sbin/nginx -sstop";
 
 warn "=== --with-stream ===\n";
 $prefix = "/usr/local/openresty-stream";
-sh "sudo rm -rf $prefix/lualib $prefix/luajit $prefix/bin $prefix/lua $prefix/nginx/sbin $prefix/nginx/html";
+cleanup();
 unless ($opts{f}) {
     sh "./configure $cfg_opts --with-stream --prefix=$prefix -j$jobs > /dev/null";
 }
@@ -106,7 +107,7 @@ sh "sudo $prefix/nginx/sbin/nginx -sstop";
 
 warn "=== --with-stream + dtrace static probes ===\n";
 $prefix = "/usr/local/openresty-stream-usdt";
-sh "sudo rm -rf $prefix/lualib $prefix/luajit $prefix/bin $prefix/lua $prefix/nginx/sbin $prefix/nginx/html";
+cleanup();
 unless ($opts{f}) {
     sh "./configure $cfg_opts --with-dtrace-probes --with-stream --prefix=$prefix -j$jobs > /dev/null";
 }
@@ -126,7 +127,7 @@ sh "sudo $prefix/nginx/sbin/nginx -sstop";
 
 warn "=== Without Gzip/SSL/PCRE ===\n";
 $prefix = "/usr/local/openresty-nogzip";
-sh "sudo rm -rf $prefix/lualib $prefix/luajit $prefix/bin $prefix/lua $prefix/nginx/sbin $prefix/nginx/html";
+cleanup();
 unless ($opts{f}) {
     sh "./configure $cfg_opts --without-http_rewrite_module --without-http_ssl_module --without-pcre --without-http_gzip_module --prefix=$prefix -j$jobs > /dev/null";
 }
@@ -149,7 +150,7 @@ $cfg_opts .= " --with-http_iconv_module";
 
 warn "\n=== --with-threads ===\n";
 $prefix = "/usr/local/openresty-threads";
-sh "sudo rm -rf $prefix/lualib $prefix/luajit $prefix/bin $prefix/lua $prefix/nginx/sbin $prefix/nginx/html";
+cleanup();
 unless ($opts{f}) {
     sh "./configure $cfg_opts --with-threads --prefix=$prefix -j$jobs > /dev/null";
 }
@@ -168,7 +169,7 @@ sh "sudo $prefix/nginx/sbin/nginx -sstop";
 
 warn "\n=== No Pool Build ===\n";
 $prefix = "/usr/local/openresty-nopool";
-sh "sudo rm -rf $prefix/lualib $prefix/luajit $prefix/bin $prefix/lua $prefix/nginx/sbin $prefix/nginx/html";
+cleanup();
 unless ($opts{f}) {
     sh "./configure --with-no-pool-patch $cfg_opts --prefix=$prefix -j$jobs > /dev/null";
 }
@@ -188,7 +189,7 @@ sh "sudo $prefix/nginx/sbin/nginx -sstop";
 
 warn "\n=== Normal Build ===\n";
 $prefix = "/usr/local/openresty";
-sh "sudo rm -rf $prefix/lualib $prefix/luajit $prefix/bin $prefix/lua $prefix/nginx/sbin $prefix/nginx/html";
+cleanup();
 unless ($opts{f}) {
     sh "./configure $cfg_opts -j$jobs > /dev/null";
 }
@@ -202,11 +203,13 @@ sh "curl -si localhost/lua|grep $lua";
 sh "curl -si localhost/lua|grep $ver";
 sh "curl -si localhost/cjson|grep 'json.safe: '";
 sh qq{$prefix/bin/resty -e 'ngx.say("Hello World!")'|grep 'Hello World'};
+sh qq{$prefix/bin/restydoc -s listen | grep 'configures the port to accept HTTP/2'};
+sh qq{$prefix/bin/restydoc opm | grep -E '^Status\$'};
 sh "sudo $prefix/nginx/sbin/nginx -sstop";
 
 warn "\n=== Debug Build ===\n";
 $prefix = "/usr/local/openresty-debug";
-sh "sudo rm -rf $prefix/lualib $prefix/luajit $prefix/bin $prefix/lua $prefix/nginx/sbin $prefix/nginx/html";
+cleanup();
 unless ($opts{f}) {
     my $more_cfg_opts = '';
     if ($lua eq 'LuaJIT') {
@@ -229,7 +232,7 @@ sh "sudo $prefix/nginx/sbin/nginx -sstop";
 
 warn "\n=== DTrace Build ===\n";
 $prefix = "/usr/local/openresty-dtrace";
-sh "sudo rm -rf $prefix/lualib $prefix/luajit $prefix/bin $prefix/lua $prefix/nginx/sbin $prefix/nginx/html";
+cleanup();
 unless ($opts{f}) {
     sh "./configure $cfg_opts --with-dtrace-probes --prefix=$prefix -j$jobs > /dev/null";
 }
@@ -258,6 +261,11 @@ sub sh ($) {
     system($cmd) == 0 or die "Command \"$cmd\" failed";
 }
 
+sub cleanup () {
+    sh "sudo rm -rf $prefix/lualib $prefix/luajit $prefix/bin $prefix/lua $prefix/nginx/sbin $prefix/nginx/html"
+       . " $prefix/site $prefix/pod $prefix/resty.index";
+}
+
 __DATA__
 
 user  nobody;

util/mirror-tarballs

@@ -389,7 +389,7 @@ mv openresty-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.31
+ver=0.32
 $root/util/get-tarball "https://github.com/openresty/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 openresty-headers-more-nginx-module-* headers-more-nginx-module-$ver || exit 1
@@ -403,7 +403,7 @@ mv openresty-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.10.6
+ver=0.10.7
 $root/util/get-tarball "https://github.com/openresty/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 openresty-lua-nginx-module-* ngx_lua-$ver || exit 1
@@ -505,7 +505,7 @@ mv openresty-redis2-nginx-module-* redis2-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.13
+ver=0.16
 $root/util/get-tarball "https://github.com/openresty/resty-cli/tarball/v$ver" -O resty-cli-$ver.tar.gz || exit 1
 tar -xzf resty-cli-$ver.tar.gz || exit 1
 mv openresty-resty-cli-* resty-cli-$ver || exit 1
@@ -513,6 +513,13 @@ resty_cli=resty-cli-$ver
 
 #################################
 
+ver=0.0.2
+$root/util/get-tarball "https://github.com/openresty/opm/tarball/v$ver" -O opm-$ver.tar.gz || exit 1
+tar -xzf opm-$ver.tar.gz || exit 1
+mv openresty-opm-* opm-$ver || exit 1
+
+#################################
+
 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
@@ -539,7 +546,7 @@ echo
 
 #################################
 
-ver=2.1-20160517
+ver=2.1-20161104
 $root/util/get-tarball "https://github.com/openresty/luajit2/archive/v$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
 tar -xzf LuaJIT-$ver.tar.gz || exit 1
 mv luajit2-* LuaJIT-$ver || exit 1
@@ -595,7 +602,7 @@ cd ..
 
 #################################
 
-ver=0.17
+ver=0.18
 $root/util/get-tarball "https://github.com/openresty/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 openresty-lua-resty-dns-* lua-resty-dns-$ver || exit 1
@@ -619,7 +626,7 @@ cd ..
 
 #################################
 
-ver=0.25
+ver=0.26
 $root/util/get-tarball "https://github.com/openresty/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 openresty-lua-resty-redis-* lua-resty-redis-$ver || exit 1
@@ -631,7 +638,7 @@ mv openresty-lua-resty-redis-* lua-resty-redis-$ver || exit 1
 
 #################################
 
-ver=0.16
+ver=0.17
 $root/util/get-tarball "https://github.com/openresty/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 openresty-lua-resty-mysql-* lua-resty-mysql-$ver || exit 1
@@ -643,7 +650,19 @@ cd ..
 
 #################################
 
-ver=0.09
+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
 mv openresty-lua-resty-upload-* lua-resty-upload-$ver || exit 1
@@ -667,7 +686,7 @@ cd ..
 
 #################################
 
-ver=0.05
+ver=0.06
 $root/util/get-tarball "https://github.com/openresty/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 openresty-lua-resty-websocket-* lua-resty-websocket-$ver || exit 1
@@ -703,7 +722,7 @@ cd ..
 
 #################################
 
-ver=0.1.8
+ver=0.1.9
 $root/util/get-tarball "https://github.com/openresty/lua-resty-core/tarball/v$ver" -O "lua-resty-core-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-core-$ver.tar.gz || exit 1
 mv openresty-lua-resty-core-* lua-resty-core-$ver || exit 1
@@ -739,7 +758,6 @@ cp $root/util/build-win32.sh util/ || exit 1
 cp $root/COPYRIGHT ./ || exit 1
 perl bundle/$resty_cli/bin/md2pod.pl $root/doc/README-win32.md | pod2text > README-win32.txt || exit 1
 unix2dos README-win32.txt || exit 1
-find bundle -name '*~' -delete
 mkdir patches/ || exit 1
 cp $root/patches/openssl-1.0.2h-sess_set_get_cb_yield.patch patches/ || exit 1
 
@@ -763,7 +781,7 @@ else
 fi
 cd nginx.org/ || exit 1
 $nginx_xml2pod xml/en/docs || exit 1
-cd $curdir
+cd $curdir || exit 1
 
 echo "restydoc-index $root/work/nginx.org"
 $restydoc_index --outdir bundle $root/work/nginx.org || exit 1
@@ -783,14 +801,15 @@ for indir in bundle/*/; do
     if [ "$indir" == "bundle/nginx-$main_ver/" ]; then
         continue
     fi
-    echo "restydoc-index $indir"
+    echo "restydoc-index --outdir bundle $indir"
-    $restydoc_index --outdir bundle $indir || exit 1
+    $restydoc_index --outdir $curdir/bundle $indir || exit 1
 done
 
 cd $curdir || exit 1
 find bundle -name '*.md' -delete
 find bundle -name '*.markdown' -delete
 find bundle -name '*.wiki' -delete
+find bundle -name '*~' -delete
 
 cd $root || exit 1
 

util/ver

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 main_ver=1.11.2
-minor_ver=1
+minor_ver=2
 version=$main_ver.$minor_ver
 echo $version