# HG changeset patch
# User Igor Sysoev <http://sysoev.ru>
# Date 1198702800 -10800
# Node ID 2b41fbc2e39e1d6c9ab4bd7c5de0191e4d27f574
# Parent  580da4bad456f849d5d5cfa52dbf2549ab1622e7
nginx 0.6.24

    *) Bugfix: a segmentation fault might occur in worker process if HTTPS
       was used; bug appeared in 0.6.23.

diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -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
--- 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
--- 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
--- 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
--- 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);