From 31ab38d0564e864230ce75c0cab0fc005fcdace1 Mon Sep 17 00:00:00 2001
From: rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 11 Apr 2010 20:51:16 +0000
Subject: [PATCH] Use spec compliant session expiration in
 STRICT_SERVLET_COMPLIANCE mode.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@932989 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/session/StandardSession.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java
index 3d9b3308b..07703298d 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -598,7 +598,12 @@ public class StandardSession
 
         if (maxInactiveInterval >= 0) { 
             long timeNow = System.currentTimeMillis();
-            int timeIdle = (int) ((timeNow - thisAccessedTime) / 1000L);
+            int timeIdle;
+            if (Globals.STRICT_SERVLET_COMPLIANCE) {
+                timeIdle = (int) ((timeNow - lastAccessedTime) / 1000L);
+            } else {
+                timeIdle = (int) ((timeNow - thisAccessedTime) / 1000L);
+            }
             if (timeIdle >= maxInactiveInterval) {
                 expire(true);
             }
-- 
2.11.0