nginx-0.3.8-RELEASE import
*) Security: nginx now checks URI got from a backend in
"X-Accel-Redirect" header line or in SSI file for the "/../" paths
and zeroes.
*) Change: nginx now does not treat the empty user name in the
"Authorization" header line as valid one.
*) Feature: the "ssl_session_timeout" directives of the
ngx_http_ssl_module and ngx_imap_ssl_module.
*) Feature: the "auth_http_header" directive of the
ngx_imap_auth_http_module.
*) Feature: the "add_header" directive.
*) Feature: the ngx_http_realip_module.
*) Feature: the new variables to use in the "log_format" directive:
$bytes_sent, $apache_bytes_sent, $status, $time_gmt, $uri,
$request_time, $request_length, $upstream_status,
$upstream_response_time, $gzip_ratio, $uid_got, $uid_set,
$connection, $pipe, and $msec. The parameters in the "%name" form
will be canceled soon.
*) Change: now the false variable values in the "if" directive are the
empty string "" and string starting with "0".
*) Bugfix: while using proxied or FastCGI-server nginx may leave
connections and temporary files with client requests in open state.
*) Bugfix: the worker processes did not flush the buffered logs on
graceful exit.
*) Bugfix: if the request URI was changes by the "rewrite" directive
and the request was proxied in location given by regular expression,
then the incorrect request was transferred to backend; the bug had
appeared in 0.2.6.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" header.
*) Bugfix: nginx may stop to accept requests if the "rtsig" method and
several worker processes were used.
*) Bugfix: the "\"" and "\'" escape symbols were incorrectly handled in
SSI commands.
*) Bugfix: if the response was ended just after the SSI command and
gzipping was used, then the response did not transferred complete or
did not transferred at all.
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 867bf31..7e4fab7 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -277,19 +277,31 @@
/* init lists of the handlers */
- if (ngx_array_init(&cmcf->phases[NGX_HTTP_REWRITE_PHASE].handlers,
- cf->pool, 1, sizeof(ngx_http_handler_pt)) != NGX_OK)
+ if (ngx_array_init(&cmcf->phases[NGX_HTTP_POST_READ_PHASE].handlers,
+ cf->pool, 1, sizeof(ngx_http_handler_pt))
+ != NGX_OK)
{
return NGX_CONF_ERROR;
}
- cmcf->phases[NGX_HTTP_REWRITE_PHASE].type = NGX_OK;
+ cmcf->phases[NGX_HTTP_POST_READ_PHASE].type = NGX_OK;
+
+
+ if (ngx_array_init(&cmcf->phases[NGX_HTTP_SERVER_REWRITE_PHASE].handlers,
+ cf->pool, 1, sizeof(ngx_http_handler_pt))
+ != NGX_OK)
+ {
+ return NGX_CONF_ERROR;
+ }
+
+ cmcf->phases[NGX_HTTP_SERVER_REWRITE_PHASE].type = NGX_OK;
/* the special find config phase for a single handler */
if (ngx_array_init(&cmcf->phases[NGX_HTTP_FIND_CONFIG_PHASE].handlers,
- cf->pool, 1, sizeof(ngx_http_handler_pt)) != NGX_OK)
+ cf->pool, 1, sizeof(ngx_http_handler_pt))
+ != NGX_OK)
{
return NGX_CONF_ERROR;
}
@@ -304,8 +316,19 @@
*h = ngx_http_find_location_config;
+ if (ngx_array_init(&cmcf->phases[NGX_HTTP_REWRITE_PHASE].handlers,
+ cf->pool, 1, sizeof(ngx_http_handler_pt))
+ != NGX_OK)
+ {
+ return NGX_CONF_ERROR;
+ }
+
+ cmcf->phases[NGX_HTTP_REWRITE_PHASE].type = NGX_OK;
+
+
if (ngx_array_init(&cmcf->phases[NGX_HTTP_ACCESS_PHASE].handlers,
- cf->pool, 1, sizeof(ngx_http_handler_pt)) != NGX_OK)
+ cf->pool, 4, sizeof(ngx_http_handler_pt))
+ != NGX_OK)
{
return NGX_CONF_ERROR;
}
@@ -314,7 +337,8 @@
if (ngx_array_init(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers,
- cf->pool, 4, sizeof(ngx_http_handler_pt)) != NGX_OK)
+ cf->pool, 4, sizeof(ngx_http_handler_pt))
+ != NGX_OK)
{
return NGX_CONF_ERROR;
}
@@ -353,6 +377,9 @@
}
}
+ if (ngx_http_variables_init_vars(cf) != NGX_OK) {
+ return NGX_CONF_ERROR;
+ }
/*
* http{}'s cf->ctx was needed while the configuration merging
