svn commit: r1516398 - /tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
Author: markt
Date: Thu Aug 22 09:43:02 2013
New Revision: 1516398
URL: http://svn.apache.org/r1516398
Log:
Add a debug message I found useful when trying to track down a WebSocket issue
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1516398&r1=1516397&r2=1516398&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Aug
22 09:43:02 2013
@@ -633,6 +633,11 @@ public abstract class AbstractProtocol i
processor = createUpgradeProcessor(wrapper, inbound);
inbound.onUpgradeComplete();
}
+if (getLog().isDebugEnabled()) {
+getLog().debug("Socket: [" + socket +
+"], Status in: [" + status +
+"], State out: [" + state + "]");
+}
} while (state == SocketState.ASYNC_END ||
state == SocketState.UPGRADING ||
state == SocketState.UPGRADING_TOMCAT);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1516400 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/
Author: markt
Date: Thu Aug 22 09:53:21 2013
New Revision: 1516400
URL: http://svn.apache.org/r1516400
Log:
Refactor connections as upgraded connections will need to support multiple
threads processing the same connection
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1425564,1425628
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1516400&r1=1516399&r2=1516400&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Aug
22 09:53:21 2013
@@ -558,8 +558,7 @@ public abstract class AbstractProtocol i
public SocketState process(SocketWrapper wrapper,
SocketStatus status) {
S socket = wrapper.getSocket();
-
-Processor processor = connections.remove(socket);
+Processor processor = connections.get(socket);
if (status == SocketStatus.DISCONNECT && processor == null) {
//nothing more to be done endpoint requested a close
@@ -646,22 +645,29 @@ public abstract class AbstractProtocol i
// In the middle of processing a request/response. Keep the
// socket associated with the processor. Exact requirements
// depend on type of long poll
+connections.put(socket, processor);
longPoll(wrapper, processor);
} else if (state == SocketState.OPEN) {
// In keep-alive but between requests. OK to recycle
// processor. Continue to poll for the next request.
+connections.remove(processor);
release(wrapper, processor, false, true);
} else if (state == SocketState.SENDFILE) {
// Sendfile in progress. If it fails, the socket will be
// closed. If it works, the socket will be re-added to the
// poller
+connections.remove(processor);
release(wrapper, processor, false, false);
} else if (state == SocketState.UPGRADED) {
// Need to keep the connection associated with the
processor
+connections.put(socket, processor);
longPoll(wrapper, processor);
} else {
-// Connection closed. OK to recycle the processor.
-if (!(processor instanceof
org.apache.coyote.http11.upgrade.UpgradeProcessor)) {
+// Connection closed. OK to recycle the processor. Upgrade
+// processors are not recycled.
+connections.remove(processor);
+if (!(processor instanceof
org.apache.coyote.http11.upgrade.UpgradeProcessor)
+&& !processor.isUpgrade()) {
release(wrapper, processor, true, false);
}
}
@@ -687,7 +693,8 @@ public abstract class AbstractProtocol i
sm.getString("abstractConnectionHandler.error"), e);
}
// Don't try to add upgrade processors back into the pool
-if (!(processor instanceof
org.apache.coyote.http11.upgrade.UpgradeProcessor)) {
+if (!(processor instanceof
org.apache.coyote.http11.upgrade.UpgradeProcessor)
+&& !processor.isUpgrade()) {
release(wrapper, processor, true, false);
}
return SocketState.CLOSED;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1516400&r1=1516399&r2=1516400&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
Thu Aug 22 09:53:21 2013
@@ -86,7 +86,6 @@ public abstract class AbstractAjpProtoco
protected void longPoll(SocketWrapper socket,
Processor processor) {
svn commit: r1516404 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/AbstractProtocol.java
Author: markt
Date: Thu Aug 22 10:00:22 2013
New Revision: 1516404
URL: http://svn.apache.org/r1516404
Log:
It is the socket that is the key for the connections map, not the processor
Align debug message with trunk code
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1426662
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1516404&r1=1516403&r2=1516404&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Aug
22 10:00:22 2013
@@ -633,7 +633,7 @@ public abstract class AbstractProtocol i
inbound.onUpgradeComplete();
}
if (getLog().isDebugEnabled()) {
-getLog().debug("Socket: [" + socket +
+getLog().debug("Socket: [" + wrapper +
"], Status in: [" + status +
"], State out: [" + state + "]");
}
@@ -650,13 +650,13 @@ public abstract class AbstractProtocol i
} else if (state == SocketState.OPEN) {
// In keep-alive but between requests. OK to recycle
// processor. Continue to poll for the next request.
-connections.remove(processor);
+connections.remove(socket);
release(wrapper, processor, false, true);
} else if (state == SocketState.SENDFILE) {
// Sendfile in progress. If it fails, the socket will be
// closed. If it works, the socket will be re-added to the
// poller
-connections.remove(processor);
+connections.remove(socket);
release(wrapper, processor, false, false);
} else if (state == SocketState.UPGRADED) {
// Need to keep the connection associated with the
processor
@@ -665,7 +665,7 @@ public abstract class AbstractProtocol i
} else {
// Connection closed. OK to recycle the processor. Upgrade
// processors are not recycled.
-connections.remove(processor);
+connections.remove(socket);
if (!(processor instanceof
org.apache.coyote.http11.upgrade.UpgradeProcessor)
&& !processor.isUpgrade()) {
release(wrapper, processor, true, false);
@@ -692,6 +692,9 @@ public abstract class AbstractProtocol i
getLog().error(
sm.getString("abstractConnectionHandler.error"), e);
}
+// Make sure socket/processor is removed from the list of current
+// connections
+connections.remove(socket);
// Don't try to add upgrade processors back into the pool
if (!(processor instanceof
org.apache.coyote.http11.upgrade.UpgradeProcessor)
&& !processor.isUpgrade()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1516405 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/AbstractProtocol.java
Author: markt
Date: Thu Aug 22 10:05:47 2013
New Revision: 1516405
URL: http://svn.apache.org/r1516405
Log:
Fix an issue highlighted when running the Autobahn test suite on Linux.
Don't register the socket for a read when a write event completes (may lead to
thread starvation)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1432867
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1516405&r1=1516404&r2=1516405&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Aug
22 10:05:47 2013
@@ -661,7 +661,14 @@ public abstract class AbstractProtocol i
} else if (state == SocketState.UPGRADED) {
// Need to keep the connection associated with the
processor
connections.put(socket, processor);
-longPoll(wrapper, processor);
+// Don't add sockets back to the poller if this was a
+// non-blocking write otherwise the poller may trigger
+// multiple read events which may lead to thread starvation
+// in the connector. The write() method will add this this
+// socket to the poller if necessary.
+if (status != SocketStatus.OPEN_WRITE) {
+longPoll(wrapper, processor);
+}
} else {
// Connection closed. OK to recycle the processor. Upgrade
// processors are not recycled.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1516407 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: markt
Date: Thu Aug 22 10:11:27 2013
New Revision: 1516407
URL: http://svn.apache.org/r1516407
Log:
Back-port NIO endpoint changes required to support concurrent read/write for
JSR-356 upgraded connections
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1516407&r1=1516406&r2=1516407&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu
Aug 22 10:11:27 2013
@@ -1260,7 +1260,7 @@ public class NioEndpoint extends Abstrac
processSocket(channel,
SocketStatus.DISCONNECT, true);
} else {
//future placement of a WRITE notif
-if (!processSocket(channel,
SocketStatus.OPEN_READ, true))
+if (!processSocket(channel,
SocketStatus.OPEN_WRITE, true))
processSocket(channel,
SocketStatus.DISCONNECT, true);
}
} else {
@@ -1269,8 +1269,23 @@ public class NioEndpoint extends Abstrac
} else {
//later on, improve latch behavior
if ( isWorkerAvailable() ) {
-unreg(sk, attachment,sk.readyOps());
-boolean close = (!processSocket(channel, null,
true));
+
+boolean readAndWrite = sk.isReadable() &&
sk.isWritable();
+reg(sk, attachment, 0);
+if (attachment.isAsync() && readAndWrite) {
+//remember the that we want to know about
write too
+
attachment.interestOps(SelectionKey.OP_WRITE);
+}
+//read goes before write
+if (sk.isReadable()) {
+//read notification
+if (!processSocket(channel,
SocketStatus.OPEN_READ, true))
+close = true;
+} else {
+//future placement of a WRITE notif
+if (!processSocket(channel,
SocketStatus.OPEN_WRITE, true))
+close = true;
+}
if (close) {
cancelledKey(sk,SocketStatus.DISCONNECT,false);
}
@@ -1319,7 +1334,9 @@ public class NioEndpoint extends Abstrac
cancelledKey(sk,SocketStatus.ERROR,false);
return false;
}
-sd.fchannel = new FileInputStream(f).getChannel();
+@SuppressWarnings("resource") // Closed when channel is
closed
+FileInputStream fis = new FileInputStream(f);
+sd.fchannel = fis.getChannel();
}
//configure output channel
@@ -1670,104 +1687,136 @@ public class NioEndpoint extends Abstrac
@Override
public void run() {
+SelectionKey key = socket.getIOChannel().keyFor(
+socket.getPoller().getSelector());
+KeyAttachment ka = null;
+
+if (key != null) {
+ka = (KeyAttachment)key.attachment();
+}
+
+// Upgraded connections need to allow multiple threads to access
the
+// connection at the same time to enable blocking IO to be used
when
+// NIO has been configured
+if (ka != null && ka.isUpgraded() &&
+SocketStatus.OPEN_WRITE == status) {
+synchronized (ka.getWriteThreadLock()) {
+doRun(key, ka);
+}
+} else {
+synchronized (socket) {
+doRun(key, ka);
+}
+}
+}
+
+private void doRun(SelectionKey key, KeyAttachment ka) {
boolean launch = false;
-synchronized (socket) {
-SelectionKey key = null;
-try {
-key =
socket.getIOChannel().keyFor(socket.getPoller().getSelector());
-int handshake = -1;
+try {
+int handshake = -1;
-try {
-if (key!=null)
svn commit: r1516409 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/AbstractProtocol.java
Author: markt
Date: Thu Aug 22 10:17:53 2013
New Revision: 1516409
URL: http://svn.apache.org/r1516409
Log:
Fix comment typo
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1455344
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1516409&r1=1516408&r2=1516409&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Aug
22 10:17:53 2013
@@ -664,8 +664,8 @@ public abstract class AbstractProtocol i
// Don't add sockets back to the poller if this was a
// non-blocking write otherwise the poller may trigger
// multiple read events which may lead to thread starvation
-// in the connector. The write() method will add this this
-// socket to the poller if necessary.
+// in the connector. The write() method will add this
socket
+// to the poller if necessary.
if (status != SocketStatus.OPEN_WRITE) {
longPoll(wrapper, processor);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1516410 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/AbstractProtocol.java
Author: markt
Date: Thu Aug 22 10:20:38 2013
New Revision: 1516410
URL: http://svn.apache.org/r1516410
Log:
Fix some NPEs observed while investigating some unit test failures.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1475900
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1516410&r1=1516409&r2=1516410&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Aug
22 10:20:38 2013
@@ -558,11 +558,16 @@ public abstract class AbstractProtocol i
public SocketState process(SocketWrapper wrapper,
SocketStatus status) {
S socket = wrapper.getSocket();
-Processor processor = connections.get(socket);
+if (socket == null) {
+// Nothing to do. Socket has been closed.
+return SocketState.CLOSED;
+}
+
+Processor processor = connections.get(socket);
if (status == SocketStatus.DISCONNECT && processor == null) {
-//nothing more to be done endpoint requested a close
-//and there are no object associated with this connection
+// Nothing to do. Endpoint requested a close and there is no
+// longer a processor associated with this socket.
return SocketState.CLOSED;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1516411 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/AbstractProtocol.java
Author: markt
Date: Thu Aug 22 10:25:25 2013
New Revision: 1516411
URL: http://svn.apache.org/r1516411
Log:
Backport
Remove unnecessary code
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1498896
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1516411&r1=1516410&r2=1516411&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Aug
22 10:25:25 2013
@@ -664,8 +664,6 @@ public abstract class AbstractProtocol i
connections.remove(socket);
release(wrapper, processor, false, false);
} else if (state == SocketState.UPGRADED) {
-// Need to keep the connection associated with the
processor
-connections.put(socket, processor);
// Don't add sockets back to the poller if this was a
// non-blocking write otherwise the poller may trigger
// multiple read events which may lead to thread starvation
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1516416 - /tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
Author: markt
Date: Thu Aug 22 11:24:07 2013
New Revision: 1516416
URL: http://svn.apache.org/r1516416
Log:
Fix NPE observed in testing logs
Modified:
tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
Modified: tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/OneLineFormatter.java?rev=1516416&r1=1516415&r2=1516416&view=diff
==
--- tomcat/trunk/java/org/apache/juli/OneLineFormatter.java (original)
+++ tomcat/trunk/java/org/apache/juli/OneLineFormatter.java Thu Aug 22 11:24:07
2013
@@ -191,7 +191,9 @@ public class OneLineFormatter extends Fo
}
ThreadInfo threadInfo =
threadMxBean.getThreadInfo(logRecordThreadId);
-result = threadInfo.getThreadName();
+if (threadInfo == null) {
+return Long.toString(logRecordThreadId);
+}
}
cache.put(Integer.valueOf(logRecordThreadId), result);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1516419 - /tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
Author: markt
Date: Thu Aug 22 11:35:36 2013
New Revision: 1516419
URL: http://svn.apache.org/r1516419
Log: (empty)
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java?rev=1516419&r1=1516418&r2=1516419&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java Thu
Aug 22 11:35:36 2013
@@ -23,8 +23,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -33,17 +32,14 @@ import org.apache.catalina.startup.Tomca
import org.apache.catalina.startup.TomcatBaseTest;
public class TestMaxConnections extends TomcatBaseTest {
+private static final int MAX_CONNECTIONS = 3;
public static final int soTimeout = 5000;
public static final int connectTimeout = 1000;
@Test
public void testConnector() throws Exception {
-log.info("This test tries to create 10 connections to connector "
-+ "that has maxConnections='4'. Expect half of them to fail.");
init();
ConnectThread[] t = new ConnectThread[10];
-int passcount = 0;
-int connectfail = 0;
for (int i=0; i maxConnections) {
+maxConnections = currentConnections;
+}
+}
+
+private static synchronized void decrement() {
+currentConnections--;
+}
+
+public static synchronized int getMaxConnections() {
+return maxConnections;
+}
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1516420 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/connector/TestMaxConnections.java
Author: markt
Date: Thu Aug 22 11:38:37 2013
New Revision: 1516420
URL: http://svn.apache.org/r1516420
Log:
Change the way max concurrent connections are counted in the test to avoid the
intermittent failures observed with the previous method.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1516419
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java?rev=1516420&r1=1516419&r2=1516420&view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
Thu Aug 22 11:38:37 2013
@@ -23,8 +23,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -33,17 +32,14 @@ import org.apache.catalina.startup.Tomca
import org.apache.catalina.startup.TomcatBaseTest;
public class TestMaxConnections extends TomcatBaseTest {
-public static final int soTimeout = 3000;
+private static final int MAX_CONNECTIONS = 3;
+public static final int soTimeout = 5000;
public static final int connectTimeout = 1000;
@Test
public void testConnector() throws Exception {
-log.info("This test tries to create 10 connections to connector "
-+ "that has maxConnections='4'. Expect half of them to fail.");
init();
ConnectThread[] t = new ConnectThread[10];
-int passcount = 0;
-int connectfail = 0;
for (int i=0; i maxConnections) {
+maxConnections = currentConnections;
+}
+}
+
+private static synchronized void decrement() {
+currentConnections--;
+}
+
+public static synchronized int getMaxConnections() {
+return maxConnections;
+}
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1361 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1516411 Blamelist: markt Build succeeded! sincerely, -The Buildbot
svn commit: r1516426 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsListener.java
Author: markt
Date: Thu Aug 22 12:08:37 2013
New Revision: 1516426
URL: http://svn.apache.org/r1516426
Log:
Have the WsListener check for a WebSocket Server Container before it triggers
initialization of the WsSCI in case the SCI has been detected by the container.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsListener.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsListener.java?rev=1516426&r1=1516425&r2=1516426&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsListener.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsListener.java Thu
Aug 22 12:08:37 2013
@@ -16,6 +16,7 @@
*/
package org.apache.tomcat.websocket.server;
+import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
@@ -30,7 +31,12 @@ public class WsListener implements Servl
@Override
public void contextInitialized(ServletContextEvent sce) {
-WsSci.init(sce.getServletContext());
+ServletContext sc = sce.getServletContext();
+// Don't trigger WebSocket initialization if a WebSocket Server
+// Container is already present
+if
(sc.getAttribute(Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE) == null)
{
+WsSci.init(sce.getServletContext());
+}
}
@Override
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1362 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1516420 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
[Tomcat Wiki] Update of "ContributorsGroup" by KonstantinKolinko
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "ContributorsGroup" page has been changed by KonstantinKolinko: https://wiki.apache.org/tomcat/ContributorsGroup?action=diff&rev1=7&rev2=8 Comment: Add LucaVisconti, as requested on the users@ list * AdminGroup * AndreaBrugiolo + * BrianBurch * dblevins * developintelligence * EmericVernat * GlenIhrig * [Krzysztof Gil] + * LucaVisconti * NevenCvetkovic * ShawnYu - * BrianBurch - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Back-porting JSR-356 Progress update
On Thu, Aug 22, 2013 at 1:08 AM, Mark Thomas wrote: > Investigating some Gump and BuildBot failures has identified a large > block of functionality that still remains to be back-ported to 7.0.x - > namely the changes to Coyote that allowed upgraded connections to > support concurrent read and write. > > It isn't as simple as copy and paste as there has been some additional > refactoring particularly in the endpoints we probably don't want to > backport. > > Fixing this is top of my TODO list followed by getting Gump and Buidlbot > passing for 7.0.x and 8.0.x and then another 8.0.0 RC.# > > Mark > tomcat-7.0.43-dev revision 1516420 passes JSR 356 TCKs Niki > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[Tomcat Wiki] Trivial Update of "SupportAndTraining" by LucaVisconti
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "SupportAndTraining" page has been changed by LucaVisconti:
https://wiki.apache.org/tomcat/SupportAndTraining?action=diff&rev1=40&rev2=41
Comment:
Changed OpenGate logo link.
!SpringSource provides global, 24x7,
[[http://www.covalent.net/supportservices/tomcat/index.html?aw|enterprise
support]] for production users of Apache Tomcat. !SpringSource employs the
leading experts on Apache Tomcat to ensure that support customers can get their
questions answered quickly and accurately and that bug fixes are incorporated
into the open source code base.
-
[[http://www.opengate.biz/|{{http://office.opengate.biz/images/og.png|http://www.opengate.biz/}}]]
+
[[http://www.opengate.biz/|{{http://www.opengate.biz/wpsysfiles/wp-content/uploads/2013/06/logo_opengate_160.png|http://www.opengate.biz/}}]]
!OpenGate provides support for Apache Tomcat enterprise users located in
Italy. !OpenGate has 8 years experience in helping customers adopting Apache
Tomcat and hundreds of success stories.<> !OpenGate fornisce supporto in
Italia per gli utenti di Apache Tomcat. !OpenGate ha 8 anni di esperienza
nell'aiutare i clienti nell'adozione di Apache Tomcat e centinaia di storie di
successo.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Back-porting JSR-356 Progress update
On 22/08/2013 15:30, Niki Dokovski wrote: > On Thu, Aug 22, 2013 at 1:08 AM, Mark Thomas wrote: > >> Investigating some Gump and BuildBot failures has identified a large >> block of functionality that still remains to be back-ported to 7.0.x - >> namely the changes to Coyote that allowed upgraded connections to >> support concurrent read and write. >> >> It isn't as simple as copy and paste as there has been some additional >> refactoring particularly in the endpoints we probably don't want to >> backport. >> >> Fixing this is top of my TODO list followed by getting Gump and Buidlbot >> passing for 7.0.x and 8.0.x and then another 8.0.0 RC.# >> >> Mark >> > > tomcat-7.0.43-dev revision 1516420 passes JSR 356 TCKs Excellent. Thanks for that update. With which connector(s)? (He asks knowing that the APR implementation is very likely to fail as it needs the concurrent read/write changes back-ported from trunk). I also want to run Autobahn against it but I have a few issues to fix first. Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Back-porting JSR-356 Progress update
On Thu, Aug 22, 2013 at 5:47 PM, Mark Thomas wrote: > On 22/08/2013 15:30, Niki Dokovski wrote: > > On Thu, Aug 22, 2013 at 1:08 AM, Mark Thomas wrote: > > > >> Investigating some Gump and BuildBot failures has identified a large > >> block of functionality that still remains to be back-ported to 7.0.x - > >> namely the changes to Coyote that allowed upgraded connections to > >> support concurrent read and write. > >> > >> It isn't as simple as copy and paste as there has been some additional > >> refactoring particularly in the endpoints we probably don't want to > >> backport. > >> > >> Fixing this is top of my TODO list followed by getting Gump and Buidlbot > >> passing for 7.0.x and 8.0.x and then another 8.0.0 RC.# > >> > >> Mark > >> > > > > tomcat-7.0.43-dev revision 1516420 passes JSR 356 TCKs > > Excellent. Thanks for that update. With which connector(s)? > > (He asks knowing that the APR implementation is very likely to fail as > it needs the concurrent read/write changes back-ported from trunk). > Default without any additional configuration. > > I also want to run Autobahn against it but I have a few issues to fix > first. > > Cheers, > > Mark > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: Back-porting JSR-356 Progress update
On 22/08/2013 16:06, Niki Dokovski wrote: > On Thu, Aug 22, 2013 at 5:47 PM, Mark Thomas wrote: > >> On 22/08/2013 15:30, Niki Dokovski wrote: >>> On Thu, Aug 22, 2013 at 1:08 AM, Mark Thomas wrote: >>> Investigating some Gump and BuildBot failures has identified a large block of functionality that still remains to be back-ported to 7.0.x - namely the changes to Coyote that allowed upgraded connections to support concurrent read and write. It isn't as simple as copy and paste as there has been some additional refactoring particularly in the endpoints we probably don't want to backport. Fixing this is top of my TODO list followed by getting Gump and Buidlbot passing for 7.0.x and 8.0.x and then another 8.0.0 RC.# Mark >>> >>> tomcat-7.0.43-dev revision 1516420 passes JSR 356 TCKs >> >> Excellent. Thanks for that update. With which connector(s)? >> >> (He asks knowing that the APR implementation is very likely to fail as >> it needs the concurrent read/write changes back-ported from trunk). >> > > Default without any additional configuration. HTTP NIO then. Thanks again for a) testing it and b) reporting back the result. Mark > >> >> I also want to run Autobahn against it but I have a few issues to fix >> first. >> >> Cheers, >> >> Mark >> >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> >> > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1516416 - /tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
On 22.08.2013 13:24, ma...@apache.org wrote:
> Author: markt
> Date: Thu Aug 22 11:24:07 2013
> New Revision: 1516416
>
> URL: http://svn.apache.org/r1516416
> Log:
> Fix NPE observed in testing logs
>
> Modified:
> tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
>
> Modified: tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/OneLineFormatter.java?rev=1516416&r1=1516415&r2=1516416&view=diff
> ==
> --- tomcat/trunk/java/org/apache/juli/OneLineFormatter.java (original)
> +++ tomcat/trunk/java/org/apache/juli/OneLineFormatter.java Thu Aug 22
> 11:24:07 2013
> @@ -191,7 +191,9 @@ public class OneLineFormatter extends Fo
> }
> ThreadInfo threadInfo =
> threadMxBean.getThreadInfo(logRecordThreadId);
> -result = threadInfo.getThreadName();
Maybe you didn't want to delete that line but keep it below the null
check? Otherwise I don't see where the MXBean gets used after the check
and the cache won't get filled with anything useful.
> +if (threadInfo == null) {
> +return Long.toString(logRecordThreadId);
> +}
> }
>
> cache.put(Integer.valueOf(logRecordThreadId), result);
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55469] New: Missing HTML closing tags in Manager application
https://issues.apache.org/bugzilla/show_bug.cgi?id=55469 Bug ID: 55469 Summary: Missing HTML closing tags in Manager application Product: Tomcat 7 Version: trunk Hardware: All OS: All Status: NEW Severity: trivial Priority: P2 Component: Manager Assignee: dev@tomcat.apache.org Reporter: lar...@apache.org Created attachment 30751 --> https://issues.apache.org/bugzilla/attachment.cgi?id=30751&action=edit Patch to fix it on trunk for Tomcat 7 trunk. In the "WAR file to deploy" that allows you to upload a war file, after the closing form tag, it is missing closing off the td and tr tag opened before form tag. -- 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 55469] Missing HTML closing tags in Manager application
https://issues.apache.org/bugzilla/show_bug.cgi?id=55469 --- Comment #1 from Larry Shatzer, jr. --- Created attachment 30752 --> https://issues.apache.org/bugzilla/attachment.cgi?id=30752&action=edit Patch to fix it on trunk for Tomcat 8. -- 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: r1516616 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Author: markt
Date: Thu Aug 22 21:28:43 2013
New Revision: 1516616
URL: http://svn.apache.org/r1516616
Log:
Ensure that HTTP upgrade responses are flushed as the normal code path for this
is bypassed when using HTTP upgrade.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1516616&r1=1516615&r2=1516616&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Thu Aug 22 21:28:43 2013
@@ -24,6 +24,8 @@ import java.security.PrivilegedActionExc
import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.catalina.Globals;
import org.apache.coyote.ActionCode;
import org.apache.coyote.Response;
@@ -300,7 +302,12 @@ public class OutputBuffer extends Writer
}
}
-doFlush(false);
+if (coyoteResponse.getStatus() ==
+HttpServletResponse.SC_SWITCHING_PROTOCOLS) {
+doFlush(true);
+} else {
+doFlush(false);
+}
closed = true;
// The request should have been completely read by the time the
response
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1516626 - /tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
Author: markt
Date: Thu Aug 22 21:44:57 2013
New Revision: 1516626
URL: http://svn.apache.org/r1516626
Log:
Ensure destroy() method of upgrade handler is called
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1516626&r1=1516625&r2=1516626&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Aug
22 21:44:57 2013
@@ -676,8 +676,11 @@ public abstract class AbstractProtocol i
// Connection closed. OK to recycle the processor. Upgrade
// processors are not recycled.
connections.remove(socket);
-if (!(processor instanceof
org.apache.coyote.http11.upgrade.UpgradeProcessor)
-&& !processor.isUpgrade()) {
+if (processor.isUpgrade()) {
+processor.getHttpUpgradeHandler().destroy();
+} else if (processor instanceof
org.apache.coyote.http11.upgrade.UpgradeProcessor) {
+// NO-OP
+} else {
release(wrapper, processor, true, false);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1516628 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/res/ webapps/docs/config/
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1516628&r1=1516627&r2=1516628&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Thu Aug 22 21:45:54 2013 @@ -778,13 +778,6 @@ connections. This is a synonym for maxConnections. - -Number of threads used to poll kept alive connections. On Windows the -default is chosen so that the sockets managed by each thread is -less than 1024. For Linux the default is 1. Changing the default on -Windows is likely to have a negative performance impact. - - Duration of a poll call in microseconds. Lowering this value will slightly decrease latency of connections being kept alive in some cases, @@ -803,13 +796,6 @@ specified amount. The default value is 1024. - -Number of threads used service sendfile sockets. On Windows the -default is chosen so that the sockets managed by each thread is -less than 1024. For Linux the default is 1. Changing the default on -Windows is likely to have a negative performance impact. - - (int)The priority of the acceptor and poller threads. The default value is 5 (the value of the - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1516634 - /tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
Author: markt
Date: Thu Aug 22 21:59:55 2013
New Revision: 1516634
URL: http://svn.apache.org/r1516634
Log:
Restore line incorrectly removed in r1516416
Thanks due to rjung for spotting my error
Modified:
tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
Modified: tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/OneLineFormatter.java?rev=1516634&r1=1516633&r2=1516634&view=diff
==
--- tomcat/trunk/java/org/apache/juli/OneLineFormatter.java (original)
+++ tomcat/trunk/java/org/apache/juli/OneLineFormatter.java Thu Aug 22 21:59:55
2013
@@ -194,6 +194,7 @@ public class OneLineFormatter extends Fo
if (threadInfo == null) {
return Long.toString(logRecordThreadId);
}
+result = threadInfo.getThreadName();
}
cache.put(Integer.valueOf(logRecordThreadId), result);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1516416 - /tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
On 22/08/2013 20:48, Rainer Jung wrote:
> On 22.08.2013 13:24, ma...@apache.org wrote:
>> Author: markt
>> Date: Thu Aug 22 11:24:07 2013
>> New Revision: 1516416
>>
>> URL: http://svn.apache.org/r1516416
>> Log:
>> Fix NPE observed in testing logs
>>
>> Modified:
>> tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
>>
>> Modified: tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/OneLineFormatter.java?rev=1516416&r1=1516415&r2=1516416&view=diff
>> ==
>> --- tomcat/trunk/java/org/apache/juli/OneLineFormatter.java (original)
>> +++ tomcat/trunk/java/org/apache/juli/OneLineFormatter.java Thu Aug 22
>> 11:24:07 2013
>> @@ -191,7 +191,9 @@ public class OneLineFormatter extends Fo
>> }
>> ThreadInfo threadInfo =
>> threadMxBean.getThreadInfo(logRecordThreadId);
>> -result = threadInfo.getThreadName();
>
> Maybe you didn't want to delete that line but keep it below the null
> check? Otherwise I don't see where the MXBean gets used after the check
> and the cache won't get filled with anything useful.
Spot on. Thanks for the catch. Fixed.
Mark
>
>> +if (threadInfo == null) {
>> +return Long.toString(logRecordThreadId);
>> +}
>> }
>>
>> cache.put(Integer.valueOf(logRecordThreadId), result);
>
> Regards,
>
> Rainer
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1363 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1516616 Blamelist: markt Build succeeded! sincerely, -The Buildbot
[GUMP@vmgump]: Project tomcat-trunk-test (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 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 30 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 : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on junit exists, no need to add for property hamcrest.jar. -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. -DEBUG- Dependency on tomcat-trunk exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 54 mins 2 secs Command Line: /usr/lib/jvm/java-7-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/dist/junit-20130823.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.1-SNAPSHOT.jar -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20130823-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20130823.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20130823-native-src.tar.gz -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/apache-commons/pool -Dcommons-dbcp.home=/ srv/gump/public/workspace/apache-commons/dbcp -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.2.jar -Dhamcrest.jar=/srv/gump/public/workspace/junit/dist/junit-20130823.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-7-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/servle t-api.jar:/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/build/lib/tomcat-spdy.jar:/s
svn commit: r1516710 - /tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Author: violetagg Date: Fri Aug 23 06:34:50 2013 New Revision: 1516710 URL: http://svn.apache.org/r1516710 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55469 tr and td tags for UPLOAD_SECTION where not properly closed Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1516710&r1=1516709&r2=1516710&view=diff == --- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Fri Aug 23 06:34:50 2013 @@ -1307,6 +1307,8 @@ public final class HTMLManagerServlet ex "\n" + "\n" + "\n" + +"\n" + +"\n" + "\n" + "\n" + "\n"; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1516711 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/HTMLManagerServlet.java webapps/docs/changelog.xml
Author: violetagg Date: Fri Aug 23 06:50:16 2013 New Revision: 1516711 URL: http://svn.apache.org/r1516711 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55469 Merged revision 1516710 from tomcat/trunk: tr and td tags for UPLOAD_SECTION were not properly closed Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1516710 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1516711&r1=1516710&r2=1516711&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Fri Aug 23 06:50:16 2013 @@ -1321,6 +1321,8 @@ public final class HTMLManagerServlet ex "\n" + "\n" + "\n" + +"\n" + +"\n" + "\n" + "\n" + "\n"; Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1516711&r1=1516710&r2=1516711&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Aug 23 06:50:16 2013 @@ -254,6 +254,10 @@ French, Spanish or Japanese get the English messages they asked for. (markt) + +55469: Fixed tags that were not properly closed. Based on a +patch provided by Larry Shatzer, jr. (violetagg) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55469] Missing HTML closing tags in Manager application
https://issues.apache.org/bugzilla/show_bug.cgi?id=55469 Violeta Georgieva changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Violeta Georgieva --- Thanks for the report and the patches. However I think that the closing tags should be after the closing form tag and not the closing table tag. Fixed in trunk and 7.0.x and will be included in 8.0.0-RC2 and 7.0.43 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
