Author: mturk
Date: Tue Dec 22 10:30:48 2009
New Revision: 893129
URL: http://svn.apache.org/viewvc?rev=893129&view=rev
Log:
Close the non reusable socket in the cache. Should never be there at the first
place.
Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=893129&r1=893128&r2=893129&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Tue Dec 22 10:30:48 2009
@@ -3033,8 +3033,18 @@
if (aw->ep_cache[slot] &&
IS_VALID_SOCKET(aw->ep_cache[slot]->sd)) {
ae = aw->ep_cache[slot];
- aw->ep_cache[slot] = NULL;
- break;
+ if (ae->reuse) {
+ aw->ep_cache[slot] = NULL;
+ break;
+ }
+ else {
+ /* XXX: We shouldn't have non reusable
+ * opened socket in the cache
+ */
+ ajp_reset_endpoint(aw->ep_cache[slot], l);
+ jk_log(l, JK_LOG_WARNING,
+ "closing non reusable pool slot=%d", slot);
+ }
}
}
if (!ae) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
