Mercurial > hg > nginx

comparison src/http/modules/ngx_http_fastcgi_module.c @ 5883:973ee2276300

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: proxy_limit_rate and friends. The directives limit the upstream read rate. For example, "proxy_limit_rate 42" limits proxy upstream read rate to 42 bytes per second.
author Roman Arutyunyan <arut@nginx.com>
date Tue, 28 Oct 2014 12:29:59 +0300
parents 2aff40b3dea2
children 2f7e557eab5b
comparison
equal deleted inserted replaced
5882:ec81934727a1 5883:973ee2276300
331 ngx_conf_set_flag_slot, 331 ngx_conf_set_flag_slot,
332 NGX_HTTP_LOC_CONF_OFFSET, 332 NGX_HTTP_LOC_CONF_OFFSET,
333 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.force_ranges), 333 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.force_ranges),
334 NULL }, 334 NULL },
335 335
336 { ngx_string("fastcgi_limit_rate"),
337 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
338 ngx_conf_set_size_slot,
339 NGX_HTTP_LOC_CONF_OFFSET,
340 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.limit_rate),
341 NULL },
342
336 #if (NGX_HTTP_CACHE) 343 #if (NGX_HTTP_CACHE)
337 344
338 { ngx_string("fastcgi_cache"), 345 { ngx_string("fastcgi_cache"),
339 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 346 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
340 ngx_http_fastcgi_cache, 347 ngx_http_fastcgi_cache,
2348 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; 2355 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
2349 conf->upstream.next_upstream_timeout = NGX_CONF_UNSET_MSEC; 2356 conf->upstream.next_upstream_timeout = NGX_CONF_UNSET_MSEC;
2350 2357
2351 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE; 2358 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE;
2352 conf->upstream.buffer_size = NGX_CONF_UNSET_SIZE; 2359 conf->upstream.buffer_size = NGX_CONF_UNSET_SIZE;
2360 conf->upstream.limit_rate = NGX_CONF_UNSET_SIZE;
2353 2361
2354 conf->upstream.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE; 2362 conf->upstream.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE;
2355 conf->upstream.max_temp_file_size_conf = NGX_CONF_UNSET_SIZE; 2363 conf->upstream.max_temp_file_size_conf = NGX_CONF_UNSET_SIZE;
2356 conf->upstream.temp_file_write_size_conf = NGX_CONF_UNSET_SIZE; 2364 conf->upstream.temp_file_write_size_conf = NGX_CONF_UNSET_SIZE;
2357 2365
2443 prev->upstream.send_lowat, 0); 2451 prev->upstream.send_lowat, 0);
2444 2452
2445 ngx_conf_merge_size_value(conf->upstream.buffer_size, 2453 ngx_conf_merge_size_value(conf->upstream.buffer_size,
2446 prev->upstream.buffer_size, 2454 prev->upstream.buffer_size,
2447 (size_t) ngx_pagesize); 2455 (size_t) ngx_pagesize);
2456
2457 ngx_conf_merge_size_value(conf->upstream.limit_rate,
2458 prev->upstream.limit_rate, 0);
2448 2459
2449 2460
2450 ngx_conf_merge_bufs_value(conf->upstream.bufs, prev->upstream.bufs, 2461 ngx_conf_merge_bufs_value(conf->upstream.bufs, prev->upstream.bufs,
2451 8, ngx_pagesize); 2462 8, ngx_pagesize);
2452 2463