svn commit: r1348752 - /tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
Author: markt
Date: Mon Jun 11 08:50:42 2012
New Revision: 1348752
URL: http://svn.apache.org/viewvc?rev=1348752&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53071
Add a test case that confirms this issue does not occur in trunk
Added:
tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
(with props)
Added: tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java?rev=1348752&view=auto
==
--- tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
(added)
+++ tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java Mon
Jun 11 08:50:42 2012
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.valves;
+
+import java.io.IOException;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestErrorReportValve extends TomcatBaseTest {
+
+@Test
+public void testBug53071() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+// Must have a real docBase - just use temp
+Context ctx =
+tomcat.addContext("", System.getProperty("java.io.tmpdir"));
+
+Tomcat.addServlet(ctx, "errorServlet", new ErrorServlet());
+ctx.addServletMapping("/", "errorServlet");
+
+tomcat.start();
+
+ByteChunk res = getUrl("http://localhost:"; + getPort());
+
+Assert.assertTrue(res.toString().contains(ErrorServlet.ERROR_TEXT));
+}
+
+
+private static final class ErrorServlet extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+private static final String ERROR_TEXT = "The wheels fell off.";
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+req.setAttribute(RequestDispatcher.ERROR_EXCEPTION,
+new Throwable(ERROR_TEXT));
+resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+}
+}
+}
Propchange:
tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1348755 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/valves/TestErrorReportValve.java
Author: markt Date: Mon Jun 11 08:53:03 2012 New Revision: 1348755 URL: http://svn.apache.org/viewvc?rev=1348755&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53071 Add a test case that confirms this issue does not occur in trunk Added: tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java - copied unchanged from r1348752, tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java Modified: tomcat/tc7.0.x/trunk/ (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1348752 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1348762 - in /tomcat/trunk: java/org/apache/catalina/valves/ErrorReportValve.java test/org/apache/catalina/valves/TestErrorReportValve.java
Author: markt
Date: Mon Jun 11 09:24:53 2012
New Revision: 1348762
URL: http://svn.apache.org/viewvc?rev=1348762&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53071
Stepping through the code, light dawns as to what the bug report was getting at.
Use the message from the Throwable for the error report if none was specified
via sendError()
Modified:
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
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=1348762&r1=1348761&r2=1348762&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Mon Jun
11 09:24:53 2012
@@ -141,7 +141,11 @@ public class ErrorReportValve extends Va
String message = RequestUtil.filter(response.getMessage());
if (message == null) {
-message = "";
+if (throwable != null) {
+message = RequestUtil.filter(throwable.getMessage());
+} else {
+message = "";
+}
}
// Do nothing if there is no report for the specified status code
Modified: tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java?rev=1348762&r1=1348761&r2=1348762&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java Mon
Jun 11 09:24:53 2012
@@ -49,7 +49,8 @@ public class TestErrorReportValve extend
ByteChunk res = getUrl("http://localhost:"; + getPort());
-Assert.assertTrue(res.toString().contains(ErrorServlet.ERROR_TEXT));
+Assert.assertTrue(res.toString().contains("message " +
+ErrorServlet.ERROR_TEXT + ""));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1348763 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/ErrorReportValve.java test/org/apache/catalina/valves/TestErrorReportValve.java
Author: markt
Date: Mon Jun 11 09:25:50 2012
New Revision: 1348763
URL: http://svn.apache.org/viewvc?rev=1348763&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53071
Stepping through the code, light dawns as to what the bug report was getting at.
Use the message from the Throwable for the error report if none was specified
via sendError()
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1348762
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1348763&r1=1348762&r2=1348763&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Mon Jun 11 09:25:50 2012
@@ -165,7 +165,11 @@ public class ErrorReportValve extends Va
String message = RequestUtil.filter(response.getMessage());
if (message == null) {
-message = "";
+if (throwable != null) {
+message = RequestUtil.filter(throwable.getMessage());
+} else {
+message = "";
+}
}
// Do nothing if there is no report for the specified status code
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java?rev=1348763&r1=1348762&r2=1348763&view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
Mon Jun 11 09:25:50 2012
@@ -49,7 +49,8 @@ public class TestErrorReportValve extend
ByteChunk res = getUrl("http://localhost:"; + getPort());
-Assert.assertTrue(res.toString().contains(ErrorServlet.ERROR_TEXT));
+Assert.assertTrue(res.toString().contains("message " +
+ErrorServlet.ERROR_TEXT + ""));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1348765 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Mon Jun 11 09:28:46 2012 New Revision: 1348765 URL: http://svn.apache.org/viewvc?rev=1348765&view=rev Log: Update changelog Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1348765&r1=1348764&r2=1348765&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jun 11 09:28:46 2012 @@ -129,6 +129,11 @@ Enable host's xmlBase attribute in ContextConfig. (kfujino) +53071: Use the message from the throwable (if there is one) +when generating the report in the ErrorReportValve and no +message has been specified via sendError(). (markt) + + 53081: Do not always cache resources loaded by the web application class loader since they may be very large which in turn could trigger a memory leak. Calls to the web application class - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1348767 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Jun 11 09:31:13 2012 New Revision: 1348767 URL: http://svn.apache.org/viewvc?rev=1348767&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=1348767&r1=1348766&r2=1348767&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jun 11 09:31:13 2012 @@ -227,6 +227,12 @@ PATCHES PROPOSED TO BACKPORT: at least set required="false" on roleNameCol, userRoleTable in config/realm.html) -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53071 + Use the message from the Throwable for the error report if none was specified + via sendError() + http://people.apache.org/~markt/patches/2012-06-11-bug53071-tc6.patch + +1: markt + -1: PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53071] ErrorReportValve ignores message from throwable
https://issues.apache.org/bugzilla/show_bug.cgi?id=53071 --- Comment #2 from Mark Thomas --- Fixed in trunk and 7.0.x and will be included in 7.0.28 onwards. Proposed for 6.0.x Notes: 1. The message from the Throwable was displayed in the stack trace. 2. I modified the patch. The message from the Throwable is only used if no message is specified via sendError() -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1348762 - in /tomcat/trunk: java/org/apache/catalina/valves/ErrorReportValve.java test/org/apache/catalina/valves/TestErrorReportValve.java
2012/6/11 :
> Author: markt
> Date: Mon Jun 11 09:24:53 2012
> New Revision: 1348762
>
> URL: http://svn.apache.org/viewvc?rev=1348762&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53071
> Stepping through the code, light dawns as to what the bug report was getting
> at.
> Use the message from the Throwable for the error report if none was specified
> via sendError()
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
> tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
>
> 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=1348762&r1=1348761&r2=1348762&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Mon
> Jun 11 09:24:53 2012
> @@ -141,7 +141,11 @@ public class ErrorReportValve extends Va
>
> String message = RequestUtil.filter(response.getMessage());
> if (message == null) {
> - message = "";
> + if (throwable != null) {
> + message = RequestUtil.filter(throwable.getMessage());
> + } else {
> + message = "";
> + }
throwable.getMessage() can return null, e.g. it usually happens with
a NullPointerException
So it'd be better to do
if (throwable != null) {
message = RequestUtil.filter(throwable.getMessage());
}
if (message == null) {
message = "";
}
Alternatively, maybe String.valueOf(throwable.getMessage()) to convert
null to "null". I cannot say what is better without a bit of
experimenting, but using "" as the value is what we had before.
> }
>
> // Do nothing if there is no report for the specified status code
>
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1348762 - in /tomcat/trunk: java/org/apache/catalina/valves/ErrorReportValve.java test/org/apache/catalina/valves/TestErrorReportValve.java
On 11/06/2012 10:33, Konstantin Kolinko wrote:
> 2012/6/11 :
>> Author: markt
>> Date: Mon Jun 11 09:24:53 2012
>> New Revision: 1348762
>>
>> URL: http://svn.apache.org/viewvc?rev=1348762&view=rev
>> Log:
>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53071
>> Stepping through the code, light dawns as to what the bug report was getting
>> at.
>> Use the message from the Throwable for the error report if none was
>> specified via sendError()
>>
>> Modified:
>>tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
>>tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
>>
>> 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=1348762&r1=1348761&r2=1348762&view=diff
>> ==
>> --- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
>> (original)
>> +++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Mon
>> Jun 11 09:24:53 2012
>> @@ -141,7 +141,11 @@ public class ErrorReportValve extends Va
>>
>> String message = RequestUtil.filter(response.getMessage());
>> if (message == null) {
>> -message = "";
>> +if (throwable != null) {
>> +message = RequestUtil.filter(throwable.getMessage());
>> +} else {
>> +message = "";
>> +}
>
> throwable.getMessage() can return null, e.g. it usually happens with
> a NullPointerException
ACK. I'll fix that.
Mark
>
> So it'd be better to do
> if (throwable != null) {
> message = RequestUtil.filter(throwable.getMessage());
> }
> if (message == null) {
> message = "";
> }
>
> Alternatively, maybe String.valueOf(throwable.getMessage()) to convert
> null to "null". I cannot say what is better without a bit of
> experimenting, but using "" as the value is what we had before.
>
>> }
>>
>> // Do nothing if there is no report for the specified status code
>>
>
> Best regards,
> Konstantin Kolinko
>
> -
> 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
svn commit: r1348772 - /tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Author: markt
Date: Mon Jun 11 09:37:00 2012
New Revision: 1348772
URL: http://svn.apache.org/viewvc?rev=1348772&view=rev
Log:
Throwable.getMessage() might be null
Modified:
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
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=1348772&r1=1348771&r2=1348772&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Mon Jun
11 09:37:00 2012
@@ -140,10 +140,9 @@ public class ErrorReportValve extends Va
}
String message = RequestUtil.filter(response.getMessage());
-if (message == null) {
-if (throwable != null) {
-message = RequestUtil.filter(throwable.getMessage());
-} else {
+if (message == null && throwable != null) {
+message = RequestUtil.filter(throwable.getMessage());
+if (message == null) {
message = "";
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1348773 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/ErrorReportValve.java
Author: markt
Date: Mon Jun 11 09:37:55 2012
New Revision: 1348773
URL: http://svn.apache.org/viewvc?rev=1348773&view=rev
Log:
Throwable.getMessage() might be null
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1348772
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1348773&r1=1348772&r2=1348773&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Mon Jun 11 09:37:55 2012
@@ -164,10 +164,9 @@ public class ErrorReportValve extends Va
}
String message = RequestUtil.filter(response.getMessage());
-if (message == null) {
-if (throwable != null) {
-message = RequestUtil.filter(throwable.getMessage());
-} else {
+if (message == null && throwable != null) {
+message = RequestUtil.filter(throwable.getMessage());
+if (message == null) {
message = "";
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1348772 - /tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
2012/6/11 :
> Author: markt
> Date: Mon Jun 11 09:37:00 2012
> New Revision: 1348772
>
> URL: http://svn.apache.org/viewvc?rev=1348772&view=rev
> Log:
> Throwable.getMessage() might be null
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
>
> 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=1348772&r1=1348771&r2=1348772&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Mon
> Jun 11 09:37:00 2012
> @@ -140,10 +140,9 @@ public class ErrorReportValve extends Va
> }
>
> String message = RequestUtil.filter(response.getMessage());
> - if (message == null) {
> - if (throwable != null) {
> - message = RequestUtil.filter(throwable.getMessage());
> - } else {
> + if (message == null && throwable != null) {
> + message = RequestUtil.filter(throwable.getMessage());
> + if (message == null) {
> message = "";
> }
> }
Huh. Still a miss.
The old logic before fixing this bug was:
String message = RequestUtil.filter(response.getMessage());
if (message == null) {
message = "";
}
So resulting message was never null.
In your code it will be null when message and throwable are both null.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1348772 - /tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
On 11/06/2012 10:42, Konstantin Kolinko wrote:
> 2012/6/11 :
>> Author: markt
>> Date: Mon Jun 11 09:37:00 2012
>> New Revision: 1348772
>>
>> URL: http://svn.apache.org/viewvc?rev=1348772&view=rev
>> Log:
>> Throwable.getMessage() might be null
>>
>> Modified:
>>tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
>>
>> 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=1348772&r1=1348771&r2=1348772&view=diff
>> ==
>> --- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
>> (original)
>> +++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Mon
>> Jun 11 09:37:00 2012
>> @@ -140,10 +140,9 @@ public class ErrorReportValve extends Va
>> }
>>
>> String message = RequestUtil.filter(response.getMessage());
>> -if (message == null) {
>> -if (throwable != null) {
>> -message = RequestUtil.filter(throwable.getMessage());
>> -} else {
>> +if (message == null && throwable != null) {
>> +message = RequestUtil.filter(throwable.getMessage());
>> +if (message == null) {
>> message = "";
>> }
>> }
>
> Huh. Still a miss.
> The old logic before fixing this bug was:
> String message = RequestUtil.filter(response.getMessage());
> if (message == null) {
> message = "";
> }
>
> So resulting message was never null.
> In your code it will be null when message and throwable are both null.
Grrr. This is going to be one of those really simple bugs that takes me
20+ attempts to get right.
Third attempt coming up.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53393] New: tomcat-connectors-1.2.37-src Crashing web server segmentation fault
https://issues.apache.org/bugzilla/show_bug.cgi?id=53393 Priority: P2 Bug ID: 53393 Assignee: dev@tomcat.apache.org Summary: tomcat-connectors-1.2.37-src Crashing web server segmentation fault Severity: normal Classification: Unclassified OS: other Reporter: garhwal_satya...@rediffmail.com Hardware: PC Status: NEW Version: 1.2.37 Component: mod_jk Product: Tomcat Connectors I have Apache/2.2.22 (Ubuntu) mod_jk/1.2.37 mod_ssl/2.2.22 OpenSSL/1.0.1 configured on Ubuntu server 12 . I compiled mod_jk from source . When we connect Apache web server to tomcat using mod_jk 1.2.37. It gives segmentation fault error in Apache error log. I seen following error in Mozilla Firefox using httpfox addon's. (Error loading content (NS_ERROR_DOCUMENT_NOT_CACHED)). I hope this is due to jk connector .does anybody have solution for this. This is apache error log [Mon Jun 11 19:47:33 2012] [notice] Apache/2.2.22 (Ubuntu) mod_jk/1.2.37 mod_ssl/2.2.22 OpenSSL/1.0.1 configured -- resuming normal operations [Mon Jun 11 20:14:16 2012] [notice] child pid 2097 exit signal Segmentation fault (11) [Mon Jun 11 20:14:16 2012] [notice] child pid 2098 exit signal Segmentation fault (11) [Mon Jun 11 20:14:18 2012] [notice] child pid 2157 exit signal Segmentation fault (11) [Mon Jun 11 20:14:19 2012] [notice] child pid 2186 exit signal Segmentation fault (11) [Mon Jun 11 20:14:19 2012] [notice] child pid 2187 exit signal Segmentation fault (11) [Mon Jun 11 20:14:21 2012] [notice] child pid 2244 exit signal Segmentation fault (11) -- 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 53393] tomcat-connectors-1.2.37-src Crashing web server segmentation fault
https://issues.apache.org/bugzilla/show_bug.cgi?id=53393 satyapal changed: What|Removed |Added Priority|P2 |P1 --- Comment #1 from satyapal --- changed priority .. -- 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: r1348776 - /tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Author: markt
Date: Mon Jun 11 09:49:21 2012
New Revision: 1348776
URL: http://svn.apache.org/viewvc?rev=1348776&view=rev
Log:
Fix logic
Modified:
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
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=1348776&r1=1348775&r2=1348776&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Mon Jun
11 09:49:21 2012
@@ -140,8 +140,10 @@ public class ErrorReportValve extends Va
}
String message = RequestUtil.filter(response.getMessage());
-if (message == null && throwable != null) {
-message = RequestUtil.filter(throwable.getMessage());
+if (message == null) {
+if (throwable != null) {
+message = RequestUtil.filter(throwable.getMessage());
+}
if (message == null) {
message = "";
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1348777 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/ErrorReportValve.java
Author: markt
Date: Mon Jun 11 09:50:03 2012
New Revision: 1348777
URL: http://svn.apache.org/viewvc?rev=1348777&view=rev
Log:
Fix logic
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1348776
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1348777&r1=1348776&r2=1348777&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Mon Jun 11 09:50:03 2012
@@ -164,8 +164,10 @@ public class ErrorReportValve extends Va
}
String message = RequestUtil.filter(response.getMessage());
-if (message == null && throwable != null) {
-message = RequestUtil.filter(throwable.getMessage());
+if (message == null) {
+if (throwable != null) {
+message = RequestUtil.filter(throwable.getMessage());
+}
if (message == null) {
message = "";
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1348780 - in /tomcat/native/branches/1.1.x/native/srclib: VERSIONS openssl/openssl-msvcrt.patch
Author: mturk
Date: Mon Jun 11 09:56:31 2012
New Revision: 1348780
URL: http://svn.apache.org/viewvc?rev=1348780&view=rev
Log:
Update openssl version and patch
Modified:
tomcat/native/branches/1.1.x/native/srclib/VERSIONS
tomcat/native/branches/1.1.x/native/srclib/openssl/openssl-msvcrt.patch
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=1348780&r1=1348779&r2=1348780&view=diff
==
--- tomcat/native/branches/1.1.x/native/srclib/VERSIONS (original)
+++ tomcat/native/branches/1.1.x/native/srclib/VERSIONS Mon Jun 11 09:56:31 2012
@@ -1,4 +1,4 @@
Use the following version of the libraries
- APR 1.4.6, http://apr.apache.org
-- OpenSSL 1.0.0g, http://www.openssl.org
+- OpenSSL 1.0.0c, http://www.openssl.org
Modified:
tomcat/native/branches/1.1.x/native/srclib/openssl/openssl-msvcrt.patch
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/srclib/openssl/openssl-msvcrt.patch?rev=1348780&r1=1348779&r2=1348780&view=diff
==
--- tomcat/native/branches/1.1.x/native/srclib/openssl/openssl-msvcrt.patch
(original)
+++ tomcat/native/branches/1.1.x/native/srclib/openssl/openssl-msvcrt.patch Mon
Jun 11 09:56:31 2012
@@ -1,24 +1,24 @@
--- util/pl/VC-32.pl
+++ util/pl/VC-32.pl
-@@ -33,7 +33,7 @@
+@@ -43,7 +43,7 @@
# considered safe to ignore.
#
$base_cflags= " $mf_cflag";
--my $f = $shlib?' /MD':' /MT';
+-my $f = $shlib || $fips ?' /MD':' /MT';
+my $f = ' /MD';
$lib_cflag='/Zl' if (!$shlib);# remove /DEFAULTLIBs from static lib
$opt_cflags=$f.' /Ox';
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-@@ -114,7 +114,7 @@
+@@ -124,7 +124,7 @@
else # Win32
{
$base_cflags= " $mf_cflag";
--my $f = $shlib?' /MD':' /MT';
+-my $f = $shlib || $fips ?' /MD':' /MT';
+my $f = ' /MD';
$lib_cflag='/Zl' if (!$shlib);# remove /DEFAULTLIBs from static lib
$opt_cflags=$f.' /Ox /O2 /Ob2';
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-@@ -165,6 +165,7 @@
+@@ -175,6 +175,7 @@
{
$ex_libs.=' gdi32.lib advapi32.lib crypt32.lib user32.lib';
$ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/ and `cl 2>&1`
=~ /14\.00\.4[0-9]{4}\./);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1348780 - in /tomcat/native/branches/1.1.x/native/srclib: VERSIONS openssl/openssl-msvcrt.patch
On 11/06/2012 10:56, mt...@apache.org wrote: > Author: mturk > Date: Mon Jun 11 09:56:31 2012 > New Revision: 1348780 > > URL: http://svn.apache.org/viewvc?rev=1348780&view=rev > Log: > Update openssl version and patch > > Modified: > tomcat/native/branches/1.1.x/native/srclib/VERSIONS > tomcat/native/branches/1.1.x/native/srclib/openssl/openssl-msvcrt.patch > > 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=1348780&r1=1348779&r2=1348780&view=diff > == > --- tomcat/native/branches/1.1.x/native/srclib/VERSIONS (original) > +++ tomcat/native/branches/1.1.x/native/srclib/VERSIONS Mon Jun 11 09:56:31 > 2012 > @@ -1,4 +1,4 @@ > Use the following version of the libraries > > - APR 1.4.6, http://apr.apache.org > -- OpenSSL 1.0.0g, http://www.openssl.org > +- OpenSSL 1.0.0c, http://www.openssl.org 1.0.1c? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Need a native connector release
On 06/10/2012 05:11 PM, Mark Thomas wrote: On 10/06/2012 16:09, Mladen Turk wrote: Sure. Need to double check few things, but Monday or Tuesday we should have RC. Excellent. Thanks. Could you check binaries from http://people.apache.org/~mturk/tomcat/ If they are OK, I'll T&R Cheers -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1348780 - in /tomcat/native/branches/1.1.x/native/srclib: VERSIONS openssl/openssl-msvcrt.patch
On 06/11/2012 11:58 AM, Mark Thomas wrote: On 11/06/2012 10:56, mt...@apache.org wrote: Author: mturk Date: Mon Jun 11 09:56:31 2012 New Revision: 1348780 URL: http://svn.apache.org/viewvc?rev=1348780&view=rev Log: Update openssl version and patch Modified: tomcat/native/branches/1.1.x/native/srclib/VERSIONS tomcat/native/branches/1.1.x/native/srclib/openssl/openssl-msvcrt.patch 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=1348780&r1=1348779&r2=1348780&view=diff == --- tomcat/native/branches/1.1.x/native/srclib/VERSIONS (original) +++ tomcat/native/branches/1.1.x/native/srclib/VERSIONS Mon Jun 11 09:56:31 2012 @@ -1,4 +1,4 @@ Use the following version of the libraries - APR 1.4.6, http://apr.apache.org -- OpenSSL 1.0.0g, http://www.openssl.org +- OpenSSL 1.0.0c, http://www.openssl.org 1.0.1c? Yeah, typo. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1348786 - /tomcat/native/branches/1.1.x/native/srclib/VERSIONS
Author: mturk Date: Mon Jun 11 10:27:13 2012 New Revision: 1348786 URL: http://svn.apache.org/viewvc?rev=1348786&view=rev Log: Fix typo. Thanks Mark ;) 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=1348786&r1=1348785&r2=1348786&view=diff == --- tomcat/native/branches/1.1.x/native/srclib/VERSIONS (original) +++ tomcat/native/branches/1.1.x/native/srclib/VERSIONS Mon Jun 11 10:27:13 2012 @@ -1,4 +1,4 @@ Use the following version of the libraries - APR 1.4.6, http://apr.apache.org -- OpenSSL 1.0.0c, http://www.openssl.org +- OpenSSL 1.0.1c, http://www.openssl.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53393] tomcat-connectors-1.2.37-src Crashing web server segmentation fault
https://issues.apache.org/bugzilla/show_bug.cgi?id=53393 --- Comment #2 from Mladen Turk --- Any chance to get a backtrace? See http://httpd.apache.org/dev/debugging.html -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1348790 - in /tomcat/trunk/java/org/apache: catalina/tribes/tipis/ReplicatedMapEntry.java tomcat/spdy/SpdyConnection.java
Author: markt
Date: Mon Jun 11 10:49:18 2012
New Revision: 1348790
URL: http://svn.apache.org/viewvc?rev=1348790&view=rev
Log:
Javadoc fixes
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java?rev=1348790&r1=1348789&r2=1348790&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java
Mon Jun 11 10:49:18 2012
@@ -120,7 +120,6 @@ public interface ReplicatedMapEntry exte
/**
* Return the last replicate time.
- * @return
*/
public long getLastTimeReplicated();
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java?rev=1348790&r1=1348789&r2=1348790&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java Mon Jun 11
10:49:18 2012
@@ -540,7 +540,6 @@ public abstract class SpdyConnection { /
* Process a SPDY connection. Called in the input thread, should not
* block.
*
- * @return
* @throws IOException
*/
protected int handleFrame() throws IOException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1348791 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java
Author: markt Date: Mon Jun 11 10:49:50 2012 New Revision: 1348791 URL: http://svn.apache.org/viewvc?rev=1348791&view=rev Log: Javadoc fixes Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java?rev=1348791&r1=1348790&r2=1348791&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java Mon Jun 11 10:49:50 2012 @@ -120,7 +120,6 @@ public interface ReplicatedMapEntry exte /** * Return the last replicate time. - * @return */ public long getLastTimeReplicated(); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53391] CometEvent.close() doesn't close socket when called from different thread
https://issues.apache.org/bugzilla/show_bug.cgi?id=53391 --- Comment #2 from Mark Thomas --- I'm not convinced that the behaviour you are seeing is a bug. Currently: a) END if called from within event() closes the connection b) END if called from a separate thread does not close the connection Essentially, the difference is that b) supports HTTP keep-alive whereas a) does not. While this report suggests the b) is incorrect, I am leaning towards a) being incorrect. Since from the client point of view, this is just an HTTP connection (the client may have zero knowledge of the Comet processing at the server end) then I see no reason not to support keep-alive. END should finish the response but I see no need for it to force the closing of the connection. -- 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: Need a native connector release
On 11/06/2012 11:24, Mladen Turk wrote: > On 06/10/2012 05:11 PM, Mark Thomas wrote: >> On 10/06/2012 16:09, Mladen Turk wrote: >>> Sure. Need to double check few things, but Monday or Tuesday we should >>> have RC. >> >> Excellent. Thanks. >> > > Could you check binaries from > http://people.apache.org/~mturk/tomcat/ > > If they are OK, I'll T&R Unit tests work for me. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53071] ErrorReportValve ignores message from throwable
https://issues.apache.org/bugzilla/show_bug.cgi?id=53071 --- Comment #3 from Michael Osipov <1983-01...@gmx.net> --- (In reply to comment #2) > Fixed in trunk and 7.0.x and will be included in 7.0.28 onwards. > > Proposed for 6.0.x > > Notes: > 1. The message from the Throwable was displayed in the stack trace. I am aware of that but I don't want to burden my users with the stack traces, the message is just fine. > 2. I modified the patch. The message from the Throwable is only used if no > message >is specified via sendError() This is perfectly fine and does the job. Thanks for the fix. Looking forward to 6.0.36. -- 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 53394] New: Log warning if SSLv2 is enabled
https://issues.apache.org/bugzilla/show_bug.cgi?id=53394 Priority: P2 Bug ID: 53394 Assignee: dev@tomcat.apache.org Summary: Log warning if SSLv2 is enabled Severity: major Classification: Unclassified OS: All Reporter: 1983-01...@gmx.net Hardware: All Status: NEW Version: 6.0.35 Component: Connectors Product: Tomcat 6 We recently had a security scan I was not aware that your APR Connector has SSLv2 activated. Since SSLv2 is unsecure, it would be best to emit a WARN message if any SSL connector has this protocol still enabled. -- 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: r1348811 - in /tomcat/native/branches/1.1.x: build.properties.default native/include/tcn_version.h xdocs/miscellaneous/changelog.xml xdocs/miscellaneous/project.xml
Author: mturk
Date: Mon Jun 11 12:13:04 2012
New Revision: 1348811
URL: http://svn.apache.org/viewvc?rev=1348811&view=rev
Log:
Add changelog entry and prepare for tag
Modified:
tomcat/native/branches/1.1.x/build.properties.default
tomcat/native/branches/1.1.x/native/include/tcn_version.h
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml
Modified: tomcat/native/branches/1.1.x/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.properties.default?rev=1348811&r1=1348810&r2=1348811&view=diff
==
--- tomcat/native/branches/1.1.x/build.properties.default (original)
+++ tomcat/native/branches/1.1.x/build.properties.default Mon Jun 11 12:13:04
2012
@@ -20,7 +20,7 @@ version.major=1
version.minor=1
version.build=24
version.patch=0
-version.suffix=-dev
+version.suffix=
# - Default Base Path for Dependent Packages -
# Please note this path must be absolute, not relative,
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=1348811&r1=1348810&r2=1348811&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 Mon Jun 11
12:13:04 2012
@@ -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 */
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=1348811&r1=1348810&r2=1348811&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Mon Jun 11
12:13:04 2012
@@ -36,6 +36,13 @@
new documentation project for Tomcat Native was started.
+
+
+
+ Add support for per-socket timeouts inside poller. (markt, mturk)
+
+
+
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml?rev=1348811&r1=1348810&r2=1348811&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml Mon Jun 11
12:13:04 2012
@@ -37,6 +37,8 @@
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1348812 - /tomcat/native/tags/TOMCAT_NATIVE_1_1_24/
Author: mturk Date: Mon Jun 11 12:16:35 2012 New Revision: 1348812 URL: http://svn.apache.org/viewvc?rev=1348812&view=rev Log: Tag 1.2.34 Added: tomcat/native/tags/TOMCAT_NATIVE_1_1_24/ (props changed) - copied from r1348811, tomcat/native/branches/1.1.x/ Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_24/ -- --- svn:ignore (added) +++ svn:ignore Mon Jun 11 12:16:35 2012 @@ -0,0 +1 @@ +dist Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_24/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jun 11 12:16:35 2012 @@ -0,0 +1 @@ +/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat Native 1.1.24
Version 1.1.24 is feature-add release containing additional API to set per-socket timeouts inside Poller. The proposed release artefacts can be found at [1], and the build was done using tag [2]. The VOTE will remain open for at least 48 hours. The Apache Tomcat Native 1.1.24 is [ ] Stable, go ahead and release [ ] Broken because of ... [1] http://people.apache.org/~mturk/native/1.1.24 [2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_1_24 Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53395] New: Syntactically incorrect webapp context.xml breaks auto deploy
https://issues.apache.org/bugzilla/show_bug.cgi?id=53395 Priority: P2 Bug ID: 53395 Assignee: dev@tomcat.apache.org Summary: Syntactically incorrect webapp context.xml breaks auto deploy Severity: normal Classification: Unclassified OS: Linux Reporter: mike.tillb...@yahoo.com Hardware: PC Status: NEW Version: 6.0.35 Component: Catalina Product: Tomcat 6 Installing a war that contains a META-INF/context.xml with invalid XML causes further updates to the war to be ignored. Other wars can be deployed, it's just the broken webapp that can't be updated. Restarting tomcat with a fixed war in place does not fix the problem, the conf/Catalina/localhost/webapp.xml is reparsed and breaks deployment again. The only fix is to remove conf/Catalina/localhost/webapp.xml and restart with a fixed war in place. The syntax I used for the error was a mistyped xml comment: !-- -- 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 53395] Syntactically incorrect webapp context.xml breaks auto deploy
https://issues.apache.org/bugzilla/show_bug.cgi?id=53395 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #1 from Mark Thomas --- This is working as designed. In Tomcat 6.0.x any context.xml (valid or invalid) that ships in a WAR is extracted to CATALINA_BASE/conf// and used until such time as the WAR is undeployed. -- 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: r1348859 - /tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Author: markt
Date: Mon Jun 11 14:19:19 2012
New Revision: 1348859
URL: http://svn.apache.org/viewvc?rev=1348859&view=rev
Log:
Additional Comet tests to confirm / deny the behaviour claimed in
https://issues.apache.org/bugzilla/show_bug.cgi?id=53391
The bug report is incorrect
Modified:
tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Modified: tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1348859&r1=1348858&r2=1348859&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java Mon Jun
11 14:19:19 2012
@@ -28,6 +28,8 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import junit.framework.Assert;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -117,6 +119,135 @@ public class TestCometProcessor extends
}
@Test
+public void testSyncClose() throws Exception {
+
+if (!isCometSupported()) {
+log.info("This test is skipped, because this connector does not
support Comet.");
+return;
+}
+
+// Setup Tomcat instance
+Tomcat tomcat = getTomcatInstance();
+Context root = tomcat.addContext("", TEMP_DIR);
+Tomcat.addServlet(root, "comet", new CometCloseServlet());
+root.addServletMapping("/comet", "comet");
+Tomcat.addServlet(root, "hello", new HelloWorldServlet());
+root.addServletMapping("/hello", "hello");
+tomcat.getConnector().setProperty("connectionTimeout", "5000");
+tomcat.start();
+
+// Create connection to Comet servlet
+final Socket socket =
+SocketFactory.getDefault().createSocket("localhost", getPort());
+socket.setSoTimeout(5000);
+
+final OutputStream os = socket.getOutputStream();
+String requestLine = "POST http://localhost:"; + getPort() +
+"/comet HTTP/1.1\r\n";
+os.write(requestLine.getBytes());
+os.write("transfer-encoding: chunked\r\n".getBytes());
+os.write("\r\n".getBytes());
+// Don't send any data
+os.write("0\r\n\r\n".getBytes());
+
+InputStream is = socket.getInputStream();
+ResponseReaderThread readThread = new ResponseReaderThread(is);
+readThread.start();
+
+// Wait for the comet request/response to finish
+int count = 0;
+while (count < 10 && !readThread.getResponse().endsWith("0\r\n\r\n")) {
+Thread.sleep(500);
+count++;
+}
+
+Assert.assertTrue(readThread.getResponse().contains("2\r\nOK"));
+
+if (count == 10) {
+fail("Comet request did not complete");
+}
+
+// Send a standard HTTP request on the same connection
+requestLine = "GET http://localhost:"; + getPort() +
+"/hello HTTP/1.1\r\n";
+os.write(requestLine.getBytes());
+os.write("connection: close\r\n".getBytes());
+os.write("\r\n".getBytes());
+
+// Check for the expected response
+count = 0;
+while (count < 10 && !readThread.getResponse().contains(
+HelloWorldServlet.RESPONSE_TEXT)) {
+Thread.sleep(500);
+count++;
+}
+
+if (count == 10) {
+fail("Non-comet request did not complete");
+}
+
+readThread.join();
+os.close();
+is.close();
+}
+
+@Test
+public void testConnectionClose() throws Exception {
+
+if (!isCometSupported()) {
+log.info("This test is skipped, because this connector does not
support Comet.");
+return;
+}
+
+// Setup Tomcat instance
+Tomcat tomcat = getTomcatInstance();
+Context root = tomcat.addContext("", TEMP_DIR);
+Tomcat.addServlet(root, "comet", new ConnectionCloseServlet());
+root.addServletMapping("/comet", "comet");
+Tomcat.addServlet(root, "hello", new HelloWorldServlet());
+root.addServletMapping("/hello", "hello");
+tomcat.getConnector().setProperty("connectionTimeout", "5000");
+tomcat.start();
+
+// Create connection to Comet servlet
+final Socket socket =
+SocketFactory.getDefault().createSocket("localhost", getPort());
+socket.setSoTimeout(5000);
+
+final OutputStream os = socket.getOutputStream();
+String requestLine = "POST http://localhost:"; + getPort() +
+"/comet HTTP/1.1\r\n";
+os.write(requestLine.getBytes());
+os.write("transfer-encoding: chunked\r\n".getBytes())
[Bug 53391] CometEvent.close() doesn't close socket when called from different thread
https://issues.apache.org/bugzilla/show_bug.cgi?id=53391 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #3 from Mark Thomas --- This report is invalid. event.close() does not close the socket in either case a) nor case b). Nor should it. I have added some unit tests that confirm this behaviour. I have also added a unit test that confirms setting the connection: close header in the response does result in the connection being closed. Without a test case that demonstrates otherwise, the most likely cause of the behaviour described in this bug report is an application bug. -- 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: r1348865 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/comet/TestCometProcessor.java
Author: markt
Date: Mon Jun 11 14:23:14 2012
New Revision: 1348865
URL: http://svn.apache.org/viewvc?rev=1348865&view=rev
Log:
Additional Comet test cases for connection closing
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1348859
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1348865&r1=1348864&r2=1348865&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Mon Jun 11 14:23:14 2012
@@ -28,6 +28,8 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import junit.framework.Assert;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -117,6 +119,135 @@ public class TestCometProcessor extends
}
@Test
+public void testSyncClose() throws Exception {
+
+if (!isCometSupported()) {
+log.info("This test is skipped, because this connector does not
support Comet.");
+return;
+}
+
+// Setup Tomcat instance
+Tomcat tomcat = getTomcatInstance();
+Context root = tomcat.addContext("", TEMP_DIR);
+Tomcat.addServlet(root, "comet", new CometCloseServlet());
+root.addServletMapping("/comet", "comet");
+Tomcat.addServlet(root, "hello", new HelloWorldServlet());
+root.addServletMapping("/hello", "hello");
+tomcat.getConnector().setProperty("connectionTimeout", "5000");
+tomcat.start();
+
+// Create connection to Comet servlet
+final Socket socket =
+SocketFactory.getDefault().createSocket("localhost", getPort());
+socket.setSoTimeout(5000);
+
+final OutputStream os = socket.getOutputStream();
+String requestLine = "POST http://localhost:"; + getPort() +
+"/comet HTTP/1.1\r\n";
+os.write(requestLine.getBytes());
+os.write("transfer-encoding: chunked\r\n".getBytes());
+os.write("\r\n".getBytes());
+// Don't send any data
+os.write("0\r\n\r\n".getBytes());
+
+InputStream is = socket.getInputStream();
+ResponseReaderThread readThread = new ResponseReaderThread(is);
+readThread.start();
+
+// Wait for the comet request/response to finish
+int count = 0;
+while (count < 10 && !readThread.getResponse().endsWith("0\r\n\r\n")) {
+Thread.sleep(500);
+count++;
+}
+
+Assert.assertTrue(readThread.getResponse().contains("2\r\nOK"));
+
+if (count == 10) {
+fail("Comet request did not complete");
+}
+
+// Send a standard HTTP request on the same connection
+requestLine = "GET http://localhost:"; + getPort() +
+"/hello HTTP/1.1\r\n";
+os.write(requestLine.getBytes());
+os.write("connection: close\r\n".getBytes());
+os.write("\r\n".getBytes());
+
+// Check for the expected response
+count = 0;
+while (count < 10 && !readThread.getResponse().contains(
+HelloWorldServlet.RESPONSE_TEXT)) {
+Thread.sleep(500);
+count++;
+}
+
+if (count == 10) {
+fail("Non-comet request did not complete");
+}
+
+readThread.join();
+os.close();
+is.close();
+}
+
+@Test
+public void testConnectionClose() throws Exception {
+
+if (!isCometSupported()) {
+log.info("This test is skipped, because this connector does not
support Comet.");
+return;
+}
+
+// Setup Tomcat instance
+Tomcat tomcat = getTomcatInstance();
+Context root = tomcat.addContext("", TEMP_DIR);
+Tomcat.addServlet(root, "comet", new ConnectionCloseServlet());
+root.addServletMapping("/comet", "comet");
+Tomcat.addServlet(root, "hello", new HelloWorldServlet());
+root.addServletMapping("/hello", "hello");
+tomcat.getConnector().setProperty("connectionTimeout", "5000");
+tomcat.start();
+
+// Create connection to Comet servlet
+final Socket socket =
+SocketFactory.getDefault().createSocket("localhost", getPort());
+socket.setSoTimeout(5000);
+
+final OutputStream os = socket.getOutputStream();
+String requestLine = "POST http://localhost:"; + getPort() +
+
[Bug 53395] Syntactically incorrect webapp context.xml breaks auto deploy
https://issues.apache.org/bugzilla/show_bug.cgi?id=53395 --- Comment #2 from Mike Tillberg --- It looks like auto deploy is implemented as a undeploy followed by deploy: Jun 11, 2012 10:15:26 AM org.apache.catalina.startup.HostConfig checkResources INFO: Undeploying context [/webapp] Jun 11, 2012 10:15:26 AM org.apache.catalina.startup.HostConfig deployWAR INFO: Deploying web application archive webapp.war The broken context then causes: Jun 11, 2012 10:15:26 AM org.apache.catalina.startup.HostConfig deployWAR SEVERE: Error deploying web application archive webapp.war So, if the deployment failed, why is the war considered "deployed" for the purposes of retaining the context.xml file? Wouldn't it be better for the failed context.xml to be removed if it can't be parsed? Or at least (if I'm reading the code correctly) setup the deployedApp.redeployResources/addWatchedResources in HostConfig so that tomcat doesn't lose track of the app? After a failed deploy, both modifying the war file or removing the war file do not trigger auto deploy or undeployment. -- 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 53324] Starting with mod_jk 1.2.35 I cannot modify worker status using JK Status Manager
https://issues.apache.org/bugzilla/show_bug.cgi?id=53324 r...@debian.org.pl changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- --- Comment #2 from r...@debian.org.pl --- I've tested Debian version from its unstable tree (1:1.2.37-1) and stopping, disabling subworkers works fine, but changes for lbfactor still don't propagate. -- 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 53395] Syntactically incorrect webapp context.xml breaks auto deploy
https://issues.apache.org/bugzilla/show_bug.cgi?id=53395 --- Comment #3 from Konstantin Kolinko --- A. If context.xml is broken, replacing a war is not going to help, as context file has priority over war. Note, that 1. in Tomcat 7 the context file is not copied to conf directory by default, so this issue is easier to solve. 2. there was a patch applied to Tomcat 7 half a year ago to improve handling of failed deployments - r1201928 (included in 7.0.23). So this issue should not exist in the current Tomcat 7. 3. A similar patch is currently proposed in STATUS file for 6.0, but as a +0 vote there indicates, there seem to be some issues. I have not investigated in detail yet. It might be that it will address your issue. -- 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 53398] New: Incorrect tag names on XML response when calling 'manager/status?XML=true'
https://issues.apache.org/bugzilla/show_bug.cgi?id=53398 Priority: P2 Bug ID: 53398 Assignee: dev@tomcat.apache.org Summary: Incorrect tag names on XML response when calling 'manager/status?XML=true' Severity: normal Classification: Unclassified OS: Linux Reporter: a...@alberti.co Hardware: PC Status: NEW Version: 7.0.21 Component: Manager Product: Tomcat 7 Created attachment 28909 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28909&action=edit Manager Status XML Response When calling 'manager/status?XML=true' on Tomcat Server the XML response includes incorrect 'requestBytesRecieved' attributes on some '' nodes. Attribute should read 'requestBytesReceived'. Seems like a typo when generating the 'requestBytesReceived' attribute for some nodes (Recieved != Received). Error can be generated using the CURL command to get the Tomcat status response: curl "http:///manager/status?XML=true" --basic -u (This assumes a user has already been defined with the proper privileges to access the status API command). -- 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 53398] Incorrect tag on XML response when calling 'manager/status?XML=true'
https://issues.apache.org/bugzilla/show_bug.cgi?id=53398 Albertico changed: What|Removed |Added Summary|Incorrect tag names on XML |Incorrect tag on XML |response when calling |response when calling |'manager/status?XML=true' |'manager/status?XML=true' -- 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: tcnative documentation is broken on tomcat.apache.org
Konstantin, On 6/7/12 5:49 PM, Konstantin Kolinko wrote: > 2012/6/8 Konstantin Kolinko : >> 2012/6/8 Christopher Schultz : >>> All, >>> >>> http://tomcat.apache.org/native-doc/ >>> >>> It says that tcnative 2.0.0 has been released, has no date, and links to >>> non-existent files. >>> >>> Same thing with http://tomcat.apache.org/native-doc/news/2010.html >>> >>> Can someone take a look? >>> >> >> Apparently it was built from native/trunk, instead of native/branches/1.1.x >> > > Fixed. Thanks. I noticed when I recently updated the website (security pages), svn pulled-in tcnative documentation at the same time. I don't grok svn module resolution but is it possible that it is misconfigured, and that I broke the tcnative portion of the docs by running 'svn up' according to the documentation? -chris signature.asc Description: OpenPGP digital signature
[Bug 53324] Starting with mod_jk 1.2.35 I cannot modify worker status using JK Status Manager
https://issues.apache.org/bugzilla/show_bug.cgi?id=53324 --- Comment #3 from Mladen Turk --- Is this from standard page or from 'Edit this attribute for all members' ? I presume its later cause I can modify lbfactors when directly editing a worker, so please open a new BZ. -- 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: tcnative documentation is broken on tomcat.apache.org
2012/6/11 Christopher Schultz : > Konstantin, > > On 6/7/12 5:49 PM, Konstantin Kolinko wrote: >> 2012/6/8 Konstantin Kolinko : >>> 2012/6/8 Christopher Schultz : All, http://tomcat.apache.org/native-doc/ It says that tcnative 2.0.0 has been released, has no date, and links to non-existent files. Same thing with http://tomcat.apache.org/native-doc/news/2010.html Can someone take a look? >>> >>> Apparently it was built from native/trunk, instead of native/branches/1.1.x >>> >> >> Fixed. > > Thanks. I noticed when I recently updated the website (security pages), > svn pulled-in tcnative documentation at the same time. I don't grok svn > module resolution but is it possible that it is misconfigured, and that > I broke the tcnative portion of the docs by running 'svn up' according > to the documentation? > The last change to native-doc was my setting svn:eol-style on some files http://svn.apache.org/viewvc?view=revision&revision=1347816 I might have forgotten to run "svn up" after that, as this operation is essentially a noop. You are not able to break anything by "svn up". What is in svn is considered the correct version. You can use "svn st" (status) to check that there are none locally modified files on the server. We are going to move to svnpubsub one day and those "svn up"s will become a history... The only pending question that prevents us from switching now is with tomcat-taglibs and tomcat-maven websites which are not in svn. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1348762 - in /tomcat/trunk: java/org/apache/catalina/valves/ErrorReportValve.java test/org/apache/catalina/valves/TestErrorReportValve.java
Mark, On 6/11/12 5:24 AM, ma...@apache.org wrote: > Author: markt > Date: Mon Jun 11 09:24:53 2012 > New Revision: 1348762 > > URL: http://svn.apache.org/viewvc?rev=1348762&view=rev > Log: > Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53071 > Stepping through the code, light dawns as to what the bug report was getting > at. > Use the message from the Throwable for the error report if none was specified > via sendError() This might end up being a security problem, depending on what information is in the exception message. Can we make this a non-default option? Many sites (ours included) attempt to avoid any part of a stack trace (even the message) leaking-out to users. -chris signature.asc Description: OpenPGP digital signature
[Bug 53071] ErrorReportValve ignores message from throwable
https://issues.apache.org/bugzilla/show_bug.cgi?id=53071 --- Comment #4 from Christopher Schultz --- Putting this caveat in the bug and not just on the dev list: This might end up being a security problem, depending on what information is in the exception message. Can we make this a non-default option? Many sites (ours included) attempt to avoid any part of a stack trace (even the message) leaking-out to users. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53071] ErrorReportValve ignores message from throwable
https://issues.apache.org/bugzilla/show_bug.cgi?id=53071 --- Comment #5 from Mark Thomas --- Then you have already replaced / modified the error report valve and you won't see this change. -- 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: [VOTE] Release Apache Tomcat Native 1.1.24
On 11/06/2012 13:54, Mladen Turk wrote: > Version 1.1.24 is feature-add release containing additional > API to set per-socket timeouts inside Poller. > The proposed release artefacts can be found at [1], > and the build was done using tag [2]. > > The VOTE will remain open for at least 48 hours. > > The Apache Tomcat Native 1.1.24 is > [X] Stable, go ahead and release > [ ] Broken because of ... Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1348965 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/antlib.xml
Author: markt
Date: Mon Jun 11 18:54:53 2012
New Revision: 1348965
URL: http://svn.apache.org/viewvc?rev=1348965&view=rev
Log:
Clean properties
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/antlib.xml (props
changed)
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/antlib.xml
('svn:mergeinfo' removed)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1348968 - in /tomcat/trunk: build.properties.default java/org/apache/tomcat/util/net/AprEndpoint.java
Author: markt
Date: Mon Jun 11 19:04:09 2012
New Revision: 1348968
URL: http://svn.apache.org/viewvc?rev=1348968&view=rev
Log:
APR 1.1.24 is now required. Remove unnecessary code.
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1348968&r1=1348967&r2=1348968&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jun 11 19:04:09 2012
@@ -138,7 +138,7 @@ npn.jar=${npn.home}/npn-${npn.version}.j
npn.loc=http://repo1.maven.org/maven2/org/eclipse/jetty/npn/npn-api/${npn.version}/npn-api-${npn.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.1.23
+tomcat-native.version=1.1.24
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1348968&r1=1348967&r2=1348968&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Jun 11
19:04:09 2012
@@ -485,53 +485,26 @@ public class AprEndpoint extends Abstrac
}
// SSL protocol
-int value;
-// This branch can be removed, once the required version is at
least 1.1.21.
-int tcnFullVersion = Library.TCN_MAJOR_VERSION * 1000
-+ Library.TCN_MINOR_VERSION * 100
-+ Library.TCN_PATCH_VERSION;
-if (tcnFullVersion <= 1120) {
+int value = SSL.SSL_PROTOCOL_NONE;
+if (SSLProtocol == null || SSLProtocol.length() == 0) {
value = SSL.SSL_PROTOCOL_ALL;
-if ("SSLv2".equalsIgnoreCase(SSLProtocol)) {
-value = SSL.SSL_PROTOCOL_SSLV2;
-} else if ("SSLv3".equalsIgnoreCase(SSLProtocol)) {
-value = SSL.SSL_PROTOCOL_SSLV3;
-} else if ("TLSv1".equalsIgnoreCase(SSLProtocol)) {
-value = SSL.SSL_PROTOCOL_TLSV1;
-} else if ("SSLv2+SSLv3".equalsIgnoreCase(SSLProtocol)) {
-value = SSL.SSL_PROTOCOL_SSLV2 | SSL.SSL_PROTOCOL_SSLV3;
-} else if ("all".equalsIgnoreCase(SSLProtocol) ||
-SSLProtocol == null || SSLProtocol.length() == 0) {
-// NOOP, use the default defined above
-} else {
-// Protocol not recognized, fail to start as it is safer
than
-// continuing with the default which might enable more
than the
-// is required
-throw new Exception(sm.getString(
-"endpoint.apr.invalidSslProtocol", SSLProtocol));
-}
} else {
-value = SSL.SSL_PROTOCOL_NONE;
-if (SSLProtocol == null || SSLProtocol.length() == 0) {
-value = SSL.SSL_PROTOCOL_ALL;
-} else {
-for (String protocol : SSLProtocol.split("\\+")) {
-protocol = protocol.trim();
-if ("SSLv2".equalsIgnoreCase(protocol)) {
-value |= SSL.SSL_PROTOCOL_SSLV2;
-} else if ("SSLv3".equalsIgnoreCase(protocol)) {
-value |= SSL.SSL_PROTOCOL_SSLV3;
-} else if ("TLSv1".equalsIgnoreCase(protocol)) {
-value |= SSL.SSL_PROTOCOL_TLSV1;
-} else if ("all".equalsIgnoreCase(protocol)) {
-value |= SSL.SSL_PROTOCOL_ALL;
-} else {
-// Protocol not recognized, fail to start as it is
safer than
-// continuing with the default which might enable
more than the
-// is required
-throw new Exception(sm.getString(
-"endpoint.apr.invalidSslProtocol",
SSLProtocol));
-}
+for (String protocol : SSLProtocol.split("\\+")) {
+protocol = protocol.trim();
+if ("SSLv2".equalsIgnoreCase(protocol)) {
+value |= SSL.SSL_PROTOCOL_SSLV2;
+} else if ("SSLv3".equalsI
Re: svn commit: r1348612 - in /tomcat/site/trunk: docs/ xdocs/
2012/6/10 : > Author: markt > Date: Sun Jun 10 15:09:29 2012 > New Revision: 1348612 > > URL: http://svn.apache.org/viewvc?rev=1348612&view=rev > Log: > Make verification text consistent across all components > > Modified: > tomcat/site/trunk/docs/download-55.html > tomcat/site/trunk/docs/download-60.html > tomcat/site/trunk/docs/download-70.html > tomcat/site/trunk/docs/download-connectors.html > tomcat/site/trunk/docs/download-native.html > tomcat/site/trunk/xdocs/download-55.xml > tomcat/site/trunk/xdocs/download-60.xml > tomcat/site/trunk/xdocs/download-70.xml > tomcat/site/trunk/xdocs/download-connectors.xml > tomcat/site/trunk/xdocs/download-native.xml There is also README file in download area, /dist/release/tomcat/tomcat-connectors/jk/README.html that need the same change. The above one comes from tools/dist/README.html of jk project Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/3065 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1348968 Blamelist: markt BUILD FAILED: exception compile upload_2 sincerely, -The Buildbot
[Bug 53394] Log warning if SSLv2 is enabled
https://issues.apache.org/bugzilla/show_bug.cgi?id=53394 --- Comment #1 from Mark Thomas --- This is a Tomcat 6 specific issue which still includes SSLv2 by default. The use of SSLv2 and that it is inherently unsafe is clearly indicated in the documentation for the APR connector. -- 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: r1348972 - /tomcat/trunk/build.properties.default
Author: markt
Date: Mon Jun 11 19:13:44 2012
New Revision: 1348972
URL: http://svn.apache.org/viewvc?rev=1348972&view=rev
Log:
Revert accidental commit of local change
Modified:
tomcat/trunk/build.properties.default
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1348972&r1=1348971&r2=1348972&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jun 11 19:13:44 2012
@@ -138,7 +138,7 @@ npn.jar=${npn.home}/npn-${npn.version}.j
npn.loc=http://repo1.maven.org/maven2/org/eclipse/jetty/npn/npn-api/${npn.version}/npn-api-${npn.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.1.24
+tomcat-native.version=1.1.23
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1348973 - /tomcat/trunk/webapps/docs/config/http.xml
Author: markt Date: Mon Jun 11 19:14:36 2012 New Revision: 1348973 URL: http://svn.apache.org/viewvc?rev=1348973&view=rev Log: Update APR SSLProtocol defaults and configuration Modified: tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1348973&r1=1348972&r2=1348973&view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Mon Jun 11 19:14:36 2012 @@ -1176,12 +1176,11 @@ Protocol which may be used for communicating with clients. The default - value is all, with other acceptable values being SSLv2, - SSLv3, TLSv1 and SSLv2+SSLv3. - Starting with version 1.1.21 of the Tomcat native - library any combination of the three protocols concatenated with a - plus sign will be supported. Note that the protocol SSLv2 - is inherently unsafe. + value is all, which is equivalent to SSLv3+TLSv1 + with other acceptable values being SSLv2, + SSLv3, TLSv1 and any combination of the three + protocols concatenated with a plus sign. Note that the protocol + SSLv2 is inherently unsafe. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53394] Log warning if SSLv2 is enabled
https://issues.apache.org/bugzilla/show_bug.cgi?id=53394 --- Comment #2 from Michael Osipov <1983-01...@gmx.net> --- (In reply to comment #1) > This is a Tomcat 6 specific issue which still includes SSLv2 by default. > > The use of SSLv2 and that it is inherently unsafe is clearly indicated in > the documentation for the APR connector. I am aware of the documention but I am absolute sure that most people leave it to the defaults. My naivety lead me to that too. :-( -- 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: r1348979 - /tomcat/jk/trunk/tools/dist/README.html
Author: markt Date: Mon Jun 11 19:26:06 2012 New Revision: 1348979 URL: http://svn.apache.org/viewvc?rev=1348979&view=rev Log: Make verification text consistent across all components Modified: tomcat/jk/trunk/tools/dist/README.html Modified: tomcat/jk/trunk/tools/dist/README.html URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/dist/README.html?rev=1348979&r1=1348978&r2=1348979&view=diff == --- tomcat/jk/trunk/tools/dist/README.html (original) +++ tomcat/jk/trunk/tools/dist/README.html Mon Jun 11 19:26:06 2012 @@ -34,35 +34,12 @@ nearest mirror site! PGP Signatures -All of the release distribution packages have been digitally signed - (using PGP or GPG) by the Apache Tomcat Group members that constructed them. - There will be an accompanying distribution.asc file - in the same directory as the distribution. The PGP keys can be found - at the MIT key repository and within this project's - http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS file. - - -Always use the signature files to verify the authenticity - of the distribution, e.g., - - -% pgpk -a KEYS -% pgpv tomcat-connectors-1.2.37-src.tar.gz.asc -or, -% pgp -ka KEYS -% pgp tomcat-connectors-1.2.37-src.tar.gz.asc -or, -% gpg --import KEYS -% gpg --verify tomcat-connectors-1.2.37-src.tar.gz.asc - - -We offer MD5 and SHA1 hashes as an alternative to validate the integrity - of the downloaded files. A unix program called md5 or - md5sum is included in many unix distributions. It is - also available as part of http://www.gnu.org/software/textutils/textutils.html";>GNU - Textutils. Windows users can get binary md5 programs from http://www.fourmilab.ch/md5/";>here, http://www.pc-tools.net/win32/freeware/console/";>here, or - http://www.slavasoft.com/fsum/";>here. - +You must verify the integrity of the downloaded files. + We provide OpenPGP signatures for every release file. This signature should + be matched against the + http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS + file which contains the OpenPGP keys of the Release Managers. We also + provide an MD5 checksum for every release file. After you + download the file, you should calculate a checksum for your download, and + make sure it is the same as ours. + \ No newline at end of file - 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/3066 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1348973 Blamelist: markt Build succeeded! sincerely, -The Buildbot
[Bug 53391] CometEvent.close() doesn't close socket when called from different thread
https://issues.apache.org/bugzilla/show_bug.cgi?id=53391 --- Comment #4 from Lawrence Kesteloot --- I think I said "close socket" when I really meant "close connection". Here's the behavior I'm seeing: If I do "curl URL" from the command line, and in BEGIN I respond and ComentEvent.close(), the curl application shows the response and terminates. But if I do this from another thread (from from within the event() method), the curl application does not terminate. It doesn't think that the connection has finished. How do I finish the connection from another thread? That's the essence of this bug. If that's not possible to do, then this bug should be reopened and the title should be modified. -- 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 53391] CometEvent.close() doesn't close socket when called from different thread
https://issues.apache.org/bugzilla/show_bug.cgi?id=53391 --- Comment #5 from Lawrence Kesteloot --- That should say "NOT from within the event() method". -- 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 53391] CometEvent.close() doesn't close socket when called from different thread
https://issues.apache.org/bugzilla/show_bug.cgi?id=53391 --- Comment #6 from Mark Thomas --- You don't mean close connection either. You mean the client is unable to determine the end of the response. This is usually signalled by one of the following: - content length header plus that many bytes being written - no content length header and the server closing the connection - chunked encoding and an end chunk being sent The Tomcat unit tests check that the end of the response is correctly signalled. You'll need to use tcpdump or similar to see exactly what is going on and why curl is not detecting the end of the response. If you can produce a test case that demonstrates that Tomcat does not end the response correctly then please re-open this bug and attach the test case. -- 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: r1348989 - in /tomcat/trunk: java/org/apache/catalina/manager/StatusTransformer.java webapps/docs/manager-howto.xml webapps/manager/status.xsd
Author: markt
Date: Mon Jun 11 20:09:20 2012
New Revision: 1348989
URL: http://svn.apache.org/viewvc?rev=1348989&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53398
recieved->received
Modified:
tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/trunk/webapps/docs/manager-howto.xml
tomcat/trunk/webapps/manager/status.xsd
Modified: tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=1348989&r1=1348988&r2=1348989&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java Mon
Jun 11 20:09:20 2012
@@ -528,7 +528,7 @@ public class StatusTransformer {
} else {
writer.write(" requestProcessingTime=\"0\"");
writer.write(" requestBytesSent=\"0\"");
-writer.write(" requestBytesRecieved=\"0\"");
+writer.write(" requestBytesReceived=\"0\"");
writer.write(" remoteAddr=\"?\"");
writer.write(" virtualHost=\"?\"");
writer.write(" method=\"?\"");
Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1348989&r1=1348988&r2=1348989&view=diff
==
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Mon Jun 11 20:09:20 2012
@@ -915,7 +915,7 @@ The same information is available for bo
appropriate.
"Keep-Alive" : The thread keeps the connection open to
the client in case the client sends another request. If another request
-is recieved, the next stage will br "Parse and Prepare Requst". If no
+is received, the next stage will br "Parse and Prepare Requst". If no
request is received before the keep alive times out, the connection
will
be closed and the next stage will be "Ready".
"Ready" : The thread is at rest and ready to be
Modified: tomcat/trunk/webapps/manager/status.xsd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/status.xsd?rev=1348989&r1=1348988&r2=1348989&view=diff
==
--- tomcat/trunk/webapps/manager/status.xsd (original)
+++ tomcat/trunk/webapps/manager/status.xsd Mon Jun 11 20:09:20 2012
@@ -62,7 +62,7 @@
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1348992 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/StatusTransformer.java webapps/docs/changelog.xml webapps/docs/manager-howto.xml webapps/manager/status.xsd
Author: markt
Date: Mon Jun 11 20:20:23 2012
New Revision: 1348992
URL: http://svn.apache.org/viewvc?rev=1348992&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53398
recieved->received
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml
tomcat/tc7.0.x/trunk/webapps/manager/status.xsd
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1348989
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=1348992&r1=1348991&r2=1348992&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
Mon Jun 11 20:20:23 2012
@@ -528,7 +528,7 @@ public class StatusTransformer {
} else {
writer.write(" requestProcessingTime=\"0\"");
writer.write(" requestBytesSent=\"0\"");
-writer.write(" requestBytesRecieved=\"0\"");
+writer.write(" requestBytesReceived=\"0\"");
writer.write(" remoteAddr=\"?\"");
writer.write(" virtualHost=\"?\"");
writer.write(" method=\"?\"");
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1348992&r1=1348991&r2=1348992&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jun 11 20:20:23 2012
@@ -350,6 +350,10 @@
Fix several HTML markup errors in servlets of examples web application.
(kkolinko)
+
+53398: Correct spelling of "received" in the
+Manager application's XML output. (markt)
+
Modified: tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml?rev=1348992&r1=1348991&r2=1348992&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml Mon Jun 11 20:20:23 2012
@@ -915,7 +915,7 @@ The same information is available for bo
appropriate.
"Keep-Alive" : The thread keeps the connection open to
the client in case the client sends another request. If another request
-is recieved, the next stage will br "Parse and Prepare Requst". If no
+is received, the next stage will br "Parse and Prepare Requst". If no
request is received before the keep alive times out, the connection
will
be closed and the next stage will be "Ready".
"Ready" : The thread is at rest and ready to be
Modified: tomcat/tc7.0.x/trunk/webapps/manager/status.xsd
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/manager/status.xsd?rev=1348992&r1=1348991&r2=1348992&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/manager/status.xsd (original)
+++ tomcat/tc7.0.x/trunk/webapps/manager/status.xsd Mon Jun 11 20:20:23 2012
@@ -62,7 +62,7 @@
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53398] Incorrect tag on XML response when calling 'manager/status?XML=true'
https://issues.apache.org/bugzilla/show_bug.cgi?id=53398 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Thanks for the report. This has been fixed in trunk and 7.0.x and will be included in 7.0.28 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53391] CometEvent.close() doesn't close socket when called from different thread
https://issues.apache.org/bugzilla/show_bug.cgi?id=53391 --- Comment #7 from Lawrence Kesteloot --- Got it. You were right that this is an invalid bug. Other async web servers like Tornado must transparently buffer the output and set the content length themselves, so "it just works", and I expected Tomcat to do the same. But I understand why it doesn't. It'd be useful to have a sample app that does this -- it's a very common (the most common?) use case for non-blocking web serving. -- 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 53391] CometEvent.close() doesn't close socket when called from different thread
https://issues.apache.org/bugzilla/show_bug.cgi?id=53391 --- Comment #8 from Mark Thomas --- Again, Tomcat does correctly signal the end of the response as per RFC2616. If you have a test case where it doesn't please re-open this bug. -- 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: r1349007 - in /tomcat/trunk/java/org/apache/catalina/startup: ContextConfig.java LocalStrings.properties
Author: markt
Date: Mon Jun 11 20:57:26 2012
New Revision: 1349007
URL: http://svn.apache.org/viewvc?rev=1349007&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53266
Handle missing classes defined in @HandlesTypes more gracefully - the
specification requires it should not stop the web application from loading
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1349007&r1=1349006&r2=1349007&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon Jun 11
20:57:26 2012
@@ -1481,8 +1481,16 @@ public class ContextConfig implements Li
initializerClassMap.put(sci, new HashSet>());
-HandlesTypes ht =
-sci.getClass().getAnnotation(HandlesTypes.class);
+HandlesTypes ht = null;
+try {
+ht = sci.getClass().getAnnotation(HandlesTypes.class);
+} catch (Exception e) {
+if (log.isDebugEnabled()) {
+log.info(sm.getString("contextConfig.sci.debug", url), e);
+} else {
+log.info(sm.getString("contextConfig.sci.info", url));
+}
+}
if (ht != null) {
Class[] types = ht.value();
if (types != null) {
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1349007&r1=1349006&r2=1349007&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Mon
Jun 11 20:57:26 2012
@@ -53,6 +53,8 @@ contextConfig.resourceJarFail=Failed to
contextConfig.role.auth=WARNING: Security role name {0} used in an
without being defined in a
contextConfig.role.link=WARNING: Security role name {0} used in a
without being defined in a
contextConfig.role.runas=WARNING: Security role name {0} used in a
without being defined in a
+contextConfig.sci.debug=Unable to process ServletContainerInitializer for
[{0}]. This is most likely due to a class defined in the @HandlesTypes
annotation being missing
+contextConfig.sci.info=Unable to process ServletContainerInitializer for
[{0}]. This is most likely due to a class defined in the @HandlesTypes
annotation being missing. Enable DEBUG level logging for the full stack trace.
contextConfig.servletContainerInitializerFail=Failed to process JAR found at
URL [{0}] for ServletContainerInitializers for context with name [{1}]
contextConfig.start=ContextConfig: Processing START
contextConfig.stop=ContextConfig: Processing STOP
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1349008 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/LocalStrings.properties webapps/docs/changelog.xml
Author: markt
Date: Mon Jun 11 20:59:49 2012
New Revision: 1349008
URL: http://svn.apache.org/viewvc?rev=1349008&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53266
Handle missing classes defined in @HandlesTypes more gracefully - the
specification requires it should not stop the web application from loading
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1349007
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1349008&r1=1349007&r2=1349008&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Mon Jun 11 20:59:49 2012
@@ -1554,8 +1554,16 @@ public class ContextConfig implements Li
initializerClassMap.put(sci, new HashSet>());
-HandlesTypes ht =
-sci.getClass().getAnnotation(HandlesTypes.class);
+HandlesTypes ht = null;
+try {
+ht = sci.getClass().getAnnotation(HandlesTypes.class);
+} catch (Exception e) {
+if (log.isDebugEnabled()) {
+log.info(sm.getString("contextConfig.sci.debug", url), e);
+} else {
+log.info(sm.getString("contextConfig.sci.info", url));
+}
+}
if (ht != null) {
Class[] types = ht.value();
if (types != null) {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1349008&r1=1349007&r2=1349008&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Mon Jun 11 20:59:49 2012
@@ -55,6 +55,8 @@ contextConfig.resourceJarFail=Failed to
contextConfig.role.auth=WARNING: Security role name {0} used in an
without being defined in a
contextConfig.role.link=WARNING: Security role name {0} used in a
without being defined in a
contextConfig.role.runas=WARNING: Security role name {0} used in a
without being defined in a
+contextConfig.sci.debug=Unable to process ServletContainerInitializer for
[{0}]. This is most likely due to a class defined in the @HandlesTypes
annotation being missing
+contextConfig.sci.info=Unable to process ServletContainerInitializer for
[{0}]. This is most likely due to a class defined in the @HandlesTypes
annotation being missing. Enable DEBUG level logging for the full stack trace.
contextConfig.servletContainerInitializerFail=Failed to process JAR found at
URL [{0}] for ServletContainerInitializers for context with name [{1}]
contextConfig.start=ContextConfig: Processing START
contextConfig.stop=ContextConfig: Processing STOP
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1349008&r1=1349007&r2=1349008&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jun 11 20:59:49 2012
@@ -177,6 +177,12 @@
(markt/kkolinko)
+53266: If a class specified in a @HandlesTypes
+annotation on a ServletContainerInitializer is missing
+log a more helpful message and do not prevent the web application from
+starting. (markt)
+
+
53267: Ensure that using the GC Daemon Protection feature of
the JreMemoryLeakPreventionListener does not trigger a
full GC every hour. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53266] ServletContainerInitializer will crash catalina if dependcy is not present.
https://issues.apache.org/bugzilla/show_bug.cgi?id=53266 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Mark Thomas --- Note the spec requires that the web application is permitted to start in this case. This has been fixed in trunk and 7.0.x and will be included in 7.0.28 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53401] New: Request objects use too much memory!
https://issues.apache.org/bugzilla/show_bug.cgi?id=53401
Priority: P2
Bug ID: 53401
Assignee: dev@tomcat.apache.org
Summary: Request objects use too much memory!
Severity: normal
Classification: Unclassified
OS: All
Reporter: huhang1...@gmail.com
Hardware: All
Status: NEW
Version: unspecified
Component: Catalina
Product: Tomcat 7
AsyncContext hold a org.apache.catalina.connector.Request object,
request object hold a InputBuffer object,
InputBuffer's default size is 8*1024 !
When I made a Comet server, I needed to hold the AsyncContext object, but the
Request object occupy too much memory, 3000 connections used 250MB memory! But
InputBuffer is not necessary!
Java test code:
public static void main(String[] args) throws IOException {
Map socketStore = new
ConcurrentHashMap();
for (int i = 0; i < 8000; i++) {
Request request = new Request();
socketStore.put("asdfsdfsadfa" + i, request);
}
MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();
MemoryUsage memoryUsage = memoryMXBean.getHeapMemoryUsage();
long usedBytes = memoryUsage.getUsed();
System.out.println("used :" + usedBytes / 1024 / 1024 + " MB");
// used :225 MB
}
--
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 53391] CometEvent.close() doesn't close socket when called from different thread
https://issues.apache.org/bugzilla/show_bug.cgi?id=53391 --- Comment #9 from Lawrence Kesteloot --- Hi Mark, I made a test servlet and it worked fine: the response was properly ended when I called event.close() from another thread. I was thrown off for hours by bug 51881, and finally when I upgraded to a fixed version of Tomcat there was leftover debugging code that made me think that close() wasn't working. Sorry to waste your time. -- 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
