Mercurial > hg > nginx-vendor-0-8

comparison src/http/modules/ngx_http_uwsgi_module.c @ 592:09d5f308901f NGINX_0_8_48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.48 *) Change: now the "server_name" directive default value is an empty name "". Thanks to Gena Makhomed. *) Change: now the "server_name_in_redirect" directive default value is "off". *) Feature: the $geoip_dma_code, $geoip_area_code, and $geoip_region_name variables. Thanks to Christine McGonagle. *) Bugfix: the "proxy_pass", "fastcgi_pass", "uwsgi_pass", and "scgi_pass" directives were not inherited inside "limit_except" blocks. *) Bugfix: the "proxy_cache_min_uses", "fastcgi_cache_min_uses" "uwsgi_cache_min_uses", and "scgi_cache_min_uses" directives did not work; the bug had appeared in 0.8.46. *) Bugfix: the "fastcgi_split_path_info" directive used incorrectly captures, if only parts of an URI were captured. Thanks to Yuriy Taraday and Frank Enderle. *) Bugfix: the "rewrite" directive did not escape a ";" character during copying from URI to query string. Thanks to Daisuke Murase. *) Bugfix: the ngx_http_image_filter_module closed a connection, if an image was larger than "image_filter_buffer" size.
author Igor Sysoev <http://sysoev.ru>
date Tue, 03 Aug 2010 00:00:00 +0400
parents b6a5942a4e6a
children
comparison
equal deleted inserted replaced
591:8b891ad58d6a 592:09d5f308901f
201 NULL }, 201 NULL },
202 202
203 #if (NGX_HTTP_CACHE) 203 #if (NGX_HTTP_CACHE)
204 204
205 { ngx_string("uwsgi_cache"), 205 { ngx_string("uwsgi_cache"),
206 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 206 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
207 ngx_http_uwsgi_cache, 207 ngx_http_uwsgi_cache,
208 NGX_HTTP_LOC_CONF_OFFSET, 208 NGX_HTTP_LOC_CONF_OFFSET,
209 0, 209 0,
210 NULL }, 210 NULL },
211 211
212 { ngx_string("uwsgi_cache_key"), 212 { ngx_string("uwsgi_cache_key"),
213 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 213 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
214 ngx_http_uwsgi_cache_key, 214 ngx_http_uwsgi_cache_key,
215 NGX_HTTP_LOC_CONF_OFFSET, 215 NGX_HTTP_LOC_CONF_OFFSET,
216 0, 216 0,
217 NULL }, 217 NULL },
218 218
308 NGX_HTTP_LOC_CONF_OFFSET, 308 NGX_HTTP_LOC_CONF_OFFSET,
309 offsetof(ngx_http_uwsgi_loc_conf_t, uwsgi_string), 309 offsetof(ngx_http_uwsgi_loc_conf_t, uwsgi_string),
310 NULL }, 310 NULL },
311 311
312 { ngx_string("uwsgi_pass_header"), 312 { ngx_string("uwsgi_pass_header"),
313 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 313 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
314 ngx_conf_set_str_array_slot, 314 ngx_conf_set_str_array_slot,
315 NGX_HTTP_LOC_CONF_OFFSET, 315 NGX_HTTP_LOC_CONF_OFFSET,
316 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.pass_headers), 316 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.pass_headers),
317 NULL }, 317 NULL },
318 318
319 { ngx_string("uwsgi_hide_header"), 319 { ngx_string("uwsgi_hide_header"),
320 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 320 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
321 ngx_conf_set_str_array_slot, 321 ngx_conf_set_str_array_slot,
322 NGX_HTTP_LOC_CONF_OFFSET, 322 NGX_HTTP_LOC_CONF_OFFSET,
323 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.hide_headers), 323 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.hide_headers),
324 NULL }, 324 NULL },
325 325
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;