Mercurial > hg > nginx
comparison src/http/modules/ngx_http_uwsgi_module.c @ 5008:fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
The "proxy_bind", "fastcgi_bind", "uwsgi_bind", "scgi_bind" and
"memcached_bind" directives are now inherited; inherited value
can be reset by the "off" parameter. Duplicate directives are
now detected. Parameter value can now contain variables.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Wed, 16 Jan 2013 09:42:57 +0000 |
parents | 4251e72b8bb4 |
children | 10c74d3b15d1 |
comparison
equal
deleted
inserted
replaced
5007:13c4c155f26f | 5008:fd84344f1df7 |
---|---|
1102 conf->upstream.store = NGX_CONF_UNSET; | 1102 conf->upstream.store = NGX_CONF_UNSET; |
1103 conf->upstream.store_access = NGX_CONF_UNSET_UINT; | 1103 conf->upstream.store_access = NGX_CONF_UNSET_UINT; |
1104 conf->upstream.buffering = NGX_CONF_UNSET; | 1104 conf->upstream.buffering = NGX_CONF_UNSET; |
1105 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; | 1105 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; |
1106 | 1106 |
1107 conf->upstream.local = NGX_CONF_UNSET_PTR; | |
1108 | |
1107 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; | 1109 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; |
1108 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; | 1110 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; |
1109 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; | 1111 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; |
1110 | 1112 |
1111 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE; | 1113 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE; |
1169 ngx_conf_merge_value(conf->upstream.buffering, | 1171 ngx_conf_merge_value(conf->upstream.buffering, |
1170 prev->upstream.buffering, 1); | 1172 prev->upstream.buffering, 1); |
1171 | 1173 |
1172 ngx_conf_merge_value(conf->upstream.ignore_client_abort, | 1174 ngx_conf_merge_value(conf->upstream.ignore_client_abort, |
1173 prev->upstream.ignore_client_abort, 0); | 1175 prev->upstream.ignore_client_abort, 0); |
1176 | |
1177 ngx_conf_merge_ptr_value(conf->upstream.local, | |
1178 prev->upstream.local, NULL); | |
1174 | 1179 |
1175 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, | 1180 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, |
1176 prev->upstream.connect_timeout, 60000); | 1181 prev->upstream.connect_timeout, 60000); |
1177 | 1182 |
1178 ngx_conf_merge_msec_value(conf->upstream.send_timeout, | 1183 ngx_conf_merge_msec_value(conf->upstream.send_timeout, |