Mercurial > hg > nginx

comparison src/http/modules/ngx_http_uwsgi_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
1104 ngx_uint_t i; 1104 ngx_uint_t i;
1105 ngx_array_t headers_names; 1105 ngx_array_t headers_names;
1106 ngx_keyval_t *src; 1106 ngx_keyval_t *src;
1107 ngx_hash_key_t *hk; 1107 ngx_hash_key_t *hk;
1108 ngx_hash_init_t hash; 1108 ngx_hash_init_t hash;
1109 ngx_http_core_loc_conf_t *clcf;
1109 ngx_http_script_compile_t sc; 1110 ngx_http_script_compile_t sc;
1110 ngx_http_script_copy_code_t *copy; 1111 ngx_http_script_copy_code_t *copy;
1111 1112
1112 if (conf->upstream.store != 0) { 1113 if (conf->upstream.store != 0) {
1113 ngx_conf_merge_value(conf->upstream.store, prev->upstream.store, 0); 1114 ngx_conf_merge_value(conf->upstream.store, prev->upstream.store, 0);
1338 if (conf->uwsgi_lengths == NULL) { 1339 if (conf->uwsgi_lengths == NULL) {
1339 conf->uwsgi_lengths = prev->uwsgi_lengths; 1340 conf->uwsgi_lengths = prev->uwsgi_lengths;
1340 conf->uwsgi_values = prev->uwsgi_values; 1341 conf->uwsgi_values = prev->uwsgi_values;
1341 } 1342 }
1342 1343
1344 if (conf->upstream.upstream || conf->uwsgi_lengths) {
1345 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
1346 if (clcf->handler == NULL && clcf->lmt_excpt) {
1347 clcf->handler = ngx_http_uwsgi_handler;
1348 }
1349 }
1350
1343 ngx_conf_merge_uint_value(conf->modifier1, prev->modifier1, 0); 1351 ngx_conf_merge_uint_value(conf->modifier1, prev->modifier1, 0);
1344 ngx_conf_merge_uint_value(conf->modifier2, prev->modifier2, 0); 1352 ngx_conf_merge_uint_value(conf->modifier2, prev->modifier2, 0);
1345 1353
1346 if (conf->params_source == NULL) { 1354 if (conf->params_source == NULL) {
1347 conf->flushes = prev->flushes; 1355 conf->flushes = prev->flushes;