Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 26999 invoked from network); 6 Jun 2010 17:36:59 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Jun 2010 17:36:59 -0000 Received: (qmail 91439 invoked by uid 500); 6 Jun 2010 17:36:58 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 91368 invoked by uid 500); 6 Jun 2010 17:36:58 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 91359 invoked by uid 99); 6 Jun 2010 17:36:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jun 2010 17:36:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jun 2010 17:36:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CBC4723888CB; Sun, 6 Jun 2010 17:36:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r951909 - in /tomcat/trunk: java/org/apache/catalina/session/StandardSession.java webapps/docs/config/systemprops.xml Date: Sun, 06 Jun 2010 17:36:34 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100606173634.CBC4723888CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Sun Jun 6 17:36:34 2010 New Revision: 951909 URL: http://svn.apache.org/viewvc?rev=951909&view=rev Log: Use STRICT_SERVLET_COMPLIANCE to override the default for ACTIVITY_CHECK to align behaviour with other system properties Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java tomcat/trunk/webapps/docs/config/systemprops.xml Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=951909&r1=951908&r2=951909&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Sun Jun 6 17:36:34 2010 @@ -84,14 +84,28 @@ import org.apache.catalina.security.Secu public class StandardSession implements HttpSession, Session, Serializable { + protected static final boolean STRICT_SERVLET_COMPLIANCE; - protected static final boolean ACTIVITY_CHECK = - Globals.STRICT_SERVLET_COMPLIANCE - || Boolean.valueOf(System.getProperty("org.apache.catalina.session.StandardSession.ACTIVITY_CHECK", "false")).booleanValue(); + protected static final boolean ACTIVITY_CHECK; // ----------------------------------------------------------- Constructors + static { + STRICT_SERVLET_COMPLIANCE = Boolean.valueOf(System.getProperty( + "org.apache.catalina.STRICT_SERVLET_COMPLIANCE", + "false")).booleanValue(); + + String activityCheck = System.getProperty( + "org.apache.catalina.session.StandardSession.ACTIVITY_CHECK"); + if (activityCheck == null) { + ACTIVITY_CHECK = STRICT_SERVLET_COMPLIANCE; + } else { + ACTIVITY_CHECK = + Boolean.valueOf(activityCheck).booleanValue(); + } + } + /** * Construct a new Session associated with the specified Manager. Modified: tomcat/trunk/webapps/docs/config/systemprops.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=951909&r1=951908&r2=951909&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/systemprops.xml (original) +++ tomcat/trunk/webapps/docs/config/systemprops.xml Sun Jun 6 17:36:34 2010 @@ -239,6 +239,7 @@
  • The default value will be changed for:
      +
    • org.apache.catalina.session.StandardSession.ACTIVITY_CHECK
    • org.apache.tomcat.util.http.ServerCookie.ALWAYS_ADD_EXPIRES.
    • org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR.
    • org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING.
      • @@ -277,16 +278,6 @@ -

      If this is true or if - org.apache.catalina.STRICT_SERVLET_COMPLIANCE is - true Tomcat will track the number of active requests for each - session. When determining if a session is valid, any session with at least - one active request will always be considered valid. If not specified, the - default value of false will be used.

      -       - -

      If this is true Tomcat will allow = characters when parsing unquoted cookie values. If false, @@ -352,6 +343,16 @@ JSESSIONIDSSO.

       + +

      If this is true Tomcat will track the number of active + requests for each session. When determining if a session is valid, any + session with at least one active request will always be considered valid. + If org.apache.catalina.STRICT_SERVLET_COMPLIANCE is set to + true, the default of this setting will be true, + else the default value will be false.

      +       + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org