changeset 606:9ad199846233 NGINX_0_9_1

nginx 0.9.1 *) Bugfix: "return CODE message" directrives did not work; the bug had appeared in 0.9.0.
author Igor Sysoev <http://sysoev.ru>
date Tue, 30 Nov 2010 00:00:00 +0300
parents 7830c2b8fedb
children a87726a9033b
files CHANGES CHANGES.ru conf/mime.types src/core/nginx.h src/http/modules/perl/nginx.pm src/http/ngx_http_core_module.c
diffstat 6 files changed, 17 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES	Mon Nov 29 00:00:00 2010 +0300
+++ b/CHANGES	Tue Nov 30 00:00:00 2010 +0300
@@ -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.
--- a/CHANGES.ru	Mon Nov 29 00:00:00 2010 +0300
+++ b/CHANGES.ru	Tue Nov 30 00:00:00 2010 +0300
@@ -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.
--- a/conf/mime.types	Mon Nov 29 00:00:00 2010 +0300
+++ b/conf/mime.types	Tue Nov 30 00:00:00 2010 +0300
@@ -61,6 +61,7 @@
 
     audio/midi                            mid midi kar;
     audio/mpeg                            mp3;
+    audio/ogg                             ogg;
     audio/x-realaudio                     ra;
 
     video/3gpp                            3gpp 3gp;
--- a/src/core/nginx.h	Mon Nov 29 00:00:00 2010 +0300
+++ b/src/core/nginx.h	Tue Nov 30 00:00:00 2010 +0300
@@ -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"
--- a/src/http/modules/perl/nginx.pm	Mon Nov 29 00:00:00 2010 +0300
+++ b/src/http/modules/perl/nginx.pm	Tue Nov 30 00:00:00 2010 +0300
@@ -48,7 +48,7 @@
     HTTP_INSUFFICIENT_STORAGE
 );
 
-our $VERSION = '0.9.0';
+our $VERSION = '0.9.1';
 
 require XSLoader;
 XSLoader::load('nginx', $VERSION);
--- a/src/http/ngx_http_core_module.c	Mon Nov 29 00:00:00 2010 +0300
+++ b/src/http/ngx_http_core_module.c	Tue Nov 30 00:00:00 2010 +0300
@@ -900,11 +900,6 @@
 
     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 @@
         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);