Mercurial > hg > nginx
comparison src/http/modules/ngx_http_proxy_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 | 13a5202b6b4b |
children | bbdb172f0927 |
comparison
equal
deleted
inserted
replaced
5007:13c4c155f26f | 5008:fd84344f1df7 |
---|---|
2367 conf->upstream.store = NGX_CONF_UNSET; | 2367 conf->upstream.store = NGX_CONF_UNSET; |
2368 conf->upstream.store_access = NGX_CONF_UNSET_UINT; | 2368 conf->upstream.store_access = NGX_CONF_UNSET_UINT; |
2369 conf->upstream.buffering = NGX_CONF_UNSET; | 2369 conf->upstream.buffering = NGX_CONF_UNSET; |
2370 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; | 2370 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; |
2371 | 2371 |
2372 conf->upstream.local = NGX_CONF_UNSET_PTR; | |
2373 | |
2372 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; | 2374 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; |
2373 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; | 2375 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; |
2374 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; | 2376 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; |
2375 | 2377 |
2376 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE; | 2378 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE; |
2450 ngx_conf_merge_value(conf->upstream.buffering, | 2452 ngx_conf_merge_value(conf->upstream.buffering, |
2451 prev->upstream.buffering, 1); | 2453 prev->upstream.buffering, 1); |
2452 | 2454 |
2453 ngx_conf_merge_value(conf->upstream.ignore_client_abort, | 2455 ngx_conf_merge_value(conf->upstream.ignore_client_abort, |
2454 prev->upstream.ignore_client_abort, 0); | 2456 prev->upstream.ignore_client_abort, 0); |
2457 | |
2458 ngx_conf_merge_ptr_value(conf->upstream.local, | |
2459 prev->upstream.local, NULL); | |
2455 | 2460 |
2456 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, | 2461 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, |
2457 prev->upstream.connect_timeout, 60000); | 2462 prev->upstream.connect_timeout, 60000); |
2458 | 2463 |
2459 ngx_conf_merge_msec_value(conf->upstream.send_timeout, | 2464 ngx_conf_merge_msec_value(conf->upstream.send_timeout, |