IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Stream: the "tcp_nodelay" directive.

Browse Source
This commit is contained in:
Vladimir Homutov 2015-08-10 12:14:41 +03:00
parent 50ff8b3c3a
commit b537def75e
4 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/stream/ngx_stream.h
View File

@ -132,6 +132,7 @@ typedef struct {
u_char *file_name; u_char *file_name;
ngx_int_t line; ngx_int_t line;
ngx_log_t *error_log; ngx_log_t *error_log;
ngx_flag_t tcp_nodelay;
} ngx_stream_core_srv_conf_t; } ngx_stream_core_srv_conf_t;

10
src/stream/ngx_stream_core_module.c
View File

@ -45,6 +45,13 @@ static ngx_command_t ngx_stream_core_commands[] = {
0, 0,
NULL }, NULL },
{ ngx_string("tcp_nodelay"),
NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
NGX_STREAM_SRV_CONF_OFFSET,
offsetof(ngx_stream_core_srv_conf_t, tcp_nodelay),
NULL },
ngx_null_command ngx_null_command
}; };
@ -122,6 +129,7 @@ ngx_stream_core_create_srv_conf(ngx_conf_t *cf)
cscf->file_name = cf->conf_file->file.name.data; cscf->file_name = cf->conf_file->file.name.data;
cscf->line = cf->conf_file->line; cscf->line = cf->conf_file->line;
cscf->tcp_nodelay = NGX_CONF_UNSET;
return cscf; return cscf;
} }
@ -148,6 +156,8 @@ ngx_stream_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
} }
} }
ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1);
return NGX_CONF_OK; return NGX_CONF_OK;
} }

19
src/stream/ngx_stream_handler.c
View File

@ -23,6 +23,7 @@ static void ngx_stream_ssl_handshake_handler(ngx_connection_t *c);
void void
ngx_stream_init_connection(ngx_connection_t *c) ngx_stream_init_connection(ngx_connection_t *c)
{ {
int tcp_nodelay;
u_char text[NGX_SOCKADDR_STRLEN]; u_char text[NGX_SOCKADDR_STRLEN];
size_t len; size_t len;
ngx_int_t rc; ngx_int_t rc;
@ -165,6 +166,24 @@ ngx_stream_init_connection(ngx_connection_t *c)
} }
} }
if (cscf->tcp_nodelay && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0, "tcp_nodelay");
tcp_nodelay = 1;
if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
(const void *) &tcp_nodelay, sizeof(int)) == -1)
{
ngx_connection_error(c, ngx_socket_errno,
"setsockopt(TCP_NODELAY) failed");
ngx_stream_close_connection(c);
return;
}
c->tcp_nodelay = NGX_TCP_NODELAY_SET;
}
#if (NGX_STREAM_SSL) #if (NGX_STREAM_SSL)
{ {
ngx_stream_ssl_conf_t *sslcf; ngx_stream_ssl_conf_t *sslcf;

24
src/stream/ngx_stream_proxy_module.c
View File

@ -478,13 +478,35 @@ ngx_stream_proxy_connect(ngx_stream_session_t *s)
static void static void
ngx_stream_proxy_init_upstream(ngx_stream_session_t *s) ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
{ {
int tcp_nodelay;
u_char *p; u_char *p;
ngx_connection_t *c, *pc; ngx_connection_t *c, *pc;
ngx_log_handler_pt handler; ngx_log_handler_pt handler;
ngx_stream_upstream_t *u; ngx_stream_upstream_t *u;
ngx_stream_core_srv_conf_t *cscf;
ngx_stream_proxy_srv_conf_t *pscf; ngx_stream_proxy_srv_conf_t *pscf;
u = s->upstream; u = s->upstream;
pc = u->peer.connection;
cscf = ngx_stream_get_module_srv_conf(s, ngx_stream_core_module);
if (cscf->tcp_nodelay && pc->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
ngx_log_debug0(NGX_LOG_DEBUG_STREAM, pc->log, 0, "tcp_nodelay");
tcp_nodelay = 1;
if (setsockopt(pc->fd, IPPROTO_TCP, TCP_NODELAY,
(const void *) &tcp_nodelay, sizeof(int)) == -1)
{
ngx_connection_error(pc, ngx_socket_errno,
"setsockopt(TCP_NODELAY) failed");
ngx_stream_proxy_next_upstream(s);
return;
}
pc->tcp_nodelay = NGX_TCP_NODELAY_SET;
}
if (u->proxy_protocol) { if (u->proxy_protocol) {
if (ngx_stream_proxy_send_proxy_protocol(s) != NGX_OK) { if (ngx_stream_proxy_send_proxy_protocol(s) != NGX_OK) {
@ -496,8 +518,6 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module); pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
pc = u->peer.connection;
#if (NGX_STREAM_SSL) #if (NGX_STREAM_SSL)
if (pscf->ssl && pc->ssl == NULL) { if (pscf->ssl && pc->ssl == NULL) {
ngx_stream_proxy_ssl_init_connection(s); ngx_stream_proxy_ssl_init_connection(s);