nginx-0.3.25-RELEASE import

    *) Bugfix: the segmentation fault was occurred on start or while
       reconfiguration if there was invalid configuration; the bug had
       appeared in 0.3.24.

diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml
index 7ef4dbf97cb623dcaf3823bf78e23668d2956c21..22d1e0914141b03e995a33442569f4df6bc91511 100644 (file)
--- a/docs/xml/nginx/changes.xml
+++ b/docs/xml/nginx/changes.xml
@@ -9,6 +9,24 @@
 <title lang="en">nginx changelog</title>
 
 
+<changes ver="0.3.25" date="01.02.2006">
+
+<change type="bugfix">
+<para lang="ru">
+ÐÒÉ ÎÅ×ÅÒÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÉ ÎÁ ÓÔÁÒÔÅ ÉÌÉ ×Ï ×ÒÅÍÑ ÐÅÒÅËÏÎÆÉÇÕÒÁÃÉÉ ÐÒÏÉÓÈÏÄÉÌ
+segmentation fault;
+ÏÛÉÂËÁ ÐÏÑ×ÉÌÁÓØ × 0.3.24.
+</para>
+<para lang="en">
+the segmentation fault was occurred on start or while reconfiguration
+if there was invalid configuration;
+bug appeared in 0.3.24.
+</para>
+</change>
+
+</changes>
+
+
 <changes ver="0.3.24" date="01.02.2006">
 
 <change type="workaround">

diff --git a/src/core/nginx.h b/src/core/nginx.h
index c2f9737a7dbc53aae8648d6c4b1300e48ef8e09b..66df80dff1eb058ffe762c09382a523d313ff4f8 100644 (file)
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -8,7 +8,7 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define NGINX_VER          "nginx/0.3.24"
+#define NGINX_VER          "nginx/0.3.25"
 
 #define NGINX_VAR          "NGINX"
 #define NGX_OLDPID_EXT     ".oldbin"

diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index 4bff828717a88e24e4571422490d41f209d27ea8..b5941be6f9461e081e0f0f3d82019bcab1470989 100644 (file)
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -613,7 +613,10 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
 static void
 ngx_destroy_cycle_pools(ngx_conf_t *conf)
 {
-    ngx_shm_free(&conf->cycle->shm);
+    if (conf->cycle->shm.addr) {
+        ngx_shm_free(&conf->cycle->shm);
+    }
+
     ngx_destroy_pool(conf->temp_pool);
     ngx_destroy_pool(conf->pool);
 }