diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-11-11 17:07:14 +0300 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-11-11 17:07:14 +0300 |
| commit | 1b73583ba2c0e4b72d951218827e0c621427d389 (patch) | |
| tree | 9e4d204e2cce91560d5cb8908b8a1a9f2c1d92ee /src/event/ngx_event_timer.c | |
| parent | d6f24959428caed68a509a19ca4fd866d978a69c (diff) | |
nginx-0.1.5-RELEASE importrelease-0.1.5
*) Bugfix: on Solaris and Linux there may be too many "recvmsg()
returned not enough data" alerts.
*) Bugfix: there were the "writev() failed (22: Invalid argument)"
errors on Solaris in proxy mode without sendfile. On other platforms
that do not support sendfile at all the process got caught in an
endless loop.
*) Bugfix: segmentation fault on Solaris in proxy mode and using
sendfile.
*) Bugfix: segmentation fault on Solaris.
*) Bugfix: on-line upgrade did not work on Linux.
*) Bugfix: the ngx_http_autoindex_module module did not escape the
spaces, the quotes, and the percent signs in the directory listing.
*) Change: the decrease of the copy operations.
*) Feature: the userid_p3p directive.
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 a09f07f73..c1ca12414 100644 --- a/src/event/ngx_event_timer.c +++ b/src/event/ngx_event_timer.c @@ -110,14 +110,13 @@ void ngx_event_expire_timers(ngx_msec_t timer) */ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0, - "event " PTR_FMT " is busy in expire timers", - ev); + "event %p is busy in expire timers", ev); break; } #endif ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, - "event timer del: %d: %d", + "event timer del: %d: %i", ngx_event_ident(ev->data), ev->rbtree_key); ngx_rbtree_delete((ngx_rbtree_t **) &ngx_event_timer_rbtree, |