nginx-0.0.10-2004-08-23-19:37:10 import

diff --git a/src/core/nginx.h b/src/core/nginx.h
index b372d0c5811f1da0af8d7e1242a6710ef776d38a..3b977624d8d67f49c6057ae6896cd349a1d0cc0b 100644 (file)
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -2,7 +2,7 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define NGINX_VER          "nginx/0.0.9"
+#define NGINX_VER          "nginx/0.0.10"
 
 #define NGINX_VAR          "NGINX"
 #define NGX_NEWPID_EXT     ".newbin"

diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index 5cb421f05d5b389b36ce98c87f655e5597ecb870..56b50cdf97c9699507d7fd5bd7a7e55c835153a4 100644 (file)
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -409,7 +409,8 @@ static ngx_int_t ngx_select_process_events(ngx_cycle_t *cycle)
     ngx_time_update(tv.tv_sec);
 
     delta = ngx_elapsed_msec;
-    ngx_elapsed_msec = tv.tv_sec * 1000 + tv.tv_usec / 1000 - ngx_start_msec;
+    ngx_elapsed_msec = (ngx_epoch_msec_t) tv.tv_sec * 1000
+                                          + tv.tv_usec / 1000 - ngx_start_msec;
 
     if (timer != NGX_TIMER_INFINITE) {
         delta = ngx_elapsed_msec - delta;