# HG changeset patch # User Igor Sysoev # Date 1238961600 -14400 # Node ID 09b45263c8178db911e60992a21df9278736dfe4 # Parent aed0c0cf845d8fd538b6fb4f83905fc319e7f96b nginx 0.7.50 *) Change: a segmentation fault might occur in worker process, if the $arg_... variables were used; the bug had appeared in 0.7.48. diff --git a/CHANGES b/CHANGES --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,10 @@ +Changes with nginx 0.7.50 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.49 06 Apr 2009 *) Change: a segmentation fault might occur in worker process, if the diff --git a/CHANGES.ru b/CHANGES.ru --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,7 +1,13 @@ +Изменения в nginx 0.7.50 06.04.2009 + + *) Изменение: при использовании переменных $arg_... в рабочем процессе + мог произойти segmentation fault; ошибка появилась в 0.7.48. + + Изменения в nginx 0.7.49 06.04.2009 - *) Изменение: если использовании переменных $arg_... в рабочем процессе + *) Изменение: при использовании переменных $arg_... в рабочем процессе мог произойти segmentation fault; ошибка появилась в 0.7.48. diff --git a/src/core/nginx.h b/src/core/nginx.h --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,8 +8,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 007049 -#define NGINX_VERSION "0.7.49" +#define nginx_version 007050 +#define NGINX_VERSION "0.7.50" #define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VAR "NGINX" diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c --- a/src/core/ngx_string.c +++ b/src/core/ngx_string.c @@ -703,17 +703,13 @@ ngx_strlcasestrn(u_char *s1, u_char *las { 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; do { do { - if (s1 == last) { + if (s1 >= last) { return 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.7.49'; +our $VERSION = '0.7.50'; require XSLoader; XSLoader::load('nginx', $VERSION);