commit 711e9031fe7acb4ceda683ecc0b338f7cbb29b52
author Igor Sysoev <igor@sysoev.ru> Thu Dec 20 20:11:45 2007 +0000
committer Igor Sysoev <igor@sysoev.ru> Thu Dec 20 20:11:45 2007 +0000
tree 50cd92166ba3714219563dccc3af671a84261331
parent 6675abe3b4329f4891016b226f35ed0fd26a09dd

use ngx_time() instead of ngx_timeofday()

src/event/ngx_event_openssl.c

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index d65ae85..88972f5 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1281,7 +1281,6 @@
     u_char                   *p, *id, *cached_sess;
     uint32_t                  hash;
     SSL_CTX                  *ssl_ctx;
-    ngx_time_t               *tp;
     ngx_shm_zone_t           *shm_zone;
     ngx_connection_t         *c;
     ngx_slab_pool_t          *shpool;
@@ -1357,15 +1356,13 @@
                    "http ssl new session: %08XD:%d:%d",
                    hash, sess->session_id_length, len);
 
-    tp = ngx_timeofday();
-
     sess_id->node.key = hash;
     sess_id->node.data = (u_char) sess->session_id_length;
     sess_id->id = id;
     sess_id->len = len;
     sess_id->session = cached_sess;
 
-    sess_id->expire = tp->sec + SSL_CTX_get_timeout(ssl_ctx);
+    sess_id->expire = ngx_time() + SSL_CTX_get_timeout(ssl_ctx);
 
     sess_id->next = cache->session_cache_head.next;
     sess_id->next->prev = sess_id;
@@ -1407,7 +1404,6 @@
     u_char                   *p;
     uint32_t                  hash;
     ngx_int_t                 rc;
-    ngx_time_t               *tp;
     ngx_shm_zone_t           *shm_zone;
     ngx_slab_pool_t          *shpool;
     ngx_connection_t         *c;
@@ -1464,9 +1460,7 @@
                               (size_t) len, (size_t) node->data);
             if (rc == 0) {
 
-                tp = ngx_timeofday();
-
-                if (sess_id->expire > tp->sec) {
+                if (sess_id->expire > ngx_time()) {
                     ngx_memcpy(buf, sess_id->session, sess_id->len);
 
                     ngx_shmtx_unlock(&shpool->mutex);
@@ -1591,10 +1585,10 @@
 ngx_ssl_expire_sessions(ngx_ssl_session_cache_t *cache,
     ngx_slab_pool_t *shpool, ngx_uint_t n)
 {
-    ngx_time_t         *tp;
+    time_t              now;
     ngx_ssl_sess_id_t  *sess_id;
 
-    tp = ngx_timeofday();
+    now = ngx_time();
 
     while (n < 3) {
 
@@ -1604,7 +1598,7 @@
             return;
         }
 
-        if (n++ != 0 && sess_id->expire > tp->sec) {
+        if (n++ != 0 && sess_id->expire > now) {
             return;
         }