diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-12-27 18:44:14 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2007-12-27 18:44:14 +0000 |
| commit | e008833361471ce496c030654c0bfd588305f124 (patch) | |
| tree | 7338b0e892e268e2677a02d5634e7a7b5a25c194 | |
| parent | 37acebc32d2a50b11537edd920af3721b93a1ecc (diff) | |
| download | nginx-e008833361471ce496c030654c0bfd588305f124.tar.gz | |
Changes with nginx 0.6.24 27 Dec 2007v0.6.24
*) Bugfix: a segmentation fault might occur in worker process if HTTPS
was used; bug appeared in 0.6.23.
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | CHANGES.ru | 6 | ||||
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/event/ngx_event_openssl.c | 6 | ||||
| -rw-r--r-- | src/http/modules/perl/nginx.pm | 2 |
5 files changed, 18 insertions, 4 deletions
@@ -1,4 +1,10 @@ +Changes with nginx 0.6.24 27 Dec 2007 + + *) Bugfix: a segmentation fault might occur in worker process if HTTPS + was used; bug appeared in 0.6.23. + + Changes with nginx 0.6.23 27 Dec 2007 *) Change: the "off" parameter in the "ssl_session_cache" directive; diff --git a/CHANGES.ru b/CHANGES.ru index 275133a6e..d416e7d52 100644 --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,4 +1,10 @@ +Изменения в nginx 0.6.24 27.12.2007 + + *) Исправление: при использовании HTTPS в рабочем процессе мог + произойти segmentation fault. ошибка появилась в 0.6.23. + + Изменения в nginx 0.6.23 27.12.2007 *) Изменение: параметр "off" в директиве ssl_session_cache; теперь этот diff --git a/src/core/nginx.h b/src/core/nginx.h index 3dac5c798..cd1b4969b 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VERSION "0.6.23" +#define NGINX_VERSION "0.6.24" #define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VAR "NGINX" diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c index d1162095c..d7fc4d223 100644 --- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c @@ -996,8 +996,10 @@ ngx_ssl_read_handler(ngx_event_t *rev) void ngx_ssl_free_buffer(ngx_connection_t *c) { - if (ngx_pfree(c->pool, c->ssl->buf->start) == NGX_OK) { - c->ssl->buf->start = NULL; + if (c->ssl->buf && c->ssl->buf->start) { + if (ngx_pfree(c->pool, c->ssl->buf->start) == NGX_OK) { + c->ssl->buf->start = NULL; + } } } diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm index 40711ff7a..55d716dfe 100644 --- a/src/http/modules/perl/nginx.pm +++ b/src/http/modules/perl/nginx.pm @@ -47,7 +47,7 @@ our @EXPORT = qw( HTTP_INSUFFICIENT_STORAGE ); -our $VERSION = '0.6.23'; +our $VERSION = '0.6.24'; require XSLoader; XSLoader::load('nginx', $VERSION); |