mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-27 23:56:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stream: allow servers with no handler.

Browse Source 
Previously handlers were mandatory.  However they are not always needed.
For example, a server configured with ssl_reject_handshake does not need a
handler.  Such servers required a fake handler to pass the check.  Now handler
absence check is moved to runtime.  If handler is missing, the connection is
closed with 500 code.
This commit is contained in:
Roman Arutyunyan 2024-06-27 17:29:56 +04:00
parent e734df6664
commit 788e462c5b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/stream/ngx_stream_core_module.c
View File

@ -458,6 +458,13 @@ ngx_stream_core_content_phase(ngx_stream_session_t *s,
return NGX_OK; return NGX_OK;
} }
if (cscf->handler == NULL) {
ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
"no handler for server");
ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
return NGX_OK;
}
cscf->handler(s); cscf->handler(s);
return NGX_OK; return NGX_OK;
@ -734,13 +741,6 @@ ngx_stream_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
conf->resolver = prev->resolver; conf->resolver = prev->resolver;
} }
if (conf->handler == NULL) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"no handler for server in %s:%ui",
conf->file_name, conf->line);
return NGX_CONF_ERROR;
}
if (conf->error_log == NULL) { if (conf->error_log == NULL) {
if (prev->error_log) { if (prev->error_log) {
conf->error_log = prev->error_log; conf->error_log = prev->error_log;