diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-04-06 10:42:59 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2009-04-06 10:42:59 +0000 |
| commit | 44efb7b809acb211fd4cdea1c7b0691a1d4f09e5 (patch) | |
| tree | acdcfa68321d274122cd36d4ac0dd2bae80e4603 | |
| parent | dacca6459d00cc5a6558df79b20a54873b3cdc38 (diff) | |
| download | nginx-0.7.49.tar.gz | |
Changes with nginx 0.7.49 06 Apr 2009v0.7.49
*) Change: a segmentation fault might occur in worker process, if the
$arg_... variables were used; the bug had appeared in 0.7.48.
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | CHANGES.ru | 6 | ||||
| -rw-r--r-- | src/core/nginx.h | 4 | ||||
| -rw-r--r-- | src/core/ngx_string.c | 4 | ||||
| -rw-r--r-- | src/http/modules/perl/nginx.pm | 2 |
5 files changed, 19 insertions, 3 deletions
@@ -1,4 +1,10 @@ +Changes with nginx 0.7.49 06 Apr 2009 + + *) Change: a segmentation fault might occur in worker process, if the + $arg_... variables were used; the bug had appeared in 0.7.48. + + Changes with nginx 0.7.48 06 Apr 2009 *) Feature: the "proxy_cache_key" directive. diff --git a/CHANGES.ru b/CHANGES.ru index f16c2ed26..33e98c481 100644 --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,4 +1,10 @@ +Изменения в nginx 0.7.49 06.04.2009 + + *) Изменение: если использовании переменных $arg_... в рабочем процессе + мог произойти segmentation fault; ошибка появилась в 0.7.48. + + Изменения в nginx 0.7.48 06.04.2009 *) Добавление: директива proxy_cache_key. diff --git a/src/core/nginx.h b/src/core/nginx.h index c976424bd..a723d2da0 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,8 +8,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 007048 -#define NGINX_VERSION "0.7.48" +#define nginx_version 007049 +#define NGINX_VERSION "0.7.49" #define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VAR "NGINX" diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c index fbde1c2ce..8f2a17159 100644 --- a/src/core/ngx_string.c +++ b/src/core/ngx_string.c @@ -703,6 +703,10 @@ ngx_strlcasestrn(u_char *s1, u_char *last, u_char *s2, size_t n) { ngx_uint_t c1, c2; + if (s1 <= last) { + return NULL; + } + c2 = (ngx_uint_t) *s2++; c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2; last -= n; diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm index 58c149c8a..5f0a6dcf0 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.48'; +our $VERSION = '0.7.49'; require XSLoader; XSLoader::load('nginx', $VERSION); |