diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2015-10-20 18:16:18 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2015-10-20 18:16:18 +0300 |
| commit | faed7212fe78508f7b9675f93946820e9efe3e8f (patch) | |
| tree | 81916e65d19ffd3f5ff0b25237fbdca5b2961ea4 /src | |
| parent | 67614b3aa39250c99d0c03fad9ae3e7db4c6a7ab (diff) | |
| download | nginx-faed7212fe78508f7b9675f93946820e9efe3e8f.tar.gz nginx-faed7212fe78508f7b9675f93946820e9efe3e8f.zip | |
Win32: timer_resolution now ignored with select.
As setitimer() isn't available on Windows, time wasn't updated at all
if timer_resolution was used with the select event method. Fix is
to ignore timer_resolution in such cases.
Diffstat (limited to 'src')
| -rw-r--r-- | src/event/ngx_event.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index b8e06077e..15da21340 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -670,6 +670,15 @@ ngx_event_process_init(ngx_cycle_t *cycle) } } +#else + + if (ngx_timer_resolution && !(ngx_event_flags & NGX_USE_TIMER_EVENT)) { + ngx_log_error(NGX_LOG_WARN, cycle->log, 0, + "the \"timer_resolution\" directive is not supported " + "with the configured event method, ignored"); + ngx_timer_resolution = 0; + } + #endif cycle->connections = |