bumped version to 1.21.4.1. (#832)

Signed-off-by: Artiom Vaskov <Artiom.Vaskov@ibm.com>

.github/actions/spelling/README.md

@@ -0,0 +1,15 @@
+# check-spelling/check-spelling configuration
+
+File | Purpose | Format | Info
+-|-|-|-
+[dictionary.txt](dictionary.txt) | Replacement dictionary (creating this file will override the default dictionary) | one word per line | [dictionary](https://github.com/check-spelling/check-spelling/wiki/Configuration#dictionary)
+[allow.txt](allow.txt) | Add words to the dictionary | one word per line (only letters and `'`s allowed) | [allow](https://github.com/check-spelling/check-spelling/wiki/Configuration#allow)
+[reject.txt](reject.txt) | Remove words from the dictionary (after allow) | grep pattern matching whole dictionary words | [reject](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-reject)
+[excludes.txt](excludes.txt) | Files to ignore entirely | perl regular expression | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes)
+[only.txt](only.txt) | Only check matching files (applied after excludes) | perl regular expression | [only](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-only)
+[patterns.txt](patterns.txt) | Patterns to ignore from checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
+[expect.txt](expect.txt) | Expected words that aren't in the dictionary | one word per line (sorted, alphabetically) | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)
+[advice.md](advice.md) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)
+
+Note: you can replace any of these files with a directory by the same name (minus the suffix)
+and then include multiple files inside that directory (with that suffix) to merge multiple files together.

.github/actions/spelling/advice.md

@@ -0,0 +1,27 @@
+<!-- See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice --> <!-- markdownlint-disable MD033 MD041 -->
+<details><summary>If you see a bunch of garbage</summary>
+
+If it relates to a ...
+<details><summary>well-formed pattern</summary>
+
+See if there's a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it.
+
+If not, try writing one and adding it to the `patterns.txt` file.
+
+Patterns are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
+
+Note that patterns can't match multiline strings.
+</details>
+<details><summary>binary-ish string</summary>
+
+Please add a file path to the `excludes.txt` file instead of just accepting the garbage.
+
+File paths are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
+
+`^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
+../tree/HEAD/README.md) (on whichever branch you're using).
+</details>
+
+</details>

.github/actions/spelling/excludes.txt

@@ -0,0 +1,23 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes
+(?:^|/)(?i)COPYRIGHT
+(?:^|/)(?i)LICEN[CS]E
+(?:^|/)package(?:-lock|)\.json$
+(?:^|/)vendor/
+ignore$
+\.avi$
+\.ico$
+\.jpe?g$
+\.js$
+\.lock$
+\.map$
+\.min\.
+\.mod$
+\.mp[34]$
+\.png$
+\.styl$
+\.svg$
+\.uve$
+\.wav$
+\.html$
+\.nav$
+^\.github/

.github/actions/spelling/expect.txt

@@ -0,0 +1,52 @@
+agentzh
+COMPAT
+csv
+dav
+dll
+DLUAJIT
+exe
+flv
+gcc
+github
+gmail
+gunzip
+gzip
+html
+http
+imagename
+imap
+IOCP
+ipv
+jit
+json
+Linux
+lua
+luajit
+Microsoft
+mkdir
+MSYS
+nginx
+ngx
+NUMMODE
+objs
+openresty
+openssl
+pcre
+perl
+pid
+preread
+rds
+README
+realip
+sbin
+SETSIZE
+smtp
+ssl
+tarballs
+taskkill
+tasklist
+todo
+toolchain
+xcflags
+Yichun
+zlib

.github/actions/spelling/only.txt

@@ -0,0 +1,2 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes
+\.md$

.github/actions/spelling/patterns.txt

@@ -0,0 +1,4 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
+
+# ignore long runs of a single character:
+\b([A-Za-z])\g{-1}{3,}\b

.github/workflows/markdownlint.yml

@@ -0,0 +1,18 @@
+name: Linting on markdown files
+on:
+  pull_request_target:
+  push:
+
+jobs:
+  lint-content:
+    name: Lint content markdown files
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v2
+
+    - name: Lint markdown files
+      uses: avto-dev/markdown-lint@v1
+      with:
+        config: './.markdownlint.jsonc'
+        args: './content/**/*.md'

.github/workflows/spelling.yml

@@ -0,0 +1,31 @@
+name: Spell checking
+on:
+  pull_request_target:
+  push:
+  issue_comment:
+    types: [created]
+
+jobs:
+  spelling:
+    name: Spell checking
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout-merge
+      if: "contains(github.event_name, 'pull_request')"
+      uses: actions/checkout@v2
+      with:
+        ref: refs/pull/${{github.event.pull_request.number}}/merge
+    - name: checkout
+      if: ${{ github.event_name == 'push' ||
+        (
+          contains(github.event.comment.body, '@check-spelling-bot apply')
+        ) }}
+      uses: actions/checkout@v2
+    - uses: check-spelling/check-spelling@main
+      id: spelling
+      if: ${{ github.event_name != 'issue_comment' ||
+        (
+          contains(github.event.comment.body, '@check-spelling-bot apply')
+        ) }}
+      with:
+        experimental_apply_changes_via_bot: 1

.travis.yml

@@ -53,6 +53,7 @@ _linux-s390x: &linux-s390x
     - export PATH=$OPENRESTY_PREFIX/bin:$OPENRESTY_PREFIX/nginx/sbin:$PATH
     - nginx -V
     - ldd `which nginx`|grep -E 'luajit|ssl|pcre'
+    - prove -I. -r t/
 
 _linux-ppc64le: &linux-ppc64le
   os: linux

doc/README-windows.md

@@ -94,7 +94,7 @@ recommended though).
 Debugging
 =========
 
-Debug symbosl are enabled even in release builds. So that when things go very wrong,
+Debug symbols are enabled even in release builds. So that when things go very wrong,
 one can still debug things with tools like MSYS2 GDB.
 
 Inclusion of debug symbols make the binary files (`.exe` and `.dll` files) much larger,
@@ -123,7 +123,7 @@ TODO
 package redistribution.
 * Bundle StrawberryPerl to make command-line utilities like `resty` work out of the box (without
 manually installing a Perl).
-* Deliver an alternative Win32/Win64 binary package built with best debuggin capabilities (like enabling
+* Deliver an alternative Win32/Win64 binary package built with best debugging capabilities (like enabling
 NGINX debugging logs, disabling C compiler optimizations, and enabling all the assertions and checks).
 
 [Back to TOC](#table-of-contents)

t/002-reuseport-close-unused-fds.t

@@ -58,10 +58,13 @@ GET /t
 [error]
 --- grep_error_log eval: qr/\[debug\] .*? closing unused fd:\d+ listening on 127\.0\.0\.\d+:12345/
 --- grep_error_log_out eval
-qr/\[debug\] .*? closing unused fd:\d+ listening on 127\.0\.0\.1:12345
+qr/(\[debug\] .*? closing unused fd:\d+ listening on 127\.0\.0\.1:12345
 \[debug\] .*? closing unused fd:\d+ listening on 127\.0\.0\.2:12345
 \[debug\] .*? closing unused fd:\d+ listening on 127\.0\.0\.1:12345
+\[debug\] .*? closing unused fd:\d+ listening on 127\.0\.0\.2:12345)|(\[debug\] .*? closing unused fd:\d+ listening on 127\.0\.0\.1:12345
+\[debug\] .*? closing unused fd:\d+ listening on 127\.0\.0\.1:12345
 \[debug\] .*? closing unused fd:\d+ listening on 127\.0\.0\.2:12345
+\[debug\] .*? closing unused fd:\d+ listening on 127\.0\.0\.2:12345)
 /
 
 

util/build-win32.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
 PCRE=pcre-8.44
-ZLIB=zlib-1.2.11
+ZLIB=zlib-1.2.12
-OPENSSL=openssl-1.1.1m
+OPENSSL=openssl-1.1.1n
 JOBS=12
 
-# wget https://www.openssl.org/source/openssl-1.1.1l.tar.gz
+# wget https://www.openssl.org/source/openssl-1.1.1n.tar.gz
-# wget http://zlib.net/zlib-1.2.11.tar.gz
+# wget http://zlib.net/zlib-1.2.12.tar.gz
 # wget https://ftp.pcre.org/pub/pcre/pcre-8.44.tar.gz
 
 rm -rf objs || exit 1

util/mirror-tarballs

@@ -582,7 +582,7 @@ mv openresty-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.10.21rc1
+ver=0.10.21
 $root/util/get-tarball "https://github.com/openresty/lua-nginx-module/archive/v$ver.tar.gz" -O lua-nginx-module-$ver.tar.gz || exit 1
 tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
 mv lua-nginx-module-$ver ngx_lua-$ver || exit 1
@@ -596,7 +596,7 @@ mv openresty-lua-upstream-nginx-module-* ngx_lua_upstream-$ver || exit 1
 
 #################################
 
-ver=0.0.11rc1
+ver=0.0.11
 $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
@@ -707,7 +707,7 @@ mv openresty-opm-* opm-$ver || exit 1
 
 #################################
 
-ver=2.1-20220111
+ver=2.1-20220411
 $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
@@ -720,7 +720,7 @@ cd .. || exit 1
 
 #################################
 
-ver=2.1.0.10rc1
+ver=2.1.0.10
 $root/util/get-tarball "https://github.com/openresty/lua-cjson/archive/$ver.tar.gz" -O "lua-cjson-$ver.tar.gz" || exit 1
 tar -xzf lua-cjson-$ver.tar.gz || exit 1
 
@@ -765,14 +765,14 @@ cd ..
 
 #################################
 
-ver=0.30rc1
+ver=0.30
 $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
 
 #################################
 
-ver=0.25rc1
+ver=0.25
 $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
@@ -783,7 +783,7 @@ cd ..
 
 #################################
 
-ver=0.08rc1
+ver=0.08
 $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
@@ -816,7 +816,7 @@ cd ..
 
 #################################
 
-ver=0.09rc1
+ver=0.09
 $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
@@ -849,7 +849,7 @@ cd ..
 
 #################################
 
-ver=0.1.23rc1
+ver=0.1.23
 $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

util/ver

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