comparison src/event/ngx_event_timer.c @ 4246:d3568507db51 stable-1.0

Merging r4132, r4134, r4143, r4183, r4191, r4199: Various fixes related to error messages: *) Removed old warning that suggested to use "server_name_in_redirect off" (now the default) in place of no longer supported "server_name *". *) Fixing directive name in error message if types hash size is not enough. *) Replaced "can not" with "cannot" and "could not" in a bunch of places. Fixed nearby grammar errors. *) Overhauled error messages.
author Igor Sysoev <igor@sysoev.ru>
date Tue, 01 Nov 2011 13:24:50 +0000
parents 4fc402c3ec73
children d620f497c50f
comparison
equal deleted inserted replaced
4245:8d39230df833 4246:d3568507db51
101 #if (NGX_THREADS) 101 #if (NGX_THREADS)
102 102
103 if (ngx_threaded && ngx_trylock(ev->lock) == 0) { 103 if (ngx_threaded && ngx_trylock(ev->lock) == 0) {
104 104
105 /* 105 /*
106 * We can not change the timer of the event that is been 106 * We cannot change the timer of the event that is being
107 * handling by another thread. And we can not easy walk 107 * handled by another thread. And we cannot easy walk
108 * the rbtree to find a next expired timer so we exit the loop. 108 * the rbtree to find next expired timer so we exit the loop.
109 * However it should be rare case when the event that is 109 * However, it should be a rare case when the event that is
110 * been handling has expired timer. 110 * being handled has an expired timer.
111 */ 111 */
112 112
113 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0, 113 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0,
114 "event %p is busy in expire timers", ev); 114 "event %p is busy in expire timers", ev);
115 break; 115 break;