diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-04-06 11:44:40 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2009-04-06 11:44:40 +0000 |
| commit | 4234c4cf86bf09e030b2f937601efaf9dd442a04 (patch) | |
| tree | 21d4e6392b5f38a6be7177fa9c049b9fcf8f56e2 | |
| parent | 44efb7b809acb211fd4cdea1c7b0691a1d4f09e5 (diff) | |
| download | nginx-4234c4cf86bf09e030b2f937601efaf9dd442a04.tar.gz | |
Changes with nginx 0.7.50 06 Apr 2009v0.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.
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | CHANGES.ru | 8 | ||||
| -rw-r--r-- | src/core/nginx.h | 4 | ||||
| -rw-r--r-- | src/core/ngx_string.c | 6 | ||||
| -rw-r--r-- | src/http/modules/perl/nginx.pm | 2 |
5 files changed, 17 insertions, 9 deletions
@@ -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 index 33e98c481..7b5091018 100644 --- 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 index a723d2da0..fc4060c76 100644 --- 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 index 8f2a17159..9b63891a8 100644 --- a/src/core/ngx_string.c +++ b/src/core/ngx_string.c @@ -703,17 +703,13 @@ 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; 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 index 5f0a6dcf0..bce7a8a49 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.49'; +our $VERSION = '0.7.50'; require XSLoader; XSLoader::load('nginx', $VERSION); |