Mercurial > hg > nginx
diff src/http/modules/ngx_http_scgi_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 |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_scgi_module.c Thu Jan 10 13:17:29 2013 +0000 +++ b/src/http/modules/ngx_http_scgi_module.c Wed Jan 16 09:42:57 2013 +0000 @@ -1067,6 +1067,8 @@ conf->upstream.buffering = NGX_CONF_UNSET; conf->upstream.ignore_client_abort = NGX_CONF_UNSET; + conf->upstream.local = NGX_CONF_UNSET_PTR; + conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; @@ -1135,6 +1137,9 @@ ngx_conf_merge_value(conf->upstream.ignore_client_abort, prev->upstream.ignore_client_abort, 0); + ngx_conf_merge_ptr_value(conf->upstream.local, + prev->upstream.local, NULL); + ngx_conf_merge_msec_value(conf->upstream.connect_timeout, prev->upstream.connect_timeout, 60000);