diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-09-28 07:00:05 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2010-09-28 07:00:05 +0000 |
| commit | d2ddc4ba6cf543fa5853ebb2e5f0ee7be6fd2ba5 (patch) | |
| tree | cf7770c01b158ca4c758fed11d6f6ae993a7037b | |
| parent | fca1ff29097d8ec1cbb25a15c4e267c015c06fb8 (diff) | |
| download | nginx-d2ddc4ba6cf543fa5853ebb2e5f0ee7be6fd2ba5.tar.gz | |
Changes with nginx 0.8.52 28 Sep 2010v0.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.
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | CHANGES.ru | 6 | ||||
| -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.c | 2 |
5 files changed, 16 insertions, 4 deletions
@@ -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 index 64188f609..e23cf6911 100644 --- 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 index 380e05724..918603817 100644 --- 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 index 708481a3a..c962360b1 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.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 index 58fc7afe5..4ecd50ce8 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1274,7 +1274,7 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, 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) { |