changeset 600:5dc296c4372a NGINX_0_8_52

nginx 0.8.52 *) Bugfix: nginx used SSL mode for a listen socket if any listen option was set; the bug had appeared in 0.8.51.
author Igor Sysoev <http://sysoev.ru>
date Tue, 28 Sep 2010 00:00:00 +0400
parents ba5a8beb9f72
children b2afd36d87f4
files CHANGES CHANGES.ru src/core/nginx.h src/http/modules/perl/nginx.pm src/http/ngx_http.c
diffstat 5 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES	Mon Sep 27 00:00:00 2010 +0400
+++ b/CHANGES	Tue Sep 28 00:00:00 2010 +0400
@@ -1,4 +1,10 @@
 
+Changes with nginx 0.8.52                                        28 Sep 2010
+
+    *) Bugfix: nginx used SSL mode for a listen socket if any listen option 
+       was set; the bug had appeared in 0.8.51.
+
+
 Changes with nginx 0.8.51                                        27 Sep 2010
 
     *) Change: the "secure_link_expires" directive has been canceled.
--- a/CHANGES.ru	Mon Sep 27 00:00:00 2010 +0400
+++ b/CHANGES.ru	Tue Sep 28 00:00:00 2010 +0400
@@ -1,4 +1,10 @@
 
+Изменения в nginx 0.8.52                                          28.09.2010
+
+    *) Исправление: nginx использовал режим SSL для listen сокета, если для 
+       него был установлен любой listen-параметр; ошибка появилась в 0.8.51.
+
+
 Изменения в nginx 0.8.51                                          27.09.2010
 
     *) Изменение: директива secure_link_expires упразднена.
--- a/src/core/nginx.h	Mon Sep 27 00:00:00 2010 +0400
+++ b/src/core/nginx.h	Tue Sep 28 00:00:00 2010 +0400
@@ -8,8 +8,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version         8051
-#define NGINX_VERSION      "0.8.51"
+#define nginx_version         8052
+#define NGINX_VERSION      "0.8.52"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #define NGINX_VAR          "NGINX"
--- a/src/http/modules/perl/nginx.pm	Mon Sep 27 00:00:00 2010 +0400
+++ b/src/http/modules/perl/nginx.pm	Tue Sep 28 00:00:00 2010 +0400
@@ -48,7 +48,7 @@
     HTTP_INSUFFICIENT_STORAGE
 );
 
-our $VERSION = '0.8.51';
+our $VERSION = '0.8.52';
 
 require XSLoader;
 XSLoader::load('nginx', $VERSION);
--- a/src/http/ngx_http.c	Mon Sep 27 00:00:00 2010 +0400
+++ b/src/http/ngx_http.c	Tue Sep 28 00:00:00 2010 +0400
@@ -1274,7 +1274,7 @@
         default_server = addr[i].opt.default_server;
 
 #if (NGX_HTTP_SSL)
-        ssl = lsopt->ssl || addr[i].opt.set;
+        ssl = lsopt->ssl || addr[i].opt.ssl;
 #endif
 
         if (lsopt->set) {