From 21d3825c0384df077ae93504fe6d813c53bff043 Mon Sep 17 00:00:00 2001 From: fhanik Date: Fri, 20 Jul 2007 22:29:12 +0000 Subject: [PATCH] up sync from 6.0 http://svn.apache.org/viewvc?view=rev&rev=555310 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@558179 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/jasper/Constants.java | 6 ++++++ java/org/apache/jasper/tagplugins/jstl/Util.java | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/java/org/apache/jasper/Constants.java b/java/org/apache/jasper/Constants.java index 8d1a85f81..19e87cb0a 100644 --- a/java/org/apache/jasper/Constants.java +++ b/java/org/apache/jasper/Constants.java @@ -196,4 +196,10 @@ public class Constants { public static final boolean USE_INSTANCE_MANAGER_FOR_TAGS = Boolean.valueOf(System.getProperty("org.apache.jasper.Constants.USE_INSTANCE_MANAGER_FOR_TAGS", "false")).booleanValue(); + /** + * 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"; + } diff --git a/java/org/apache/jasper/tagplugins/jstl/Util.java b/java/org/apache/jasper/tagplugins/jstl/Util.java index 5815a2add..dfe0f2f5a 100644 --- a/java/org/apache/jasper/tagplugins/jstl/Util.java +++ b/java/org/apache/jasper/tagplugins/jstl/Util.java @@ -18,6 +18,8 @@ package org.apache.jasper.tagplugins.jstl; +import org.apache.jasper.Constants; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintWriter; @@ -150,7 +152,7 @@ public class Util { 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); -- 2.11.0