Author: kkolinko
Date: Thu Mar 4 14:34:28 2010
New Revision: 918999
URL: http://svn.apache.org/viewvc?rev=918999&view=rev
Log:
Fix 'Error' part of https://issues.apache.org/bugzilla/show_bug.cgi?id=48584
Prevent the APR connector logging an error if the acceptor fails during
shutdown since this is expected.
Patch by mturk
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918999&r1=918998&r2=918999&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Mar 4 14:34:28 2010
@@ -122,11 +122,3 @@
Patch by markt
+1: kkolinko, rjung
-1:
-
-* Fix 'Error' part of https://issues.apache.org/bugzilla/show_bug.cgi?id=48584
- Prevent the APR connector logging an error if the acceptor fails during
- shutdown since this is expected.
- Patch by mturk
- http://svn.apache.org/viewvc?rev=918495&view=rev
- +1: kkolinko, rjung, mturk
- -1:
Modified:
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=918999&r1=918998&r2=918999&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Thu Mar 4 14:34:28 2010
@@ -1005,7 +1005,7 @@
// Hand this socket off to an appropriate processor
getWorkerThread().assign(socket, true);
} catch (Throwable t) {
- log.error(sm.getString("endpoint.accept.fail"), t);
+ if (running)
log.error(sm.getString("endpoint.accept.fail"), t);
}
// The processor will recycle itself when it finishes
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=918999&r1=918998&r2=918999&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Thu Mar 4
14:34:28 2010
@@ -190,6 +190,10 @@
<bug>48581</bug>: Avoid security exception on first access. (markt)
</fix>
<fix>
+ <bug>48584</bug>: Prevent the APR connector logging an error if the
+ acceptor fails during shutdown since this is expected. (mturk)
+ </fix>
+ <fix>
CVE-2009-3555. Provide option to disable legacy SSL renegotiation.
(markt/costin)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
