svn commit: r1653179 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Author: kfujino
Date: Tue Jan 20 01:51:30 2015
New Revision: 1653179
URL: http://svn.apache.org/r1653179
Log:
Simplify the code.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1653179r1=1653178r2=1653179view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Tue Jan 20 01:51:30 2015
@@ -900,7 +900,10 @@ public abstract class AbstractReplicated
try {
Member[] backup = null;
MapMessage msg = null;
-if ( entry.isProxy() ) {
+if (entry.isBackup()) {
+//select a new backup node
+backup = publishEntryInfo(key, entry.getValue());
+} else if ( entry.isProxy() ) {
//make sure we don't retrieve from ourselves
msg = new MapMessage(getMapContextName(),
MapMessage.MSG_RETRIEVE_BACKUP, false,
(Serializable) key, null, null,
null,null);
@@ -918,11 +921,7 @@ public abstract class AbstractReplicated
val.setOwner(getMapOwner());
}
if ( msg.getValue()!=null ) entry.setValue((V)
msg.getValue());
-}
-if (entry.isBackup()) {
-//select a new backup node
-backup = publishEntryInfo(key, entry.getValue());
-} else if ( entry.isProxy() ) {
+
//invalidate the previous primary
msg = new
MapMessage(getMapContextName(),MapMessage.MSG_PROXY,false,(Serializable)key,null,null,channel.getLocalMember(false),backup);
Member[] dest = getMapMembersExcl(backup);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 4 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 23 mins 46 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150120-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150120/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150120.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150120-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl/dest-20150120/bin/openssl -Dexecute.test.apr=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20150120.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
svn commit: r1653193 - in /tomcat/trunk/java/org/apache/catalina/tribes/tipis: AbstractReplicatedMap.java ReplicatedMap.java
Author: kfujino
Date: Tue Jan 20 04:54:05 2015
New Revision: 1653193
URL: http://svn.apache.org/r1653193
Log:
Fix behavior of ReplicatedMap when member has disappeared.
If map entry is primary, rebuild the backup members.
If primary node of map entry has disappeared, backup node is promoted to
primary.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1653193r1=1653192r2=1653193view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Tue Jan 20 04:54:05 2015
@@ -71,7 +71,7 @@ public abstract class AbstractReplicated
//--
// INSTANCE VARIABLES
//--
-private final ConcurrentHashMapK, MapEntryK,V innerMap;
+protected final ConcurrentHashMapK, MapEntryK,V innerMap;
protected abstract int getStateMessageType();
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1653193r1=1653192r2=1653193view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Tue
Jan 20 04:54:05 2015
@@ -17,10 +17,14 @@
package org.apache.catalina.tribes.tipis;
import java.io.Serializable;
+import java.util.Iterator;
+import java.util.Map;
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.Member;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* All-to-all replication for a hash map implementation. Each node in the
cluster will carry an identical
@@ -49,6 +53,8 @@ public class ReplicatedMapK,V extends
private static final long serialVersionUID = 1L;
+private final Log log = LogFactory.getLog(ReplicatedMap.class);
+
//--
// CONSTRUCTORS / DESTRUCTORS
//--
@@ -134,4 +140,67 @@ public class ReplicatedMapK,V extends
return backup;
}
+@Override
+public void memberDisappeared(Member member) {
+boolean removed = false;
+synchronized (mapMembers) {
+removed = (mapMembers.remove(member) != null );
+if (!removed) {
+if (log.isDebugEnabled()) log.debug(Member[+member+]
disappeared, but was not present in the map.);
+return; //the member was not part of our map.
+}
+}
+if (log.isInfoEnabled())
+log.info(Member[+member+] disappeared. Related map entries will
be relocated to the new node.);
+long start = System.currentTimeMillis();
+IteratorMap.EntryK,MapEntryK,V i =
innerMap.entrySet().iterator();
+while (i.hasNext()) {
+Map.EntryK,MapEntryK,V e = i.next();
+MapEntryK,V entry = innerMap.get(e.getKey());
+if (entry==null) continue;
+if (entry.isPrimary()) {
+try {
+Member[] backup = getMapMembers();
+if (backup.length 0) {
+MapMessage msg = new MapMessage(getMapContextName(),
MapMessage.MSG_NOTIFY_MAPMEMBER,false,
+
(Serializable)entry.getKey(),null,null,channel.getLocalMember(false),backup);
+getChannel().send(backup, msg,
getChannelSendOptions());
+}
+entry.setBackupNodes(backup);
+entry.setPrimary(channel.getLocalMember(false));
+} catch (ChannelException x) {
+log.error(Unable to relocate[ + entry.getKey() + ] to a
new backup node, x);
+}
+} else if (member.equals(entry.getPrimary())) {
+entry.setPrimary(null);
+}
+
+if ( entry.getPrimary() == null
+entry.isCopy()
+entry.getBackupNodes()!=null
+entry.getBackupNodes().length 0
+
entry.getBackupNodes()[0].equals(channel.getLocalMember(false)) ) {
+
svn commit: r1653178 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Author: kfujino
Date: Tue Jan 20 01:47:08 2015
New Revision: 1653178
URL: http://svn.apache.org/r1653178
Log:
Clarify the handling of Copy message and Copy nodes.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1653178r1=1653177r2=1653178view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Tue Jan 20 01:47:08 2015
@@ -632,6 +632,7 @@ public abstract class AbstractReplicated
}
entry.setProxy(true);
entry.setBackup(false);
+entry.setCopy(false);
entry.setBackupNodes(mapmsg.getBackupNodes());
entry.setPrimary(mapmsg.getPrimary());
}
@@ -646,6 +647,7 @@ public abstract class AbstractReplicated
entry = new MapEntry((K) mapmsg.getKey(), (V)
mapmsg.getValue());
entry.setBackup(mapmsg.getMsgType() == MapMessage.MSG_BACKUP);
entry.setProxy(false);
+entry.setCopy(mapmsg.getMsgType() == MapMessage.MSG_COPY);
entry.setBackupNodes(mapmsg.getBackupNodes());
entry.setPrimary(mapmsg.getPrimary());
if (mapmsg.getValue() instanceof ReplicatedMapEntry ) {
@@ -654,6 +656,7 @@ public abstract class AbstractReplicated
} else {
entry.setBackup(mapmsg.getMsgType() == MapMessage.MSG_BACKUP);
entry.setProxy(false);
+entry.setCopy(mapmsg.getMsgType() == MapMessage.MSG_COPY);
entry.setBackupNodes(mapmsg.getBackupNodes());
entry.setPrimary(mapmsg.getPrimary());
if (entry.getValue() instanceof ReplicatedMapEntry) {
@@ -810,6 +813,7 @@ public abstract class AbstractReplicated
entry.setPrimary(channel.getLocalMember(false));
entry.setBackup(false);
entry.setProxy(false);
+entry.setCopy(false);
Member[] backup = publishEntryInfo(entry.getKey(),
entry.getValue());
entry.setBackupNodes(backup);
if ( mapOwner!=null )
mapOwner.objectMadePrimary(entry.getKey(),entry.getValue());
@@ -896,7 +900,7 @@ public abstract class AbstractReplicated
try {
Member[] backup = null;
MapMessage msg = null;
-if ( !entry.isBackup() ) {
+if ( entry.isProxy() ) {
//make sure we don't retrieve from ourselves
msg = new MapMessage(getMapContextName(),
MapMessage.MSG_RETRIEVE_BACKUP, false,
(Serializable) key, null, null,
null,null);
@@ -929,11 +933,15 @@ public abstract class AbstractReplicated
ReplicatedMapEntry val =
(ReplicatedMapEntry)entry.getValue();
val.setOwner(getMapOwner());
}
+} else if ( entry.isCopy() ) {
+// TODO no need to send the entry data.
+backup = publishEntryInfo(key, entry.getValue());
}
entry.setPrimary(channel.getLocalMember(false));
entry.setBackupNodes(backup);
entry.setBackup(false);
entry.setProxy(false);
+entry.setCopy(false);
if ( getMapOwner()!=null )
getMapOwner().objectMadePrimary(key, entry.getValue());
} catch (Exception x) {
@@ -990,6 +998,7 @@ public abstract class AbstractReplicated
MapEntryK,V entry = new MapEntry(key, value);
entry.setBackup(false);
entry.setProxy(false);
+entry.setCopy(false);
entry.setPrimary(channel.getLocalMember(false));
V old = null;
@@ -1148,6 +1157,7 @@ public abstract class AbstractReplicated
public static class MapEntryK,V implements Map.EntryK,V {
private boolean backup;
private boolean proxy;
+private boolean copy;
private Member[] backupNodes;
private Member primary;
private K key;
@@ -1184,7 +1194,7 @@ public abstract class AbstractReplicated
}
public boolean isPrimary() {
-return (!proxy !backup);
+return (!proxy !backup !copy);
}
public boolean isActive() {
@@ -1195,6 +1205,14 @@ public abstract class AbstractReplicated
this.proxy = proxy;
}
+public boolean isCopy() {
+return copy;
+}
+
+public void setCopy(boolean copy)
svn commit: r1653183 - in /tomcat/trunk/java/org/apache/catalina/tribes/tipis: AbstractReplicatedMap.java LazyReplicatedMap.java ReplicatedMap.java
Author: kfujino
Date: Tue Jan 20 02:23:21 2015
New Revision: 1653183
URL: http://svn.apache.org/r1653183
Log:
ReplicatedMap should send the Copy message when replicating.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1653183r1=1653182r2=1653183view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Tue Jan 20 02:23:21 2015
@@ -75,6 +75,8 @@ public abstract class AbstractReplicated
protected abstract int getStateMessageType();
+protected abstract int getRplicateMessageType();
+
/**
* Timeout for RPC messages, how long we will wait for a reply
@@ -426,7 +428,7 @@ public abstract class AbstractReplicated
rentry.lock();
try {
//construct a diff message
-msg = new MapMessage(mapContextName, MapMessage.MSG_BACKUP,
+msg = new MapMessage(mapContextName,
getRplicateMessageType(),
true, (Serializable) entry.getKey(),
null,
rentry.getDiff(),
entry.getPrimary(),
@@ -440,7 +442,7 @@ public abstract class AbstractReplicated
}
if (msg == null complete) {
//construct a complete
-msg = new MapMessage(mapContextName, MapMessage.MSG_BACKUP,
+msg = new MapMessage(mapContextName, getRplicateMessageType(),
false, (Serializable) entry.getKey(),
(Serializable) entry.getValue(),
null,
entry.getPrimary(),entry.getBackupNodes());
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=1653183r1=1653182r2=1653183view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
Tue Jan 20 02:23:21 2015
@@ -124,6 +124,11 @@ public class LazyReplicatedMapK,V exte
return AbstractReplicatedMap.MapMessage.MSG_STATE;
}
+@Override
+protected int getRplicateMessageType() {
+return AbstractReplicatedMap.MapMessage.MSG_BACKUP;
+}
+
/**
* publish info about a map pair (key/value) to other nodes in the cluster
* @param key Object
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1653183r1=1653182r2=1653183view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Tue
Jan 20 02:23:21 2015
@@ -105,6 +105,11 @@ public class ReplicatedMapK,V extends
return AbstractReplicatedMap.MapMessage.MSG_STATE_COPY;
}
+@Override
+protected int getRplicateMessageType() {
+return AbstractReplicatedMap.MapMessage.MSG_COPY;
+}
+
/**
* publish info about a map pair (key/value) to other nodes in the cluster
* @param key Object
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57178] Add CorsFilter configuration option to allow requests with Origin null
https://issues.apache.org/bugzilla/show_bug.cgi?id=57178 --- Comment #4 from Gregor Zurowski gzurow...@apache.org --- No, is not needed, but I initially thought of a separate configuration option for making the decision of whether to allow the null origin more explicit. This also allows to control whether the default value * (any origin) of the existing configuration option 'cors.allowed.origins' includes or excludes the null origin. The proposed patch does not alter the current default behavior: if 'cors.allowed.origins' is set to *, then the null origin is not allowed. It must be explicitly enabled by setting the new configuration option 'cors.allowed.nullorigins' to true, which might be useful for specific configuration needs. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1653180 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Author: kfujino
Date: Tue Jan 20 01:55:29 2015
New Revision: 1653180
URL: http://svn.apache.org/r1653180
Log:
Remove duplicated code.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1653180r1=1653179r2=1653180view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Tue Jan 20 01:55:29 2015
@@ -916,10 +916,6 @@ public abstract class AbstractReplicated
msg = (MapMessage) resp[0].getMessage();
msg.deserialize(getExternalLoaders());
backup = entry.getBackupNodes();
-if ( entry.getValue() instanceof ReplicatedMapEntry ) {
-ReplicatedMapEntry val =
(ReplicatedMapEntry)entry.getValue();
-val.setOwner(getMapOwner());
-}
if ( msg.getValue()!=null ) entry.setValue((V)
msg.getValue());
//invalidate the previous primary
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1653181 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Author: kfujino
Date: Tue Jan 20 02:07:41 2015
New Revision: 1653181
URL: http://svn.apache.org/r1653181
Log:
Copy node does not need to send the entry data.
It is enough to send only the node information of the entry.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1653181r1=1653180r2=1653181view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Tue Jan 20 02:07:41 2015
@@ -695,6 +695,14 @@ public abstract class AbstractReplicated
}
}
}
+
+if (mapmsg.getMsgType() == MapMessage.MSG_NOTIFY_MAPMEMBER) {
+MapEntryK, V entry = innerMap.get(mapmsg.getKey());
+if (entry != null) {
+entry.setBackupNodes(mapmsg.getBackupNodes());
+entry.setPrimary(mapmsg.getPrimary());
+}
+}
}
@Override
@@ -929,8 +937,12 @@ public abstract class AbstractReplicated
val.setOwner(getMapOwner());
}
} else if ( entry.isCopy() ) {
-// TODO no need to send the entry data.
-backup = publishEntryInfo(key, entry.getValue());
+backup = getMapMembers();
+if (backup.length 0) {
+msg = new MapMessage(getMapContextName(),
MapMessage.MSG_NOTIFY_MAPMEMBER,false,
+
(Serializable)key,null,null,channel.getLocalMember(false),backup);
+getChannel().send(backup, msg,
getChannelSendOptions());
+}
}
entry.setPrimary(channel.getLocalMember(false));
entry.setBackupNodes(backup);
@@ -1319,6 +1331,7 @@ public abstract class AbstractReplicated
public static final int MSG_COPY = 9;
public static final int MSG_STATE_COPY = 10;
public static final int MSG_ACCESS = 11;
+public static final int MSG_NOTIFY_MAPMEMBER = 12;
private final byte[] mapId;
private final int msgtype;
@@ -1357,6 +1370,7 @@ public abstract class AbstractReplicated
case MSG_STATE_COPY: return MSG_STATE_COPY;
case MSG_COPY: return MSG_COPY;
case MSG_ACCESS: return MSG_ACCESS;
+case MSG_NOTIFY_MAPMEMBER: return MSG_NOTIFY_MAPMEMBER;
default : return UNKNOWN;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 10 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 26 mins 42 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150120-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150120/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150120.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150120-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl/dest-20150120/bin/openssl -Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20150120.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
svn commit: r1653182 - /tomcat/trunk/webapps/docs/changelog.xml
Author: kfujino Date: Tue Jan 20 02:12:31 2015 New Revision: 1653182 URL: http://svn.apache.org/r1653182 Log: Add changelog entry. Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1653182r1=1653181r2=1653182view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan 20 02:12:31 2015 @@ -81,6 +81,13 @@ /scode /changelog /subsection + subsection name=Tribes +changelog + fix +Clarify the handling of Copy message and Copy nodes. (kfujino) + /fix +/changelog + /subsection /section /body /document - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57458] Mixed up responses sent to wrong users
https://issues.apache.org/bugzilla/show_bug.cgi?id=57458 --- Comment #2 from Mahmoud Al-Yasein mahmoud.alyas...@gmail.com --- We are not using any of mentioned items, unfortunately I don't have the stack trace just null pointer exception without stack trace, I'll try to use the latest version and see -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1653183 - in /tomcat/trunk/java/org/apache/catalina/tribes/tipis: AbstractReplicatedMap.java LazyReplicatedMap.java ReplicatedMap.java
2015-01-20 14:39 GMT+09:00 Felix Schumacher felix.schumac...@internetallee.de: Am 20. Januar 2015 03:23:22 MEZ, schrieb kfuj...@apache.org: Author: kfujino Date: Tue Jan 20 02:23:21 2015 New Revision: 1653183 URL: http://svn.apache.org/r1653183 Log: ReplicatedMap should send the Copy message when replicating. Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1653183r1=1653182r2=1653183view=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Tue Jan 20 02:23:21 2015 @@ -75,6 +75,8 @@ public abstract class AbstractReplicated protected abstract int getStateMessageType(); +protected abstract int getRplicateMessageType(); I think you wanted to type getR*e*plicateMessageType. Regards Felix Thanks . -- Keiichi.Fujino dev-h...@tomcat.apache.org dev-h...@tomcat.apache.org
svn commit: r1653198 - in /tomcat/trunk/java/org/apache/catalina/tribes/tipis: AbstractReplicatedMap.java LazyReplicatedMap.java ReplicatedMap.java
Author: kfujino
Date: Tue Jan 20 05:58:32 2015
New Revision: 1653198
URL: http://svn.apache.org/r1653198
Log:
Fix typos.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1653198r1=1653197r2=1653198view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Tue Jan 20 05:58:32 2015
@@ -75,7 +75,7 @@ public abstract class AbstractReplicated
protected abstract int getStateMessageType();
-protected abstract int getRplicateMessageType();
+protected abstract int getReplicateMessageType();
/**
@@ -428,7 +428,7 @@ public abstract class AbstractReplicated
rentry.lock();
try {
//construct a diff message
-msg = new MapMessage(mapContextName,
getRplicateMessageType(),
+msg = new MapMessage(mapContextName,
getReplicateMessageType(),
true, (Serializable) entry.getKey(),
null,
rentry.getDiff(),
entry.getPrimary(),
@@ -442,7 +442,7 @@ public abstract class AbstractReplicated
}
if (msg == null complete) {
//construct a complete
-msg = new MapMessage(mapContextName, getRplicateMessageType(),
+msg = new MapMessage(mapContextName, getReplicateMessageType(),
false, (Serializable) entry.getKey(),
(Serializable) entry.getValue(),
null,
entry.getPrimary(),entry.getBackupNodes());
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=1653198r1=1653197r2=1653198view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
Tue Jan 20 05:58:32 2015
@@ -125,7 +125,7 @@ public class LazyReplicatedMapK,V exte
}
@Override
-protected int getRplicateMessageType() {
+protected int getReplicateMessageType() {
return AbstractReplicatedMap.MapMessage.MSG_BACKUP;
}
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1653198r1=1653197r2=1653198view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Tue
Jan 20 05:58:32 2015
@@ -112,7 +112,7 @@ public class ReplicatedMapK,V extends
}
@Override
-protected int getRplicateMessageType() {
+protected int getReplicateMessageType() {
return AbstractReplicatedMap.MapMessage.MSG_COPY;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57420] Wrong class names generated since URL_ENCODER in DirContextURLConnection is not thread safe
https://issues.apache.org/bugzilla/show_bug.cgi?id=57420 --- Comment #6 from Violeta Georgieva violet...@apache.org --- (In reply to Konstantin Kolinko from comment #4) 1) As far as I see, UDecoder does not have any fields and thus is thread-safe. The thread safety is not documented, though. As such, I do not mind creating an instance of UDecoder, as that feels safer. A possible way to solve documentation issue is to add getInstance() factory methods to UEncoder, UDecoder. For decoder the method would return a singleton (thus documenting the thread safety), while for encoder it will always return a new instance. 2) Both encoder and decoder are usually used only once per connection. Thus I think it would be better to use local variables, creating the objects just before use, instead of caching them in class fields. UDecoder is used in connect(). That call happens once. +1 for creating it as a local variable UEncoder is used in list(). While it is possible to call list() multiple times, I think that in practice it is called only once. list() is called many times by org.apache.catalina.startup.ContextConfig.processAnnotationsJndi(URL, WebXml, boolean) As we add a save char to UEncoder I do not think that it will be OK to do this every time when list() is called. Wdyt? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1652942 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardContext.java test/org/apache/catalina/core/TestStandardContext.java test/org/apache/catalina/core/TesterTldLis
Author: markt Date: Mon Jan 19 09:19:44 2015 New Revision: 1652942 URL: http://svn.apache.org/r1652942 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57446 Ensure that the ServletContext presented to a listener for contextInitialized() is the same as the one presented when contextDestroyed() is called for the same listener. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContext.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TesterTldListener.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 19 09:19:44 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
[Bug 57461] Rename 'JAVA_HOME' message printed by VersionLoggerListener
https://issues.apache.org/bugzilla/show_bug.cgi?id=57461 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Mark Thomas ma...@apache.org --- Fixed in trunk, 8.0.x (for 8.0.18 onwards) and in 7.0.x (for 7.0.58 onwards). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57420] Wrong class names generated since URL_ENCODER in DirContextURLConnection is not thread safe
https://issues.apache.org/bugzilla/show_bug.cgi?id=57420 --- Comment #4 from Konstantin Kolinko knst.koli...@gmail.com --- 1) As far as I see, UDecoder does not have any fields and thus is thread-safe. The thread safety is not documented, though. As such, I do not mind creating an instance of UDecoder, as that feels safer. A possible way to solve documentation issue is to add getInstance() factory methods to UEncoder, UDecoder. For decoder the method would return a singleton (thus documenting the thread safety), while for encoder it will always return a new instance. 2) Both encoder and decoder are usually used only once per connection. Thus I think it would be better to use local variables, creating the objects just before use, instead of caching them in class fields. UDecoder is used in connect(). That call happens once. UEncoder is used in list(). While it is possible to call list() multiple times, I think that in practice it is called only once. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57464] New: Please support for TLS Fallback SCSV
https://issues.apache.org/bugzilla/show_bug.cgi?id=57464 Bug ID: 57464 Summary: Please support for TLS Fallback SCSV Product: Tomcat 7 Version: unspecified Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: hau...@acm.org https://tools.ietf.org/html/draft-ietf-tls-downgrade-scsv https://www.ssllabs.com/ssltest/analyze.html?d=issues.apache.org complains about Downgrade attack prevention No, TLS_FALLBACK_SCSV not supported (more info), but Mark expressed reluctance to do so as per http://mail-archives.apache.org/mod_mbox/tomcat-users/201412.mbox/%3c547ed9dd.2090...@apache.org%3E On the other hand - it wouldn't really hurt to support it? Or is ssllabs with its warning off the map? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1652943 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml
Author: markt Date: Mon Jan 19 09:21:19 2015 New Revision: 1652943 URL: http://svn.apache.org/r1652943 Log: (empty) Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 19 09:21:19 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652940 +/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940 /tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
svn commit: r1652973 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/LocalStrings.properties webapps/docs/changelog.xml
Author: markt
Date: Mon Jan 19 11:58:26 2015
New Revision: 1652973
URL: http://svn.apache.org/r1652973
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57461
When reporting value of java.home don't make it look like an environment
variable.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 19 11:58:26 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1652973r1=1652972r2=1652973view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Mon Jan 19 11:58:26 2015
@@ -127,7 +127,7 @@ versionLoggerListener.serverInfo.server.
versionLoggerListener.os.name =OS Name: {0}
versionLoggerListener.os.version =OS Version:{0}
versionLoggerListener.os.arch =Architecture: {0}
-versionLoggerListener.java.home=JAVA_HOME: {0}
+versionLoggerListener.java.home=Java Home: {0}
versionLoggerListener.vm.version =JVM Version: {0}
versionLoggerListener.vm.vendor=JVM Vendor:{0}
versionLoggerListener.catalina.base=CATALINA_BASE: {0}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1652973r1=1652972r2=1652973view=diff
[Bug 57464] Please support for TLS Fallback SCSV
https://issues.apache.org/bugzilla/show_bug.cgi?id=57464 Mark Thomas ma...@apache.org changed: What|Removed |Added Severity|normal |enhancement --- Comment #1 from Mark Thomas ma...@apache.org --- This can't be supported for BIO or NIO since Java does not support it. I assume it could be supported for APR/native but: a) I haven't looked into it b) I still don't see the point in expending effort on a feature that is only required by very old clients that are themselves unsupported That said, I'm not going to stand in anyone's way if they want to implement it (unless the patch is very large and/or invasive). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57455] Bootstrap doesn't handle paths with one quote
https://issues.apache.org/bugzilla/show_bug.cgi?id=57455 --- Comment #1 from Mark Thomas ma...@apache.org --- Thanks for the patch. I can confirm that it fixes the issues described. But... This has the potential to get messy. Neither nor , is permitted in a file name in Windows but both are acceptable in unix and friends. We started off simply using ',' (comma) as a delimiter. This assumed ',' never appeared in the value. Then we had a bug report that paths containing ',' broke things. To fix this we added optional quoting using ''. This allowed ',' to appear in the value if the value was quoted. This assumed '' never appeared in a value. Now we have this bug. I am concerned that the proposed solution is a sticking plaster rather than a complete fix and that in a few months time we'll have someone raising a bug about a different edge case (I can already see several valid file names that will break this). Unless we switch to using an escape character of some form, we are always going to have these issues. And I'm not at all sure that escaping will be possible since the values being parsed are obtained - in the default case - via unescaped environment variables. I'm leaning towards 'fixing' this by adding a comment that paths with '' are not permitted to catalina.propeties. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57465] New: Build TC Native with with latest OpenSSL to address CVEs
https://issues.apache.org/bugzilla/show_bug.cgi?id=57465 Bug ID: 57465 Summary: Build TC Native with with latest OpenSSL to address CVEs Product: Tomcat Native Version: 1.1.32 Hardware: PC Status: NEW Severity: major Priority: P2 Component: Library Assignee: dev@tomcat.apache.org Reporter: brian.m.pick...@gmail.com OpenSSL has a reported 8 CVE's affecting 1.0.1j and older since October last year, which is the version that's built into the latest windows binary, version 1.1.32. Please build with the latest version of OpenSSL (1.0.1l at this time) which addresses all of these issues. https://www.openssl.org/news/vulnerabilities.html -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1653041 - /tomcat/trunk/java/org/apache/juli/WebappProperties.java
Author: markt
Date: Mon Jan 19 16:20:27 2015
New Revision: 1653041
URL: http://svn.apache.org/r1653041
Log:
Simple Javadoc fix (mainly to test the CI system)
Modified:
tomcat/trunk/java/org/apache/juli/WebappProperties.java
Modified: tomcat/trunk/java/org/apache/juli/WebappProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/WebappProperties.java?rev=1653041r1=1653040r2=1653041view=diff
==
--- tomcat/trunk/java/org/apache/juli/WebappProperties.java (original)
+++ tomcat/trunk/java/org/apache/juli/WebappProperties.java Mon Jan 19 16:20:27
2015
@@ -26,19 +26,29 @@ package org.apache.juli;
public interface WebappProperties {
/**
- * Returns a name for the web application or null if none is available.
+ * Returns a name for the logging system to use for the web application, if
+ * any, associated with the class loader.
+ *
+ * @return The name to use for the web application or null if none is
+ * available.
*/
String getWebappName();
/**
- * Returns a name for the Host where the web application is deployed or
null
- * if none is available.
+ * Returns a name for the logging system to use for the Host where the
+ * web application, if any, associated with the class loader is deployed.
+ *
+ * @return The name to use for the Host where the web application is
+ * deployed or null if none is available.
*/
String getHostName();
/**
- * Returns a name for the service where the Host is deployed or null if
none
- * is available.
+ * Returns a name for the logging system to use for the Service where the
+ * Host, if any, associated with the class loader is deployed.
+ *
+ * @return The name to use for the Service where the Host is deployed or
+ * null if none is available.
*/
String getServiceName();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57441] EL Lambda expression in a JSP fails with The function incr must be used with a prefix when a default namespace is not specified
https://issues.apache.org/bugzilla/show_bug.cgi?id=57441 --- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com --- Is it at all possible to reliably validate functions at compile time? Maybe whitelist functions that have name only with no prefix? BTW, it is possible to use javax.el.ImportHandler.importStatic() to declare a function by importing a static method of a class. An example of manipulating ImportHandler at run time is in bug 57142. If it is manipulated at run time, it means that the information is not available at compile time to perform validation. https://issues.apache.org/bugzilla/show_bug.cgi?id=57142#c1 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1652940 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/StandardContext.java test/org/apache/catalina/core/TestStandardContext.java test/org/apache/catalina/core/TesterTldLis
Author: markt Date: Mon Jan 19 09:14:29 2015 New Revision: 1652940 URL: http://svn.apache.org/r1652940 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57446 Ensure that the ServletContext presented to a listener for contextInitialized() is the same as the one presented when contextDestroyed() is called for the same listener. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContext.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TesterTldListener.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 19 09:14:29 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938 Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1652940r1=1652939r2=1652940view=diff == --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Mon Jan 19 09:14:29 2015 @@ -210,6 +210,12 @@ public class StandardContext extends Con private final Object applicationListenersLock = new Object(); +/** + * The set of application listeners that are required to have limited access + * to ServletContext methods. See Servlet 3.1 section 4.4. + */ + +private final SetObject noPluggabilityListeners = new HashSet(); /** * The set of instantiated application event listener objects. Note that @@ -289,6 +295,13 @@ public class StandardContext extends Con */ protected ApplicationContext context = null; +/** + * The wrapped version of the associated ServletContext that is presented + * to listeners that are required to have limited
[Bug 57446] Catalina presents a wrapped ServletContext in de-init phase to application listeners
https://issues.apache.org/bugzilla/show_bug.cgi?id=57446 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas ma...@apache.org --- This has been fixed in trunk, 8.0.x (for 8.0.18 onwards) and 7.0.x (for 7.0.58 onwards). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1652938 - in /tomcat/trunk: java/org/apache/catalina/core/StandardContext.java test/org/apache/catalina/core/TestStandardContext.java test/org/apache/catalina/core/TesterTldListener.java
Author: markt
Date: Mon Jan 19 09:08:08 2015
New Revision: 1652938
URL: http://svn.apache.org/r1652938
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57446
Ensure that the ServletContext presented to a listener for contextInitialized()
is the same as the one presented when contextDestroyed() is called for the same
listener.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/trunk/test/org/apache/catalina/core/TesterTldListener.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1652938r1=1652937r2=1652938view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Jan 19
09:08:08 2015
@@ -210,6 +210,12 @@ public class StandardContext extends Con
private final Object applicationListenersLock = new Object();
+/**
+ * The set of application listeners that are required to have limited
access
+ * to ServletContext methods. See Servlet 3.1 section 4.4.
+ */
+
+private final SetObject noPluggabilityListeners = new HashSet();
/**
* The set of instantiated application event listener objects. Note that
@@ -289,6 +295,13 @@ public class StandardContext extends Con
*/
protected ApplicationContext context = null;
+/**
+ * The wrapped version of the associated ServletContext that is presented
+ * to listeners that are required to have limited access to ServletContext
+ * methods. See Servlet 3.1 section 4.4.
+ */
+private NoPluggabilityServletContext noPluggabilityServletContext = null;
+
/**
* Should we attempt to use cookies for session id communication?
@@ -4618,7 +4631,6 @@ public class StandardContext extends Con
String listeners[] = findApplicationListeners();
Object results[] = new Object[listeners.length];
boolean ok = true;
-SetObject noPluggabilityListeners = new HashSet();
for (int i = 0; i results.length; i++) {
if (getLogger().isDebugEnabled())
getLogger().debug( Configuring event listener class ' +
@@ -4687,12 +4699,11 @@ public class StandardContext extends Con
return ok;
}
-ServletContextEvent event =
-new ServletContextEvent(getServletContext());
+ServletContextEvent event = new
ServletContextEvent(getServletContext());
ServletContextEvent tldEvent = null;
if (noPluggabilityListeners.size() 0) {
-tldEvent = new ServletContextEvent(new
NoPluggabilityServletContext(
-getServletContext()));
+noPluggabilityServletContext = new
NoPluggabilityServletContext(getServletContext());
+tldEvent = new ServletContextEvent(noPluggabilityServletContext);
}
for (int i = 0; i instances.length; i++) {
if (!(instances[i] instanceof ServletContextListener))
@@ -4734,8 +4745,11 @@ public class StandardContext extends Con
boolean ok = true;
Object listeners[] = getApplicationLifecycleListeners();
if (listeners != null listeners.length 0) {
-ServletContextEvent event =
-new ServletContextEvent(getServletContext());
+ServletContextEvent event = new
ServletContextEvent(getServletContext());
+ServletContextEvent tldEvent = null;
+if (noPluggabilityServletContext != null) {
+tldEvent = new
ServletContextEvent(noPluggabilityServletContext);
+}
for (int i = 0; i listeners.length; i++) {
int j = (listeners.length - 1) - i;
if (listeners[j] == null)
@@ -4745,7 +4759,11 @@ public class StandardContext extends Con
(ServletContextListener) listeners[j];
try {
fireContainerEvent(beforeContextDestroyed, listener);
-listener.contextDestroyed(event);
+if (noPluggabilityListeners.contains(listener)) {
+listener.contextDestroyed(tldEvent);
+} else {
+listener.contextDestroyed(event);
+}
fireContainerEvent(afterContextDestroyed, listener);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
@@ -4792,8 +4810,10 @@ public class StandardContext extends Con
setApplicationEventListeners(null);
setApplicationLifecycleListeners(null);
-return (ok);
+noPluggabilityServletContext = null;
+
[Bug 57178] Add CorsFilter configuration option to allow requests with Origin null
https://issues.apache.org/bugzilla/show_bug.cgi?id=57178 --- Comment #3 from Mark Thomas ma...@apache.org --- Having had a closer look at this, I'm wondering why another configation option is needed. Why not just add null to the list of allowed origins? (This would still requires a small patch so null is accepted as a valid origin.) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57460] New: [DB2]Connection broken after few hours but not removed from the pool?
https://issues.apache.org/bugzilla/show_bug.cgi?id=57460 Bug ID: 57460 Summary: [DB2]Connection broken after few hours but not removed from the pool? Product: Tomcat Modules Version: unspecified Hardware: Other OS: Linux Status: NEW Severity: normal Priority: P2 Component: jdbc-pool Assignee: dev@tomcat.apache.org Reporter: loic.rod...@gmail.com Hi, We encountered an error using tomcat.jdbc in acceptance. This pool is used by default on TomEE 1.6.0.2. Some application using DB2 had the issue after a night or at least some hours of inactivity. Some broken connections seems to be in pool. Changing the pool implementation to Common JDBC fix the problem. I am not sure it is very interesting to solve issue on DB2 but maybe... TomEE 1.6.0.2 use Tomcat 7.0.53 The driver used is DataDirect 5.1.3 Here is the pool configuration is: JdbcDriver com.merant.datadirect.jdbc.db2.DB2Driver JdbcUrl jdbc:datadirect:db2://o:uuu;locationName=;packageCollection=JDBCV5R0 UserName XX Password XX JtaManaged true InitialSize 3 MaxActive 20 MinIdle 3 MaxIdle 10 TestOnBorrow true testOnReturn true testWhileIdle true numTestsPerEvictionRun 1 PoolPreparedStatements true MaxOpenPreparedStatements 128 ValidationQuery select current date from sysibm.sysdummy1 timeBetweenEvictionRunsMillis 10 The stack trace is: Caused by: java.sql.SQLException: [DataDirect][DB2 JDBC Driver]Object has been closed. at com.ddtek.jdbc.db2base.ddcf.b(Unknown Source) at com.ddtek.jdbc.db2base.ddcf.a(Unknown Source) at com.ddtek.jdbc.db2base.ddce.b(Unknown Source) at com.ddtek.jdbc.db2base.ddce.a(Unknown Source) at com.ddtek.jdbc.db2base.BaseConnection.rollback(Unknown Source) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) at java.lang.reflect.Method.invoke(Unknown Source) at org.apache.tomcat.jdbc.pool.ProxyConnection.invoke(ProxyConnection.java:126) at org.apache.tomcat.jdbc.pool.JdbcInterceptor.invoke(JdbcInterceptor.java:109) at org.apache.tomcat.jdbc.pool.interceptor.AbstractCreateStatementInterceptor.invoke(AbstractCreateStatementInterceptor.java:71) at org.apache.tomcat.jdbc.pool.interceptor.StatementCache.invoke(StatementCache.java:180) at org.apache.tomcat.jdbc.pool.JdbcInterceptor.invoke(JdbcInterceptor.java:109) at org.apache.tomcat.jdbc.pool.TrapException.invoke(TrapException.java:41) at org.apache.tomcat.jdbc.pool.JdbcInterceptor.invoke(JdbcInterceptor.java:109) at org.apache.tomcat.jdbc.pool.DisposableConnectionFacade.invoke(DisposableConnectionFacade.java:80) at com.sun.proxy.$Proxy71.rollback(Unknown Source) at org.apache.openejb.resource.jdbc.managed.local.LocalXAResource.rollback(LocalXAResource.java:158) ... 36 more -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57458] Mixed up responses sent to wrong users
https://issues.apache.org/bugzilla/show_bug.cgi?id=57458 --- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com --- (In reply to Mark Thomas from comment #1) 7.0.39 is getting on for 2 years old and has a number of known security vulnerabilities including one that can result in response mix ups. Please upgrade to the latest stable 7.0.x release (7.0.58 as I type this) and retest. +1 Correction: 7.0.57 is the last released version. (7.0.58 has not been tagged yet). I also recommend to add the following line to conf/catalina.properties org.apache.catalina.connector.RECYCLE_FACADES=true Documentation: http://tomcat.apache.org/tomcat-7.0-doc/config/systemprops.html#Security That settings helps to prevent and detect programming errors in web applications such as illegal access to request/response objects outside of their life cycle. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57461] New: Rename 'JAVA_HOME' message printed by VersionLoggerListener
https://issues.apache.org/bugzilla/show_bug.cgi?id=57461 Bug ID: 57461 Summary: Rename 'JAVA_HOME' message printed by VersionLoggerListener Product: Tomcat 8 Version: 8.0.17 Hardware: PC Status: NEW Severity: minor Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: knst.koli...@gmail.com Inspired by https://stackoverflow.com/questions/27965823/ Steps to reproduce: 1. Create bin\setenv.bat set JAVA_HOME=C:\Program Files (x86)\Java\jdk1.7.0_72 2. Start Tomcat 8 with bin\startup.bat 3. The following is observed A) startup.bat prints: Using JRE_HOME:C:\Program Files (x86)\Java\jdk1.7.0_72 B) The following is logged by VersionLoggerListener in logs\catalina.-mm-dd.log: 18-Jan-2015 11:41:21.345 INFO [main] org.apache.catalina.startup.VersionLoggerListener.log JAVA_HOME: C:\Program Files (x86)\Java\jdk1.7.0_72\jre The log message is confusing, because the actual JAVA_HOME variable is pointing to a JDK, but the log message displays a different path. The message displays the value of System.getProperty(java.home), not of an environment variable. Proposal: Change the message, s/JAVA_HOME/Java Home/. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57446] Catalina presents a wrapped ServletContext in de-init phase to application listeners
https://issues.apache.org/bugzilla/show_bug.cgi?id=57446 Birger Zimmermann b...@denkformat.de changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- --- Comment #3 from Birger Zimmermann b...@denkformat.de --- Just checked the issue with the latest trunk. Seems like it is still not fixed. Now the org.apache.catalina.core.StandardContext$NoPluggabilityServletContext is presented in the init phase. And a org.apache.catalina.core.ApplicationContextFacade in the de-init. How i understand the issue; it is a must to present the same context instance in init and de-init phase? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1652468 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
On 19/01/2015 10:52, Rémy Maucherat wrote: 2015-01-17 2:41 GMT+01:00 Mark Thomas ma...@apache.org: The other thought I had (but haven't had time to test for performance impact) is that the readPending semaphore is really only useful when the previous or current read is non-blocking. A blocking read followed by a blocking read doesn't need it. I tested it (commenting it out in flushBlocking), the impact is rather marginal with ab. Thanks for testing that. I won't investigate this idea further then. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1652970 - /tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Author: markt
Date: Mon Jan 19 11:54:01 2015
New Revision: 1652970
URL: http://svn.apache.org/r1652970
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57461
When reporting value of java.home don't make it look like an environment
variable.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1652970r1=1652969r2=1652970view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Mon
Jan 19 11:54:01 2015
@@ -127,7 +127,7 @@ versionLoggerListener.serverInfo.server.
versionLoggerListener.os.name =OS Name: {0}
versionLoggerListener.os.version =OS Version:{0}
versionLoggerListener.os.arch =Architecture: {0}
-versionLoggerListener.java.home=JAVA_HOME: {0}
+versionLoggerListener.java.home=Java Home: {0}
versionLoggerListener.vm.version =JVM Version: {0}
versionLoggerListener.vm.vendor=JVM Vendor:{0}
versionLoggerListener.catalina.base=CATALINA_BASE: {0}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1652975 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/LocalStrings.properties webapps/docs/changelog.xml
Author: markt Date: Mon Jan 19 12:00:49 2015 New Revision: 1652975 URL: http://svn.apache.org/r1652975 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57461 When reporting value of java.home don't make it look like an environment variable. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 19 12:00:49 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
Re: svn commit: r1652468 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
2015-01-17 2:41 GMT+01:00 Mark Thomas ma...@apache.org: The other thought I had (but haven't had time to test for performance impact) is that the readPending semaphore is really only useful when the previous or current read is non-blocking. A blocking read followed by a blocking read doesn't need it. I tested it (commenting it out in flushBlocking), the impact is rather marginal with ab. Rémy
[Bug 57420] Wrong class names generated since URL_ENCODER in DirContextURLConnection is not thread safe
https://issues.apache.org/bugzilla/show_bug.cgi?id=57420 Violeta Georgieva violet...@apache.org changed: What|Removed |Added Attachment #32378|0 |1 is patch|| -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57420] Wrong class names generated since URL_ENCODER in DirContextURLConnection is not thread safe
https://issues.apache.org/bugzilla/show_bug.cgi?id=57420 --- Comment #3 from Violeta Georgieva violet...@apache.org --- Created attachment 32378 -- https://issues.apache.org/bugzilla/attachment.cgi?id=32378action=edit Patch Hi, What do you think if we switch to UEncoder/UDecoder as regular fields of the class? (see attachment) Regards, Violeta -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1652939 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Mon Jan 19 09:10:58 2015 New Revision: 1652939 URL: http://svn.apache.org/r1652939 Log: Fix formatting: - ':' after bug/ - max width 80 chars Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1652939r1=1652938r2=1652939view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Jan 19 09:10:58 2015 @@ -48,10 +48,12 @@ subsection name=Catalina changelog fix -bug57425/bug Don't add attributes with null value or name to the replicated context. (fschumacher) +bug57425/bug: Don't add attributes with null value or name to the +replicated context. (fschumacher) /fix add -bug57431/bug Enable usage of custom class for context creation when using embedded tomcat. (fschumacher) +bug57431/bug: Enable usage of custom class for context creation when +using embedded tomcat. (fschumacher) /add /changelog /subsection - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 23 mins 33 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150119-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150119/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150119.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150119-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl/dest-20150119/bin/openssl -Dexecute.test.apr=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20150119.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib
[Bug 57446] Catalina presents a wrapped ServletContext in de-init phase to application listeners
https://issues.apache.org/bugzilla/show_bug.cgi?id=57446 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas ma...@apache.org --- Check again. This has been fixed and includes a test case to confirm the correct behaviour. Please do not reopen this issue unless you can provide a patch to the existing test case that demonstrates a problem. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57465] Build TC Native with with latest OpenSSL to address CVEs
https://issues.apache.org/bugzilla/show_bug.cgi?id=57465 --- Comment #2 from brian.m.pick...@gmail.com --- Unless I'm somehow mistaken I believe the following CVEs apply to openssl 1.0.1j and I believe tcnative 1.1.31 is built with 1.0.1j. CVE-2014-3569: 21st October 2014 CVE-2014-8275: 5th January 2015 CVE-2014-3572: 5th January 2015 CVE-2015-0204: 6th January 2015 CVE-2014-3570: 8th January 2015 CVE-2015-0205: 8th January 2015 CVE-2015-0206: 8th January 2015 CVE-2014-3571: 8th January 2015 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57465] Build TC Native with with latest OpenSSL to address CVEs
https://issues.apache.org/bugzilla/show_bug.cgi?id=57465 --- Comment #5 from brian.m.pick...@gmail.com --- (In reply to Mark Thomas from comment #4) Again, which of those do you think apply to tc-native? Just because OpenSSL has a vulnerability that does not mean that tc-native automatically has the vulnerability. I admit most of those CVEs effect the ssl3_get_key_exchange function, which I believe ssl3 is switched off in tcnative by default and is known to be an insecure protocol. And I do not know if DTLS is a protocol supported by tomcat native. However the reported ability to defeat the certificate blacklist does seems somewhat problematic as reported in CVE-2014-8275. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57465] Build TC Native with with latest OpenSSL to address CVEs
https://issues.apache.org/bugzilla/show_bug.cgi?id=57465 Mark Thomas ma...@apache.org changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas ma...@apache.org --- Which vulnreability do think think applies to the tc-native binary? I don't see anything in the most recent OpenSSL announcement that would require a new tc-native release. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57465] Build TC Native with with latest OpenSSL to address CVEs
https://issues.apache.org/bugzilla/show_bug.cgi?id=57465 --- Comment #3 from brian.m.pick...@gmail.com --- (In reply to brian.m.pickens from comment #2) Unless I'm somehow mistaken I believe the following CVEs apply to openssl 1.0.1j and I believe tcnative 1.1.31 is built with 1.0.1j. CVE-2014-3569: 21st October 2014 CVE-2014-8275: 5th January 2015 CVE-2014-3572: 5th January 2015 CVE-2015-0204: 6th January 2015 CVE-2014-3570: 8th January 2015 CVE-2015-0205: 8th January 2015 CVE-2015-0206: 8th January 2015 CVE-2014-3571: 8th January 2015 Basically according to these CVEs the specified openssl version is vulnerable to ddos attacks, downgraded key attacks, and removal of forward secrecy attacks, these being the most critical of the rest. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57465] Build TC Native with with latest OpenSSL to address CVEs
https://issues.apache.org/bugzilla/show_bug.cgi?id=57465 --- Comment #4 from Mark Thomas ma...@apache.org --- Again, which of those do you think apply to tc-native? Just because OpenSSL has a vulnerability that does not mean that tc-native automatically has the vulnerability. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1653046 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/juli/WebappProperties.java
Author: markt
Date: Mon Jan 19 16:48:14 2015
New Revision: 1653046
URL: http://svn.apache.org/r1653046
Log:
Backport some Javadoc fixes. (Mainly to see if CI for 8.0.x-trunk has been
fixed)
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/juli/WebappProperties.java
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 19 16:48:14 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041
Modified: tomcat/tc8.0.x/trunk/java/org/apache/juli/WebappProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/juli/WebappProperties.java?rev=1653046r1=1653045r2=1653046view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/juli/WebappProperties.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/juli/WebappProperties.java Mon Jan 19
16:48:14 2015
@@ -26,19 +26,29 @@ package org.apache.juli;
public interface WebappProperties {
/**
- * Returns a name for the web application or null if none is available.
+ * Returns a name for the logging system to use for the web application, if
+ * any, associated with the class loader.
+ *
+ * @return The name to use for the web application or null if none is
+ * available.
*/
String getWebappName();
/**
- * Returns a name for the Host where the web application is deployed or
null
- * if none is available.
+ * Returns a name for the logging system to use for the Host where the
+ * web application, if any, associated with the class loader is deployed.
+ *
+ * @return The name to use for the Host where the web application is
+ * deployed or null if none is available.
*/
String getHostName();
/**
- * Returns a name for the service where the Host is deployed or null if
none
- * is available.
+ * Returns a name for the logging system to use for the Service where the
+ *
[Bug 57467] New: Tomcat 8.0.14 - Using the Wrong Webapp Directory?
https://issues.apache.org/bugzilla/show_bug.cgi?id=57467 Bug ID: 57467 Summary: Tomcat 8.0.14 - Using the Wrong Webapp Directory? Product: Tomcat 8 Version: 8.0.14 Hardware: PC OS: Linux Status: NEW Severity: major Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: mark.bar...@adp.com It looks to me like Tomcat 8.0.14 is trying to use the wrong directory when trying to load a web app. In my server.xml, in my Host element, I have name='wapp1_001 and appBase=””. In my Context element, I have path=”/src” and docBase=”webapps/src” I would expect Tomcat to use $TOMCAT_HOME/webapps/src for the /src context, but it's not. It's trying to use $TOMCAT_HOME/src. Why? Both TOMCAT_HOME and CATALINA_HOME are set to /usr/local/tomcat, which is a symbolic link to /usr/local/tomcat8, which is a symbolic to /usr/local/apache-tomcat-8.0.14. When I use appBase=/usr/local/tomcat/webapps things work just fine. Notice that webapps is now in both appBase and docBase. When I use appBase=webapps things work just fine as well. Notice that webapps is redundant again. Buth when I use appBase= it doesn't work. The Tomcat 8 configuration docs seem to say that the default for appBase is the webapps sub-directory of $TOMCAT_HOME, as it always has been. I have had this same problem on both Windows 7 and Ubuntu Linux. JDK is 1.8.0_25 (64-bit) in both cases Am I missing something here? Did somethning change between Tomcat 6 and Tomcat 8. Or is this a bug in Tomcat 8.0.14? Here is the stack traceback: java.util.concurrent.ExecutionException: org.apache.catalina.LifecycleException: Failed to start component [StandardEngine[Tomcat-Standalone].StandardHost[wapp1_001].StandardContext[/src]] at java.util.concurrent.FutureTask.report(FutureTask.java:122) at java.util.concurrent.FutureTask.get(FutureTask.java:192) at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:916) at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:868) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150) at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1408) at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1398) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) at java.lang.Thread.run(Thread.java:745) Caused by: org.apache.catalina.LifecycleException: Failed to start component [StandardEngine[Tomcat-Standalone].StandardHost[wapp1_001].StandardContext[/src]] at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:154) ... 6 more Caused by: org.apache.catalina.LifecycleException: Failed to start component [org.apache.catalina.webresources.StandardRoot@6672f1f2] at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:154) at org.apache.catalina.core.StandardContext.resourcesStart(StandardContext.java:4900) at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5029) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150) ... 6 more Caused by: java.lang.IllegalArgumentException: The main resource set specified [/usr/local/apache-tomcat-8.0.14/src] is not valid at org.apache.catalina.webresources.StandardRoot.startInternal(StandardRoot.java:665) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150) ... 9 more 01-19-2015 14:16:03.524 A child container failed during start -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57467] Tomcat 8.0.14 - Using the Wrong Webapp Directory?
https://issues.apache.org/bugzilla/show_bug.cgi?id=57467 Chuck Caldarale chuck.caldar...@unisys.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #1 from Chuck Caldarale chuck.caldar...@unisys.com --- (In reply to Mark Barnes from comment #0) In my server.xml, in my Host element, I have name='wapp1_001 and appBase=””. Invalid right off the bat. Buth when I use appBase= it doesn't work. Nor should it, since that's an invalid configuration. Bugzilla is not a support forum; post your configuration issues on the Tomcat users' mailing list. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57420] Wrong class names generated since URL_ENCODER in DirContextURLConnection is not thread safe
https://issues.apache.org/bugzilla/show_bug.cgi?id=57420 --- Comment #5 from Felix Schumacher felix.schumac...@internetallee.de --- I came up with the same patch as Violeta and it fixes the reported problem (unpackWARs has to be set to false, if you want to reproduce it and of course it helps if some sleep statements are inserted into the encoder methods). I agree, that it would be nicer to use the UDecoder/UEncoder as local variables. I don't think that we should introduce getInstance methods for tomcat7 only. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57455] Bootstrap doesn't handle paths with one quote
https://issues.apache.org/bugzilla/show_bug.cgi?id=57455 --- Comment #2 from Tobias Stoeckmann tob...@stoeckmann.org --- Totally fine with that approach! -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57467] Tomcat 8.0.14 - Using the Wrong Webapp Directory?
https://issues.apache.org/bugzilla/show_bug.cgi?id=57467 --- Comment #2 from Mark Barnes mark.bar...@adp.com --- It works for Tomcat 6 and it worked for Tomcat 5. We're upgrading from 6.0.20 to 8.0.14. The configuration reference does say this: The Application Base directory for this virtual host. This is the pathname of a directory that may contain web applications to be deployed on this virtual host. You may specify an absolute pathname, or a pathname that is relative to the $CATALINA_BASE directory. See Automatic Application Deployment for more information on automatic recognition and deployment of web applications. If not specified, the default of webapps will be used. I get that it does NOT say that appBase= is the same as not specifying appBase at all. In fact, it doesn't say what appBase= means. It doesn't say it's invalid, either. So is not relative $CATALINA_BASE ??? The Document Base (also known as the Context Root) directory for this web application, or the pathname to the web application archive file (if this web application is being executed directly from the WAR file). You may specify an absolute pathname for this directory or WAR file, or a pathname that is relative to the appBase directory of the owning Host. The value of this field must not be set unless the Context element is defined in server.xml or the docBase is not located under the Host's appBase. If a symbolic link is used for docBase then changes to the symbolic link will only be effective after a Tomcat restart or by undeploying and redeploying the context. A context reload is not sufficient. Oh, well... -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57465] Build TC Native with with latest OpenSSL to address CVEs
https://issues.apache.org/bugzilla/show_bug.cgi?id=57465 --- Comment #6 from Mark Thomas ma...@apache.org --- DTLS is not supported by tc-native. Neither was the no-ssl3 buidl option used to produce the Windows binaries. The client issues are also clearly not relevant. That leaves three issues, all of which appear to very unlikely to impact tc-native users. In the unlikely event of folks needing fixes for these issues it isn't that hard to build tc-native now that the build process has been fully documented on the wiki: http://wiki.apache.org/tomcat/BuildTcNativeWin I am therefore minded to close this as WONTFIX, subject to a re-evaluation of that decision if we discover one or more of the 3 remaining issues are more likely that we thought to impact tc-native users. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
