diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-11-30 10:50:04 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2011-11-30 10:50:04 +0000 |
| commit | 56831c260fdbd5d130c692d0d4dc8918a462f4bb (patch) | |
| tree | 4a1b56b1625112d40b8eeef9c6ae17024c57347b | |
| parent | 7989e17482b6bd13b83a9e63a9c4f58f3432945a (diff) | |
| download | nginx-1.1.10.tar.gz | |
Changes with nginx 1.1.10 30 Nov 2011v1.1.10
*) Bugfix: a segmentation fault occured in a worker process if AIO was
used on Linux; the bug had appeared in 1.1.9.
Maxim Dounin
_______________________________________________
nginx-announce mailing list
nginx-announce@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-announce
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | CHANGES.ru | 6 | ||||
| -rw-r--r-- | src/core/nginx.h | 4 | ||||
| -rw-r--r-- | src/event/modules/ngx_epoll_module.c | 20 | ||||
| -rw-r--r-- | src/http/modules/perl/nginx.pm | 2 |
5 files changed, 25 insertions, 13 deletions
@@ -1,4 +1,10 @@ +Changes with nginx 1.1.10 30 Nov 2011 + + *) Bugfix: a segmentation fault occured in a worker process if AIO was + used on Linux; the bug had appeared in 1.1.9. + + Changes with nginx 1.1.9 28 Nov 2011 *) Change: now double quotes are encoded in an "echo" SSI-command diff --git a/CHANGES.ru b/CHANGES.ru index b4af1fe1c..9bb327769 100644 --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,4 +1,10 @@ +Изменения в nginx 1.1.10 30.11.2011 + + *) Исправление: при использовании AIO на Linux в рабочем процессе + происходил segmentation fault; ошибка появилась в 1.1.9. + + Изменения в nginx 1.1.9 28.11.2011 *) Изменение: теперь двойные кавычки экранируется при выводе diff --git a/src/core/nginx.h b/src/core/nginx.h index 4bde2c713..28955661b 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,8 +8,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1001009 -#define NGINX_VERSION "1.1.9" +#define nginx_version 1001010 +#define NGINX_VERSION "1.1.10" #define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VAR "NGINX" diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c index 4f9c5118e..f4003af70 100644 --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -681,19 +681,19 @@ ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags) wev = c->write; - if (c->fd == -1 || wev->instance != instance) { + if ((revents & EPOLLOUT) && wev->active) { - /* - * the stale event from a file descriptor - * that was just closed in this iteration - */ + if (c->fd == -1 || wev->instance != instance) { - ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, - "epoll: stale event %p", c); - continue; - } + /* + * the stale event from a file descriptor + * that was just closed in this iteration + */ - if ((revents & EPOLLOUT) && wev->active) { + ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, + "epoll: stale event %p", c); + continue; + } if (flags & NGX_POST_THREAD_EVENTS) { wev->posted_ready = 1; diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm index 001acc792..c25925ab9 100644 --- a/src/http/modules/perl/nginx.pm +++ b/src/http/modules/perl/nginx.pm @@ -48,7 +48,7 @@ our @EXPORT = qw( HTTP_INSUFFICIENT_STORAGE ); -our $VERSION = '1.1.9'; +our $VERSION = '1.1.10'; require XSLoader; XSLoader::load('nginx', $VERSION); |