diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-03-11 13:17:28 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2009-03-11 13:17:28 +0000 |
| commit | d3c9e5f56459032d10c0c86e04472fc97621999f (patch) | |
| tree | a5d1e2c77e1fdc0488f988a72e1105b9f2707005 | |
| parent | 8b60224feb810a5f021dd1ba9bbd1ac69f8fbe67 (diff) | |
| download | nginx-0.7.41.tar.gz | |
Changes with nginx 0.7.41 11 Mar 2009v0.7.41
*) 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.
| -rw-r--r-- | CHANGES | 8 | ||||
| -rw-r--r-- | CHANGES.ru | 8 | ||||
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/http/modules/perl/nginx.pm | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.c | 4 | ||||
| -rw-r--r-- | src/http/ngx_http_request.c | 4 |
6 files changed, 22 insertions, 6 deletions
@@ -1,4 +1,12 @@ +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 *) Feature: the "location" directive supports captures in regular diff --git a/CHANGES.ru b/CHANGES.ru index 0f71c6e9e..575fa6c8c 100644 --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,4 +1,12 @@ +Изменения в nginx 0.7.41 11.03.2009 + + *) Исправление: в рабочем процессе мог произойти segmentation fault, + если в server_name или location были выделения в регулярных + выражениях; ошибка появилась в 0.7.40. + Спасибо Владимиру Сопоту. + + Изменения в nginx 0.7.40 09.03.2009 *) Добавление: директива location поддерживает выделения в регулярных diff --git a/src/core/nginx.h b/src/core/nginx.h index 243712b7c..2c0406ca6 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VERSION "0.7.40" +#define NGINX_VERSION "0.7.41" #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 350a3d626..a780ee43b 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.7.40'; +our $VERSION = '0.7.41'; require XSLoader; XSLoader::load('nginx', $VERSION); diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index ad009462e..a2d4e8688 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -1380,9 +1380,9 @@ ngx_http_core_find_location(ngx_http_request_t *r) if ((*clcfp)->captures && r->captures == NULL) { - len = (NGX_HTTP_MAX_CAPTURES + 1) * 3 * sizeof(int); + len = (NGX_HTTP_MAX_CAPTURES + 1) * 3; - r->captures = ngx_palloc(r->pool, len); + r->captures = ngx_palloc(r->pool, len * sizeof(int)); if (r->captures == NULL) { return NGX_ERROR; } diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index 95a392a82..c018d6868 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -1662,9 +1662,9 @@ ngx_http_find_virtual_server(ngx_http_request_t *r, u_char *host, size_t len) if (sn[i].captures && r->captures == NULL) { - ncaptures = (NGX_HTTP_MAX_CAPTURES + 1) * 3 * sizeof(int); + ncaptures = (NGX_HTTP_MAX_CAPTURES + 1) * 3; - r->captures = ngx_palloc(r->pool, ncaptures); + r->captures = ngx_palloc(r->pool, ncaptures * sizeof(int)); if (r->captures == NULL) { return NGX_ERROR; } |