diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-11-30 13:10:39 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2010-11-30 13:10:39 +0000 |
| commit | 27294215f36bb3c0e2ed2f438f615efc2bc67260 (patch) | |
| tree | a70628ed5eee94942da3d21801aa437cec1f212c | |
| parent | 3f13cc6b2c2c6f71bcaa8b1e3a2e2190db6d852f (diff) | |
| download | nginx-27294215f36bb3c0e2ed2f438f615efc2bc67260.tar.gz | |
Changes with nginx 0.9.1 30 Nov 2010v0.9.1
*) Bugfix: "return CODE message" directives did not work; the bug had
appeared in 0.9.0.
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | CHANGES.ru | 6 | ||||
| -rw-r--r-- | conf/mime.types | 1 | ||||
| -rw-r--r-- | src/core/nginx.h | 4 | ||||
| -rw-r--r-- | src/http/modules/perl/nginx.pm | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.c | 7 |
6 files changed, 17 insertions, 9 deletions
@@ -1,4 +1,10 @@ +Changes with nginx 0.9.1 30 Nov 2010 + + *) Bugfix: "return CODE message" directrives did not work; the bug had + appeared in 0.9.0. + + Changes with nginx 0.9.0 29 Nov 2010 *) Feature: the "keepalive_disable" directive. diff --git a/CHANGES.ru b/CHANGES.ru index 2330fb11b..e7bc52b8c 100644 --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,4 +1,10 @@ +Изменения в nginx 0.9.1 30.11.2010 + + *) Исправление: директивы вида "return CODE message" не работали; + ошибка появилась в 0.9.0. + + Изменения в nginx 0.9.0 29.11.2010 *) Добавление: директива keepalive_disable. diff --git a/conf/mime.types b/conf/mime.types index efcfede76..b64f2277a 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -61,6 +61,7 @@ types { audio/midi mid midi kar; audio/mpeg mp3; + audio/ogg ogg; audio/x-realaudio ra; video/3gpp 3gpp 3gp; diff --git a/src/core/nginx.h b/src/core/nginx.h index 3a67533e2..c5bf5330f 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,8 +8,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 9000 -#define NGINX_VERSION "0.9.0" +#define nginx_version 9001 +#define NGINX_VERSION "0.9.1" #define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VAR "NGINX" diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm index a2a0f7470..b2b72c221 100644 --- a/src/http/modules/perl/nginx.pm +++ b/src/http/modules/perl/nginx.pm @@ -48,7 +48,7 @@ our @EXPORT = qw( HTTP_INSUFFICIENT_STORAGE ); -our $VERSION = '0.9.0'; +our $VERSION = '0.9.1'; require XSLoader; XSLoader::load('nginx', $VERSION); diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 0e8d5a497..f3fa765c1 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -900,11 +900,6 @@ ngx_http_core_rewrite_phase(ngx_http_request_t *r, ngx_http_phase_handler_t *ph) rc = ph->handler(r); - if (rc == NGX_OK) { - r->phase_handler = ph->next; - return NGX_AGAIN; - } - if (rc == NGX_DECLINED) { r->phase_handler++; return NGX_AGAIN; @@ -914,7 +909,7 @@ ngx_http_core_rewrite_phase(ngx_http_request_t *r, ngx_http_phase_handler_t *ph) return NGX_OK; } - /* NGX_AGAIN || rc == NGX_ERROR || rc == NGX_HTTP_... */ + /* NGX_OK, NGX_AGAIN, NGX_ERROR, NGX_HTTP_... */ ngx_http_finalize_request(r, rc); |