diff options
| author | NGINX team <nginx@nginx.org> | 2012-04-12 13:05:40 +0000 |
|---|---|---|
| committer | Jon Kolb <jon@b0g.us> | 2012-04-12 13:05:40 +0000 |
| commit | ed2df87c83d3a68ab2a395d4c2549dbe26e86ab0 (patch) | |
| tree | ff91c69d84d5e4b84a15a12b873c3cb2193fd481 /src/event/ngx_event_timer.c | |
| parent | 60a50f7b445d1ac18ea0b1ff140745b6844c6794 (diff) | |
| download | nginx-1.1.tar.gz | |
*) Security: specially crafted mp4 file might allow to overwrite memory
locations in a worker process if the ngx_http_mp4_module was used,
potentially resulting in arbitrary code execution (CVE-2012-2089).
Thanks to Matthew Daley.
*) Bugfix: nginx/Windows might be terminated abnormally.
Thanks to Vincent Lee.
*) Bugfix: nginx hogged CPU if all servers in an upstream were marked as
"backup".
*) Bugfix: the "allow" and "deny" directives might be inherited
incorrectly if they were used with IPv6 addresses.
*) Bugfix: the "modern_browser" and "ancient_browser" directives might
be inherited incorrectly.
*) Bugfix: timeouts might be handled incorrectly on Solaris/SPARC.
*) Bugfix: in the ngx_http_mp4_module.
Diffstat (limited to 'src/event/ngx_event_timer.c')
| -rw-r--r-- | src/event/ngx_event_timer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c index 7a8107209..177ac1cf1 100644 --- a/src/event/ngx_event_timer.c +++ b/src/event/ngx_event_timer.c @@ -67,7 +67,7 @@ ngx_event_find_timer(void) ngx_mutex_unlock(ngx_event_timer_mutex); - timer = (ngx_msec_int_t) node->key - (ngx_msec_int_t) ngx_current_msec; + timer = (ngx_msec_int_t) (node->key - ngx_current_msec); return (ngx_msec_t) (timer > 0 ? timer : 0); } @@ -95,8 +95,7 @@ ngx_event_expire_timers(void) /* node->key <= ngx_current_time */ - if ((ngx_msec_int_t) node->key - (ngx_msec_int_t) ngx_current_msec <= 0) - { + if ((ngx_msec_int_t) (node->key - ngx_current_msec) <= 0) { ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, timer)); #if (NGX_THREADS) |