From 403dcfc5d13bf7fc2fe668713a06b6734f448e38 Mon Sep 17 00:00:00 2001 From: willmafh Date: Thu, 23 Oct 2025 11:18:13 +0800 Subject: [PATCH 1/3] chore: typo fixes --- src/ngx_stream_lua_ssl_certby.c | 6 +++--- t/139-ssl-cert-by.t | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ngx_stream_lua_ssl_certby.c b/src/ngx_stream_lua_ssl_certby.c index 862e43d1..c24dd344 100644 --- a/src/ngx_stream_lua_ssl_certby.c +++ b/src/ngx_stream_lua_ssl_certby.c @@ -224,7 +224,7 @@ ngx_stream_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data) if (cctx->done) { ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0, - "stream lua_certificate_by_lua:" + "stream ssl_certificate_by_lua:" " cert cb exit code: %d", cctx->exit_code); @@ -319,7 +319,7 @@ ngx_stream_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data) } ngx_log_debug2(NGX_LOG_DEBUG_STREAM, c->log, 0, - "stream lua_certificate_by_lua:" + "stream ssl_certificate_by_lua:" " handler return value: %i, " "cert cb exit code: %d", rc, cctx->exit_code); @@ -408,7 +408,7 @@ ngx_stream_lua_ssl_cert_aborted(void *data) } ngx_log_debug0(NGX_LOG_DEBUG_STREAM, cctx->connection->log, 0, - "stream lua_certificate_by_lua: cert cb aborted"); + "stream ssl_certificate_by_lua: cert cb aborted"); cctx->aborted = 1; cctx->request->connection->ssl = NULL; diff --git a/t/139-ssl-cert-by.t b/t/139-ssl-cert-by.t index 9bfcfca2..7fcadfcc 100644 --- a/t/139-ssl-cert-by.t +++ b/t/139-ssl-cert-by.t @@ -448,7 +448,7 @@ failed to do SSL handshake: handshake failed --- error_log eval [ -'lua_certificate_by_lua: handler return value: -1, cert cb exit code: 0', +'ssl_certificate_by_lua: handler return value: -1, cert cb exit code: 0', qr/\[info\] .*? SSL_do_handshake\(\) failed .*?cert cb error/, 'lua exit with code -1', ] @@ -567,7 +567,7 @@ failed to do SSL handshake: handshake failed --- error_log eval [ -'lua_certificate_by_lua: cert cb exit code: 0', +'ssl_certificate_by_lua: cert cb exit code: 0', qr/\[info\] .*? SSL_do_handshake\(\) failed .*?cert cb error/, 'lua exit with code -1', ] @@ -627,7 +627,7 @@ failed to do SSL handshake: handshake failed --- error_log eval [ 'runtime error: ssl_certificate_by_lua:2: bad bad bad', -'lua_certificate_by_lua: handler return value: 500, cert cb exit code: 0', +'ssl_certificate_by_lua: handler return value: 500, cert cb exit code: 0', qr/\[info\] .*? SSL_do_handshake\(\) failed .*?cert cb error/, qr/context: ssl_certificate_by_lua\*, client: \d+\.\d+\.\d+\.\d+, server: \d+\.\d+\.\d+\.\d+:\d+/, ] @@ -688,7 +688,7 @@ failed to do SSL handshake: handshake failed --- error_log eval [ 'runtime error: ssl_certificate_by_lua:3: bad bad bad', -'lua_certificate_by_lua: cert cb exit code: 0', +'ssl_certificate_by_lua: cert cb exit code: 0', qr/\[info\] .*? SSL_do_handshake\(\) failed .*?cert cb error/, ] From dfd7fd39cd45252b4117e45cbc08fed873329b7d Mon Sep 17 00:00:00 2001 From: willmafh Date: Thu, 23 Oct 2025 11:34:36 +0800 Subject: [PATCH 2/3] chore: typo fixes --- src/ngx_stream_lua_ssl_certby.c | 2 +- src/ngx_stream_lua_ssl_client_helloby.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngx_stream_lua_ssl_certby.c b/src/ngx_stream_lua_ssl_certby.c index c24dd344..bc18e202 100644 --- a/src/ngx_stream_lua_ssl_certby.c +++ b/src/ngx_stream_lua_ssl_certby.c @@ -400,7 +400,7 @@ ngx_stream_lua_ssl_cert_aborted(void *data) { ngx_stream_lua_ssl_ctx_t *cctx = data; - dd("lua ssl cert done"); + dd("lua ssl cert aborted"); if (cctx->done) { /* completed successfully already */ diff --git a/src/ngx_stream_lua_ssl_client_helloby.c b/src/ngx_stream_lua_ssl_client_helloby.c index db478ec0..897ce6e0 100644 --- a/src/ngx_stream_lua_ssl_client_helloby.c +++ b/src/ngx_stream_lua_ssl_client_helloby.c @@ -392,7 +392,7 @@ ngx_stream_lua_ssl_client_hello_aborted(void *data) { ngx_stream_lua_ssl_ctx_t *cctx = data; - dd("lua ssl client hello done"); + dd("lua ssl client hello aborted"); if (cctx->done) { /* completed successfully already */ From c9147a8ac6ebfdb6ad774f7da7153d586aea5e44 Mon Sep 17 00:00:00 2001 From: lijunlong Date: Thu, 23 Oct 2025 13:44:27 +0800 Subject: [PATCH 3/3] fixed tests . --- t/139-ssl-cert-by.t | 1 + 1 file changed, 1 insertion(+) diff --git a/t/139-ssl-cert-by.t b/t/139-ssl-cert-by.t index 7fcadfcc..3ab8eae5 100644 --- a/t/139-ssl-cert-by.t +++ b/t/139-ssl-cert-by.t @@ -96,6 +96,7 @@ reusable connection: 0 ssl cert: connection reusable: 0 reusable connection: 0 ssl_certificate_by_lua:1: ssl cert by lua is running!, +ssl_certificate_by_lua: handler return value: 0, reusable connection: 0 reusable connection: 0 reusable connection: 0