Mercurial > hg > nginx

comparison src/http/modules/ngx_http_scgi_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 10c74d3b15d1
comparison
equal deleted inserted replaced
5007:13c4c155f26f 5008:fd84344f1df7
1065 conf->upstream.store = NGX_CONF_UNSET; 1065 conf->upstream.store = NGX_CONF_UNSET;
1066 conf->upstream.store_access = NGX_CONF_UNSET_UINT; 1066 conf->upstream.store_access = NGX_CONF_UNSET_UINT;
1067 conf->upstream.buffering = NGX_CONF_UNSET; 1067 conf->upstream.buffering = NGX_CONF_UNSET;
1068 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; 1068 conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
1069 1069
1070 conf->upstream.local = NGX_CONF_UNSET_PTR;
1071
1070 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; 1072 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
1071 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; 1073 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
1072 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; 1074 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
1073 1075
1074 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE; 1076 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE;
1132 ngx_conf_merge_value(conf->upstream.buffering, 1134 ngx_conf_merge_value(conf->upstream.buffering,
1133 prev->upstream.buffering, 1); 1135 prev->upstream.buffering, 1);
1134 1136
1135 ngx_conf_merge_value(conf->upstream.ignore_client_abort, 1137 ngx_conf_merge_value(conf->upstream.ignore_client_abort,
1136 prev->upstream.ignore_client_abort, 0); 1138 prev->upstream.ignore_client_abort, 0);
1139
1140 ngx_conf_merge_ptr_value(conf->upstream.local,
1141 prev->upstream.local, NULL);
1137 1142
1138 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, 1143 ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
1139 prev->upstream.connect_timeout, 60000); 1144 prev->upstream.connect_timeout, 60000);
1140 1145
1141 ngx_conf_merge_msec_value(conf->upstream.send_timeout, 1146 ngx_conf_merge_msec_value(conf->upstream.send_timeout,