Author: fhanik
Date: Fri Jul 20 15:28:05 2007
New Revision: 558178
URL: http://svn.apache.org/viewvc?view=rev&rev=558178
Log:
up sync from 6.0
http://svn.apache.org/viewvc?view=rev&rev=554814
http://svn.apache.org/viewvc?view=rev&rev=555304
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?view=diff&rev=558178&r1=558177&r2=558178
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Fri Jul
20 15:28:05 2007
@@ -510,7 +510,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: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?view=diff&rev=558178&r1=558177&r2=558178
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Fri Jul 20
15:28:05 2007
@@ -1447,7 +1447,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);
}
@@ -1581,7 +1582,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: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?view=diff&rev=558178&r1=558177&r2=558178
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Fri Jul 20
15:28:05 2007
@@ -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: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?view=diff&rev=558178&r1=558177&r2=558178
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Fri Jul 20 15:28:05 2007
@@ -344,7 +344,7 @@
<attribute name="server" required="false">
<p>The Server header for the http response.
- Unless your paranoid, you won't need this feature.
+ Unless you are paranoid, you won't need this feature.
</p>
</attribute>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
