From 42410a71cd4ca1b1024689f64f61495e7e062ec7 Mon Sep 17 00:00:00 2001 From: jiahao Date: Wed, 12 May 2021 10:58:38 +0800 Subject: [PATCH 1/3] upgraded ngx_stream_lua to 0.0.10rc2. --- t/000-sanity.t | 118 +++++++++++++++++++++---------------------- util/mirror-tarballs | 2 +- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/t/000-sanity.t b/t/000-sanity.t index 1825a13..3f602cd 100644 --- a/t/000-sanity.t +++ b/t/000-sanity.t @@ -303,7 +303,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -390,7 +390,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -477,7 +477,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -564,7 +564,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib -llua' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -650,7 +650,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -736,7 +736,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -1073,7 +1073,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -1161,7 +1161,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -1262,7 +1262,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/opt/drizzle/lib:/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -1349,7 +1349,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-cc=gcc-4.2 --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -1439,7 +1439,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -1527,7 +1527,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-cc=cl --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -1630,7 +1630,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/opt/postgres/lib:/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -1718,7 +1718,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -1836,7 +1836,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -1923,7 +1923,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -2010,7 +2010,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -2097,7 +2097,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -2184,7 +2184,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -2271,7 +2271,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -2361,7 +2361,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -2452,7 +2452,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -2539,7 +2539,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -2624,7 +2624,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -2709,7 +2709,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -2795,7 +2795,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -2879,7 +2879,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -2962,7 +2962,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -3043,7 +3043,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/tmp/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -3128,7 +3128,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -3215,7 +3215,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -3302,7 +3302,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --add-module=/path/to/some/module --add-module=$OPENRESTY_DIR/../some/module --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -3389,7 +3389,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-openssl=$OPENRESTY_DIR/../some/module --with-openssl-opt=-g --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -3476,7 +3476,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -3562,7 +3562,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -3648,7 +3648,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -3736,7 +3736,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -3823,7 +3823,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-pcre=$OPENRESTY_DIR/../some/module --with-pcre-opt=-g --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -3910,7 +3910,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-zlib=$OPENRESTY_DIR/../some/module --with-zlib-opt=-g --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -3997,7 +3997,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-md5=$OPENRESTY_DIR/../some/module --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -4084,7 +4084,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-sha1=$OPENRESTY_DIR/../some/module --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -4171,7 +4171,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-libatomic=$OPENRESTY_DIR/../some/module --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -4258,7 +4258,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -4344,7 +4344,7 @@ sh ./configure --prefix=./nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -4433,7 +4433,7 @@ sh ./configure --prefix=./nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -4522,7 +4522,7 @@ sh ./configure --prefix=./nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -4614,7 +4614,7 @@ sh ./configure --prefix=. \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. Type the following commands to build and install: @@ -4698,7 +4698,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ '--with-pcre-opt=-g -foo -bar' $'--with-zlib-opt=-g hello, \'\\world' --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -4785,7 +4785,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -4872,7 +4872,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -4959,7 +4959,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -5046,7 +5046,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -5133,7 +5133,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -5220,7 +5220,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --sbin-path=/opt/blah/nginx --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -5307,7 +5307,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --sbin-path=../bin/nginx --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -5393,7 +5393,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -5534,7 +5534,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --add-dynamic-module=/path/to/some/module --add-dynamic-module=$OPENRESTY_DIR/../some/module --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. @@ -5620,7 +5620,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_preread_module cd ../.. @@ -5674,7 +5674,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../redis-nginx-module-0.3.7 \ --add-module=../rds-json-nginx-module-0.15 \ --add-module=../rds-csv-nginx-module-0.09 \ - --add-module=../ngx_stream_lua-0.0.10rc1 \ + --add-module=../ngx_stream_lua-0.0.10rc2 \ --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module cd ../.. diff --git a/util/mirror-tarballs b/util/mirror-tarballs index c190697..d755112 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -569,7 +569,7 @@ mv openresty-lua-upstream-nginx-module-* ngx_lua_upstream-$ver || exit 1 ################################# -ver=0.0.10rc1 +ver=0.0.10rc2 $root/util/get-tarball "https://github.com/openresty/stream-lua-nginx-module/tarball/v$ver" -O stream-lua-nginx-module-$ver.tar.gz || exit 1 tar -xzf stream-lua-nginx-module-$ver.tar.gz || exit 1 mv openresty-stream-lua-nginx-module-* ngx_stream_lua-$ver || exit 1 From 4b5ec7edd78616f544abc194308e0cf4b788725b Mon Sep 17 00:00:00 2001 From: Johnny Wang Date: Fri, 28 May 2021 10:25:01 +0800 Subject: [PATCH 2/3] bugfix: applied the patch for security advisory to NGINX cores >= 0.6.18 and <= 1.20.0 (CVE-2021-23017). (#739) --- patches/patch.2021.resolver.txt | 23 +++++++++++++++++++++++ util/mirror-tarballs | 10 ++++++++++ 2 files changed, 33 insertions(+) create mode 100644 patches/patch.2021.resolver.txt diff --git a/patches/patch.2021.resolver.txt b/patches/patch.2021.resolver.txt new file mode 100644 index 0000000..6c895e6 --- /dev/null +++ b/patches/patch.2021.resolver.txt @@ -0,0 +1,23 @@ +diff --git src/core/ngx_resolver.c src/core/ngx_resolver.c +--- src/core/ngx_resolver.c ++++ src/core/ngx_resolver.c +@@ -4008,15 +4008,15 @@ done: + n = *src++; + + } else { ++ if (dst != name->data) { ++ *dst++ = '.'; ++ } ++ + ngx_strlow(dst, src, n); + dst += n; + src += n; + + n = *src++; +- +- if (n != 0) { +- *dst++ = '.'; +- } + } + + if (n == 0) { diff --git a/util/mirror-tarballs b/util/mirror-tarballs index d755112..736b139 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -469,6 +469,16 @@ else echo fi +answer=`$root/util/ver-ge "$main_ver" 0.6.18` +if [ "$answer" = "Y" ]; then + answer=`$root/util/ver-ge "$main_ver" 1.20.1` + if [ "$answer" = "N" ]; then + echo "$info_txt applying the patch for nginx security advisory (CVE-2021-23017)" + patch -p0 < $root/patches/patch.2021.resolver.txt || exit 1 + echo + fi +fi + echo "$info_txt applying the upstream_timeout_fields patch for nginx" patch -p1 < $root/patches/nginx-$main_ver-upstream_timeout_fields.patch || exit 1 echo From 46610182dd2a723ac5d335e2f950dd549f0da47c Mon Sep 17 00:00:00 2001 From: Johnny Wang Date: Tue, 1 Jun 2021 12:20:27 +0800 Subject: [PATCH 3/3] travis-ci: upgraded OpenSSL to 1.1.1k. (#743) --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c0f34c9..5924a5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,7 @@ env: matrix: - OPENSSL_VER=1.0.2u OPENSSL_PATCH_VER=1.0.2h - OPENSSL_VER=1.1.0l OPENSSL_PATCH_VER=1.1.0d - - OPENSSL_VER=1.1.1f OPENSSL_PATCH_VER=1.1.1f + - OPENSSL_VER=1.1.1k OPENSSL_PATCH_VER=1.1.1f jobs: include: @@ -83,7 +83,7 @@ jobs: - <<: *linux-s390x env: OPENSSL_VER=1.1.0l OPENSSL_PATCH_VER=1.1.0d - <<: *linux-s390x - env: OPENSSL_VER=1.1.1f OPENSSL_PATCH_VER=1.1.1f + env: OPENSSL_VER=1.1.1k OPENSSL_PATCH_VER=1.1.1f install: - sudo cpanm --notest Test::Nginx IPC::Run3 > build.log 2>&1 || (cat build.log && exit 1)