Skip to content

Commit 9165021

Browse files
bugfix: typo fixes.
Co-authored-by: lijunlong <[email protected]>
1 parent 05f1cba commit 9165021

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

src/ngx_stream_lua_ssl_certby.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ ngx_stream_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data)
224224

225225
if (cctx->done) {
226226
ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0,
227-
"stream lua_certificate_by_lua:"
227+
"stream ssl_certificate_by_lua:"
228228
" cert cb exit code: %d",
229229
cctx->exit_code);
230230

@@ -319,7 +319,7 @@ ngx_stream_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data)
319319
}
320320

321321
ngx_log_debug2(NGX_LOG_DEBUG_STREAM, c->log, 0,
322-
"stream lua_certificate_by_lua:"
322+
"stream ssl_certificate_by_lua:"
323323
" handler return value: %i, "
324324
"cert cb exit code: %d", rc, cctx->exit_code);
325325

@@ -400,15 +400,15 @@ ngx_stream_lua_ssl_cert_aborted(void *data)
400400
{
401401
ngx_stream_lua_ssl_ctx_t *cctx = data;
402402

403-
dd("lua ssl cert done");
403+
dd("lua ssl cert aborted");
404404

405405
if (cctx->done) {
406406
/* completed successfully already */
407407
return;
408408
}
409409

410410
ngx_log_debug0(NGX_LOG_DEBUG_STREAM, cctx->connection->log, 0,
411-
"stream lua_certificate_by_lua: cert cb aborted");
411+
"stream ssl_certificate_by_lua: cert cb aborted");
412412

413413
cctx->aborted = 1;
414414
cctx->request->connection->ssl = NULL;

src/ngx_stream_lua_ssl_client_helloby.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ ngx_stream_lua_ssl_client_hello_aborted(void *data)
392392
{
393393
ngx_stream_lua_ssl_ctx_t *cctx = data;
394394

395-
dd("lua ssl client hello done");
395+
dd("lua ssl client hello aborted");
396396

397397
if (cctx->done) {
398398
/* completed successfully already */

t/139-ssl-cert-by.t

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ reusable connection: 0
9696
ssl cert: connection reusable: 0
9797
reusable connection: 0
9898
ssl_certificate_by_lua:1: ssl cert by lua is running!,
99+
ssl_certificate_by_lua: handler return value: 0,
99100
reusable connection: 0
100101
reusable connection: 0
101102
reusable connection: 0
@@ -448,7 +449,7 @@ failed to do SSL handshake: handshake failed
448449

449450
--- error_log eval
450451
[
451-
'lua_certificate_by_lua: handler return value: -1, cert cb exit code: 0',
452+
'ssl_certificate_by_lua: handler return value: -1, cert cb exit code: 0',
452453
qr/\[info\] .*? SSL_do_handshake\(\) failed .*?cert cb error/,
453454
'lua exit with code -1',
454455
]
@@ -567,7 +568,7 @@ failed to do SSL handshake: handshake failed
567568

568569
--- error_log eval
569570
[
570-
'lua_certificate_by_lua: cert cb exit code: 0',
571+
'ssl_certificate_by_lua: cert cb exit code: 0',
571572
qr/\[info\] .*? SSL_do_handshake\(\) failed .*?cert cb error/,
572573
'lua exit with code -1',
573574
]
@@ -627,7 +628,7 @@ failed to do SSL handshake: handshake failed
627628
--- error_log eval
628629
[
629630
'runtime error: ssl_certificate_by_lua:2: bad bad bad',
630-
'lua_certificate_by_lua: handler return value: 500, cert cb exit code: 0',
631+
'ssl_certificate_by_lua: handler return value: 500, cert cb exit code: 0',
631632
qr/\[info\] .*? SSL_do_handshake\(\) failed .*?cert cb error/,
632633
qr/context: ssl_certificate_by_lua\*, client: \d+\.\d+\.\d+\.\d+, server: \d+\.\d+\.\d+\.\d+:\d+/,
633634
]
@@ -688,7 +689,7 @@ failed to do SSL handshake: handshake failed
688689
--- error_log eval
689690
[
690691
'runtime error: ssl_certificate_by_lua:3: bad bad bad',
691-
'lua_certificate_by_lua: cert cb exit code: 0',
692+
'ssl_certificate_by_lua: cert cb exit code: 0',
692693
qr/\[info\] .*? SSL_do_handshake\(\) failed .*?cert cb error/,
693694
]
694695

0 commit comments

Comments
 (0)