Mercurial > hg > nginx

comparison src/http/modules/ngx_http_fastcgi_module.c @ 5008:fd84344f1df7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 f3f3083f1253
comparison
equal deleted inserted replaced
5007:13c4c155f26f 5008:fd84344f1df7
2104 conf->upstream.store = NGX_CONF_UNSET; 2104 conf->upstream.store = NGX_CONF_UNSET;
2105 conf->upstream.store_access = NGX_CONF_UNSET_UINT; 2105 conf->upstream.store_access = NGX_CONF_UNSET_UINT;
2106 conf->upstream.buffering = NGX_CONF_UNSET; 2106 conf->upstream.buffering = NGX_CONF_UNSET;
2107 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; 2107 conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
2108 2108
2109 conf->upstream.local = NGX_CONF_UNSET_PTR;
2110
2109 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; 2111 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
2110 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; 2112 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
2111 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; 2113 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
2112 2114
2113 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE; 2115 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE;
2174 ngx_conf_merge_value(conf->upstream.buffering, 2176 ngx_conf_merge_value(conf->upstream.buffering,
2175 prev->upstream.buffering, 1); 2177 prev->upstream.buffering, 1);
2176 2178
2177 ngx_conf_merge_value(conf->upstream.ignore_client_abort, 2179 ngx_conf_merge_value(conf->upstream.ignore_client_abort,
2178 prev->upstream.ignore_client_abort, 0); 2180 prev->upstream.ignore_client_abort, 0);
2181
2182 ngx_conf_merge_ptr_value(conf->upstream.local,
2183 prev->upstream.local, NULL);
2179 2184
2180 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, 2185 ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
2181 prev->upstream.connect_timeout, 60000); 2186 prev->upstream.connect_timeout, 60000);
2182 2187
2183 ngx_conf_merge_msec_value(conf->upstream.send_timeout, 2188 ngx_conf_merge_msec_value(conf->upstream.send_timeout,