Author: rjung
Date: Mon Sep 23 08:08:56 2013
New Revision: 1525525
URL: http://svn.apache.org/r1525525
Log:
Change return code when removing a socket from a poller, that was
actually not in the poller from APR_SUCCESS to APR_NOTFOUND.
This lead to corrupt poller handling in the Tomcat APR connector,
at least sporadically on Solaris Sparc.
Modified:
tomcat/native/branches/1.1.x/native/src/poll.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/branches/1.1.x/native/src/poll.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/poll.c?rev=1525525&r1=1525524&r2=1525525&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/poll.c (original)
+++ tomcat/native/branches/1.1.x/native/src/poll.c Mon Sep 23 08:08:56 2013
@@ -259,7 +259,7 @@ TCN_IMPLEMENT_CALL(jint, Poll, remove)(T
if (s->pe == NULL) {
/* Already removed */
- return APR_SUCCESS;
+ return APR_NOTFOUND;
}
fd.desc_type = APR_POLL_SOCKET;
fd.desc.s = s->sock;
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=1525525&r1=1525524&r2=1525525&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Mon Sep 23
08:08:56 2013
@@ -36,6 +36,14 @@
new documentation project for Tomcat Native was started.
</p>
</section>
+<section name="Changes between 1.1.28 and 1.1.29">
+ <changelog>
+ <fix>
+ Change return code when removing a socket from a poller, that was
+ actually not in the poller from APR_SUCCESS to APR_NOTFOUND. (rjung)
+ </fix>
+ </changelog>
+</section>
<section name="Changes between 1.1.27 and 1.1.28">
<changelog>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
