mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stream: renamed rate limiting directives.

Browse Source 
The directive proxy_downstream_limit_rate is now called proxy_upload_rate.
The directive proxy_upstream_limit_rate is now called proxy_download_rate.
This commit is contained in:
Roman Arutyunyan 2015-07-14 09:38:13 -07:00
parent 47b6817411
commit f1dbcf61a2
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/stream/ngx_stream_proxy_module.c
View File

@ -18,9 +18,9 @@ typedef struct {
ngx_msec_t timeout; ngx_msec_t timeout;
ngx_msec_t next_upstream_timeout; ngx_msec_t next_upstream_timeout;
size_t downstream_buf_size; size_t downstream_buf_size;
size_t downstream_limit_rate; size_t upload_rate;
size_t upstream_buf_size; size_t upstream_buf_size;
size_t upstream_limit_rate; size_t download_rate;
ngx_uint_t next_upstream_tries; ngx_uint_t next_upstream_tries;
ngx_flag_t next_upstream; ngx_flag_t next_upstream;
ngx_flag_t proxy_protocol; ngx_flag_t proxy_protocol;
@ -134,11 +134,11 @@ static ngx_command_t ngx_stream_proxy_commands[] = {
offsetof(ngx_stream_proxy_srv_conf_t, downstream_buf_size), offsetof(ngx_stream_proxy_srv_conf_t, downstream_buf_size),
NULL }, NULL },
{ ngx_string("proxy_downstream_limit_rate"), { ngx_string("proxy_upload_rate"),
NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1, NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
ngx_conf_set_size_slot, ngx_conf_set_size_slot,
NGX_STREAM_SRV_CONF_OFFSET, NGX_STREAM_SRV_CONF_OFFSET,
offsetof(ngx_stream_proxy_srv_conf_t, downstream_limit_rate), offsetof(ngx_stream_proxy_srv_conf_t, upload_rate),
NULL }, NULL },
{ ngx_string("proxy_upstream_buffer"), { ngx_string("proxy_upstream_buffer"),
@ -148,11 +148,11 @@ static ngx_command_t ngx_stream_proxy_commands[] = {
offsetof(ngx_stream_proxy_srv_conf_t, upstream_buf_size), offsetof(ngx_stream_proxy_srv_conf_t, upstream_buf_size),
NULL }, NULL },
{ ngx_string("proxy_upstream_limit_rate"), { ngx_string("proxy_download_rate"),
NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1, NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
ngx_conf_set_size_slot, ngx_conf_set_size_slot,
NGX_STREAM_SRV_CONF_OFFSET, NGX_STREAM_SRV_CONF_OFFSET,
offsetof(ngx_stream_proxy_srv_conf_t, upstream_limit_rate), offsetof(ngx_stream_proxy_srv_conf_t, download_rate),
NULL }, NULL },
{ ngx_string("proxy_next_upstream"), { ngx_string("proxy_next_upstream"),
@ -1010,14 +1010,14 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
src = pc; src = pc;
dst = c; dst = c;
b = &u->upstream_buf; b = &u->upstream_buf;
limit_rate = pscf->upstream_limit_rate; limit_rate = pscf->download_rate;
received = &u->received; received = &u->received;
} else { } else {
src = c; src = c;
dst = pc; dst = pc;
b = &u->downstream_buf; b = &u->downstream_buf;
limit_rate = pscf->downstream_limit_rate; limit_rate = pscf->upload_rate;
received = &s->received; received = &s->received;
} }
@ -1296,9 +1296,9 @@ ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf)
conf->timeout = NGX_CONF_UNSET_MSEC; conf->timeout = NGX_CONF_UNSET_MSEC;
conf->next_upstream_timeout = NGX_CONF_UNSET_MSEC; conf->next_upstream_timeout = NGX_CONF_UNSET_MSEC;
conf->downstream_buf_size = NGX_CONF_UNSET_SIZE; conf->downstream_buf_size = NGX_CONF_UNSET_SIZE;
conf->downstream_limit_rate = NGX_CONF_UNSET_SIZE; conf->upload_rate = NGX_CONF_UNSET_SIZE;
conf->upstream_buf_size = NGX_CONF_UNSET_SIZE; conf->upstream_buf_size = NGX_CONF_UNSET_SIZE;
conf->upstream_limit_rate = NGX_CONF_UNSET_SIZE; conf->download_rate = NGX_CONF_UNSET_SIZE;
conf->next_upstream_tries = NGX_CONF_UNSET_UINT; conf->next_upstream_tries = NGX_CONF_UNSET_UINT;
conf->next_upstream = NGX_CONF_UNSET; conf->next_upstream = NGX_CONF_UNSET;
conf->proxy_protocol = NGX_CONF_UNSET; conf->proxy_protocol = NGX_CONF_UNSET;
@ -1335,14 +1335,14 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_size_value(conf->downstream_buf_size, ngx_conf_merge_size_value(conf->downstream_buf_size,
prev->downstream_buf_size, 16384); prev->downstream_buf_size, 16384);
ngx_conf_merge_size_value(conf->downstream_limit_rate, ngx_conf_merge_size_value(conf->upload_rate,
prev->downstream_limit_rate, 0); prev->upload_rate, 0);
ngx_conf_merge_size_value(conf->upstream_buf_size, ngx_conf_merge_size_value(conf->upstream_buf_size,
prev->upstream_buf_size, 16384); prev->upstream_buf_size, 16384);
ngx_conf_merge_size_value(conf->upstream_limit_rate, ngx_conf_merge_size_value(conf->download_rate,
prev->upstream_limit_rate, 0); prev->download_rate, 0);
ngx_conf_merge_uint_value(conf->next_upstream_tries, ngx_conf_merge_uint_value(conf->next_upstream_tries,
prev->next_upstream_tries, 0); prev->next_upstream_tries, 0);