diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 13:24:50 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 13:24:50 +0000 |
| commit | 340e48b29f49b89bf7dc562533dae1d8d2ec2cc7 (patch) | |
| tree | b3a423ebd7d008ca87a0ab512d472376c6a21a78 /src/event/ngx_event_timer.c | |
| parent | 8f86bdbb06393fdd48054c955aca4114f88c4ad7 (diff) | |
| download | nginx-340e48b29f49b89bf7dc562533dae1d8d2ec2cc7.tar.gz nginx-340e48b29f49b89bf7dc562533dae1d8d2ec2cc7.tar.bz2 | |
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.
Diffstat (limited to 'src/event/ngx_event_timer.c')
| -rw-r--r-- | src/event/ngx_event_timer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c index 2931a9f4e..76a1a1f41 100644 --- a/src/event/ngx_event_timer.c +++ b/src/event/ngx_event_timer.c @@ -103,11 +103,11 @@ ngx_event_expire_timers(void) if (ngx_threaded && ngx_trylock(ev->lock) == 0) { /* - * We can not change the timer of the event that is been - * handling by another thread. And we can not easy walk - * the rbtree to find a next expired timer so we exit the loop. - * However it should be rare case when the event that is - * been handling has expired timer. + * We cannot change the timer of the event that is being + * handled by another thread. And we cannot easy walk + * the rbtree to find next expired timer so we exit the loop. + * However, it should be a rare case when the event that is + * being handled has an expired timer. */ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0, |