expiry_time fix

Author: blackav

lib/new_server_html.c

@@ -9588,7 +9588,7 @@ priv_check_cached_key(struct http_request_info *phr)
     if (phr->ssl_flag != cti->ssl_flag) {
       break;
     }
-    if (current_time >= cti->expiry_time) {
+    if (cti->expiry_time > 0 && current_time >= cti->expiry_time) {
       break;
     }
     if (current_time >= cti->refresh_time) {
@@ -9611,7 +9611,7 @@ priv_check_cached_key(struct http_request_info *phr)
     if (cti && cti->used && cti->cmd == ULS_GET_API_KEY
         && !ej_ip_cmp(&phr->ip, &cti->origin_ip)
         && phr->ssl_flag == cti->ssl_flag
-        && current_time < cti->expiry_time
+        && (cti->expiry_time <= 0 || current_time < cti->expiry_time)
         && phr->role <= cti->role) {
       copy_cti_to_phr(phr, cti, current_time);
       rdtscll(tsc_end);
@@ -9635,7 +9635,7 @@ priv_check_cached_key(struct http_request_info *phr)
     if (cti && cti->used && cti->cmd == ULS_GET_API_KEY
         && !ej_ip_cmp(&phr->ip, &cti->origin_ip)
         && phr->ssl_flag == cti->ssl_flag
-        && current_time < cti->expiry_time
+        && (cti->expiry_time <= 0 || current_time < cti->expiry_time)
         && phr->role <= cti->role) {
       copy_cti_to_phr(phr, cti, current_time);
       rdtscll(tsc_end);
@@ -16869,7 +16869,7 @@ unpriv_check_cached_key(struct http_request_info *phr)
     if (phr->ssl_flag != cti->ssl_flag) {
       break;
     }
-    if (current_time >= cti->expiry_time) {
+    if (cti->expiry_time > 0 && current_time >= cti->expiry_time) {
       break;
     }
     if (current_time >= cti->refresh_time) {
@@ -16892,7 +16892,7 @@ unpriv_check_cached_key(struct http_request_info *phr)
     if (cti && cti->used && cti->cmd == ULS_GET_API_KEY
         && !ej_ip_cmp(&phr->ip, &cti->origin_ip)
         && phr->ssl_flag == cti->ssl_flag
-        && current_time < cti->expiry_time
+        && (cti->expiry_time <= 0 || current_time < cti->expiry_time)
         && phr->role <= cti->role) {
       copy_cti_to_phr(phr, cti, current_time);
       rdtscll(tsc_end);
@@ -16916,7 +16916,7 @@ unpriv_check_cached_key(struct http_request_info *phr)
     if (cti && cti->used && cti->cmd == ULS_GET_API_KEY
         && !ej_ip_cmp(&phr->ip, &cti->origin_ip)
         && phr->ssl_flag == cti->ssl_flag
-        && current_time < cti->expiry_time
+        && (cti->expiry_time <= 0 || current_time < cti->expiry_time)
         && phr->role <= cti->role) {
       copy_cti_to_phr(phr, cti, current_time);
       rdtscll(tsc_end);