diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ngx_times.c | 2 | ||||
| -rw-r--r-- | src/event/modules/ngx_kqueue_module.c | 6 | ||||
| -rw-r--r-- | src/http/ngx_http_request.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/core/ngx_times.c b/src/core/ngx_times.c index 2717d5c5b..df73a1dde 100644 --- a/src/core/ngx_times.c +++ b/src/core/ngx_times.c @@ -85,7 +85,7 @@ void ngx_time_init() ngx_gettimeofday(&tv); - ngx_start_msec = tv.tv_sec * 1000 + tv.tv_usec / 1000; + ngx_start_msec = (ngx_epoch_msec_t) tv.tv_sec * 1000 + tv.tv_usec / 1000; ngx_old_elapsed_msec = 0; ngx_elapsed_msec = 0; diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c index dbf86ff70..ddce6d9f7 100644 --- a/src/event/modules/ngx_kqueue_module.c +++ b/src/event/modules/ngx_kqueue_module.c @@ -524,7 +524,11 @@ static ngx_int_t ngx_kqueue_process_events(ngx_cycle_t *cycle) "kevent events: %d", events); 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; + + ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, + "elapsed: %qd", ngx_elapsed_msec); if (err) { ngx_log_error((err == NGX_EINTR) ? NGX_LOG_INFO : NGX_LOG_ALERT, diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index 580cabaf3..65b024d75 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -815,7 +815,7 @@ static ssize_t ngx_http_read_request_header(ngx_http_request_t *r) return NGX_AGAIN; } -#if 1 +#if 0 n = ngx_http_ssl_read(r, r->header_in->last, r->header_in->end - r->header_in->last); #else |