Mercurial > hg > nginx

comparison src/http/modules/ngx_http_proxy_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 20d966ad5e89
comparison
equal deleted inserted replaced
5882:ec81934727a1 5883:973ee2276300
392 { ngx_string("proxy_force_ranges"), 392 { ngx_string("proxy_force_ranges"),
393 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 393 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
394 ngx_conf_set_flag_slot, 394 ngx_conf_set_flag_slot,
395 NGX_HTTP_LOC_CONF_OFFSET, 395 NGX_HTTP_LOC_CONF_OFFSET,
396 offsetof(ngx_http_proxy_loc_conf_t, upstream.force_ranges), 396 offsetof(ngx_http_proxy_loc_conf_t, upstream.force_ranges),
397 NULL },
398
399 { ngx_string("proxy_limit_rate"),
400 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
401 ngx_conf_set_size_slot,
402 NGX_HTTP_LOC_CONF_OFFSET,
403 offsetof(ngx_http_proxy_loc_conf_t, upstream.limit_rate),
397 NULL }, 404 NULL },
398 405
399 #if (NGX_HTTP_CACHE) 406 #if (NGX_HTTP_CACHE)
400 407
401 { ngx_string("proxy_cache"), 408 { ngx_string("proxy_cache"),
2488 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; 2495 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
2489 conf->upstream.next_upstream_timeout = NGX_CONF_UNSET_MSEC; 2496 conf->upstream.next_upstream_timeout = NGX_CONF_UNSET_MSEC;
2490 2497
2491 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE; 2498 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE;
2492 conf->upstream.buffer_size = NGX_CONF_UNSET_SIZE; 2499 conf->upstream.buffer_size = NGX_CONF_UNSET_SIZE;
2500 conf->upstream.limit_rate = NGX_CONF_UNSET_SIZE;
2493 2501
2494 conf->upstream.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE; 2502 conf->upstream.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE;
2495 conf->upstream.max_temp_file_size_conf = NGX_CONF_UNSET_SIZE; 2503 conf->upstream.max_temp_file_size_conf = NGX_CONF_UNSET_SIZE;
2496 conf->upstream.temp_file_write_size_conf = NGX_CONF_UNSET_SIZE; 2504 conf->upstream.temp_file_write_size_conf = NGX_CONF_UNSET_SIZE;
2497 2505
2598 prev->upstream.send_lowat, 0); 2606 prev->upstream.send_lowat, 0);
2599 2607
2600 ngx_conf_merge_size_value(conf->upstream.buffer_size, 2608 ngx_conf_merge_size_value(conf->upstream.buffer_size,
2601 prev->upstream.buffer_size, 2609 prev->upstream.buffer_size,
2602 (size_t) ngx_pagesize); 2610 (size_t) ngx_pagesize);
2611
2612 ngx_conf_merge_size_value(conf->upstream.limit_rate,
2613 prev->upstream.limit_rate, 0);
2603 2614
2604 ngx_conf_merge_bufs_value(conf->upstream.bufs, prev->upstream.bufs, 2615 ngx_conf_merge_bufs_value(conf->upstream.bufs, prev->upstream.bufs,
2605 8, ngx_pagesize); 2616 8, ngx_pagesize);
2606 2617
2607 if (conf->upstream.bufs.num < 2) { 2618 if (conf->upstream.bufs.num < 2) {