Mercurial > hg > nginx

changeset 388:80e72c428b39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.7-2004-07-13-00:43:53 import
author Igor Sysoev <igor@sysoev.ru>
date Mon, 12 Jul 2004 20:43:53 +0000
parents 236611271946
children 537de4dca8ca
files src/core/ngx_times.c src/event/modules/ngx_kqueue_module.c src/http/ngx_http_request.c
diffstat 3 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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;
 
--- 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_even
                    "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,
--- 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_hea
         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