December 2009 - jbossweb-commits - Jboss List Archives

JBossWeb SVN: r1326 - branches/JBOSSWEB_2_0_0_GA_CP06_JBPAPP-3222/src/share/classes/org/apache/catalina/connector.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2009-12-08 17:18:50 -0500 (Tue, 08 Dec 2009) New Revision: 1326 Modified: branches/JBOSSWEB_2_0_0_GA_CP06_JBPAPP-3222/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java Log: Fix parent context cookie overwriting URL encoded cookie for [JBWEB-153] Modified: branches/JBOSSWEB_2_0_0_GA_CP06_JBPAPP-3222/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP06_JBPAPP-3222/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java 2009-12-08 22:05:21 UTC (rev 1325) +++ branches/JBOSSWEB_2_0_0_GA_CP06_JBPAPP-3222/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java 2009-12-08 22:18:50 UTC (rev 1326) @@ -494,6 +494,13 @@ */ protected void parseSessionCookiesId(org.apache.coyote.Request req, Request request) { + // If session tracking via cookies has been disabled for the current + // context, don't go looking for a session ID in a cookie as a cookie + // from a parent context with a session ID may be present which would + // overwrite the valid session ID encoded in the URL + if (!((Context)request.getMappingData().context).getCookies()) + return; + // Parse session id from cookies Cookies serverCookies = req.getCookies(); int count = serverCookies.getCookieCount();

14 years, 5 months

1
0
0 / 0

JBossWeb SVN: r1325 - branches.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2009-12-08 17:05:21 -0500 (Tue, 08 Dec 2009) New Revision: 1325 Added: branches/JBOSSWEB_2_0_0_GA_CP11_JBPAPP-3233/ Log: Create JBPAPP-3233 patch branch from JBOSSWEB_2_0_0_GA_CP11 tag Copied: branches/JBOSSWEB_2_0_0_GA_CP11_JBPAPP-3233 (from rev 1324, tags/JBOSSWEB_2_0_0_GA_CP11)

14 years, 5 months

1
0
0 / 0

JBossWeb SVN: r1324 - trunk/java/org/apache/catalina/core.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2009-12-08 13:29:07 -0500 (Tue, 08 Dec 2009) New Revision: 1324 Modified: trunk/java/org/apache/catalina/core/StandardContext.java Log: - During init, it is necessary to default to the list of yet to be sorted listeners. Modified: trunk/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContext.java 2009-12-08 15:42:37 UTC (rev 1323) +++ trunk/java/org/apache/catalina/core/StandardContext.java 2009-12-08 18:29:07 UTC (rev 1324) @@ -954,7 +954,8 @@ * this application has started, or after it has been stopped */ public Object[] getApplicationEventListeners() { - return (applicationEventListenersInstances); + return (applicationEventListenersInstances != null + ? applicationEventListenersInstances : listenersInstances); } @@ -979,7 +980,8 @@ * this application has started, or after it has been stopped */ public Object[] getApplicationSessionLifecycleListeners() { - return (applicationSessionLifecycleListenersInstances); + return (applicationSessionLifecycleListenersInstances != null + ? applicationSessionLifecycleListenersInstances : listenersInstances); }

14 years, 5 months

1
0
0 / 0

JBossWeb SVN: r1323 - trunk/java/org/apache/tomcat/util/net.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2009-12-08 10:42:37 -0500 (Tue, 08 Dec 2009) New Revision: 1323 Modified: trunk/java/org/apache/tomcat/util/net/SSLImplementation.java Log: - Remove PureTLS. Modified: trunk/java/org/apache/tomcat/util/net/SSLImplementation.java =================================================================== --- trunk/java/org/apache/tomcat/util/net/SSLImplementation.java 2009-12-07 15:43:23 UTC (rev 1322) +++ trunk/java/org/apache/tomcat/util/net/SSLImplementation.java 2009-12-08 15:42:37 UTC (rev 1323) @@ -31,14 +31,11 @@ org.jboss.logging.Logger.getLogger(SSLImplementation.class); // The default implementations in our search path - private static final String PureTLSImplementationClass= - "org.apache.tomcat.util.net.puretls.PureTLSImplementation"; private static final String JSSEImplementationClass= "org.apache.tomcat.util.net.jsse.JSSEImplementation"; private static final String[] implementations= { - PureTLSImplementationClass, JSSEImplementationClass };

14 years, 5 months

1
0
0 / 0

JBossWeb SVN: r1322 - branches/2.1.x/java/org/jboss/web/cluster.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-12-07 10:43:23 -0500 (Mon, 07 Dec 2009) New Revision: 1322 Modified: branches/2.1.x/java/org/jboss/web/cluster/ClusterListener.java Log: Required by MODCLUSTER-110 tests. Modified: branches/2.1.x/java/org/jboss/web/cluster/ClusterListener.java =================================================================== --- branches/2.1.x/java/org/jboss/web/cluster/ClusterListener.java 2009-12-07 02:28:04 UTC (rev 1321) +++ branches/2.1.x/java/org/jboss/web/cluster/ClusterListener.java 2009-12-07 15:43:23 UTC (rev 1322) @@ -709,6 +709,9 @@ } return result.toString(); } + public String doProxyPing(String scheme, String host, int port) { + return doProxyPing(scheme + "://" + host + String.valueOf(port)); + } /** * Reset a DOWN connection to the proxy up to ERROR, where the configuration will

14 years, 5 months

1
0
0 / 0

JBossWeb SVN: r1321 - in trunk: webapps/docs and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2009-12-06 21:28:04 -0500 (Sun, 06 Dec 2009) New Revision: 1321 Modified: trunk/java/org/apache/jasper/compiler/JspUtil.java trunk/webapps/docs/changelog.xml Log: - Revert nice bugfix: a method returning void being used to set the value of an attribute is something that is allowed. Modified: trunk/java/org/apache/jasper/compiler/JspUtil.java =================================================================== --- trunk/java/org/apache/jasper/compiler/JspUtil.java 2009-12-06 21:29:54 UTC (rev 1320) +++ trunk/java/org/apache/jasper/compiler/JspUtil.java 2009-12-07 02:28:04 UTC (rev 1321) @@ -463,8 +463,6 @@ c = float.class; else if ("double".equals(type)) c = double.class; - else if ("void".equals(type)) - c = void.class; else if (type.indexOf('[') < 0) c = loader.loadClass(type); Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2009-12-06 21:29:54 UTC (rev 1320) +++ trunk/webapps/docs/changelog.xml 2009-12-07 02:28:04 UTC (rev 1321) @@ -217,9 +217,6 @@ <bug>42390</bug>: Correct JSP compilation error with nested tagfile tags with variables with "AT_BEGIN" scope. Patch provided by Konstantin Kolinko. (markt) </fix> - <fix> - <bug>47453</bug>: Handle void return types in JspUtil. Patch by Tim Funk. (markt) - </fix> </changelog> </subsection> </section>

14 years, 5 months

1
0
0 / 0

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

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2009-12-06 16:29:54 -0500 (Sun, 06 Dec 2009) New Revision: 1320 Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Log: - Revert ... Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java =================================================================== --- trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2009-12-04 19:43:30 UTC (rev 1319) +++ trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2009-12-06 21:29:54 UTC (rev 1320) @@ -652,13 +652,6 @@ */ protected void parseSessionCookiesId(org.apache.coyote.Request req, Request request) { - // If session tracking via cookies has been disabled for the current - // context, don't go looking for a session ID in a cookie as a cookie - // from a parent context with a session ID may be present which would - // overwrite the valid session ID encoded in the URL - if (!((Context)request.getMappingData().context).getCookies()) - return; - // Parse session id from cookies Cookies serverCookies = req.getCookies(); int count = serverCookies.getCookieCount();

14 years, 5 months

1
0
0 / 0

JBossWeb SVN: r1319 - branches.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2009-12-04 14:43:30 -0500 (Fri, 04 Dec 2009) New Revision: 1319 Added: branches/JBOSSWEB_2_0_0_GA_CP06_JBPAPP-3222/ Log: Create JBPAPP-3222 patch branch from JBOSSWEB_2_0_0_GA_CP06 tag Copied: branches/JBOSSWEB_2_0_0_GA_CP06_JBPAPP-3222 (from rev 1318, tags/JBOSSWEB_2_0_0_GA_CP06)

14 years, 5 months

1
0
0 / 0

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

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2009-12-04 14:03:33 -0500 (Fri, 04 Dec 2009) New Revision: 1318 Modified: branches/2.1.x/java/org/apache/catalina/connector/CoyoteAdapter.java Log: Fix parent context cookie overwriting URL encoded cookie for [JBWEB-153] Modified: branches/2.1.x/java/org/apache/catalina/connector/CoyoteAdapter.java =================================================================== --- branches/2.1.x/java/org/apache/catalina/connector/CoyoteAdapter.java 2009-12-04 18:57:36 UTC (rev 1317) +++ branches/2.1.x/java/org/apache/catalina/connector/CoyoteAdapter.java 2009-12-04 19:03:33 UTC (rev 1318) @@ -598,6 +598,13 @@ */ protected void parseSessionCookiesId(org.apache.coyote.Request req, Request request) { + // If session tracking via cookies has been disabled for the current + // context, don't go looking for a session ID in a cookie as a cookie + // from a parent context with a session ID may be present which would + // overwrite the valid session ID encoded in the URL + if (!((Context)request.getMappingData().context).getCookies()) + return; + // Parse session id from cookies Cookies serverCookies = req.getCookies(); int count = serverCookies.getCookieCount();

14 years, 5 months

1
0
0 / 0

JBossWeb SVN: r1317 - branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2009-12-04 13:57:36 -0500 (Fri, 04 Dec 2009) New Revision: 1317 Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java Log: Fix parent context cookie overwriting URL encoded cookie for [JBWEB-153] 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 2009-12-04 16:50:03 UTC (rev 1316) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java 2009-12-04 18:57:36 UTC (rev 1317) @@ -500,6 +500,13 @@ */ protected void parseSessionCookiesId(org.apache.coyote.Request req, Request request) { + // If session tracking via cookies has been disabled for the current + // context, don't go looking for a session ID in a cookie as a cookie + // from a parent context with a session ID may be present which would + // overwrite the valid session ID encoded in the URL + if (!((Context)request.getMappingData().context).getCookies()) + return; + // Parse session id from cookies Cookies serverCookies = req.getCookies(); int count = serverCookies.getCookieCount();

14 years, 5 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 December 2009