Mercurial > hg > nginx
comparison src/stream/ngx_stream_core_module.c @ 6221:7565e056fad6
Stream: the "tcp_nodelay" directive.
author | Vladimir Homutov <vl@nginx.com> |
---|---|
date | Mon, 10 Aug 2015 12:14:41 +0300 |
parents | 68c106e6fa0a |
children | 2a621245f4cf |
comparison
equal
deleted
inserted
replaced
6220:5e6142609e48 | 6221:7565e056fad6 |
---|---|
41 { ngx_string("error_log"), | 41 { ngx_string("error_log"), |
42 NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_1MORE, | 42 NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_1MORE, |
43 ngx_stream_core_error_log, | 43 ngx_stream_core_error_log, |
44 NGX_STREAM_SRV_CONF_OFFSET, | 44 NGX_STREAM_SRV_CONF_OFFSET, |
45 0, | 45 0, |
46 NULL }, | |
47 | |
48 { ngx_string("tcp_nodelay"), | |
49 NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG, | |
50 ngx_conf_set_flag_slot, | |
51 NGX_STREAM_SRV_CONF_OFFSET, | |
52 offsetof(ngx_stream_core_srv_conf_t, tcp_nodelay), | |
46 NULL }, | 53 NULL }, |
47 | 54 |
48 ngx_null_command | 55 ngx_null_command |
49 }; | 56 }; |
50 | 57 |
120 * cscf->error_log = NULL; | 127 * cscf->error_log = NULL; |
121 */ | 128 */ |
122 | 129 |
123 cscf->file_name = cf->conf_file->file.name.data; | 130 cscf->file_name = cf->conf_file->file.name.data; |
124 cscf->line = cf->conf_file->line; | 131 cscf->line = cf->conf_file->line; |
132 cscf->tcp_nodelay = NGX_CONF_UNSET; | |
125 | 133 |
126 return cscf; | 134 return cscf; |
127 } | 135 } |
128 | 136 |
129 | 137 |
145 conf->error_log = prev->error_log; | 153 conf->error_log = prev->error_log; |
146 } else { | 154 } else { |
147 conf->error_log = &cf->cycle->new_log; | 155 conf->error_log = &cf->cycle->new_log; |
148 } | 156 } |
149 } | 157 } |
158 | |
159 ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1); | |
150 | 160 |
151 return NGX_CONF_OK; | 161 return NGX_CONF_OK; |
152 } | 162 } |
153 | 163 |
154 | 164 |