svn commit: r755236 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/OutputBuffer.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt
Author: rjung
Date: Tue Mar 17 13:29:17 2009
New Revision: 755236
URL: http://svn.apache.org/viewvc?rev=755236&view=rev
Log:
Fix BZ 46770: Don't send duplicate headers when using flushBuffer().
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/OutputBuffer.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/OutputBuffer.java?rev=755236&r1=755235&r2=755236&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/OutputBuffer.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/OutputBuffer.java
Tue Mar 17 13:29:17 2009
@@ -79,6 +79,7 @@
* State of the output buffer.
*/
private int state = 0;
+private boolean initial = true;
/**
@@ -229,6 +230,7 @@
public void recycle() {
state = INITIAL_STATE;
+initial = true;
bytesWritten = 0;
charsWritten = 0;
@@ -306,15 +308,17 @@
return;
doFlush = true;
+if (initial) {
+// If the buffers are empty, commit the response header
+coyoteResponse.sendHeaders();
+initial = false;
+}
if (state == CHAR_STATE) {
cb.flushBuffer();
bb.flushBuffer();
state = BYTE_STATE;
} else if (state == BYTE_STATE) {
bb.flushBuffer();
-} else if (state == INITIAL_STATE) {
-// If the buffers are empty, commit the response header
-coyoteResponse.sendHeaders();
}
doFlush = false;
@@ -650,6 +654,7 @@
gotEnc = false;
enc = null;
state = INITIAL_STATE;
+initial = true;
}
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=755236&r1=755235&r2=755236&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Mar 17 13:29:17 2009
@@ -52,6 +52,9 @@
+46770: Don't send duplicate headers when using
flushBuffer(). (rjung)
+
+
44021, 43013: Add support for # to signify
multi-level contexts for directories and wars.
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=755236&r1=755235&r2=755236&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Mar 17 13:29:17 2009
@@ -230,12 +230,3 @@
http://svn.apache.org/viewvc?rev=708273&view=rev
+1: markt
-1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46770
- Headers send duplicate when using AJP and flush.
- mod_jk doesn't accept such a response (starting with version 1.2.27).
- Only a problem before 6.0.
- Patch backported from
http://svn.eu.apache.org/viewvc?view=rev&revision=411577
- Patch available at https://issues.apache.org/bugzilla/attachment.cgi?id=23316
- +1: rjung, billbarker, mturk
- -1:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r755289 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Tue Mar 17 15:52:08 2009 New Revision: 755289 URL: http://svn.apache.org/viewvc?rev=755289&view=rev Log: Vote and comment. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=755289&r1=755288&r2=755289&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Tue Mar 17 15:52:08 2009 @@ -47,7 +47,7 @@ Improved fix that hopefully addresses previous concerns http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?r1=685981&r2=687645&diff_format=h http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties?r1=656035&r2=687503 - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45666 @@ -114,36 +114,36 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45933 Don't use xml parser from web-app to process tld files http://svn.apache.org/viewvc?rev=701355&view=rev - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42419 Support changing of JSESSIONID cookie name and jsessionid path parameter name http://svn.apache.org/viewvc?rev=702219&view=rev - +1: markt, mturk + +1: markt, mturk, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45996 Add Accept-Range header to DefaultServlet response http://svn.apache.org/viewvc?rev=696408&view=rev - +1: mark + +1: mark, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46105 Correctly set URI encoding when replaying a request after FORM auth http://svn.apache.org/viewvc?rev=709294&view=rev - +1: markt + +1: markt, rjung -1: * Fix thread safety issues in date formats http://svn.apache.org/viewvc?view=rev&revision=708160 - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46408 Correct potential invalid cast http://svn.apache.org/viewvc?rev=728032&view=rev - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=36923 @@ -156,22 +156,22 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37498 Handle logging errors during undeployment triggered by deleting the base - diretcory + directory https://issues.apache.org/bugzilla/attachment.cgi?id=23069 - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37458 Correct sync issue that leads to NPE in rare circumstances Patch provided by Konstantin Kolinko http://svn.apache.org/viewvc?rev=730735&view=rev - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37515 Add options for 1.6 and 1.7 source and target to JDT compiler http://svn.apache.org/viewvc?rev=731773&view=rev - +1: markt + +1: markt, rjung -1: * Lock contention during cookie creation, implementation is single threaded @@ -179,54 +179,63 @@ This patch realizes that DateFormat is not thread safe, but uses them without the need for synchronization using thread locals +1: fhanik -1: + rjung: http://svn.apache.org/viewvc?rev=709294&view=rev above seems + to already fix all cases, in which the problematic DateTool code was + actually used in TC 5.5.x. + rjung: How does a static thread local work (lifecycle)? + Is it lazily initialized for each thread when it starts using the class? * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46606 Make max depth configurable for WebDAV servlet http://svn.apache.org/viewvc?rev=740635&view=rev - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38197 Take account of jsp:attribute elements when naming tag pools http://svn.apache.org/viewvc?rev=740675&view=rev - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38483 Make access log valves thread safe http://people.apache.org/~markt/patches/2009-02-04-bug38483.patch - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38553 Return 401 rather than 400 if client presents no certs for CLIENT-CERT auth http://svn.apache.org/viewvc?rev=740684&view=rev - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38570 When checking docBase against appBase, make sure we check for an exact match against the appBase http://svn.apache.org/viewvc?rev=742677&view=rev - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39013 When testing for invalid docBase, test for an exact match with the appBase dir http://svn.apache.org/viewvc?re
svn commit: r755302 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Author: rjung
Date: Tue Mar 17 16:21:07 2009
New Revision: 755302
URL: http://svn.apache.org/viewvc?rev=755302&view=rev
Log:
MulticastSocket.setLoopbackmode() works reversed.
The argument is named "disabled", so true is for disable.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=755302&r1=755301&r2=755302&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Tue Mar 17 16:21:07 2009
@@ -218,7 +218,7 @@
} else {
socket = new MulticastSocket(port);
}
-socket.setLoopbackMode(false); //hint that we don't need loop back
messages
+socket.setLoopbackMode(true); //hint that we don't need loop back
messages
if (mcastBindAddress != null) {
if(log.isInfoEnabled())
log.info("Setting multihome multicast interface to:"
+mcastBindAddress);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r755307 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Tue Mar 17 16:24:39 2009 New Revision: 755307 URL: http://svn.apache.org/viewvc?rev=755307&view=rev Log: Add backport proposal. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=755307&r1=755306&r2=755307&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar 17 16:24:39 2009 @@ -107,3 +107,8 @@ Align mbean with implementation +1: markt -1: + +* Fix use of setLoopbackMode() for tribes multicast. + Backport of http://svn.apache.org/viewvc?rev=755302&view=rev + +1: rjung + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r755310 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Tue Mar 17 16:35:47 2009 New Revision: 755310 URL: http://svn.apache.org/viewvc?rev=755310&view=rev Log: Add two backport proposals. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=755310&r1=755309&r2=755310&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Tue Mar 17 16:35:47 2009 @@ -239,3 +239,18 @@ -1: rjung: I suggest doing the same changes for container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43641 + Backport of http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?r1=567474&r2=586228&diff_format=h + Patch for container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java + and container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java + at http://people.apache.org/~rjung/patches/mcast.patch + +1: rjung + -1: + +* Fix use of setLoopbackMode() for tribes multicast. + in container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java + and container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java + Backport of http://svn.apache.org/viewvc?rev=755302&view=rev + +1: rjung + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r755312 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Tue Mar 17 16:36:58 2009 New Revision: 755312 URL: http://svn.apache.org/viewvc?rev=755312&view=rev Log: Add a little verbosity to backport proposal. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=755312&r1=755311&r2=755312&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Tue Mar 17 16:36:58 2009 @@ -241,6 +241,7 @@ container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43641 + (multicasting bind address on multihomed computers). Backport of http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?r1=567474&r2=586228&diff_format=h Patch for container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java and container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r755331 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: fhanik Date: Tue Mar 17 17:27:15 2009 New Revision: 755331 URL: http://svn.apache.org/viewvc?rev=755331&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=755331&r1=755330&r2=755331&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar 17 17:27:15 2009 @@ -110,5 +110,5 @@ * Fix use of setLoopbackMode() for tribes multicast. Backport of http://svn.apache.org/viewvc?rev=755302&view=rev - +1: rjung + +1: rjung, fhanik -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r755351 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java src/share/org/apache/catalina/cluster/membership/McastS
Author: rjung
Date: Tue Mar 17 18:56:56 2009
New Revision: 755351
URL: http://svn.apache.org/viewvc?rev=755351&view=rev
Log:
Two backports from trunk:
- Fix not wanting to receive node local heartbeat
on multicast socket.
- BZ 43641: Fix setting multicast bind address
on multihomed computers.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=755351&r1=755350&r2=755351&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Mar 17 18:56:56 2009
@@ -33,6 +33,12 @@
+Fix not wanting to receive node local heartbeat on multicast socket.
(rjung)
+
+
+43641: Fix setting multicast bind address on multihomed
computers. (rjung)
+
+
Fix small memory leak in FarmWarDeployer. Backport from Tomcat 6.0.
(rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java?rev=755351&r1=755350&r2=755351&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
Tue Mar 17 18:56:56 2009
@@ -166,10 +166,23 @@
}
protected void setupSocket() throws IOException {
-if (mcastBindAddress != null) socket = new MulticastSocket(new
java.net.
-InetSocketAddress(mcastBindAddress, port));
-else socket = new MulticastSocket(port);
- socket.setLoopbackMode(false); //hint that we don't need loop back
messages
+if (mcastBindAddress != null) {
+try {
+log.info("Attempting to bind the multicast socket to
"+address+":"+port);
+socket = new MulticastSocket(new
InetSocketAddress(address,port));
+} catch (BindException e) {
+/*
+ * On some plattforms (e.g. Linux) it is not possible to bind
+ * to the multicast address. In this case only bind to the
+ * port.
+ */
+log.info("Binding to multicast address, failed. Binding to
port only.");
+socket = new MulticastSocket(port);
+}
+} else {
+socket = new MulticastSocket(port);
+}
+socket.setLoopbackMode(true); //hint that we don't need loop back
messages
if (mcastBindAddress != null) {
if(log.isInfoEnabled())
log.info("Setting multihome multicast interface to:" +
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java?rev=755351&r1=755350&r2=755351&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java
Tue Mar 17 18:56:56 2009
@@ -178,10 +178,23 @@
}
protected void setupSocket() throws IOException {
-if (mcastBindAddress != null) socket = new MulticastSocket(new
java.net.
-InetSocketAddress(mcastBindAddress, port));
-else socket = new MulticastSocket(port);
- socket.setLoopbackMode(false); //hint that we don't need loop back
messages
+if (mcastBindAddress != null) {
+try {
+log.info("Attempting to bind the multicast socket to
"+address+":"+port);
+socket = new MulticastSocket(new
InetSocketAddress(address,port));
+} catch (BindException e) {
+/*
+ * On some plattforms (e.g. Linux) it is not possible to bind
+ * to the multicast address. In this case only bind to the
+ * port.
+ */
+log.info("Binding to multicast address, failed. Binding to
port only.");
+socket = new MulticastSocket(port);
+}
+} else {
+sock
