September 2010 - jbossweb-commits

Dear jbossweb-commits@lists.jboss.org LOVE YOU!

by jbossweb-commits＠lists.jboss.org

Find Your Love Now jbossweb-commits(a)lists.jboss.org http://groups.yahoo.com/group/rqoowiupb/message

14 years, 2 months

1
0
0 / 0

JBossWeb SVN: r1563 - tags.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2010-09-29 15:42:12 -0400 (Wed, 29 Sep 2010) New Revision: 1563 Added: tags/JBOSSWEB_2_0_0_GA_CP15/ Log: For 4.3.0.GA_CP09 Copied: tags/JBOSSWEB_2_0_0_GA_CP15 (from rev 1562, branches/JBOSSWEB_2_0_0_GA_CP)

14 years, 2 months

1
0
0 / 0

JBossWeb SVN: r1562 - trunk/java/org/apache/catalina/connector.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2010-09-29 11:16:20 -0400 (Wed, 29 Sep 2010) New Revision: 1562 Modified: trunk/java/org/apache/catalina/connector/Response.java Log: - The session id is valid for the entire vhost, so the check is not useful. Modified: trunk/java/org/apache/catalina/connector/Response.java =================================================================== --- trunk/java/org/apache/catalina/connector/Response.java 2010-09-29 15:06:39 UTC (rev 1561) +++ trunk/java/org/apache/catalina/connector/Response.java 2010-09-29 15:16:20 UTC (rev 1562) @@ -64,8 +64,6 @@ public class Response implements HttpServletResponse { - protected static final boolean REWRITE_CONTEXT_CHECK = - Boolean.valueOf(System.getProperty("org.apache.catalina.connector.Response.REWRITE_CONTEXT_CHECK", "true")).booleanValue(); // ----------------------------------------------------------- Constructors @@ -1510,15 +1508,12 @@ if (serverPort != urlPort) return (false); - String contextPath = request.getContext().getPath(); - if (contextPath != null) { - String file = url.getFile(); - if ((file == null) || (REWRITE_CONTEXT_CHECK && !file.startsWith(contextPath))) - return (false); - String tok = request.getContext().getSessionCookie().getPathParameterName() + session.getIdInternal(); - if (file.indexOf(tok, contextPath.length()) >= 0) - return (false); - } + String file = url.getFile(); + if (file == null) + return (false); + String tok = request.getContext().getSessionCookie().getPathParameterName() + session.getIdInternal(); + if (file.indexOf(tok) >= 0) + return (false); // This URL belongs to our web application, so it is encodeable return (true);

14 years, 2 months

1
0
0 / 0

JBossWeb SVN: r1561 - branches/JBOSSWEB_2_1_7_GA_JBPAPP-5170/java/org/apache/catalina/connector.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2010-09-29 11:06:39 -0400 (Wed, 29 Sep 2010) New Revision: 1561 Modified: branches/JBOSSWEB_2_1_7_GA_JBPAPP-5170/java/org/apache/catalina/connector/Response.java Log: Add the ability to allow rewriting URLs for other contexts for [JBPAPP-5170]. Modified: branches/JBOSSWEB_2_1_7_GA_JBPAPP-5170/java/org/apache/catalina/connector/Response.java =================================================================== --- branches/JBOSSWEB_2_1_7_GA_JBPAPP-5170/java/org/apache/catalina/connector/Response.java 2010-09-29 14:53:45 UTC (rev 1560) +++ branches/JBOSSWEB_2_1_7_GA_JBPAPP-5170/java/org/apache/catalina/connector/Response.java 2010-09-29 15:06:39 UTC (rev 1561) @@ -65,6 +65,8 @@ public class Response implements HttpServletResponse { + protected static final boolean REWRITE_CONTEXT_CHECK = + Boolean.valueOf(System.getProperty("org.apache.catalina.connector.Response.REWRITE_CONTEXT_CHECK", "true")).booleanValue(); // ----------------------------------------------------------- Constructors @@ -1534,7 +1536,7 @@ String contextPath = getContext().getPath(); if (contextPath != null) { String file = url.getFile(); - if ((file == null) || !file.startsWith(contextPath)) + if ((file == null) || (REWRITE_CONTEXT_CHECK && !file.startsWith(contextPath))) return (false); String tok = ";" + Globals.SESSION_PARAMETER_NAME + "=" + session.getIdInternal(); if (file.indexOf(tok, contextPath.length()) >= 0)

14 years, 2 months

1
0
0 / 0

JBossWeb SVN: r1560 - branches.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2010-09-29 10:53:45 -0400 (Wed, 29 Sep 2010) New Revision: 1560 Added: branches/JBOSSWEB_2_1_7_GA_JBPAPP-5170/ Log: Create JBPAPP-5170 patch branch from JBOSSWEB_2_1_7_GA tag Copied: branches/JBOSSWEB_2_1_7_GA_JBPAPP-5170 (from rev 1559, tags/JBOSSWEB_2_1_7_GA)

14 years, 2 months

1
0
0 / 0

JBossWeb SVN: r1559 - branches/2.1.x/java/org/apache/catalina/connector.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2010-09-29 10:35:28 -0400 (Wed, 29 Sep 2010) New Revision: 1559 Modified: branches/2.1.x/java/org/apache/catalina/connector/Response.java Log: Add the ability to allow rewriting URLs for other contexts for [JBPAPP-5168]. Modified: branches/2.1.x/java/org/apache/catalina/connector/Response.java =================================================================== --- branches/2.1.x/java/org/apache/catalina/connector/Response.java 2010-09-29 13:51:33 UTC (rev 1558) +++ branches/2.1.x/java/org/apache/catalina/connector/Response.java 2010-09-29 14:35:28 UTC (rev 1559) @@ -65,6 +65,8 @@ public class Response implements HttpServletResponse { + protected static final boolean REWRITE_CONTEXT_CHECK = + Boolean.valueOf(System.getProperty("org.apache.catalina.connector.Response.REWRITE_CONTEXT_CHECK", "true")).booleanValue(); // ----------------------------------------------------------- Constructors @@ -1534,7 +1536,7 @@ String contextPath = getContext().getPath(); if (contextPath != null) { String file = url.getFile(); - if ((file == null) || !file.startsWith(contextPath)) + if ((file == null) || (REWRITE_CONTEXT_CHECK && !file.startsWith(contextPath))) return (false); String tok = ";" + Globals.SESSION_PARAMETER_NAME + "=" + session.getIdInternal(); if (file.indexOf(tok, contextPath.length()) >= 0)

14 years, 2 months

1
0
0 / 0

JBossWeb SVN: r1558 - trunk/java/org/apache/catalina/connector.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2010-09-29 09:51:33 -0400 (Wed, 29 Sep 2010) New Revision: 1558 Modified: trunk/java/org/apache/catalina/connector/Response.java Log: Add the ability to allow rewriting URLs for other contexts for [JBWEB-181]. Modified: trunk/java/org/apache/catalina/connector/Response.java =================================================================== --- trunk/java/org/apache/catalina/connector/Response.java 2010-09-29 02:10:17 UTC (rev 1557) +++ trunk/java/org/apache/catalina/connector/Response.java 2010-09-29 13:51:33 UTC (rev 1558) @@ -64,6 +64,8 @@ public class Response implements HttpServletResponse { + protected static final boolean REWRITE_CONTEXT_CHECK = + Boolean.valueOf(System.getProperty("org.apache.catalina.connector.Response.REWRITE_CONTEXT_CHECK", "true")).booleanValue(); // ----------------------------------------------------------- Constructors @@ -1511,7 +1513,7 @@ String contextPath = request.getContext().getPath(); if (contextPath != null) { String file = url.getFile(); - if ((file == null) || !file.startsWith(contextPath)) + if ((file == null) || (REWRITE_CONTEXT_CHECK && !file.startsWith(contextPath))) return (false); String tok = request.getContext().getSessionCookie().getPathParameterName() + session.getIdInternal(); if (file.indexOf(tok, contextPath.length()) >= 0)

14 years, 2 months

1
0
0 / 0

JBossWeb SVN: r1557 - branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/session.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2010-09-28 22:10:17 -0400 (Tue, 28 Sep 2010) New Revision: 1557 Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/session/ManagerBase.java Log: Backport Tomcat Bug 42530: ManagerBase.backgroundProcess throws NullPointerException for [JBPAPP-4909]. Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/session/ManagerBase.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/session/ManagerBase.java 2010-09-21 15:03:19 UTC (rev 1556) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/session/ManagerBase.java 2010-09-29 02:10:17 UTC (rev 1557) @@ -176,7 +176,7 @@ * The set of currently active Sessions for this Manager, keyed by * session identifier. */ - protected Map sessions = new ConcurrentHashMap(); + protected Map<String, Session> sessions = new ConcurrentHashMap<String, Session>(); // Number of sessions created by this manager protected int sessionCounter=0; @@ -869,12 +869,7 @@ */ public Session[] findSessions() { - Session results[] = null; - synchronized (sessions) { - results = new Session[sessions.size()]; - results = (Session[]) sessions.values().toArray(results); - } - return (results); + return sessions.values().toArray(new Session[0]); }

14 years, 2 months

1
0
0 / 0

JBossWeb SVN: r1556 - tags.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2010-09-21 11:03:19 -0400 (Tue, 21 Sep 2010) New Revision: 1556 Added: tags/JBOSSWEB_3_0_0_BETA7/ Log: - 3.0 beta7. Copied: tags/JBOSSWEB_3_0_0_BETA7 (from rev 1555, trunk)

14 years, 3 months

1
0
0 / 0

JBossWeb SVN: r1555 - trunk.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2010-09-21 10:52:05 -0400 (Tue, 21 Sep 2010) New Revision: 1555 Modified: trunk/build.xml Log: - Hack a bit the Maven stuff for JBWEB-174. Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2010-09-21 13:23:58 UTC (rev 1554) +++ trunk/build.xml 2010-09-21 14:52:05 UTC (rev 1555) @@ -498,28 +498,28 @@ <arg value="-c" /> <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt.jar -DpomFile=${tomcat.jars}/jasper-jdt-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> </exec> + <exec dir="." executable="/bin/sh" os="Linux"> + <arg value="-c" /> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb-src.jar -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=org.jboss.web -DartifactId=jbossweb -Dversion=${version} -Dclassifier=sources"/> + </exec> <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb.jar -DpomFile=${tomcat.jars}/jbossweb-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> </exec> - <exec dir="." executable="/bin/sh" os="Linux"> - <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb-src.jar -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=org.jboss.web -DartifactId=jbossweb-src -Dversion=${version} -Dclassifier=sources"/> - </exec>  <exec dir="." executable="cmd" os="Windows NT"> <arg value="/c" /> <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt.jar -DpomFile=${tomcat.jars}/jasper-jdt-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> </exec> + <exec dir="." executable="cmd" os="Windows NT"> + <arg value="/c" /> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb-src.jar -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=org.jboss.web -DartifactId=jbossweb -Dversion=${version} -Dclassifier=sources"/> + </exec> <exec dir="." executable="cmd" os="Windows NT"> <arg value="/c" /> <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb.jar -DpomFile=${tomcat.jars}/jbossweb-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> </exec> - <exec dir="." executable="cmd" os="Windows NT"> - <arg value="/c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb-src.jar -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=org.jboss.web -DartifactId=jbossweb-src -Dversion=${version} -Dclassifier=sources"/> - </exec> </target>

14 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits September 2010