Mercurial > hg > nginx

comparison src/http/modules/ngx_http_scgi_module.c @ 3731:72cc5b789021

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside a limit_except block if no handler was defined for the block
author Igor Sysoev <igor@sysoev.ru>
date Tue, 03 Aug 2010 09:24:25 +0000
parents 4b773fc06336
children 502a6b0acf3f
comparison
equal deleted inserted replaced
3730:d094e237abf4 3731:72cc5b789021
1051 ngx_uint_t i; 1051 ngx_uint_t i;
1052 ngx_array_t headers_names; 1052 ngx_array_t headers_names;
1053 ngx_keyval_t *src; 1053 ngx_keyval_t *src;
1054 ngx_hash_key_t *hk; 1054 ngx_hash_key_t *hk;
1055 ngx_hash_init_t hash; 1055 ngx_hash_init_t hash;
1056 ngx_http_core_loc_conf_t *clcf;
1056 ngx_http_script_compile_t sc; 1057 ngx_http_script_compile_t sc;
1057 ngx_http_script_copy_code_t *copy; 1058 ngx_http_script_copy_code_t *copy;
1058 1059
1059 if (conf->upstream.store != 0) { 1060 if (conf->upstream.store != 0) {
1060 ngx_conf_merge_value(conf->upstream.store, prev->upstream.store, 0); 1061 ngx_conf_merge_value(conf->upstream.store, prev->upstream.store, 0);
1283 if (conf->scgi_lengths == NULL) { 1284 if (conf->scgi_lengths == NULL) {
1284 conf->scgi_lengths = prev->scgi_lengths; 1285 conf->scgi_lengths = prev->scgi_lengths;
1285 conf->scgi_values = prev->scgi_values; 1286 conf->scgi_values = prev->scgi_values;
1286 } 1287 }
1287 1288
1289 if (conf->upstream.upstream || conf->scgi_lengths) {
1290 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
1291 if (clcf->handler == NULL && clcf->lmt_excpt) {
1292 clcf->handler = ngx_http_scgi_handler;
1293 }
1294 }
1295
1288 if (conf->params_source == NULL) { 1296 if (conf->params_source == NULL) {
1289 conf->flushes = prev->flushes; 1297 conf->flushes = prev->flushes;
1290 conf->params_len = prev->params_len; 1298 conf->params_len = prev->params_len;
1291 conf->params = prev->params; 1299 conf->params = prev->params;
1292 conf->params_source = prev->params_source; 1300 conf->params_source = prev->params_source;