[Bug 443] incomplete classpath when running from BugRat Report#761
https://issues.apache.org/bugzilla/show_bug.cgi?id=443 bangjuwon changed: What|Removed |Added Depends on||53219 -- 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 443] incomplete classpath when running from BugRat Report#761
https://issues.apache.org/bugzilla/show_bug.cgi?id=443 Reed Loden changed: What|Removed |Added Depends on|53219 | -- 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: Tagging native 1.1.27
On 06/02/2013 07:29, Mladen Turk wrote: > Hi, > > The latest fix solves issues manifested with 1.1.26 and since > there were no new issues reported with 1.1.27-dev binaries I plan > to tag and push for a release 1.1.27. > > Any objections or someone is doing some pending tasks/tests? Can we update to OpenSSL 1.0.1d as well please? Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[RESULT][VOTE] Release Apache Tomcat 7.0.36
The result of this vote is that 7.0.36 is broken due to DAEMON-276 found by Konstantin. The problem has been fixed and a new Commons Daemon release is on the way. I aim to tag as soon as the release is available. If native 1.1.27 is available by then I'll pick that up too. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54456] ChunkedInputFilter returning EOF when client closes connection without sending end chunk
https://issues.apache.org/bugzilla/show_bug.cgi?id=54456 --- Comment #5 from Konstantin Kolinko --- (In reply to comment #4) > "throw new EOFException()" would be better. On a thought, it would be better to use org.apache.catalina.connector.ClientAbortException or a generic IOException. It is abnormal abort of connection by the client. It is not a proper end of stream. -- 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: Again: Java classes in tcnative
On 05/02/2013 16:09, Rainer Jung wrote: > I went through the Java classes in tcnative branch 1.1.x. Remember there > are no such classes in tcnative trunk. > > - in tcnative branches/1.1.x there were no additions, > that were missing from TC trunk (good) > > - I first merged all missing additions from > the jni classes in TC 7 > > - I then also merged all missing additions from > the jni classes in TC trunk > > As a result tcnative Java classes are now identical to TC trunk jni > classes except: > > - additional tcnative classes o.a.t.jni.Buffer and o.a.t.jni.Thread > - top level classes o.a.t.Apr and apr.properties. > > I would like to replace the folder > native/branches/1.1.x/java/org/apache/tomcat/jni with an svn external to > trunk/java/org/apache/tomcat/jni. For this we need to decide on the > future of the Buffer and Thread class. Make sure it is an external that specifies a version. That will enable tags to work properly (and the release process will involve updating the reference to the latest trunk version). > a) Either we move them into TC trunk jni >(where Mark will likely remove them as unused code?) I didn't use the unused code detector on that package as there are lots that Tomcat doesn't use. I'm happy for those classes to be added to trunk jni. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging native 1.1.27
On 06.02.2013 10:12, Mark Thomas wrote: > On 06/02/2013 07:29, Mladen Turk wrote: >> Hi, >> >> The latest fix solves issues manifested with 1.1.26 and since >> there were no new issues reported with 1.1.27-dev binaries I plan >> to tag and push for a release 1.1.27. >> >> Any objections or someone is doing some pending tasks/tests? > > Can we update to OpenSSL 1.0.1d as well please? +1 If you can do a quick check on the TODO file to see whether you find any low hanging fuit that would be great (especially for the first two items). There are no show stoppers there though. I'm currently trying to readjust the native source part in trunk, so no need to wait for me for 1.1.x. One note: If you can run buildconf against an apr 1.4 HEAD source, then it should copy config.guess and config.sub from there. I just checked in the recent ones to the APR branches. If you run against 1.4.6 or similar source, then config.* will be the ones from the old release dates. When running configure one can then of course build against a normal released version of apr. Again, not a show stopper. Thanks for RM! Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1442914 - in /tomcat/trunk/java/org/apache/tomcat/jni: Buffer.java Thread.java
Author: rjung Date: Wed Feb 6 11:25:06 2013 New Revision: 1442914 URL: http://svn.apache.org/viewvc?rev=1442914&view=rev Log: Copy classes from tcnative. Next is removing al jni from tcnative and link to TC trunk using an svn external. Added: tomcat/trunk/java/org/apache/tomcat/jni/Buffer.java - copied unchanged from r1442634, tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java tomcat/trunk/java/org/apache/tomcat/jni/Thread.java - copied unchanged from r1442634, tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Thread.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging native 1.1.27
On 02/06/2013 10:12 AM, Mark Thomas wrote: On 06/02/2013 07:29, Mladen Turk wrote: Hi, The latest fix solves issues manifested with 1.1.26 and since there were no new issues reported with 1.1.27-dev binaries I plan to tag and push for a release 1.1.27. Any objections or someone is doing some pending tasks/tests? Can we update to OpenSSL 1.0.1d as well please? Sure. 1.0.1d release is one of the factors to kick the 1.1.27. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging native 1.1.27
On 02/06/2013 12:19 PM, Rainer Jung wrote: One note: If you can run buildconf against an apr 1.4 HEAD source, then it should copy config.guess and config.sub from there. I just checked in the recent ones to the APR branches. If you run against 1.4.6 or similar source, then config.* will be the ones from the old release dates. When running configure one can then of course build against a normal released version of apr. Again, not a show stopper. So you are suggesting to run buildconf against 1.4 HEAD instead 1.4.6 correct? Sure I can do that. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 51497] Use canonical IPv6 text representation in logs
https://issues.apache.org/bugzilla/show_bug.cgi?id=51497 Ognjen Blagojevic changed: What|Removed |Added Attachment #29921|0 |1 is obsolete|| --- Comment #10 from Ognjen Blagojevic --- Created attachment 29924 --> https://issues.apache.org/bugzilla/attachment.cgi?id=29924&action=edit AccessLogValve patch (In reply to comment #9) > Trunk uses junit4-style tests. > Checkstyle there is configured that junit3 ones will not pass validation. I ran the checkstyle and corrected all errors: trailing spaces and JUnit version. Thank you both for reviewing the 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
Re: Tagging native 1.1.27
On 06.02.2013 12:27, Mladen Turk wrote: > On 02/06/2013 12:19 PM, Rainer Jung wrote: >> >> One note: If you can run buildconf against an apr 1.4 HEAD source, then >> it should copy config.guess and config.sub from there. I just checked in >> the recent ones to the APR branches. If you run against 1.4.6 or similar >> source, then config.* will be the ones from the old release dates. When >> running configure one can then of course build against a normal released >> version of apr. Again, not a show stopper. >> > > So you are suggesting to run buildconf against 1.4 HEAD instead 1.4.6 > correct? Sure I can do that. Yes, that picks up the latest build files from there. When then actually doing the build using configure, you would proceed using 1.4.6 as normal. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54522] Add patch binary as prerequisite in BUILDING.txt
https://issues.apache.org/bugzilla/show_bug.cgi?id=54522 Ognjen Blagojevic changed: What|Removed |Added Attachment #29920|0 |1 is obsolete|| --- Comment #4 from Ognjen Blagojevic --- Created attachment 29925 --> https://issues.apache.org/bugzilla/attachment.cgi?id=29925&action=edit BUILDING.txt patch Checkstyle errors fixed. -- 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: Tagging native 1.1.27
On 02/06/2013 12:39 PM, Rainer Jung wrote: On 06.02.2013 12:27, Mladen Turk wrote: So you are suggesting to run buildconf against 1.4 HEAD instead 1.4.6 correct? Sure I can do that. Yes, that picks up the latest build files from there. When then actually doing the build using configure, you would proceed using 1.4.6 as normal. OK. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1442958 - /tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
Author: markt
Date: Wed Feb 6 13:25:44 2013
New Revision: 1442958
URL: http://svn.apache.org/viewvc?rev=1442958&view=rev
Log:
Fix typo
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1442958&r1=1442957&r2=1442958&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Wed
Feb 6 13:25:44 2013
@@ -35,7 +35,7 @@ wsFrame.oneByteCloseCode=The client sent
wsFrame.textMessageTooBig=The decoded text message was too big for the output
buffer and the endpoint does not support partial messages
wsFrame.wrongRsv=The client frame set the reserved bits to [{0}] which was not
supported by this endpoint
-wsRemoteEndpoint.concurrentMessageSend=Messages may not be send concurrently
even when using the asynchronous send messages. The client must wait for the
previous message to complete before sending the next.
+wsRemoteEndpoint.concurrentMessageSend=Messages may not be sent concurrently
even when using the asynchronous send messages. The client must wait for the
previous message to complete before sending the next.
wsSession.duplicateHandlerBinary=A binary message handler has already been
configured
wsSession.duplicateHandlerPong=A pong message handler has already been
configured
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1442966 - /tomcat/native/branches/1.1.x/native/srclib/VERSIONS
Author: mturk Date: Wed Feb 6 14:01:54 2013 New Revision: 1442966 URL: http://svn.apache.org/viewvc?rev=1442966&view=rev Log: Update dependency versions Modified: tomcat/native/branches/1.1.x/native/srclib/VERSIONS Modified: tomcat/native/branches/1.1.x/native/srclib/VERSIONS URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/srclib/VERSIONS?rev=1442966&r1=1442965&r2=1442966&view=diff == --- tomcat/native/branches/1.1.x/native/srclib/VERSIONS (original) +++ tomcat/native/branches/1.1.x/native/srclib/VERSIONS Wed Feb 6 14:01:54 2013 @@ -1,4 +1,4 @@ Use the following version of the libraries - APR 1.4.6, http://apr.apache.org -- OpenSSL 1.0.1c, http://www.openssl.org +- OpenSSL 1.0.1d, http://www.openssl.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Consider support for the Servlet profile of JSR 196 (JASPIC) in Tomcat 7.0.x
On 2/3/13 5:02 AM, Mark Thomas wrote: On 30/01/2013 23:57, Ron Monzillo wrote: Tomcat Experts and Users, The Servlet Profile of JSR 196 defines the use of the JASPIC SPI in support of the portable integration of new and/or custom authentication mechanisms in compatible Servlet containers. The Profile is a required component of all Full Platform EE Web Containers, and we are receiving requests for the profile to become a required component of the EE web profile. To that end, we are contacting standalone and EE web profile Servlet containers to determine if there is interest in adopting the profile. For those unfamiliar with JASPIC, the SPI is a general purpose facility that applies the concepts of pluggable authentication as defined by PAM and JAAS to the realm of message authentication. The Servlet profile applies the SPI to the realm of HttpServletRequest message authentication in the context of servlet security constraint processing. The SPI was defined to support complex challenge response authentication protocols, and has been shown to be an effective means to integrate portable implementations of new internet authentication mechanisms (e.g. Facebook Connect, and SAML WEB SSO) in compatible Servlet containers. Does the Tomcat community support the inclusion of the Servlet profile of JSR 196 in the EE web Profile? Apache Tomcat does not currently support the Java EE web profile. Tomcat currently supports only the Servlet, JSP and EL specifications and will be adding WebSocket to that list for Tomcat 8. The has been very little demand from the Apache Tomcat user community to support the Java EE web profile. There have been just two threads on the users list that mention the web profile. There have been slightly more on the dev list. JASPIC was on the TODO list for Tomcat 7 for a while but it dropped off because a) it wasn't a mandatory requirement for Servlet containers and b) there was very little (no references at all on the users list) for it. I think it would be safe to say that the Apache Tomcat community has no opinion on the Java EE web profile requiring JSR 196 support. You'd obviously get a very different reaction if the Servlet spec was going to require JSR 196 support. Apache TomEE does support the Java EE web profile. If you haven't already approached that community for their views, I recommend that you do so. Mark, I have posted the question to the TomEE and Caucho/Resin user's lists. It would also help to know what the level of interest is from Tomcat users and developers. I anticipate that there are Tomcat users and developers who are committed to other approaches, but I'd like to make sure the use of JASPIC has been presented for consideration by the Tomcat community. I would also like to know if anyone has already done or is interested in doing the work to integrate the JASPIC profile in the Tomcat code base. kind regards, Ron Kind regards, 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: [RESULT][VOTE] Release Apache Tomcat 7.0.36
On 02/06/2013 10:23 AM, Mark Thomas wrote: The result of this vote is that 7.0.36 is broken due to DAEMON-276 found by Konstantin. The problem has been fixed and a new Commons Daemon release is on the way. I aim to tag as soon as the release is available. If native 1.1.27 is available by then I'll pick that up too. I'll start the RM process for both of those components so hopefully they'll be in place for next release. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Consider support for the Servlet profile of JSR 196 (JASPIC) in Tomcat 7.0.x
On 06/02/2013 15:45, Ron Monzillo wrote: > I have posted the question to the TomEE and Caucho/Resin user's lists. > > It would also help to know what the level of interest is from Tomcat > users and developers. For users@, yours is the first post ever to mention JASPIC. We'll see what reaction your post gets. For dev@, it is safe to say it is an itch no-one has wanted to scratch so far because it hasn't been implemented. User demand could change that but so far there hasn't been any. > I anticipate that there are Tomcat users and developers who are committed > to other approaches, but I'd like to make sure the use of JASPIC has been > presented for consideration by the Tomcat community. It has been on our radar for well over 3 years. As I keep saying, so far no-one seems to be that interested in either using it or implementing it. > I would also like to know if anyone has already done or is interested in > doing > the work to integrate the JASPIC profile in the Tomcat code base. I believe the Geronimo folks have had this implemented for a number of years. If JASPIC support was going to be added to Tomcat, that is probably where we'd start. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1443121 - /tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Author: markt
Date: Wed Feb 6 18:49:49 2013
New Revision: 1443121
URL: http://svn.apache.org/viewvc?rev=1443121&view=rev
Log:
Move triggering of listener outside the sync block else users of the API
(WebSocket in this case) can end up in deadlock through no fault of their own.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java?rev=1443121&r1=1443120&r2=1443121&view=diff
==
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Wed Feb 6 18:49:49 2013
@@ -130,12 +130,18 @@ public abstract class AbstractServletOut
}
// Make sure canWrite() and onWritePossible() have a consistent view of
// buffer and fireListener when determining if the listener should fire
+boolean fire = false;
+
synchronized (fireListenerLock) {
if (buffer == null && fireListener) {
fireListener = false;
-listener.onWritePossible();
+fire = true;
}
}
+if (fire) {
+listener.onWritePossible();
+}
+
}
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1443122 - /tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
Author: markt
Date: Wed Feb 6 18:50:43 2013
New Revision: 1443122
URL: http://svn.apache.org/viewvc?rev=1443122&view=rev
Log:
Add a utility method for generating secure masks for client data.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Util.java?rev=1443122&r1=1443121&r2=1443122&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/Util.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Util.java Wed Feb 6 18:50:43
2013
@@ -16,6 +16,11 @@
*/
package org.apache.tomcat.websocket;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
import javax.websocket.CloseReason.CloseCode;
import javax.websocket.CloseReason.CloseCodes;
@@ -25,6 +30,9 @@ import javax.websocket.CloseReason.Close
*/
class Util {
+private static final Queue randoms =
+new ConcurrentLinkedQueue<>();
+
private Util() {
// Hide default constructor
}
@@ -91,4 +99,34 @@ class Util {
return CloseCodes.PROTOCOL_ERROR;
}
}
+
+
+static byte[] generateMask() {
+// SecureRandom is not thread-safe so need to make sure only one thread
+// uses it at a time. In theory, the pool could grow to the same size
+// as the number of request processing threads. In reality it will be
+// a lot smaller.
+
+// Get a SecureRandom from the pool
+SecureRandom sr = randoms.poll();
+
+// If one isn't available, generate a new one
+if (sr == null) {
+try {
+sr = SecureRandom.getInstance("SHA1PRNG");
+} catch (NoSuchAlgorithmException e) {
+// Fall back to platform default
+sr = new SecureRandom();
+}
+}
+
+// Generate the mask
+byte[] result = new byte[4];
+sr.nextBytes(result);
+
+// Put the SecureRandom back in the poll
+randoms.add(sr);
+
+return result;
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1443135 - in /tomcat/trunk: java/org/apache/tomcat/websocket/ java/org/apache/tomcat/websocket/server/ test/org/apache/tomcat/websocket/
Author: markt
Date: Wed Feb 6 19:06:56 2013
New Revision: 1443135
URL: http://svn.apache.org/viewvc?rev=1443135&view=rev
Log:
Refactor the RemoteEndpoint implementation.
- Add support for masking client data
- Add support batching (a.k.a. buffering) messages
- Provide building blocks for Stream, Writer, etc. support
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointClient.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java?rev=1443135&r1=1443134&r2=1443135&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java Wed
Feb 6 19:06:56 2013
@@ -21,7 +21,6 @@ import java.io.OutputStream;
import java.io.Writer;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
-import java.nio.channels.CompletionHandler;
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderResult;
@@ -31,6 +30,8 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
import javax.websocket.EncodeException;
import javax.websocket.RemoteEndpoint;
@@ -44,17 +45,18 @@ public abstract class WsRemoteEndpointBa
private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
-// TODO Make the size of these buffers configurable
-private final ByteBuffer intermediateBuffer = ByteBuffer.allocate(8192);
-protected final ByteBuffer outputBuffer = ByteBuffer.allocate(8192);
-private final AtomicBoolean charToByteInProgress = new
AtomicBoolean(false);
-private final CharsetEncoder encoder =
Charset.forName("UTF8").newEncoder();
+private final ReentrantLock writeLock = new ReentrantLock();
+private final Condition notInProgress = writeLock.newCondition();
+// Must hold writeLock above to modify state
private final MessageSendStateMachine state = new
MessageSendStateMachine();
-
+// Max size of WebSocket header is 14 bytes
+private final ByteBuffer headerBuffer = ByteBuffer.allocate(14);
+private final ByteBuffer outputBuffer = ByteBuffer.allocate(8192);
+private final CharsetEncoder encoder =
Charset.forName("UTF8").newEncoder();
+private final ByteBuffer encoderBuffer = ByteBuffer.allocate(8192);
+private AtomicBoolean batchingAllowed = new AtomicBoolean(false);
private volatile long asyncSendTimeout = -1;
-protected ByteBuffer payload = null;
-
@Override
public long getAsyncSendTimeout() {
@@ -70,66 +72,79 @@ public abstract class WsRemoteEndpointBa
@Override
public void setBatchingAllowed(boolean batchingAllowed) {
-// TODO Auto-generated method stub
+boolean oldValue = this.batchingAllowed.getAndSet(batchingAllowed);
+if (oldValue && !batchingAllowed) {
+// Just disabled batched. Must flush.
+flushBatch();
+}
}
@Override
public boolean getBatchingAllowed() {
-// TODO Auto-generated method stub
-return false;
+return batchingAllowed.get();
}
@Override
public void flushBatch() {
-// TODO Auto-generated method stub
-
+// Have to hold lock to flush output buffer
+writeLock.lock();
+try {
+while (state.isInProgress()) {
+notInProgress.await();
+}
+FutureToSendHandler f2sh = new FutureToSendHandler();
+doWrite(f2sh, outputBuffer);
+f2sh.get();
+} catch (InterruptedException | ExecutionException e) {
+// TODO Log this? Runtime exception? Something else?
+} finally {
+writeLock.unlock();
+}
}
@Override
-public final void sendString(String text) throws IOException {
-sendPartialString(text, true);
+public void sendBytes(ByteBuffer data) throws IOException {
+Future f = sendBytesByFuture(data);
+try {
+SendResult sr = f.get();
+if (!sr.isOK()) {
+if (sr.getException() == null) {
+throw new IOException();
+} else {
+throw new IOException(sr.getException());
+}
[Bug 54534] New: JMX connection may load servlet with invalid ClassLoader
https://issues.apache.org/bugzilla/show_bug.cgi?id=54534 Bug ID: 54534 Summary: JMX connection may load servlet with invalid ClassLoader Product: Tomcat 7 Version: 7.0.35 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: robby.mor...@bazaarvoice.com Classification: Unclassified Created attachment 29929 --> https://issues.apache.org/bugzilla/attachment.cgi?id=29929&action=edit Project for reproduction of bug I've recently observed a bug in Tomcat 7 that is causing our servers to fail to start-up, with the root cause being that, in response to a JMX request, Tomcat 7 is loading our servlet on a Thread whose contextClassLoader is NOT that of the web application. This may lead to various problems; in our case, it leads to failure of Spring to find the requisite XSDs that are present in jars in our web app's WEB-INF/lib directory. Here is the stack trace that is reported for Tomcat7.0.35 + Spring 3.1.1: org.springframework.beans.factory.parsing.BeanDefinitionParsingException: Configuration problem: Unable to locate Spring NamespaceHandler for XML schema namespace [http://www.springframework.org/schema/context] Offending resource: ServletContext resource [/WEB-INF/spring-servlet.xml] at org.springframework.beans.factory.parsing.FailFastProblemReporter.error(FailFastProblemReporter.java:68) at org.springframework.beans.factory.parsing.ReaderContext.error(ReaderContext.java:85) at org.springframework.beans.factory.parsing.ReaderContext.error(ReaderContext.java:80) at org.springframework.beans.factory.xml.BeanDefinitionParserDelegate.error(BeanDefinitionParserDelegate.java:316) at org.springframework.beans.factory.xml.BeanDefinitionParserDelegate.parseCustomElement(BeanDefinitionParserDelegate.java:1416) at org.springframework.beans.factory.xml.BeanDefinitionParserDelegate.parseCustomElement(BeanDefinitionParserDelegate.java:1409) at org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader.parseBeanDefinitions(DefaultBeanDefinitionDocumentReader.java:184) at org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader.doRegisterBeanDefinitions(DefaultBeanDefinitionDocumentReader.java:140) at org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader.registerBeanDefinitions(DefaultBeanDefinitionDocumentReader.java:111) at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.registerBeanDefinitions(XmlBeanDefinitionReader.java:493) at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.doLoadBeanDefinitions(XmlBeanDefinitionReader.java:390) at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.loadBeanDefinitions(XmlBeanDefinitionReader.java:334) at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.loadBeanDefinitions(XmlBeanDefinitionReader.java:302) at org.springframework.beans.factory.support.AbstractBeanDefinitionReader.loadBeanDefinitions(AbstractBeanDefinitionReader.java:174) at org.springframework.beans.factory.support.AbstractBeanDefinitionReader.loadBeanDefinitions(AbstractBeanDefinitionReader.java:209) at org.springframework.beans.factory.support.AbstractBeanDefinitionReader.loadBeanDefinitions(AbstractBeanDefinitionReader.java:180) at org.springframework.web.context.support.XmlWebApplicationContext.loadBeanDefinitions(XmlWebApplicationContext.java:125) at org.springframework.web.context.support.XmlWebApplicationContext.loadBeanDefinitions(XmlWebApplicationContext.java:94) at org.springframework.context.support.AbstractRefreshableApplicationContext.refreshBeanFactory(AbstractRefreshableApplicationContext.java:131) at org.springframework.context.support.AbstractApplicationContext.obtainFreshBeanFactory(AbstractApplicationContext.java:522) at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:436) at org.springframework.web.servlet.FrameworkServlet.configureAndRefreshWebApplicationContext(FrameworkServlet.java:631) at org.springframework.web.servlet.FrameworkServlet.createWebApplicationContext(FrameworkServlet.java:588) at org.springframework.web.servlet.FrameworkServlet.createWebApplicationContext(FrameworkServlet.java:645) at org.springframework.web.servlet.FrameworkServlet.initWebApplicationContext(FrameworkServlet.java:508) at org.springframework.web.servlet.FrameworkServlet.initServletBean(FrameworkServlet.java:449) at org.springframework.web.servlet.HttpServletBean.init(HttpServletBean.java:133) at javax.servlet.GenericServlet.init(GenericServlet.java:160) at org.apache.catalina.core.StandardWrapper.initServlet(StandardWrapper.java:1274) at org.apache.catalina.core.StandardWrapper.loadServlet(StandardWrapper.jav
[Bug 54534] JMX connection may load servlet with invalid ClassLoader
https://issues.apache.org/bugzilla/show_bug.cgi?id=54534 Dusty Herrman changed: What|Removed |Added CC||dherr...@gmail.com -- 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: Consider support for the Servlet profile of JSR 196 (JASPIC) in Tomcat 7.0.x
Umm, a few years ago I was quite interested in implementing it for tomcat, but couldn't raise any support over here. I still think the geronimo-tomcat-jaspic integration could be adapted to tomcat standalone pretty easily, although I don't think I'll have time to work on it. thanks david jencks On Feb 6, 2013, at 10:29 AM, Mark Thomas wrote: > On 06/02/2013 15:45, Ron Monzillo wrote: >> I have posted the question to the TomEE and Caucho/Resin user's lists. >> >> It would also help to know what the level of interest is from Tomcat >> users and developers. > > For users@, yours is the first post ever to mention JASPIC. We'll see > what reaction your post gets. > > For dev@, it is safe to say it is an itch no-one has wanted to scratch > so far because it hasn't been implemented. User demand could change that > but so far there hasn't been any. > >> I anticipate that there are Tomcat users and developers who are committed >> to other approaches, but I'd like to make sure the use of JASPIC has been >> presented for consideration by the Tomcat community. > > It has been on our radar for well over 3 years. As I keep saying, so far > no-one seems to be that interested in either using it or implementing it. > >> I would also like to know if anyone has already done or is interested in >> doing >> the work to integrate the JASPIC profile in the Tomcat code base. > > I believe the Geronimo folks have had this implemented for a number of > years. If JASPIC support was going to be added to Tomcat, that is > probably where we'd start. > > 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
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/3878 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1443135 Blamelist: markt Build succeeded! sincerely, -The Buildbot
[Bug 54534] JMX connection may load servlet with invalid ClassLoader
https://issues.apache.org/bugzilla/show_bug.cgi?id=54534 r...@datadoghq.com changed: What|Removed |Added CC||r...@datadoghq.com -- 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 54456] ChunkedInputFilter returning EOF when client closes connection without sending end chunk
https://issues.apache.org/bugzilla/show_bug.cgi?id=54456
--- Comment #6 from Sudhan Moghe ---
Tested with protocol="HTTP/1.1" and false
Took latest code from trunk and then added following debug statements to
ChunkedInputFilter.
if (pos >= lastValid) {
int readBytes = readBytes();
if (readBytes <= 0){
System.out.println("ChunkedInputFilter.doRead()1 readBytes
returned : " + readBytes);
}
}
if (remaining > (lastValid - pos)) {
result = lastValid - pos;
System.out.println("ChunkedInputFilter.doRead()2 result: " + result
+ " remaining: " + remaining + " lastValid: " + lastValid + " pos: " + pos);
Output on console
ChunkedInputFilter.doRead()1 readBytes returned : -1
ChunkedInputFilter.doRead()2 result: -1 remaining: 8192 lastValid: 334 pos: 335
Method returns -1, which is treated as normal EOF. And application ends up
processing incomplete data.
"return -1" won't do as that is what is being returned.
"throw new EOFException("Unexpected end of stream while reading chunk body");"
or
"throw new org.apache.catalina.connector.ClientAbortException()"
looks appropriate.
--
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
[Tomcat Wiki] Trivial Update of "SupportAndTraining" by developintelligence
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 developintelligence:
http://wiki.apache.org/tomcat/SupportAndTraining?action=diff&rev1=38&rev2=39
Comment:
updated developintelligence information
!NobleProg provides comprehensive
[[http://www.nobleprog.com/tomcat-training/training-course|Online
Instructor-led Tomcat Training]] all around the world. !NobleProg also provides
intensive [[http://www.nobleprog.co.uk/apache/training|Tomcat Classroom Courses
in the UK]]. The training can be bespoken as users want with hands-on
exercises. The course can be conducted even if there is only one person by
experienced Tomcat instructors.
+
[[http://www.DevelopIntelligence.com/|{{http://www.developintelligence.com/img/logo.jpg}}]]
+
+ !DevelopIntelligence provides customized
on-site[[http://www.developintelligence.com/catalog/apache-training|Apache
training]], with
[[http://www.developintelligence.com/catalog/open-source-training|open source
training courses]] on
[[http://www.developintelligence.com/catalog/open-source-training/server-administration/introduction-to-apache-tomcat|Apache
Tomcat Training]],
[[http://www.developintelligence.com/catalog/open-source-training/server-administration/introduction-to-activemq|ActiveMQ]],
[[http://www.developintelligence.com/catalog/software-engineering-training/development-tools/working-with-apache-maven|Maven]],
and more.
+
[[http://www.openlogic.com/|{{http://www.openlogic.com/assets/layout/openlogic-logo.gif}}]]
!OpenLogic offers
[[http://www.openlogic.com/products/open-source-training.php|training for
Tomcat]] and a wide range of other open source packages. Training options
include open-enrolment training for individuals and customized, multi-day
enterprise training courses.
-
-
[[http://www.DevelopIntelligence.com/|{{http://www.developintelligence.com/img/logo.jpg}}]]
-
- !DevelopIntelligence offers highly-customized, project-centric learning
solutions delivered on-site or on-line. Check out our
[[http://www.developintelligence.com/catalog/open-source-training/server-administration/introduction-to-apache-tomcat|Apache
Tomcat Training]] course, or our wide variety of
[[http://www.developintelligence.com/catalog/apache-training|Apache Training]]
and [[http://www.developintelligence.com/catalog/open-source-training|Open
Source Training]] programs.
[[http://www.savoirfairelinux.com|{{http://www.savoirfairelinux.com/image/image_gallery?img_id=53315&t=1287776986392|http://www.savoirfairelinux.com}}]]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "SupportAndTraining" by KonstantinKolinko
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 KonstantinKolinko:
http://wiki.apache.org/tomcat/SupportAndTraining?action=diff&rev1=39&rev2=40
Comment:
Partial revert of r39: restore ordering. (DI was added in r21, which is later
than OpenLogic).
!NobleProg provides comprehensive
[[http://www.nobleprog.com/tomcat-training/training-course|Online
Instructor-led Tomcat Training]] all around the world. !NobleProg also provides
intensive [[http://www.nobleprog.co.uk/apache/training|Tomcat Classroom Courses
in the UK]]. The training can be bespoken as users want with hands-on
exercises. The course can be conducted even if there is only one person by
experienced Tomcat instructors.
-
[[http://www.DevelopIntelligence.com/|{{http://www.developintelligence.com/img/logo.jpg}}]]
-
- !DevelopIntelligence provides customized
on-site[[http://www.developintelligence.com/catalog/apache-training|Apache
training]], with
[[http://www.developintelligence.com/catalog/open-source-training|open source
training courses]] on
[[http://www.developintelligence.com/catalog/open-source-training/server-administration/introduction-to-apache-tomcat|Apache
Tomcat Training]],
[[http://www.developintelligence.com/catalog/open-source-training/server-administration/introduction-to-activemq|ActiveMQ]],
[[http://www.developintelligence.com/catalog/software-engineering-training/development-tools/working-with-apache-maven|Maven]],
and more.
-
[[http://www.openlogic.com/|{{http://www.openlogic.com/assets/layout/openlogic-logo.gif}}]]
!OpenLogic offers
[[http://www.openlogic.com/products/open-source-training.php|training for
Tomcat]] and a wide range of other open source packages. Training options
include open-enrolment training for individuals and customized, multi-day
enterprise training courses.
+
+
+
[[http://www.DevelopIntelligence.com/|{{http://www.developintelligence.com/img/logo.jpg}}]]
+
+ !DevelopIntelligence provides customized
on-site[[http://www.developintelligence.com/catalog/apache-training|Apache
training]], with
[[http://www.developintelligence.com/catalog/open-source-training|open source
training courses]] on
[[http://www.developintelligence.com/catalog/open-source-training/server-administration/introduction-to-apache-tomcat|Apache
Tomcat Training]],
[[http://www.developintelligence.com/catalog/open-source-training/server-administration/introduction-to-activemq|ActiveMQ]],
[[http://www.developintelligence.com/catalog/software-engineering-training/development-tools/working-with-apache-maven|Maven]],
and more.
[[http://www.savoirfairelinux.com|{{http://www.savoirfairelinux.com/image/image_gallery?img_id=53315&t=1287776986392|http://www.savoirfairelinux.com}}]]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1443328 - /tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Author: mturk Date: Thu Feb 7 07:22:09 2013 New Revision: 1443328 URL: http://svn.apache.org/viewvc?rev=1443328&view=rev Log: Update changelog with latest fix Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1443328&r1=1443327&r2=1443328&view=diff == --- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Thu Feb 7 07:22:09 2013 @@ -39,12 +39,15 @@ + 54513: Fix regression in pollset return value. (mturk) + + Switch CPU information on Solaris from milliseconds to microseconds. Make consistent with OS.java and Linux impl. (rjung) - + 54468: Fix FIPS mode for listeners when using OpenSSL 1.0.1c - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1443330 - in /tomcat/native/branches/1.1.x/native: NMAKEmakefile include/tcn_version.h
Author: mturk
Date: Thu Feb 7 07:34:07 2013
New Revision: 1443330
URL: http://svn.apache.org/viewvc?rev=1443330&view=rev
Log:
Cleanup windows makefile - Make sure we have correct dependencies
Modified:
tomcat/native/branches/1.1.x/native/NMAKEmakefile
tomcat/native/branches/1.1.x/native/include/tcn_version.h
Modified: tomcat/native/branches/1.1.x/native/NMAKEmakefile
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/NMAKEmakefile?rev=1443330&r1=1443329&r2=1443330&view=diff
==
--- tomcat/native/branches/1.1.x/native/NMAKEmakefile (original)
+++ tomcat/native/branches/1.1.x/native/NMAKEmakefile Thu Feb 7 07:34:07 2013
@@ -17,8 +17,9 @@
#
# NMAKEmakefile Master Tomcat Native makefile.
# Usage:
-# STATIC=1 Use static version of the APR
-# DEBUG=1 Build DEBUG version of TCN
+# APR_DECLARE_STATIC=1 Use static version of the APR
+# ENABLE_OCSP=1Enable OpenSSL OCSP code
+# DEBUG=1 Build DEBUG version of TCN
#
# Originally contributed by Mladen Turk
#
@@ -40,6 +41,9 @@ APR_LIB = libapr-1.lib
CFLAGS = $(CFLAGS) -DAPR_DECLARE_STATIC
APR_LIB = apr-1.lib
!ENDIF
+!IF DEFINED(ENABLE_OCSP)
+CFLAGS = $(CFLAGS) -DHAVE_OPENSSL_OCSP
+!ENDIF
!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
SRCDIR = .
@@ -68,9 +72,6 @@ LFLAGS = $(LFLAGS) /version:1.1
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib
ole32.lib
LFLAGS = $(LFLAGS) $(APR_LIB)
LFLAGS = $(LFLAGS) libeay32.lib ssleay32.lib
-!IF DEFINED(WITH_OPENSSL)
-!ELSE
-!ENDIF
CFLAGS = $(CFLAGS) -DZLIB_WINAPI -DNO_IDEA -DNO_RC5 -DNO_MDC2
-DOPENSSL_NO_IDEA \
-DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DHAVE_OPENSSL -DHAVE_SSL_SET_STATE=1
@@ -107,6 +108,12 @@ OBJECTS = \
$(WORKDIR)\registry.obj \
$(WORKDIR)\system.obj
+HEADERS = \
+ $(SRCDIR)\include\tcn.h \
+ $(SRCDIR)\include\tcn_api.h \
+ $(SRCDIR)\include\tcn_version.h \
+ $(SRCDIR)\include\ssl_private.h
+
BUILDLIB = $(PREFIX)\lib
BUILDBIN = $(WORKDIR)\$(PROJECT).dll
BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
@@ -127,9 +134,9 @@ $(WORKDIR) :
{$(SRCDIR)\os\win32}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-$(OBJECTS): $(SRCDIR)\include\*.h
+$(OBJECTS): $(HEADERS)
-$(BUILDRES): $(SRCDIR)\os\win32\libtcnative.rc $(SRCDIR)\include\*.h
+$(BUILDRES): $(SRCDIR)\os\win32\libtcnative.rc $(HEADERS)
$(RC) $(RCFLAGS) /i "$(SRCDIR)\include" /fo $(BUILDRES)
$(SRCDIR)\os\win32\libtcnative.rc
$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
Modified: tomcat/native/branches/1.1.x/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/tcn_version.h?rev=1443330&r1=1443329&r2=1443330&view=diff
==
--- tomcat/native/branches/1.1.x/native/include/tcn_version.h (original)
+++ tomcat/native/branches/1.1.x/native/include/tcn_version.h Thu Feb 7
07:34:07 2013
@@ -75,7 +75,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging native 1.1.27
On 02/06/2013 10:12 AM, Mark Thomas wrote: On 06/02/2013 07:29, Mladen Turk wrote: Can we update to OpenSSL 1.0.1d as well please? I've build the test binaries with 1.0.1d but according to OpenSSL dev list there is an regression in that version, although in FIPS mode only (IIUC). Guys are fixing the issue, so although probably we are not affected I'll wait today to see if they'll come up with 1.0.1e. If not, we can either wait or proceed with 1.0.1d. WDYT? Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
