Skip to content

[pull] master from openresty:master#1

Open
pull[bot] wants to merge 443 commits intodetailyang:masterfrom
openresty:master
Open

[pull] master from openresty:master#1
pull[bot] wants to merge 443 commits intodetailyang:masterfrom
openresty:master

Conversation

@pull
Copy link

@pull pull bot commented Apr 26, 2022

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

thibaultcha and others added 30 commits June 19, 2019 10:12
…trix.

OpenSSL 1.1.1c support for `ssl_session_(store|fetch)_*` has been reverted
from the current master branches of our projects. It will be brought
back once the NGINX core has been bumped to 1.17.1.

See:

openresty/lua-nginx-module#1539
openresty/lua-nginx-module#1540
openresty/lua-nginx-module#1544
This test case invokes the `openssl` binary from a shell to execute a
handshake. It is supposed to be for old versions of OpenSSL, but since
we can't skip the test with `skip_openssl` (since it isn't about the
linked OpenSSL lib), we updated the subject line check to work for
OpenSSL 1.1.1 CLI binaries.

With older versions of OpenSSL:

    subject=/C=US/ST=California/L=San Francisco/O=OpenResty/OU=OpenResty/CN=test.com/emailAddress=agentzh@gmail.com

With OpenSSL 1.1.1:

    subject=C = US, ST = California, L = San Francisco, O = OpenResty, OU = OpenResty, CN = test.com, emailAddress = agentzh@gmail.com
…ersion" when the TLS version number is not recognized.

In the future, this will avoid bugs in user applications when the `ver`
return value is expected to be non-nil, but is `nil` since the TLS
version number has not been registered in the Lua module yet.

Also includes a few grammatical and styling changes to the ssl.md
documentation.
…' is an empty table.

Signed-off-by: Thibault Charbonnier <thibaultcha@me.com>
…()'.

Signed-off-by: Thibault Charbonnier <thibaultcha@me.com>
…thread is waiting on it.

Signed-off-by: Thibault Charbonnier <thibaultcha@me.com>
…pport.

Since we override the `require` function in `resty.base`, the proper
stacktrace level for this error is 3 since it is thrown in the main
chunk of the module.

Example:

Previously, the previous behavior with `resty` was:

    $ resty -e 'require "ngx.re"'
    ERROR: no support for 'ngx.re' module: OpenResty was compiled without PCRE support
    stack traceback:
            ...

Now, the error contains the chunkame `(command line -e):1:`:

    $ resty -e 'require "ngx.re"'
    ERROR: (command line -e):1: no support for 'ngx.re' module: OpenResty was compiled without PCRE support
    stack traceback:
            ...

Which is similar to the error reported by other `ngx.re` APIs when
attempting to use them without PCRE support:

    $ resty -e 'ngx.re.gmatch()'
    ERROR: (command line -e):1: no support for 'ngx.re.gmatch': OpenResty was compiled without PCRE support
    stack traceback:
            ...
…ngx'.

This ensures that all `resty.core` modules setting values under the
`ngx` table can do so without having to enter the `__newindex`
metamethod set by `resty.core.misc`. This commit also includes a style
fix.
…()' API.

Signed-off-by: Thibault Charbonnier <thibaultcha@me.com>
ChrisCatCP and others added 30 commits June 12, 2025 09:33
* better prefix for proxy ssl verify ffi functions
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.