Author: rjung
Date: Tue Feb 23 05:20:40 2010
New Revision: 915189
URL: http://svn.apache.org/viewvc?rev=915189&view=rev
Log:
During shutdown we shouldn't try to decrement
the shared memory connections counter.
Otherwise we get a segfault.
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=915189&r1=915188&r2=915189&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Tue Feb 23 05:20:40 2010
@@ -775,7 +775,10 @@
jk_log(l, JK_LOG_DEBUG,
"closing endpoint with sd = %u%s",
ae->sd, ae->reuse ? "" : " (socket shutdown)");
- ajp_abort_endpoint(ae, JK_TRUE, l);
+ if (IS_VALID_SOCKET(ae->sd)) {
+ jk_shutdown_socket(ae->sd, l);
+ }
+ ae->sd = JK_INVALID_SOCKET;
jk_close_pool(&(ae->pool));
free(ae);
JK_TRACE_EXIT(l);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
