diff --git a/src/ngx_http_lua_ssl_certby.c b/src/ngx_http_lua_ssl_certby.c index 0667ec4293..5d16834212 100644 --- a/src/ngx_http_lua_ssl_certby.c +++ b/src/ngx_http_lua_ssl_certby.c @@ -217,7 +217,7 @@ ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data) if (cctx->done) { ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, - "lua_certificate_by_lua: cert cb exit code: %d", + "ssl_certificate_by_lua: cert cb exit code: %d", cctx->exit_code); dd("lua ssl cert done, finally"); @@ -319,7 +319,7 @@ ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data) } ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, - "lua_certificate_by_lua: handler return value: %i, " + "ssl_certificate_by_lua: handler return value: %i, " "cert cb exit code: %d", rc, cctx->exit_code); c->log->action = "SSL handshaking"; @@ -405,7 +405,7 @@ ngx_http_lua_ssl_cert_aborted(void *data) { ngx_http_lua_ssl_ctx_t *cctx = data; - dd("lua ssl cert done"); + dd("lua ssl cert aborted"); if (cctx->done) { /* completed successfully already */ @@ -413,7 +413,7 @@ ngx_http_lua_ssl_cert_aborted(void *data) } ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cctx->connection->log, 0, - "lua_certificate_by_lua: cert cb aborted"); + "ssl_certificate_by_lua: cert cb aborted"); cctx->aborted = 1; cctx->request->connection->ssl = NULL; diff --git a/src/ngx_http_lua_ssl_session_fetchby.c b/src/ngx_http_lua_ssl_session_fetchby.c index ebce63ce28..fee039fca8 100644 --- a/src/ngx_http_lua_ssl_session_fetchby.c +++ b/src/ngx_http_lua_ssl_session_fetchby.c @@ -416,7 +416,7 @@ ngx_http_lua_ssl_sess_fetch_aborted(void *data) { ngx_http_lua_ssl_ctx_t *cctx = data; - dd("lua ssl sess_fetch done"); + dd("lua ssl sess_fetch aborted"); if (cctx->done) { /* completed successfully already */ diff --git a/t/139-ssl-cert-by.t b/t/139-ssl-cert-by.t index c5b1665046..82ae791787 100644 --- a/t/139-ssl-cert-by.t +++ b/t/139-ssl-cert-by.t @@ -582,7 +582,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|routines:OPENSSL_internal:CERT_CB_ERROR)/, 'lua exit with code -1', ] @@ -723,7 +723,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|routines:OPENSSL_internal:CERT_CB_ERROR)/, 'lua exit with code -1', ] @@ -794,7 +794,7 @@ failed to do SSL handshake: handshake failed --- error_log eval [ 'runtime error: ssl_certificate_by_lua(nginx.conf:28):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|routines:OPENSSL_internal:CERT_CB_ERROR)/, qr/context: ssl_certificate_by_lua\*, client: \d+\.\d+\.\d+\.\d+, server: \d+\.\d+\.\d+\.\d+:\d+/, ] @@ -866,7 +866,7 @@ failed to do SSL handshake: handshake failed --- error_log eval [ 'runtime error: ssl_certificate_by_lua(nginx.conf:28):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|routines:OPENSSL_internal:CERT_CB_ERROR)/, ]