Author: markt
Date: Mon Oct 27 07:38:32 2008
New Revision: 708201
URL: http://svn.apache.org/viewvc?rev=708201&view=rev
Log:
Support changing of JSESSIONID cookie name and jsessionid path parameter name.
Based on a patch by Jean-frederic Clere.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=708201&r1=708200&r2=708201&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 07:38:32 2008
@@ -166,12 +166,6 @@
+1: markt
-0: remm (I also do not think the patch is a good idea as a backport)
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45951
- Support changing of JSESSIONID cookie name and jsessionid path parameter name
- http://svn.apache.org/viewvc?rev=702219&view=rev
- +1: markt, fhanik, pero
- -1:
-
* Derefence socket when the request is complete
http://svn.apache.org/viewvc?rev=702676&view=rev
+1: fhanik, remm, markt, pero
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java?rev=708201&r1=708200&r2=708201&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java Mon Oct 27
07:38:32 2008
@@ -269,14 +269,18 @@
* The name of the cookie used to pass the session identifier back
* and forth with the client.
*/
- public static final String SESSION_COOKIE_NAME = "JSESSIONID";
+ public static final String SESSION_COOKIE_NAME =
+ System.getProperty("org.apache.catalina.SESSION_COOKIE_NAME",
+ "JSESSIONID");
/**
* The name of the path parameter used to pass the session identifier
* back and forth with the client.
*/
- public static final String SESSION_PARAMETER_NAME = "jsessionid";
+ public static final String SESSION_PARAMETER_NAME =
+ System.getProperty("org.apache.catalina.SESSION_PARAMETER_NAME",
+ "jsessionid");
/**
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java?rev=708201&r1=708200&r2=708201&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java
Mon Oct 27 07:38:32 2008
@@ -40,7 +40,10 @@
public static final String FORM_USERNAME = "j_username";
// Cookie name for single sign on support
- public static final String SINGLE_SIGN_ON_COOKIE = "JSESSIONIDSSO";
+ public static final String SINGLE_SIGN_ON_COOKIE =
+ System.getProperty(
+
"org.apache.catalina.authenticator.Constants.SSO_SESSION_COOKIE_NAME",
+ "JSESSIONIDSSO");
// --------------------------------------------------------- Request Notes
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java?rev=708201&r1=708200&r2=708201&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java Mon Oct 27
07:38:32 2008
@@ -201,6 +201,8 @@
* The name of the path parameter used to pass the session identifier
* back and forth with the client.
*/
- public static final String SESSION_PARAMETER_NAME = "jsessionid";
+ public static final String SESSION_PARAMETER_NAME =
+ System.getProperty("org.apache.catalina.SESSION_PARAMETER_NAME",
+ "jsessionid");
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=708201&r1=708200&r2=708201&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct 27 07:38:32 2008
@@ -132,6 +132,10 @@
Correct handle multi-level contexts defined using context.xml files.
(markt)
</fix>
+ <add>
+ Support changing of JSESSIONID cookie name and jsessionid path
parameter
+ name. Based on a patch by Jean-frederic Clere. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml?rev=708201&r1=708200&r2=708201&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml Mon Oct 27
07:38:32 2008
@@ -252,6 +252,34 @@
</section>
+<section name="Sessions">
+
+ <properties>
+
+ <property name="org.apache.catalina.SESSION_COOKIE_NAME">
+ <p>An alternative name for the session cookie. Defaults to
+ <code>JSESSIONID</code>. Note that the Servlet specification requires
+ this to be <code>JSESSIONID</code>. You should not rely on being able to
+ change this.</p>
+ </property>
+
+ <property name="org.apache.catalina.SESSION_PARAMETER_NAME">
+ <p>An alternative name for the session path parameter. Defaults to
+ <code>jsessionid</code>. Note that the Servlet specification requires
+ this to be <code>jsessionid</code>. You should not rely on being able to
+ change this.</p>
+ </property>
+
+ <property name="org.apache.catalina.SSO_SESSION_COOKIE_NAME">
+ <p>An alternative name for the single sign on session cookie. Defaults to
+ <code>JSESSIONIDSSO</code>.</p>
+ </property>
+
+ </properties>
+
+</section>
+
+
<section name="Other">
<properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
