JBossWeb SVN: r2577 - branches/7.4.x/src/main/java/org/apache/catalina/authenticator.
by jbossweb-commits＠lists.jboss.org
Author: aogburn
Date: 2014-12-17 11:14:56 -0500 (Wed, 17 Dec 2014)
New Revision: 2577
Modified:
branches/7.4.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java
Log:
BZ1175380: Add hack to filter out some events, submitted by Aaron Ogburn.
Modified: branches/7.4.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java
===================================================================
--- branches/7.4.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java 2014-12-17 08:47:05 UTC (rev 2576)
+++ branches/7.4.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java 2014-12-17 16:14:56 UTC (rev 2577)
@@ -318,6 +318,11 @@
&& (!Session.SESSION_PASSIVATED_EVENT.equals(event.getType())))
return;
+ // We don't care about passivation events caused by replication
+ if (Session.SESSION_PASSIVATED_EVENT.equals(event.getType()) && (event.getData() != null)
+ && event.getData().equals("REPLICATION"))
+ return;
+
// Look up the single session id associated with this session (if any)
Session session = event.getSession();
Property changes on: branches/7.4.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/7.5.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java:2574
/branches/8.0.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java:2529
10 years
JBossWeb SVN: r2576 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2014-12-17 03:47:05 -0500 (Wed, 17 Dec 2014)
New Revision: 2576
Added:
tags/JBOSSWEB_7_5_4_FINAL/
Log:
7.5.4 build.
10 years
JBossWeb SVN: r2575 - branches/7.5.x.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2014-12-17 03:40:24 -0500 (Wed, 17 Dec 2014)
New Revision: 2575
Modified:
branches/7.5.x/pom.xml
Log:
7.5.4 build.
Modified: branches/7.5.x/pom.xml
===================================================================
--- branches/7.5.x/pom.xml 2014-12-17 08:39:33 UTC (rev 2574)
+++ branches/7.5.x/pom.xml 2014-12-17 08:40:24 UTC (rev 2575)
@@ -33,7 +33,7 @@
<groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
- <version>7.5.3.Final</version>
+ <version>7.5.4.Final</version>
<name>JBoss Web</name>
<description>Servlet 3.0 container</description>
10 years
JBossWeb SVN: r2574 - branches/7.5.x/src/main/java/org/apache/catalina/authenticator.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2014-12-17 03:39:33 -0500 (Wed, 17 Dec 2014)
New Revision: 2574
Modified:
branches/7.5.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java
Log:
BZ1173313: Add hack to filter out some events, submitted by Aaron Ogburn.
Modified: branches/7.5.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java
===================================================================
--- branches/7.5.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java 2014-12-15 13:55:19 UTC (rev 2573)
+++ branches/7.5.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java 2014-12-17 08:39:33 UTC (rev 2574)
@@ -318,6 +318,11 @@
&& (!Session.SESSION_PASSIVATED_EVENT.equals(event.getType())))
return;
+ // We don't care about passivation events caused by replication
+ if (Session.SESSION_PASSIVATED_EVENT.equals(event.getType()) && (event.getData() != null)
+ && event.getData().equals("REPLICATION"))
+ return;
+
// Look up the single session id associated with this session (if any)
Session session = event.getSession();
10 years
JBossWeb SVN: r2573 - branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2014-12-15 08:55:19 -0500 (Mon, 15 Dec 2014)
New Revision: 2573
Modified:
branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java
Log:
BZ1172737: Always add SSLv2Hello, following review by JF.
Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
===================================================================
--- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2014-12-08 13:50:48 UTC (rev 2572)
+++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2014-12-15 13:55:19 UTC (rev 2573)
@@ -739,15 +739,13 @@
if (protocols == null) {
return null;
}
- String vmVersion = System.getProperty("java.runtime.version");
- boolean isJava6JVM = (vmVersion != null) && vmVersion.startsWith("1.6");
List<String> result = new ArrayList<String>(protocols.length);
for (String protocol : protocols) {
if (protocol == null || protocol.toUpperCase(Locale.ENGLISH).contains("SSL")) {
if (CoyoteLogger.UTIL_LOGGER.isDebugEnabled()) {
CoyoteLogger.UTIL_LOGGER.debug("Exclude protocol: " + protocol);
}
- if (protocol != null && isJava6JVM && protocol.equalsIgnoreCase("SSLv2Hello")) {
+ if (protocol != null && protocol.equalsIgnoreCase("SSLv2Hello")) {
result.add(protocol);
}
} else {
Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java
===================================================================
--- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java 2014-12-08 13:50:48 UTC (rev 2572)
+++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java 2014-12-15 13:55:19 UTC (rev 2573)
@@ -809,6 +809,9 @@
if (CoyoteLogger.UTIL_LOGGER.isDebugEnabled()) {
CoyoteLogger.UTIL_LOGGER.debug("Exclude protocol: " + protocol);
}
+ if (protocol != null && protocol.equalsIgnoreCase("SSLv2Hello")) {
+ result.add(protocol);
+ }
} else {
result.add(protocol);
}
10 years
JBossWeb SVN: r2572 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2014-12-08 08:50:48 -0500 (Mon, 08 Dec 2014)
New Revision: 2572
Added:
tags/JBOSSWEB_7_5_3_FINAL/
Log:
Web 7.5.3
10 years
JBossWeb SVN: r2571 - branches/7.5.x.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2014-12-08 08:28:39 -0500 (Mon, 08 Dec 2014)
New Revision: 2571
Modified:
branches/7.5.x/pom.xml
Log:
Web 7.5.3
Modified: branches/7.5.x/pom.xml
===================================================================
--- branches/7.5.x/pom.xml 2014-12-08 11:47:04 UTC (rev 2570)
+++ branches/7.5.x/pom.xml 2014-12-08 13:28:39 UTC (rev 2571)
@@ -33,7 +33,7 @@
<groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
- <version>7.5.2.Final</version>
+ <version>7.5.3.Final</version>
<name>JBoss Web</name>
<description>Servlet 3.0 container</description>
10 years
JBossWeb SVN: r2570 - branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2014-12-08 06:47:04 -0500 (Mon, 08 Dec 2014)
New Revision: 2570
Modified:
branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Log:
Allow SSLv2Hello if Java 6. But this is a very short term strategy probably.
Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
===================================================================
--- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2014-12-08 09:56:56 UTC (rev 2569)
+++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2014-12-08 11:47:04 UTC (rev 2570)
@@ -736,23 +736,24 @@
}
public static String[] filterInsecureProcotols(String[] protocols) {
- // Filtering is disabled for Java 6 compatibility (TLS is nearly unusable with it)
- return protocols;
- /*
if (protocols == null) {
return null;
}
+ String vmVersion = System.getProperty("java.runtime.version");
+ boolean isJava6JVM = (vmVersion != null) && vmVersion.startsWith("1.6");
List<String> result = new ArrayList<String>(protocols.length);
for (String protocol : protocols) {
if (protocol == null || protocol.toUpperCase(Locale.ENGLISH).contains("SSL")) {
if (CoyoteLogger.UTIL_LOGGER.isDebugEnabled()) {
CoyoteLogger.UTIL_LOGGER.debug("Exclude protocol: " + protocol);
}
+ if (protocol != null && isJava6JVM && protocol.equalsIgnoreCase("SSLv2Hello")) {
+ result.add(protocol);
+ }
} else {
result.add(protocol);
}
}
return result.toArray(new String[result.size()]);
- */
}
}
10 years
JBossWeb SVN: r2569 - branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2014-12-08 04:56:56 -0500 (Mon, 08 Dec 2014)
New Revision: 2569
Modified:
branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Log:
Comment out the protocol filtering code (JDK 6 incompatibility that has been ruled as more important).
Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
===================================================================
--- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2014-12-05 10:06:08 UTC (rev 2568)
+++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2014-12-08 09:56:56 UTC (rev 2569)
@@ -736,10 +736,12 @@
}
public static String[] filterInsecureProcotols(String[] protocols) {
+ // Filtering is disabled for Java 6 compatibility (TLS is nearly unusable with it)
+ return protocols;
+ /*
if (protocols == null) {
return null;
}
-
List<String> result = new ArrayList<String>(protocols.length);
for (String protocol : protocols) {
if (protocol == null || protocol.toUpperCase(Locale.ENGLISH).contains("SSL")) {
@@ -751,5 +753,6 @@
}
}
return result.toArray(new String[result.size()]);
+ */
}
}
10 years
JBossWeb SVN: r2568 - in branches/7.5.x/src/main/java/org/apache/catalina: core and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2014-12-05 05:06:08 -0500 (Fri, 05 Dec 2014)
New Revision: 2568
Modified:
branches/7.5.x/src/main/java/org/apache/catalina/Lifecycle.java
branches/7.5.x/src/main/java/org/apache/catalina/core/StandardContext.java
Log:
JBWEB-308: Add extra hooks.
Modified: branches/7.5.x/src/main/java/org/apache/catalina/Lifecycle.java
===================================================================
--- branches/7.5.x/src/main/java/org/apache/catalina/Lifecycle.java 2014-12-04 15:06:08 UTC (rev 2567)
+++ branches/7.5.x/src/main/java/org/apache/catalina/Lifecycle.java 2014-12-05 10:06:08 UTC (rev 2568)
@@ -107,6 +107,18 @@
public static final String LOAD_ON_STARTUP_EVENT = "load_on_startup";
+ /**
+ * The LifecycleEvent type for the "component before unload" event.
+ */
+ public static final String BEFORE_UNLOAD_EVENT = "before_unload";
+
+
+ /**
+ * The LifecycleEvent type for the "component after unload" event.
+ */
+ public static final String AFTER_UNLOAD_EVENT = "after_unload";
+
+
// --------------------------------------------------------- Public Methods
Modified: branches/7.5.x/src/main/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- branches/7.5.x/src/main/java/org/apache/catalina/core/StandardContext.java 2014-12-04 15:06:08 UTC (rev 2567)
+++ branches/7.5.x/src/main/java/org/apache/catalina/core/StandardContext.java 2014-12-05 10:06:08 UTC (rev 2568)
@@ -3906,8 +3906,23 @@
// Stop our child containers, if any
Container[] children = findChildren();
for (int i = 0; i < children.length; i++) {
- if (children[i] instanceof Lifecycle)
+ if (children[i] instanceof Lifecycle){
+ StandardWrapper standardWrapper = null;
+ if(children[i] instanceof StandardWrapper){
+ standardWrapper = (StandardWrapper) children[i];
+ }
+
+ // it might be better to use InstanceEvent, but JBossContextConfig implements LifecycleListener
+ if(standardWrapper != null){
+ lifecycle.fireLifecycleEvent(Lifecycle.BEFORE_UNLOAD_EVENT, standardWrapper.getServletClass());
+ }
+
((Lifecycle) children[i]).stop();
+
+ if(standardWrapper != null){
+ lifecycle.fireLifecycleEvent(Lifecycle.AFTER_UNLOAD_EVENT, standardWrapper.getServletClass());
+ }
+ }
}
// Stop our filters
10 years