From faed7212fe78508f7b9675f93946820e9efe3e8f Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Tue, 20 Oct 2015 18:16:18 +0300 Subject: 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. --- src/event/ngx_event.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/event') 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 = -- cgit