nginx-0.3.12-RELEASE import
*) Security: if nginx was built with the ngx_http_realip_module and the
"satisfy_any on" directive was used, then access and authorization
directives did not work. The ngx_http_realip_module was not built
and is not built by default.
*) Change: the "$time_gmt" variable name was changed to "$time_local".
*) Change: the "proxy_header_buffer_size" and
"fastcgi_header_buffer_size" directives was renamed to the
"proxy_buffer_size" and "fastcgi_buffer_size" directives.
*) Feature: the ngx_http_memcached_module.
*) Feature: the "proxy_buffering" directive.
*) Bugfix: the changes in accept mutex handling when the "rtsig" method
was used; the bug had appeared in 0.3.0.
*) Bugfix: if the client sent the "Transfer-Encoding: chunked" header
line, then nginx returns the 411 error.
*) Bugfix: if the "auth_basic" directive was inherited from the http
level, then the realm in the "WWW-Authenticate" header line was
without the "Basic realm" text.
*) Bugfix: if the "combined" format was explicitly specified in the
"access_log" directive, then the empty lines was written to the log;
the bug had appeared in 0.3.8.
*) Bugfix: nginx did not run on the sparc platform under any OS except
Solaris.
*) Bugfix: now it is not necessary to place space between the quoted
string and closing bracket in the "if" directive.
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index f1581e9..8278d34 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -111,6 +111,10 @@
static ngx_conf_post_t ngx_http_proxy_lowat_post =
{ ngx_http_proxy_lowat_check };
+static ngx_conf_deprecated_t ngx_conf_deprecated_proxy_header_buffer_size = {
+ ngx_conf_deprecated, "proxy_header_buffer_size", "proxy_buffer_size"
+};
+
static ngx_conf_bitmask_t ngx_http_proxy_next_upstream_masks[] = {
{ ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
@@ -138,6 +142,13 @@
0,
NULL },
+ { ngx_string("proxy_buffering"),
+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+ ngx_conf_set_flag_slot,
+ NGX_HTTP_LOC_CONF_OFFSET,
+ offsetof(ngx_http_proxy_loc_conf_t, upstream.buffering),
+ NULL },
+
{ ngx_string("proxy_connect_timeout"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_msec_slot,
@@ -201,12 +212,19 @@
offsetof(ngx_http_proxy_loc_conf_t, upstream.pass_request_body),
NULL },
+ { ngx_string("proxy_buffer_size"),
+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+ ngx_conf_set_size_slot,
+ NGX_HTTP_LOC_CONF_OFFSET,
+ offsetof(ngx_http_proxy_loc_conf_t, upstream.buffer_size),
+ NULL },
+
{ ngx_string("proxy_header_buffer_size"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_size_slot,
NGX_HTTP_LOC_CONF_OFFSET,
- offsetof(ngx_http_proxy_loc_conf_t, upstream.header_buffer_size),
- NULL },
+ offsetof(ngx_http_proxy_loc_conf_t, upstream.buffer_size),
+ &ngx_conf_deprecated_proxy_header_buffer_size },
{ ngx_string("proxy_read_timeout"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -333,6 +351,7 @@
static ngx_table_elt_t ngx_http_proxy_headers[] = {
{ 0, ngx_string("Host"), ngx_string("$proxy_host") },
{ 0, ngx_string("Connection"), ngx_string("close") },
+ { 0, ngx_string("Keep-Alive"), ngx_string("") },
{ 0, ngx_null_string, ngx_null_string }
};
@@ -395,7 +414,15 @@
u->rewrite_redirect = ngx_http_proxy_rewrite_redirect;
}
- u->pipe.input_filter = ngx_event_pipe_copy_input_filter;
+ if (plcf->upstream.buffering) {
+
+ u->pipe = ngx_pcalloc(r->pool, sizeof(ngx_event_pipe_t));
+ if (u->pipe == NULL) {
+ return NGX_HTTP_INTERNAL_SERVER_ERROR;
+ }
+
+ u->pipe->input_filter = ngx_event_pipe_copy_input_filter;
+ }
u->accel = 1;
@@ -828,7 +855,7 @@
state = r->state;
- for (pos = u->header_in.pos; pos < u->header_in.last; pos++) {
+ for (pos = u->buffer.pos; pos < u->buffer.last; pos++) {
ch = *pos;
switch (state) {
@@ -986,14 +1013,14 @@
}
}
- u->header_in.pos = pos;
+ u->buffer.pos = pos;
r->state = state;
return NGX_AGAIN;
done:
- u->header_in.pos = pos + 1;
+ u->buffer.pos = pos + 1;
if (p->status_end == NULL) {
p->status_end = pos;
@@ -1019,7 +1046,7 @@
for ( ;; ) {
- rc = ngx_http_parse_header_line(r, &r->upstream->header_in);
+ rc = ngx_http_parse_header_line(r, &r->upstream->buffer);
if (rc == NGX_OK) {
@@ -1359,7 +1386,6 @@
* set by ngx_pcalloc():
*
* conf->upstream.bufs.num = 0;
- * conf->upstream.path = NULL;
* conf->upstream.next_upstream = 0;
* conf->upstream.temp_path = NULL;
* conf->upstream.schema = { 0, NULL };
@@ -1377,12 +1403,14 @@
* conf->rewrite_locations = NULL;
*/
+ conf->upstream.buffering = NGX_CONF_UNSET;
+
conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE;
- conf->upstream.header_buffer_size = NGX_CONF_UNSET_SIZE;
+ conf->upstream.buffer_size = NGX_CONF_UNSET_SIZE;
conf->upstream.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE;
conf->upstream.max_temp_file_size_conf = NGX_CONF_UNSET_SIZE;
@@ -1426,6 +1454,9 @@
ngx_http_script_compile_t sc;
ngx_http_script_copy_code_t *copy;
+ ngx_conf_merge_value(conf->upstream.buffering,
+ prev->upstream.buffering, 1);
+
ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
prev->upstream.connect_timeout, 60000);
@@ -1438,8 +1469,8 @@
ngx_conf_merge_size_value(conf->upstream.send_lowat,
prev->upstream.send_lowat, 0);
- ngx_conf_merge_size_value(conf->upstream.header_buffer_size,
- prev->upstream.header_buffer_size,
+ ngx_conf_merge_size_value(conf->upstream.buffer_size,
+ prev->upstream.buffer_size,
(size_t) ngx_pagesize);
ngx_conf_merge_bufs_value(conf->upstream.bufs, prev->upstream.bufs,
@@ -1452,7 +1483,7 @@
}
- size = conf->upstream.header_buffer_size;
+ size = conf->upstream.buffer_size;
if (size < conf->upstream.bufs.size) {
size = conf->upstream.bufs.size;
}
