Mercurial > hg > nginx

changeset 6266:dceb078b1156

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 20 Oct 2015 18:16:18 +0300
parents 954b67727af3
children adaac65899c8
files src/event/ngx_event.c
diffstat 1 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -670,6 +670,15 @@ ngx_event_process_init(ngx_cycle_t *cycl
         }
     }
 
+#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 =