svn commit: r1055357 - /tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java
Author: markt
Date: Wed Jan 5 08:44:20 2011
New Revision: 1055357
URL: http://svn.apache.org/viewvc?rev=1055357&view=rev
Log:
Fix required after removing unused code
Modified:
tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java
Modified: tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java?rev=1055357&r1=1055356&r2=1055357&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java Wed
Jan 5 08:44:20 2011
@@ -49,7 +49,8 @@ public class TestGzipOutputFilter extend
public void testFlushingWithGzip() throws Exception {
// set up response, InternalOutputBuffer, and ByteArrayOutputStream
Response res = new Response();
-InternalOutputBuffer iob = new InternalOutputBuffer(res);
+InternalOutputBuffer iob = new InternalOutputBuffer(res,
+Constants.DEFAULT_HTTP_HEADER_BUFFER_SIZE);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
iob.setOutputStream(bos);
res.setOutputBuffer(iob);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1055377 - in /tomcat/trunk/java/org/apache/coyote/http11: OutputFilter.java filters/ChunkedOutputFilter.java filters/GzipOutputFilter.java filters/IdentityOutputFilter.java filters/VoidOu
Author: markt
Date: Wed Jan 5 09:40:09 2011
New Revision: 1055377
URL: http://svn.apache.org/viewvc?rev=1055377&view=rev
Log:
Remove unused method
Modified:
tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java?rev=1055377&r1=1055376&r2=1055377&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java Wed Jan 5
09:40:09 2011
@@ -56,12 +56,6 @@ public interface OutputFilter extends Ou
/**
- * Get the name of the encoding handled by this filter.
- */
-public ByteChunk getEncodingName();
-
-
-/**
* Set the next buffer in the filter pipeline.
*/
public void setBuffer(OutputBuffer buffer);
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java?rev=1055377&r1=1055376&r2=1055377&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
Wed Jan 5 09:40:09 2011
@@ -179,16 +179,4 @@ public class ChunkedOutputFilter impleme
public void recycle() {
// NOOP: Nothing to recycle
}
-
-
-/**
- * Return the name of the associated encoding; Here, the value is
- * "identity".
- */
-@Override
-public ByteChunk getEncodingName() {
-return ENCODING;
-}
-
-
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java?rev=1055377&r1=1055376&r2=1055377&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
Wed Jan 5 09:40:09 2011
@@ -163,16 +163,6 @@ public class GzipOutputFilter implements
}
-/**
- * Return the name of the associated encoding; Here, the value is
- * "identity".
- */
-@Override
-public ByteChunk getEncodingName() {
-return ENCODING;
-}
-
-
// --- FakeOutputStream Inner Class
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java?rev=1055377&r1=1055376&r2=1055377&view=diff
==
---
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
Wed Jan 5 09:40:09 2011
@@ -180,16 +180,4 @@ public class IdentityOutputFilter implem
contentLength = -1;
remaining = 0;
}
-
-
-/**
- * Return the name of the associated encoding; Here, the value is
- * "identity".
- */
-@Override
-public ByteChunk getEncodingName() {
-return ENCODING;
-}
-
-
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java?rev=1055377&r1=1055376&r2=1055377&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
Wed Jan 5 09:40:09 2011
@@ -98,16 +98,6 @@ public class VoidOutputFilter implements
/**
- * Return the name of the associated encoding; Here, the value is
- * "identity".
- */
-@Override
-public ByteChunk getEncodingName() {
-return ENCODING;
-}
-
-
-/**
* End the current request. It is acceptable to write extra bytes using
* buffer.doWrite during the execution of this method.
*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-
svn commit: r1055382 - in /tomcat/trunk/java/org/apache/coyote/http11/filters: ChunkedOutputFilter.java GzipOutputFilter.java IdentityOutputFilter.java VoidOutputFilter.java
Author: markt
Date: Wed Jan 5 09:45:18 2011
New Revision: 1055382
URL: http://svn.apache.org/viewvc?rev=1055382&view=rev
Log:
Remove unused constants (follow up to r1055377)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java?rev=1055382&r1=1055381&r2=1055382&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
Wed Jan 5 09:45:18 2011
@@ -34,12 +34,6 @@ public class ChunkedOutputFilter impleme
// -- Constants
-
-
-protected static final String ENCODING_NAME = "chunked";
-protected static final ByteChunk ENCODING = new ByteChunk();
-
-
/**
* End chunk.
*/
@@ -50,7 +44,6 @@ public class ChunkedOutputFilter impleme
static {
-ENCODING.setBytes(ENCODING_NAME.getBytes(), 0, ENCODING_NAME.length());
byte[] END_CHUNK_BYTES = {(byte) '0', (byte) '\r', (byte) '\n',
(byte) '\r', (byte) '\n'};
END_CHUNK.setBytes(END_CHUNK_BYTES, 0, END_CHUNK_BYTES.length);
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java?rev=1055382&r1=1055381&r2=1055382&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
Wed Jan 5 09:45:18 2011
@@ -34,13 +34,6 @@ import org.apache.tomcat.util.buf.ByteCh
public class GzipOutputFilter implements OutputFilter {
-// -- Constants
-
-
-protected static final String ENCODING_NAME = "gzip";
-protected static final ByteChunk ENCODING = new ByteChunk();
-
-
/**
* Logger.
*/
@@ -48,14 +41,6 @@ public class GzipOutputFilter implements
org.apache.juli.logging.LogFactory.getLog(GzipOutputFilter.class);
-// - Static Initializer
-
-
-static {
-ENCODING.setBytes(ENCODING_NAME.getBytes(), 0, ENCODING_NAME.length());
-}
-
-
// - Instance Variables
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java?rev=1055382&r1=1055381&r2=1055382&view=diff
==
---
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
Wed Jan 5 09:45:18 2011
@@ -32,21 +32,6 @@ import org.apache.tomcat.util.buf.ByteCh
public class IdentityOutputFilter implements OutputFilter {
-// -- Constants
-
-
-protected static final String ENCODING_NAME = "identity";
-protected static final ByteChunk ENCODING = new ByteChunk();
-
-
-// - Static Initializer
-
-
-static {
-ENCODING.setBytes(ENCODING_NAME.getBytes(), 0, ENCODING_NAME.length());
-}
-
-
// - Instance Variables
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java?rev=1055382&r1=1055381&r2=1055382&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
Wed Jan 5 09:45:18 2011
@@ -33,21 +33,6 @@ import org.apache.tomcat.util.buf.ByteCh
public class VoidOutputFilter implements OutputFilter {
-// -- Constants
-
-
-protected static final String ENCODING_NAME = "void";
-protected static final ByteChunk ENCODING = new ByteChunk();
-
-
-// ---
svn commit: r1055384 - /tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
Author: markt
Date: Wed Jan 5 09:47:43 2011
New Revision: 1055384
URL: http://svn.apache.org/viewvc?rev=1055384&view=rev
Log:
Remove unused methods
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java?rev=1055384&r1=1055383&r2=1055384&view=diff
==
---
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
Wed Jan 5 09:47:43 2011
@@ -53,25 +53,6 @@ public class IdentityOutputFilter implem
protected OutputBuffer buffer;
-// - Properties
-
-
-/**
- * Get content length.
- */
-public long getContentLength() {
-return contentLength;
-}
-
-
-/**
- * Get remaining bytes.
- */
-public long getRemaining() {
-return remaining;
-}
-
-
// --- OutputBuffer Methods
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1055389 - /tomcat/trunk/java/org/apache/coyote/Response.java
Author: markt
Date: Wed Jan 5 09:57:44 2011
New Revision: 1055389
URL: http://svn.apache.org/viewvc?rev=1055389&view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/coyote/Response.java
Modified: tomcat/trunk/java/org/apache/coyote/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Response.java?rev=1055389&r1=1055388&r2=1055389&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Response.java Wed Jan 5 09:57:44 2011
@@ -109,11 +109,6 @@ public final class Response {
*/
protected boolean charsetSet = false;
-/**
- * Request error URI.
- */
-protected String errorURI = null;
-
protected Request req;
// - Properties
@@ -245,22 +240,6 @@ public final class Response {
}
-/**
- * Set request URI that caused an error during
- * request processing.
- */
-public void setErrorURI(String uri) {
-errorURI = uri;
-}
-
-
-/** Get the request URI that caused the original error.
- */
-public String getErrorURI() {
-return errorURI;
-}
-
-
// Methods
@@ -569,7 +548,6 @@ public final class Response {
message = null;
commited = false;
errorException = null;
-errorURI = null;
headers.clear();
// update counters
@@ -579,8 +557,4 @@ public final class Response {
public long getBytesWritten() {
return bytesWritten;
}
-
-public void setBytesWritten(long bytesWritten) {
-this.bytesWritten = bytesWritten;
-}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1055391 - in /tomcat/trunk/java/org/apache/catalina: connector/OutputBuffer.java connector/Response.java valves/AccessLogValve.java valves/ErrorReportValve.java valves/JDBCAccessLogValve.
Author: markt
Date: Wed Jan 5 10:10:29 2011
New Revision: 1055391
URL: http://svn.apache.org/viewvc?rev=1055391&view=rev
Log:
Simplify getContentCount.
Prep for fixing bug 50496
Modified:
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1055391&r1=1055390&r2=1055391&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Wed Jan
5 10:10:29 2011
@@ -340,6 +340,7 @@ public class OutputBuffer extends Writer
*
* @throws IOException An underlying IOException occurred
*/
+@Override
public void realWriteBytes(byte buf[], int off, int cnt)
throws IOException {
@@ -513,6 +514,7 @@ public class OutputBuffer extends Writer
conv = AccessController.doPrivileged(
new PrivilegedExceptionAction(){
+@Override
public C2BConverter run() throws IOException{
return new C2BConverter(bb, enc);
}
@@ -547,29 +549,7 @@ public class OutputBuffer extends Writer
}
-public int getBytesWritten() {
-if (bytesWritten < Integer.MAX_VALUE) {
-return (int) bytesWritten;
-}
-return -1;
-}
-
-public int getCharsWritten() {
-if (charsWritten < Integer.MAX_VALUE) {
-return (int) charsWritten;
-}
-return -1;
-}
-
-public int getContentWritten() {
-long size = bytesWritten + charsWritten ;
-if (size < Integer.MAX_VALUE) {
-return (int) size;
-}
-return -1;
-}
-
-public long getContentWrittenLong() {
+public long getContentWritten() {
return bytesWritten + charsWritten;
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1055391&r1=1055390&r2=1055391&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Wed Jan 5
10:10:29 2011
@@ -310,16 +310,9 @@ public class Response
/**
* Return the number of bytes actually written to the output stream.
*/
-public int getContentCount() {
+public long getContentCount() {
return outputBuffer.getContentWritten();
}
-
-/**
- * Return the number of bytes actually written to the output stream.
- */
-public long getContentCountLong() {
-return outputBuffer.getContentWrittenLong();
-}
/**
* Set the application commit flag.
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1055391&r1=1055390&r2=1055391&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Wed Jan 5
10:10:29 2011
@@ -1057,7 +1057,7 @@ public class AccessLogValve extends Valv
@Override
public void addElement(StringBuilder buf, Date date, Request request,
Response response, long time) {
-long length = response.getContentCountLong() ;
+long length = response.getContentCount() ;
if (length <= 0 && conversion) {
buf.append('-');
} else {
Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1055391&r1=1055390&r2=1055391&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Wed Jan
5 10:10:29 2011
@@ -165,7 +165,7 @@ public class ErrorReportValve extends Va
// Do nothing on a 1xx, 2xx and 3xx status
// Do nothing if anything has been written already
-if ((statusCode < 400
DO NOT REPLY [Bug 50541] JNDIRealm: support configuring LDAP sizeLimit (countLimit in SearchControls)
https://issues.apache.org/bugzilla/show_bug.cgi?id=50541 --- Comment #2 from Marek Wasilewski 2011-01-05 06:33:18 EST --- (In reply to comment #1) > Fixed in 7.0.x and will be included in 7.0.6 onwards. Areyou planning on applying this fix also to the 6.0.x version? -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 50541] JNDIRealm: support configuring LDAP sizeLimit (countLimit in SearchControls)
https://issues.apache.org/bugzilla/show_bug.cgi?id=50541 --- Comment #3 from Mark Thomas 2011-01-05 06:36:35 EST --- There are no such plans at present. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: Time for 6.0.30?
On 01/04/2011 07:04 PM, Konstantin Kolinko wrote: 2011/1/4 jean-frederic clere: On 01/04/2011 11:44 AM, Mark Thomas wrote: It has been a while since 6.0.29 and there have been a few requests for this on the users list. Jean-Frederic, do you have any plans for 6.0.30 at this point? Next week :D Cheers Jean-Frederic Sounds good. FYI: current TC 6 is configured to use commons-daemon 1.0.4 and I was hitting a regression with that [1]. In short, [1] is a race condition between service thread and jvm initialization thread, that caused the service to fail to start at boot time. I did not observe it with commons-daemon 1.0.2 that 6.0.29 release is using, but I am not sure that it is absent there. I'd be nice if next release of commons-daemon were available in time for TC 6.0.30 to use it. I think Mladen is working on that :D Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1055439 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jfclere Date: Wed Jan 5 12:23:36 2011 New Revision: 1055439 URL: http://svn.apache.org/viewvc?rev=1055439&view=rev Log: My votes. 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=1055439&r1=1055438&r2=1055439&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 5 12:23:36 2011 @@ -212,14 +212,14 @@ PATCHES PROPOSED TO BACKPORT: Avoid creating file SESSIONS.ser if there's no session. The patch provided by Marc Guillemot works for tc 6 & 7 http://svn.apache.org/viewvc?rev=1042022&view=rev - +1: slaurent, kkolinko + +1: slaurent, kkolinko, jfclere +1: markt with r1044944 +1: kfujino with r1044944 -1: Additional patch: i18n, as asked by Mark: http://svn.apache.org/viewvc?rev=1044944&view=rev - +1: kkolinko, markt, kfujino + +1: kkolinko, markt, kfujino, jfclere -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50282 @@ -240,7 +240,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413 Ensure 304s are not returned when using static files as error pages http://people.apache.org/~markt/patches/2011-01-04-bug50413-tc6.patch - +1: markt + +1: markt, jfclere -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50459 @@ -279,5 +279,5 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50527 Improve error message http://svn.apache.org/viewvc?rev=1055236&view=rev - +1: markt + +1: markt, jfclere -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Time for 6.0.30?
On 01/05/2011 12:49 PM, jean-frederic clere wrote: On 01/04/2011 07:04 PM, Konstantin Kolinko wrote: I'd be nice if next release of commons-daemon were available in time for TC 6.0.30 to use it. I think Mladen is working on that :D Right. Tagged 1.0.5, and currently in VOTE stage. I hope I'll gather enough votes by the end of this week and make an announcement. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1055458 - in /tomcat/trunk: java/org/apache/tomcat/util/net/NioEndpoint.java webapps/docs/changelog.xml
Author: markt
Date: Wed Jan 5 13:51:48 2011
New Revision: 1055458
URL: http://svn.apache.org/viewvc?rev=1055458&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50467
Protect against NPE that will cause Poller to fail
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1055458&r1=1055457&r2=1055458&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Jan 5
13:51:48 2011
@@ -1141,9 +1141,15 @@ public class NioEndpoint extends Abstrac
while (iterator != null && iterator.hasNext()) {
SelectionKey sk = iterator.next();
KeyAttachment attachment =
(KeyAttachment)sk.attachment();
-attachment.access();
-iterator.remove();
-processKey(sk, attachment);
+// Attachment may be null if another thread has called
+// cancelledKey()
+if (attachment == null) {
+iterator.remove();
+} else {
+attachment.access();
+iterator.remove();
+processKey(sk, attachment);
+}
}//while
//process timeouts
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1055458&r1=1055457&r2=1055458&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jan 5 13:51:48 2011
@@ -195,6 +195,11 @@
Remove a huge memory leak in the NIO connector introduced by the fix
for 49884. (markt)
+
+50467: Protected against NPE triggered by a race condition
+that causes the NIO poller to fail, preventing the processing of
further
+requests. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1055459 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Jan 5 13:53:33 2011 New Revision: 1055459 URL: http://svn.apache.org/viewvc?rev=1055459&view=rev Log: 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=1055459&r1=1055458&r2=1055459&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 5 13:53:33 2011 @@ -281,3 +281,9 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1055236&view=rev +1: markt, jfclere -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50467 + Avoid NOE that causes NIO poller to fail + http://svn.apache.org/viewvc?rev=1055458&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50467] Occasional NIO connector lockups on high load
https://issues.apache.org/bugzilla/show_bug.cgi?id=50467 --- Comment #4 from Mark Thomas 2011-01-05 08:53:41 EST --- The null check seems reasonable to me. I have fixed this in 7.0.x and it will be included in 7.0.6 onwards. I have also proposed the fix for 6.0.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1055461 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/JspDocumentParser.java java/org/apache/naming/resources/ImmutableNameNotFoundException.java webapps/docs/
Author: markt Date: Wed Jan 5 13:59:06 2011 New Revision: 1055461 URL: http://svn.apache.org/viewvc?rev=1055461&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50460 Avoid leak caused by using a cached exception instance (kkolinko) Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 5 13:59:06 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,962865,962872,962881,962900,963865,963868,964614,966177-966178,966292,966692,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004868-1004869,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1037715,1037794,1037887,1037924,1038041 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,74
DO NOT REPLY [Bug 50460] First access to a jspx page causes classloader leak in JspDocumentParser
https://issues.apache.org/bugzilla/show_bug.cgi?id=50460 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #6 from Mark Thomas 2011-01-05 09:00:07 EST --- Fixed in 6.0.x and will be included in 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1055465 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml
Author: markt
Date: Wed Jan 5 14:18:05 2011
New Revision: 1055465
URL: http://svn.apache.org/viewvc?rev=1055465&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50459
StandardContext.bindThread() and unbindThread() are not symmetrical and not
limited to current thread (slaurent)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1055465&r1=1055464&r2=1055465&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 5 14:18:05 2011
@@ -243,13 +243,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, jfclere
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50459
- StandardContext.bindThread() and unbindThread() are not symmetrical and not
- limited to current thread
-
http://people.apache.org/~slaurent/patches/2010-12-12_BZ50459_bindThread_tc6.patch
- +1: slaurent, kkolinko, kfujino
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48822
Include context name in reload and stop log statements.
http://people.apache.org/~slaurent/patches/2010-12-16_BZ48822_context_name_on_reload-tc6.patch
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1055465&r1=1055464&r2=1055465&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Wed
Jan 5 14:18:05 2011
@@ -4540,10 +4540,11 @@ public class StandardContext
if ((loader != null) && (loader instanceof Lifecycle))
((Lifecycle) loader).start();
-// Unbinding thread
+// since the loader just started, the webapp classloader is now
+// created.
+// By calling unbindThread and bindThread in a row, we setup
the
+// current Thread CCL to be the webapp classloader
unbindThread(oldCCL);
-
-// Binding thread
oldCCL = bindThread();
// Initialize logger again. Other components might have used
it too early,
@@ -5062,7 +5063,7 @@ public class StandardContext
(getLoader().getClassLoader());
}
-DirContextURLStreamHandler.bind(getResources());
+DirContextURLStreamHandler.bindThread(getResources());
if (isUseNaming()) {
try {
@@ -5083,16 +5084,13 @@ public class StandardContext
*/
private void unbindThread(ClassLoader oldContextClassLoader) {
-Thread.currentThread().setContextClassLoader(oldContextClassLoader);
-
-oldContextClassLoader = null;
-
if (isUseNaming()) {
ContextBindings.unbindThread(this, this);
}
-DirContextURLStreamHandler.unbind();
+DirContextURLStreamHandler.unbindThread();
+Thread.currentThread().setContextClassLoader(oldContextClassLoader);
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1055465&r1=1055464&r2=1055465&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 5 14:18:05 2011
@@ -183,6 +183,10 @@
robust against objects with toString() methods that throw
exceptions. (markt)
+
+50459: Fix thread/classloader binding issues in
+StandardContext. (slaurent)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50459] StandardContext.bindThread() and unbindThread() are not symmetrical and not limited to current thread
https://issues.apache.org/bugzilla/show_bug.cgi?id=50459 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #8 from Mark Thomas 2011-01-05 09:18:11 EST --- Fixed in 6.0.x and will be included in 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1055469 - in /tomcat/trunk/java/org/apache/catalina/valves: AccessLogValve.java CometConnectionManagerValve.java ErrorReportValve.java JDBCAccessLogValve.java PersistentValve.java RemoteI
Author: markt Date: Wed Jan 5 14:28:30 2011 New Revision: 1055469 URL: http://svn.apache.org/viewvc?rev=1055469&view=rev Log: Remove unnecessary code. Valves in this package can use the StringManager defined in ValveBase Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1055469&r1=1055468&r2=1055469&view=diff == --- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Wed Jan 5 14:28:30 2011 @@ -46,7 +46,6 @@ import org.apache.coyote.RequestInfo; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.ExceptionUtils; -import org.apache.tomcat.util.res.StringManager; /** @@ -190,13 +189,6 @@ public class AccessLogValve extends Valv /** - * The string manager for this package. - */ -protected static final StringManager sm = -StringManager.getManager(Constants.Package); - - -/** * The suffix that is added to log file filenames. */ protected String suffix = ""; Modified: tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java?rev=1055469&r1=1055468&r2=1055469&view=diff == --- tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java Wed Jan 5 14:28:30 2011 @@ -41,7 +41,6 @@ import org.apache.catalina.comet.CometPr import org.apache.catalina.connector.CometEventImpl; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; -import org.apache.tomcat.util.res.StringManager; /** @@ -74,13 +73,6 @@ public class CometConnectionManagerValve /** - * The string manager for this package. - */ -protected static final StringManager sm = -StringManager.getManager(Constants.Package); - - -/** * List of current Comet connections. */ protected List cometRequests = Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1055469&r1=1055468&r2=1055469&view=diff == --- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Wed Jan 5 14:28:30 2011 @@ -31,7 +31,6 @@ import org.apache.catalina.connector.Res import org.apache.catalina.util.RequestUtil; import org.apache.catalina.util.ServerInfo; import org.apache.tomcat.util.ExceptionUtils; -import org.apache.tomcat.util.res.StringManager; /** * Implementation of a Valve that outputs HTML error pages. @@ -66,13 +65,6 @@ public class ErrorReportValve extends Va "org.apache.catalina.valves.ErrorReportValve/1.0"; -/** - * The StringManager for this package. - */ -protected static final StringManager sm = -StringManager.getManager(Constants.Package); - - // - Properties Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=1055469&r1=1055468&r2=1055469&view=diff == --- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Wed Jan 5 14:28:30 2011 @@ -35,7 +35,6 @@ import org.apache.catalina.LifecycleStat import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.tomcat.util.ExceptionUtils; -import org.apache.tomcat.util.res.StringManager; /** * @@ -219,12 +218,6 @@ public final class JDBCAccessLogValve ex "org.apache.catalina.valves.JDBCAccessLogValve/1.1"; -/** -
svn commit: r1055482 - in /tomcat/trunk: java/org/apache/catalina/filters/ java/org/apache/catalina/valves/ test/org/apache/catalina/filters/ test/org/apache/catalina/valves/ webapps/docs/
Author: markt
Date: Wed Jan 5 15:05:42 2011
New Revision: 1055482
URL: http://svn.apache.org/viewvc?rev=1055482&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50453
Correctly handle multiple X-Forwarded-For headers
Modified:
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1055482&r1=1055481&r2=1055482&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Wed Jan
5 15:05:42 2011
@@ -720,8 +720,17 @@ public class RemoteIpFilter implements F
String remoteIp = null;
// In java 6, proxiesHeaderValue should be declared as a
java.util.Deque
LinkedList proxiesHeaderValue = new LinkedList();
+StringBuffer concatRemoteIpHeaderValue = new StringBuffer();
-String[] remoteIpHeaderValue =
commaDelimitedListToStringArray(request.getHeader(remoteIpHeader));
+for (Enumeration e = request.getHeaders(remoteIpHeader);
e.hasMoreElements();) {
+if (concatRemoteIpHeaderValue.length() > 0) {
+concatRemoteIpHeaderValue.append(", ");
+}
+
+concatRemoteIpHeaderValue.append(e.nextElement());
+}
+
+String[] remoteIpHeaderValue =
commaDelimitedListToStringArray(concatRemoteIpHeaderValue.toString());
int idx;
// loop on remoteIpHeaderValue to find the first trusted remote ip
and to build the proxies chain
for (idx = remoteIpHeaderValue.length - 1; idx >= 0; idx--) {
@@ -782,11 +791,11 @@ public class RemoteIpFilter implements F
log.debug("Incoming request " + request.getRequestURI() + "
with originalRemoteAddr '" + request.getRemoteAddr()
+ "', originalRemoteHost='" + request.getRemoteHost()
+ "', originalSecure='" + request.isSecure()
+ "', originalScheme='" + request.getScheme() + "',
original[" + remoteIpHeader + "]='"
-+ request.getHeader(remoteIpHeader) + ", original[" +
protocolHeader + "]='"
++ concatRemoteIpHeaderValue + "', original[" +
protocolHeader + "]='"
+ (protocolHeader == null ? null :
request.getHeader(protocolHeader)) + "' will be seen as newRemoteAddr='"
+ xRequest.getRemoteAddr() + "', newRemoteHost='" +
xRequest.getRemoteHost() + "', newScheme='"
+ xRequest.getScheme() + "', newSecure='" +
xRequest.isSecure() + "', new[" + remoteIpHeader + "]='"
-+ xRequest.getHeader(remoteIpHeader) + ", new[" +
proxiesHeader + "]='" + xRequest.getHeader(proxiesHeader) + "'");
++ xRequest.getHeader(remoteIpHeader) + "', new[" +
proxiesHeader + "]='" + xRequest.getHeader(proxiesHeader) + "'");
}
chain.doFilter(xRequest, response);
} else {
Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1055482&r1=1055481&r2=1055482&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Wed Jan 5
15:05:42 2011
@@ -19,6 +19,7 @@ package org.apache.catalina.valves;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Enumeration;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -548,8 +549,17 @@ public class RemoteIpValve extends Valve
String remoteIp = null;
// In java 6, proxiesHeaderValue should be declared as a
java.util.Deque
LinkedList proxiesHeaderValue = new LinkedList();
+StringBuffer concatRemoteIpHeaderValue = new StringBuffer();
-String[] remoteIpHeaderValue =
commaDelimitedListToStringArray(request.getHeader(remoteIpHeader));
+for (Enumeration e = request.getHeaders(remoteIpHeader);
e.hasMoreElements();) {
+if (concatRemoteIpHeaderValue.length() > 0) {
+concatRemoteIpHeaderValue.append(", ");
+}
+
+concatRemoteIpHeaderValue.append(e.nextElement());
+
svn commit: r1055483 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Jan 5 15:06:58 2011 New Revision: 1055483 URL: http://svn.apache.org/viewvc?rev=1055483&view=rev Log: 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=1055483&r1=1055482&r2=1055483&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 5 15:06:58 2011 @@ -274,3 +274,9 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1055458&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50453 + Correct handle multiple X-Forwarded-For headers in RemoteIpValve + http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?r1=1055482&r2=1055481&pathrev=1055482 + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50453] Multiple X-Forwarded-For headers not handled by RemoteIP valve
https://issues.apache.org/bugzilla/show_bug.cgi?id=50453 --- Comment #13 from Mark Thomas 2011-01-05 10:08:01 EST --- Fixed in trunk for 7.0.x and will be included in 7.0.6 onwards. I also updated the test cases. The Valve fix has been proposed for 6.0.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 49929] AJP APR connector to mod_jk can result in SEND_BODY_CHUNK message after END_RESPONSE message
https://issues.apache.org/bugzilla/show_bug.cgi?id=49929 --- Comment #11 from Mark Thomas 2011-01-05 10:10:23 EST --- Without a reproducible test case this is eventually going to get closed as WONTFIX. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 50026] DefaultServlet serves META-INF and WEB-INF from root when remapped on /folder/*
https://issues.apache.org/bugzilla/show_bug.cgi?id=50026 --- Comment #14 from Christopher Schultz 2011-01-05 11:30:07 EST --- Has a CVE number been assigned to this? Seems there should be one, and this vulnerability should be documented in Tomcat's security page(s). -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 50026] DefaultServlet serves META-INF and WEB-INF from root when remapped on /folder/*
https://issues.apache.org/bugzilla/show_bug.cgi?id=50026 --- Comment #15 from Mark Thomas 2011-01-05 11:48:05 EST --- No. The view was that it was mis-configuration rather than a vulnerability (the default servlet was never intended to be mapped to anything other than /). -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1055690 - /tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
Author: fhanik
Date: Wed Jan 5 23:58:38 2011
New Revision: 1055690
URL: http://svn.apache.org/viewvc?rev=1055690&view=rev
Log:
allow system to start
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=1055690&r1=1055689&r2=1055690&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java Wed
Jan 5 23:58:38 2011
@@ -88,6 +88,7 @@ public class TestMaxConnections extends
tomcat.getConnector().setProperty("maxConnections", "4");
tomcat.getConnector().setProperty("acceptCount", "1");
tomcat.start();
+Thread.currentThread().sleep(2000);
}
private class TestClient extends SimpleHttpClient {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1055776 - /tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Author: jfclere Date: Thu Jan 6 07:42:48 2011 New Revision: 1055776 URL: http://svn.apache.org/viewvc?rev=1055776&view=rev Log: Add missing information. 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=1055776&r1=1055775&r2=1055776&view=diff == --- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Thu Jan 6 07:42:48 2011 @@ -39,6 +39,15 @@ + Update copyright year. (rjung) + + + Add tm logo. (mturk) + + + Make the non blocking write really no blocking. (jfclere) + + Add support for unsafe legacy renegotiation. (mturk) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
tagging tc native 1.1.21 for a release
Hi, I plan to tag TOMCAT_NATIVE_1_1_21 to release it later, is that OK? Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
