Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/ngx_http_lua_ssl_client_helloby.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ ngx_http_lua_ssl_client_hello_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
}

chunkname = ngx_http_lua_gen_chunk_name(cf, "ssl_client_hello_by_lua",
sizeof("ssl_client_hello_by_lua")- 1,
sizeof("ssl_client_hello_by_lua") - 1,
&chunkname_len);
if (chunkname == NULL) {
return NGX_CONF_ERROR;
Expand Down Expand Up @@ -207,7 +207,7 @@ ngx_http_lua_ssl_client_hello_handler(ngx_ssl_conn_t *ssl_conn,

if (cctx->done) {
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"lua_client_hello_by_lua: "
"ssl_client_hello_by_lua: "
"client hello cb exit code: %d",
cctx->exit_code);

Expand Down Expand Up @@ -310,7 +310,7 @@ ngx_http_lua_ssl_client_hello_handler(ngx_ssl_conn_t *ssl_conn,
}

ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
"lua_client_hello_by_lua: handler return value: %i, "
"ssl_client_hello_by_lua: handler return value: %i, "
"client hello cb exit code: %d", rc, cctx->exit_code);

c->log->action = "SSL handshaking";
Expand Down Expand Up @@ -402,7 +402,7 @@ ngx_http_lua_ssl_client_hello_aborted(void *data)
}

ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cctx->connection->log, 0,
"lua_client_hello_by_lua: client hello cb aborted");
"ssl_client_hello_by_lua: client hello cb aborted");

cctx->aborted = 1;
cctx->request->connection->ssl = NULL;
Expand Down
10 changes: 5 additions & 5 deletions t/166-ssl-client-hello.t
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ failed to do SSL handshake: handshake failed

--- error_log eval
[
'lua_client_hello_by_lua: handler return value: -1, client hello cb exit code: 0',
'ssl_client_hello_by_lua: handler return value: -1, client hello cb exit code: 0',
qr/\[info\] .*? SSL_do_handshake\(\) failed .*?callback failed/,
'lua exit with code -1',
]
Expand Down Expand Up @@ -724,7 +724,7 @@ failed to do SSL handshake: handshake failed

--- error_log eval
[
'lua_client_hello_by_lua: client hello cb exit code: 0',
'ssl_client_hello_by_lua: client hello cb exit code: 0',
qr/\[info\] .*? SSL_do_handshake\(\) failed .*?callback failed/,
'lua exit with code -1',
]
Expand Down Expand Up @@ -795,7 +795,7 @@ failed to do SSL handshake: handshake failed
--- error_log eval
[
'runtime error: ssl_client_hello_by_lua(nginx.conf:28):2: bad bad bad',
'lua_client_hello_by_lua: handler return value: 500, client hello cb exit code: 0',
'ssl_client_hello_by_lua: handler return value: 500, client hello cb exit code: 0',
qr/\[info\] .*? SSL_do_handshake\(\) failed .*?callback failed/,
qr/context: ssl_client_hello_by_lua\*, client: \d+\.\d+\.\d+\.\d+, server: \d+\.\d+\.\d+\.\d+:\d+/,
]
Expand Down Expand Up @@ -867,7 +867,7 @@ failed to do SSL handshake: handshake failed
--- error_log eval
[
'runtime error: ssl_client_hello_by_lua(nginx.conf:28):3: bad bad bad',
'lua_client_hello_by_lua: client hello cb exit code: 0',
'ssl_client_hello_by_lua: client hello cb exit code: 0',
qr/\[info\] .*? SSL_do_handshake\(\) failed .*?callback failed/,
]

Expand Down Expand Up @@ -2631,7 +2631,7 @@ ssl handshake: boolean

--- error_log eval
[
'lua_client_hello_by_lua: handler return value: 0, client hello cb exit code: 1',
'ssl_client_hello_by_lua: handler return value: 0, client hello cb exit code: 1',
qr/\[debug\] .*? SSL_do_handshake: 1/,
'lua exit with code 0',
]
Expand Down
Loading