nginx-0.3.3-RELEASE import
*) Change: the "bl" and "af" parameters of the "listen" directive was
renamed to the "backlog" and "accept_filter".
*) Feature: the "rcvbuf" and "sndbuf" parameters of the "listen"
directive.
*) Change: the "$msec" log parameter does not require now the
additional the gettimeofday() system call.
*) Feature: the -t switch now tests the "listen" directives.
*) Bugfix: if the invalid address was specified in the "listen"
directive, then after the -HUP signal nginx left an open socket in
the CLOSED state.
*) Bugfix: the mime type may be incorrectly set to default value for
index file with variable in the name; the bug had appeared in 0.3.0.
*) Feature: the "timer_resolution" directive.
*) Feature: the millisecond "$upstream_response_time" log parameter.
*) Bugfix: a temporary file with client request body now is removed
just after the response header was transferred to a client.
*) Bugfix: OpenSSL 0.9.6 compatibility.
*) Bugfix: the SSL certificate and key file paths could not be relative.
*) Bugfix: the "ssl_prefer_server_ciphers" directive did not work in
the ngx_imap_ssl_module.
*) Bugfix: the "ssl_protocols" directive allowed to specify the single
protocol only.
diff --git a/src/event/ngx_event_timer.h b/src/event/ngx_event_timer.h
index f980234..ce32ce9 100644
--- a/src/event/ngx_event_timer.h
+++ b/src/event/ngx_event_timer.h
@@ -14,7 +14,6 @@
#define NGX_TIMER_INFINITE (ngx_msec_t) -1
-#define NGX_TIMER_ERROR (ngx_msec_t) -2
#define NGX_TIMER_LAZY_DELAY 300
@@ -39,9 +38,7 @@
"event timer del: %d: %M",
ngx_event_ident(ev->data), ev->timer.key);
- if (ngx_mutex_lock(ngx_event_timer_mutex) == NGX_ERROR) {
- return;
- }
+ ngx_mutex_lock(ngx_event_timer_mutex);
ngx_rbtree_delete(&ngx_event_timer_rbtree, &ev->timer);
@@ -63,7 +60,7 @@
ngx_msec_t key;
ngx_msec_int_t diff;
- key = ngx_current_time + timer;
+ key = ngx_current_msec + timer;
if (ev->timer_set) {
@@ -91,9 +88,7 @@
"event timer add: %d: %M:%M",
ngx_event_ident(ev->data), timer, ev->timer.key);
- if (ngx_mutex_lock(ngx_event_timer_mutex) == NGX_ERROR) {
- return;
- }
+ ngx_mutex_lock(ngx_event_timer_mutex);
ngx_rbtree_insert(&ngx_event_timer_rbtree, &ev->timer);
