diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-08-23 15:37:10 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-08-23 15:37:10 +0000 |
| commit | 94085ff2b5803eb84e15b8c8fe0cd631d7aa1804 (patch) | |
| tree | e509f20966bcfae370b6d8c83cb4df0fba22a1c7 /src | |
| parent | 6deb041b2f9b360c80bb2530b1fb55634305a55b (diff) | |
| download | nginx-94085ff2b5803eb84e15b8c8fe0cd631d7aa1804.tar.gz nginx-94085ff2b5803eb84e15b8c8fe0cd631d7aa1804.zip | |
nginx-0.0.10-2004-08-23-19:37:10 import
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/event/modules/ngx_select_module.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h index b372d0c58..3b977624d 100644 --- 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 5cb421f05..56b50cdf9 100644 --- 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; |