nginx-0.0.7-2004-07-13-00:43:53 import
diff --git a/src/core/ngx_times.c b/src/core/ngx_times.c index 2717d5c..df73a1d 100644 --- a/src/core/ngx_times.c +++ b/src/core/ngx_times.c
@@ -85,7 +85,7 @@ 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 dbf86ff..ddce6d9 100644 --- a/src/event/modules/ngx_kqueue_module.c +++ b/src/event/modules/ngx_kqueue_module.c
@@ -524,7 +524,11 @@ "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 580caba..65b024d 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c
@@ -815,7 +815,7 @@ 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