Merge branch 'master' into patch-1.17.4-rc0

util/configure

@@ -1304,8 +1304,6 @@ sub usage ($) {
   --prefix=PATH                      set the installation prefix (default to /usr/local/openresty)
 
   --with-debug                       enable debug logging
-  --with-dtrace-probes               enable dtrace USDT probes
-  --with-dtrace=PATH                 set dtrace utility pathname
 
   --with-no-pool-patch               enable the no-pool patch for debugging memory issues
 
@@ -1410,8 +1408,6 @@ Options directly inherited from nginx
   --error-log-path=PATH              set error log pathname
   --pid-path=PATH                    set nginx.pid pathname
   --lock-path=PATH                   set nginx.lock pathname
-  --tapset-prefix=PATH               set systemtap tapset directory prefix
-  --stap-nginx-path=PATH             set stap-nginx pathname
 
   --user=USER                        set non-privileged user for
                                      worker processes
@@ -1429,7 +1425,6 @@ Options directly inherited from nginx
   --with-threads                     enable thread pool support
 
   --with-file-aio                    enable file AIO support
-  --with-ipv6                        enable IPv6 support
 
   --with-http_v2_module              enable ngx_http_v2_module
   --with-http_realip_module          enable ngx_http_realip_module
@@ -1543,6 +1538,8 @@ Options directly inherited from nginx
   --add-module=PATH                  enable external module
   --add-dynamic-module=PATH          enable dynamic external module
 
+  --with-compat                      dynamic modules compatibility
+
   --with-cc=PATH                     set C compiler pathname
   --with-cpp=PATH                    set C preprocessor pathname
   --with-cc-opt=OPTIONS              set additional C compiler options

util/dist-check

@@ -96,25 +96,25 @@ sh "sudo $prefix/nginx/sbin/nginx -sstop";
 
 }
 
-warn "\n=== --without-stream + dtrace static probes ===\n";
-$prefix = "/usr/local/openresty-nostream-usdt";
-cleanup();
-unless ($opts{f}) {
-    sh "./configure $cfg_opts --with-dtrace-probes --without-stream --prefix=$prefix -j$jobs";
-}
-sh "$make -j$jobs";
-sh "sudo $make install";
-sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf";
-sh "$prefix/nginx/sbin/nginx -V 2>\&1", $ver;
-sh "$prefix/nginx/sbin/nginx -V 2>\&1", "--with-stream", 1;
-sh "$prefix/nginx/sbin/nginx -V 2>\&1", "--with-dtrace-probes";
-system "sudo killall nginx > /dev/null 2>&1";
-sh "sudo $prefix/nginx/sbin/nginx";
-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!")'}, 'Hello World';
-sh "sudo $prefix/nginx/sbin/nginx -sstop";
+#warn "\n=== --without-stream + dtrace static probes ===\n";
+#$prefix = "/usr/local/openresty-nostream-usdt";
+#cleanup();
+#unless ($opts{f}) {
+#sh "./configure $cfg_opts --with-dtrace-probes --without-stream --prefix=$prefix -j$jobs";
+#}
+#sh "$make -j$jobs";
+#sh "sudo $make install";
+#sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf";
+#sh "$prefix/nginx/sbin/nginx -V 2>\&1", $ver;
+#sh "$prefix/nginx/sbin/nginx -V 2>\&1", "--with-stream", 1;
+#sh "$prefix/nginx/sbin/nginx -V 2>\&1", "--with-dtrace-probes";
+#system "sudo killall nginx > /dev/null 2>&1";
+#sh "sudo $prefix/nginx/sbin/nginx";
+#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!")'}, 'Hello World';
+#sh "sudo $prefix/nginx/sbin/nginx -sstop";
 
 warn "\n=== Without Gzip/SSL/PCRE ===\n";
 $prefix = "/usr/local/openresty-nogzip";
@@ -223,31 +223,31 @@ sh "curl -si localhost/cjson|grep 'json.safe: '";
 sh qq{$prefix/bin/resty -e 'ngx.say("Hello World!")'|grep 'Hello World'};
 sh "sudo $prefix/nginx/sbin/nginx -sstop";
 
