# HG changeset patch
# User Igor Sysoev <http://sysoev.ru>
# Date 1285617600 -14400
# Node ID 5dc296c4372ab4049b1a17259c894ad4f2a78e73
# Parent  ba5a8beb9f723092fcd8616338016db066ee97a7
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.

diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -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.
diff --git a/CHANGES.ru b/CHANGES.ru
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -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 упразднена.
diff --git a/src/core/nginx.h b/src/core/nginx.h
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -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"
diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm
--- 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.8.51';
+our $VERSION = '0.8.52';
 
 require XSLoader;
 XSLoader::load('nginx', $VERSION);
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1274,7 +1274,7 @@ ngx_http_add_addresses(ngx_conf_t *cf, n
         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) {