Changeset ffe438

Timestamp:

04/24/09 12:23:31 (3 years ago)

Author:

George Potapov <nephrite@…>

Branches:

master-v0.7, nginx-v0.7, nginx-v0.8

Children:

9c4ca3

Parents:

48f6cd

git-author:

George Potapov <nephrite@…> (04/24/09 12:23:31)

git-committer:

George Potapov <nephrite@…> (04/24/09 12:23:31)

Message:

Vendor drop nginx v0.7.41

Location:

server

Files:

• CHANGES (modified) (1 diff)
• CHANGES.ru (modified) (1 diff)
• src/core/nginx.h (modified) (1 diff)
• src/http/modules/perl/nginx.pm (modified) (1 diff)
• src/http/ngx_http_core_module.c (modified) (1 diff)
• src/http/ngx_http_request.c (modified) (1 diff)

server/CHANGES

@@ +1 @@
+
+Changes with nginx 0.7.41                                        11 Mar 2009
+
+    *) Bugfix: a segmentation fault might occur in worker process, if a 
+       "server_name" or a "location" directives had captures in regular 
+       expressions; the issue had appeared in 0.7.40.
+       Thanks to Vladimir Sopot.
+
 
 Changes with nginx 0.7.40                                        09 Mar 2009

server/CHANGES.ru

@@ +1 @@
+
+éÚÍÅÎÅÎÉÑ × nginx 0.7.41                                          11.03.2009
+
+    *) éÓÐÒÁ×ÌÅÎÉÅ: × ÒÁÂÏÞÅÍ ÐÒÏÃÅÓÓÅ ÍÏÇ ÐÒÏÉÚÏÊÔÉ segmentation fault, 
+       ÅÓÌÉ × server_name ÉÌÉ location ÂÙÌÉ ×ÙÄÅÌÅÎÉÑ × ÒÅÇÕÌÑÒÎÙÈ 
+       ×ÙÒÁÖÅÎÉÑÈ; ÏÛÉÂËÁ ÐÏÑ×ÉÌÁÓØ × 0.7.40.
+       óÐÁÓÉÂÏ ÷ÌÁÄÉÍÉÒÕ óÏÐÏÔÕ.
+
 
 éÚÍÅÎÅÎÉÑ × nginx 0.7.40                                          09.03.2009

server/src/core/nginx.h

@@ -9 +9 @@
 
 
-#define NGINX_VERSION      "0.7.40"
+#define NGINX_VERSION      "0.7.41"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 

server/src/http/modules/perl/nginx.pm

@@ -48 +48 @@
 );
 
-our $VERSION = '0.7.40';
+our $VERSION = '0.7.41';
 
 require XSLoader;

server/src/http/ngx_http_core_module.c

@@ -1381 +1381 @@
             if ((*clcfp)->captures && r->captures == NULL) {
 
-                len = (NGX_HTTP_MAX_CAPTURES + 1) * 3 * sizeof(int);
-
-                r->captures = ngx_palloc(r->pool, len);
+                len = (NGX_HTTP_MAX_CAPTURES + 1) * 3;
+
+                r->captures = ngx_palloc(r->pool, len * sizeof(int));
                 if (r->captures == NULL) {
                     return NGX_ERROR;

server/src/http/ngx_http_request.c

@@ -1663 +1663 @@
             if (sn[i].captures && r->captures == NULL) {
 
-                ncaptures = (NGX_HTTP_MAX_CAPTURES + 1) * 3 * sizeof(int);
-
-                r->captures = ngx_palloc(r->pool, ncaptures);
+                ncaptures = (NGX_HTTP_MAX_CAPTURES + 1) * 3;
+
+                r->captures = ngx_palloc(r->pool, ncaptures * sizeof(int));
                 if (r->captures == NULL) {
                     return NGX_ERROR;