-warn "\n=== DTrace Build ===\n";
-$prefix = "/usr/local/openresty-dtrace";
-cleanup();
-unless ($opts{f}) {
-    sh "./configure $cfg_opts --with-dtrace-probes --prefix=$prefix -j$jobs";
-}
-sh "$make -j$jobs";
-sh "sudo $make install";
-sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf";
-sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver";
-sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-dtrace-probes'";
-system "sudo killall nginx > /dev/null 2>&1";
-sh "sudo $prefix/nginx/sbin/nginx";
-sh "curl -si localhost/lua|grep $lua";
-sh "curl -si localhost/lua|grep $ver";
-sh "curl -si localhost/cjson|grep 'json.safe: '";
-if ($^O eq 'linux') {
-    sh "stap -L 'process(\"$prefix/nginx/sbin/nginx\").mark(\"*\")'|grep http__lua__coroutine__done";
-
-} elsif ($^O eq 'freebsd' || $^O eq 'darwin' || $^O eq 'solaris') {
-    sh "sudo dtrace -l|grep http-lua-coroutine-done";
-}
-sh qq{$prefix/bin/resty -e 'ngx.say("Hello World!")'|grep 'Hello World'};
+#warn "\n=== DTrace Build ===\n";
+#$prefix = "/usr/local/openresty-dtrace";
+#cleanup();
+#unless ($opts{f}) {
+#sh "./configure $cfg_opts --with-dtrace-probes --prefix=$prefix -j$jobs";
+#}
+#sh "$make -j$jobs";
+#sh "sudo $make install";
+#sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf";
+#sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver";
+#sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-dtrace-probes'";
+#system "sudo killall nginx > /dev/null 2>&1";
+#sh "sudo $prefix/nginx/sbin/nginx";
+#sh "curl -si localhost/lua|grep $lua";
+#sh "curl -si localhost/lua|grep $ver";
+#sh "curl -si localhost/cjson|grep 'json.safe: '";
+#if ($^O eq 'linux') {
+#sh "stap -L 'process(\"$prefix/nginx/sbin/nginx\").mark(\"*\")'|grep http__lua__coroutine__done";
+#
+#} elsif ($^O eq 'freebsd' || $^O eq 'darwin' || $^O eq 'solaris') {
+#sh "sudo dtrace -l|grep http-lua-coroutine-done";
+#}
+#sh qq{$prefix/bin/resty -e 'ngx.say("Hello World!")'|grep 'Hello World'};
 
-sh "sudo $prefix/nginx/sbin/nginx -sstop";
+#sh "sudo $prefix/nginx/sbin/nginx -sstop";
 
 sub sh ($@) {
     my $cmd = shift;

util/mirror-tarballs

@@ -234,9 +234,9 @@ if [ "$answer" = "N" ]; then
     echo
 fi
 
-echo "$info_txt applying the dtrace patch for nginx"
-patch -p1 < $root/patches/nginx-$main_ver-dtrace.patch || exit 1
-echo
+#echo "$info_txt applying the dtrace patch for nginx"
+#patch -p1 < $root/patches/nginx-$main_ver-dtrace.patch || exit 1
+#echo
 
 answer=`$root/util/ver-ge "$main_ver" 1.2.6`
 if [ "$answer" = "N" ]; then
@@ -499,7 +499,7 @@ rm -rf no-pool-nginx-$ver
 
 #################################
 
-ver=0.61
+ver=0.62rc1
 $root/util/get-tarball "https://github.com/openresty/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 openresty-echo-nginx-module-* echo-nginx-module-$ver || exit 1
@@ -590,7 +590,7 @@ mv openresty-memc-nginx-module-* memc-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.31
+ver=0.32rc1
 $root/util/get-tarball "https://github.com/openresty/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 openresty-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1
@@ -683,7 +683,7 @@ mv openresty-opm-* opm-$ver || exit 1
 
 #################################
 
-ver=2.1-20190912
+ver=2.1-20200102
 $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