comparison src/stream/ngx_stream_proxy_module.c @ 6217:b544f8e0d921

Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. The directive proxy_buffer_size should be used instead.
author Roman Arutyunyan <arut@nginx.com>
date Thu, 30 Jul 2015 16:43:48 -0700
parents 543f10fe34d2
children 7565e056fad6
comparison
equal deleted inserted replaced
6216:543f10fe34d2 6217:b544f8e0d921
94 }; 94 };
95 95
96 #endif 96 #endif
97 97
98 98
99 static ngx_conf_deprecated_t ngx_conf_deprecated_proxy_downstream_buffer = {
100 ngx_conf_deprecated, "proxy_downstream_buffer", "proxy_buffer_size"
101 };
102
103 static ngx_conf_deprecated_t ngx_conf_deprecated_proxy_upstream_buffer = {
104 ngx_conf_deprecated, "proxy_upstream_buffer", "proxy_buffer_size"
105 };
106
107
99 static ngx_command_t ngx_stream_proxy_commands[] = { 108 static ngx_command_t ngx_stream_proxy_commands[] = {
100 109
101 { ngx_string("proxy_pass"), 110 { ngx_string("proxy_pass"),
102 NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1, 111 NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
103 ngx_stream_proxy_pass, 112 ngx_stream_proxy_pass,
130 NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1, 139 NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
131 ngx_conf_set_size_slot, 140 ngx_conf_set_size_slot,
132 NGX_STREAM_SRV_CONF_OFFSET, 141 NGX_STREAM_SRV_CONF_OFFSET,
133 offsetof(ngx_stream_proxy_srv_conf_t, buffer_size), 142 offsetof(ngx_stream_proxy_srv_conf_t, buffer_size),
134 NULL }, 143 NULL },
144
145 { ngx_string("proxy_downstream_buffer"),
146 NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
147 ngx_conf_set_size_slot,
148 NGX_STREAM_SRV_CONF_OFFSET,
149 offsetof(ngx_stream_proxy_srv_conf_t, buffer_size),
150 &ngx_conf_deprecated_proxy_downstream_buffer },
151
152 { ngx_string("proxy_upstream_buffer"),
153 NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
154 ngx_conf_set_size_slot,
155 NGX_STREAM_SRV_CONF_OFFSET,
156 offsetof(ngx_stream_proxy_srv_conf_t, buffer_size),
157 &ngx_conf_deprecated_proxy_upstream_buffer },
135 158
136 { ngx_string("proxy_upload_rate"), 159 { ngx_string("proxy_upload_rate"),
137 NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1, 160 NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
138 ngx_conf_set_size_slot, 161 ngx_conf_set_size_slot,
139 NGX_STREAM_SRV_CONF_OFFSET, 162 NGX_STREAM_SRV_CONF_OFFSET,