Author: jfrederic.clere(a)jboss.com
Date: 2007-11-05 05:23:56 -0500 (Mon, 05 Nov 2007)
New Revision: 335
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/Globals.java
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/authenticator/Constants.java
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/Response.java
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/realm/RealmBase.java
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/Constants.java
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/tagplugins/jstl/Util.java
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/net/JIoEndpoint.java
Log:
Configurable JSESSIONID Cookie Name for case 16667.
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/Globals.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/Globals.java 2007-11-01
17:03:01 UTC (rev 334)
+++
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/Globals.java 2007-11-05
10:23:56 UTC (rev 335)
@@ -269,14 +269,16 @@
* 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.JSESSIONID",
"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.jsessionid",
"jsessionid");
/**
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/authenticator/Constants.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/authenticator/Constants.java 2007-11-01
17:03:01 UTC (rev 334)
+++
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/authenticator/Constants.java 2007-11-05
10:23:56 UTC (rev 335)
@@ -40,7 +40,8 @@
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.JSESSIONIDSSO",
"JSESSIONIDSSO");
// --------------------------------------------------------- Request Notes
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java 2007-11-01
17:03:01 UTC (rev 334)
+++
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java 2007-11-05
10:23:56 UTC (rev 335)
@@ -427,7 +427,7 @@
if (request.isRequestedSessionIdFromURL()) {
// This is not optimal, but as this is not very common, it
// shouldn't matter
- redirectPath = redirectPath + ";jsessionid="
+ redirectPath = redirectPath + ";" +
Globals.SESSION_PARAMETER_NAME + "="
+ request.getRequestedSessionId();
}
if (query != null) {
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/Response.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/Response.java 2007-11-01
17:03:01 UTC (rev 334)
+++
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/Response.java 2007-11-05
10:23:56 UTC (rev 335)
@@ -1435,7 +1435,8 @@
String file = url.getFile();
if ((file == null) || !file.startsWith(contextPath))
return (false);
- if( file.indexOf(";jsessionid=" + session.getIdInternal()) >= 0
)
+ String tok = ";" + Globals.SESSION_PARAMETER_NAME + "=" +
session.getIdInternal();
+ if (file.indexOf(tok, contextPath.length()) >= 0)
return (false);
}
@@ -1569,7 +1570,9 @@
}
StringBuffer sb = new StringBuffer(path);
if( sb.length() > 0 ) { // jsessionid can't be first.
- sb.append(";jsessionid=");
+ sb.append(";");
+ sb.append(Globals.SESSION_PARAMETER_NAME);
+ sb.append("=");
sb.append(sessionId);
}
sb.append(anchor);
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/realm/RealmBase.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/realm/RealmBase.java 2007-11-01
17:03:01 UTC (rev 334)
+++
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/realm/RealmBase.java 2007-11-05
10:23:56 UTC (rev 335)
@@ -37,6 +37,7 @@
import org.apache.catalina.Container;
import org.apache.catalina.Context;
+import org.apache.catalina.Globals;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
@@ -944,7 +945,9 @@
String requestedSessionId = request.getRequestedSessionId();
if ((requestedSessionId != null) &&
request.isRequestedSessionIdFromURL()) {
- file.append(";jsessionid=");
+ file.append(";");
+ file.append(Globals.SESSION_PARAMETER_NAME);
+ file.append("=");
file.append(requestedSessionId);
}
String queryString = request.getQueryString();
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/Constants.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/Constants.java 2007-11-01
17:03:01 UTC (rev 334)
+++
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/Constants.java 2007-11-05
10:23:56 UTC (rev 335)
@@ -193,4 +193,10 @@
public static final boolean IS_SECURITY_ENABLED =
(System.getSecurityManager() != null);
+ /**
+ * 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";
+
}
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/tagplugins/jstl/Util.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/tagplugins/jstl/Util.java 2007-11-01
17:03:01 UTC (rev 334)
+++
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/tagplugins/jstl/Util.java 2007-11-05
10:23:56 UTC (rev 335)
@@ -33,6 +33,8 @@
import javax.servlet.jsp.JspTagException;
import javax.servlet.jsp.PageContext;
+import org.apache.jasper.Constants;
+
/**
* Util contains some often used consts, static methods and embedded class
* to support the JSTL tag plugin.
@@ -150,7 +152,7 @@
public static String stripSession(String url) {
StringBuffer u = new StringBuffer(url);
int sessionStart;
- while ((sessionStart = u.toString().indexOf(";jsessionid=")) != -1) {
+ while ((sessionStart = u.toString().indexOf(";" +
Constants.SESSION_PARAMETER_NAME + "=")) != -1) {
int sessionEnd = u.toString().indexOf(";", sessionStart + 1);
if (sessionEnd == -1)
sessionEnd = u.toString().indexOf("?", sessionStart + 1);
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/net/JIoEndpoint.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/net/JIoEndpoint.java 2007-11-01
17:03:01 UTC (rev 334)
+++
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/net/JIoEndpoint.java 2007-11-05
10:23:56 UTC (rev 335)
@@ -440,8 +440,12 @@
// Wait for the next socket to be assigned
Socket socket = await();
+ // JFC
+ log.error("JIoEndpoint.run: " + socket);
if (socket == null)
continue;
+ log.error("JIoEndpoint.run: " + socket.isClosed() + "
" + socket.isInputShutdown()
+ + " " + socket.isOutputShutdown());
// Process the request from this socket
if (!setSocketOptions(socket) || !handler.process(socket)) {
Show replies by date