Merge branch 'splitice-master'

Lax · Aug 15, 2015 · 21e7872 · 21e7872
2 parents 8407802 + 964189c
commit 21e7872
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/ngx_http_accounting_worker_process.c b/src/ngx_http_accounting_worker_process.c
@@ -2,6 +2,7 @@
 #include <ngx_core.h>
 #include <ngx_http.h>
 #include <ngx_http_upstream.h>
+#include <nginx.h>
 
 #include <syslog.h>
 
@@ -108,7 +109,11 @@ ngx_http_accounting_handler(ngx_http_request_t *r)
         state = r->upstream_states->elts;
         if (state[0].status) {
             // not even checking the status here...
-	    upstream_req_latency_ms = (state[0].response_sec * 1000 + state[0].response_msec);
+			#if (nginx_version < 1009000)
+			upstream_req_latency_ms = (state[0].response_sec * 1000 + state[0].response_msec);
+			#else
+			upstream_req_latency_ms = state[0].response_time;
+			#endif
         }
     }
     // TODO: key should be cached to save CPU time