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

diff --git a/java/org/apache/jasper/Constants.java b/java/org/apache/jasper/Constants.java
index 8d1a85f..19e87cb 100644 (file)
--- 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 5815a2a..dfe0f2f 100644 (file)
--- 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);