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 2717d5c5b699f63580b8755927a94e1fedc78bc8..df73a1dde78868f22265e221f84af40c8bcd5ebb 100644 (file)
--- 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 dbf86ff7035d17b606cea38df586c555a66379c5..ddce6d9f768eaab1bd45acfcb45e6fcd5a0bd339 100644 (file)
--- 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 580cabaf32ef89c653f22cb38688b0689b5daf86..65b024d75ba0697d3948cc5993ceefba92af0420 100644 (file)
--- 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