# HG changeset patch # User Igor Sysoev # Date 1093275430 0 # Node ID e2452dd9c0871287ad4869358711d06648b08292 # Parent 37b5381fb6d8d5f53ddcafb1051a1c02b4b05ed8 nginx-0.0.10-2004-08-23-19:37:10 import diff --git a/src/core/nginx.h b/src/core/nginx.h --- 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 --- 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_even 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;