summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--generic/tclIO.c9
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a39aaf4..974ae0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-13 Zoran Vasiljevic <vasiljevic@users.sourceforge.net>
+
+ * generic/tclIO.c (Tcl_ClearChannelHandlers): temporary
+ ifdef TCL_THREADS changes done to de-activate pending
+ event processing when channel is being closed/cutted.
+
2005-10-10 Jeff Hobbs <jeffh@ActiveState.com>
* generic/tclInt.h: ensure MODULE_SCOPE decl
diff --git a/generic/tclIO.c b/generic/tclIO.c
index ccc107b..208fb69 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIO.c,v 1.61.2.12 2005/10/04 18:15:09 vasiljevic Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.61.2.13 2005/10/13 20:40:48 vasiljevic Exp $
*/
#include "tclInt.h"
@@ -2710,7 +2710,14 @@ Tcl_ClearChannelHandlers (channel)
*/
statePtr->interestMask = 0;
+
+ /*
+ * TEMPORARILY DEFINED FOR THREADED BUILD ONLY. SEE SF BUG# 1323992
+ */
+
+#ifdef TCL_THREADS
(chanPtr->typePtr->watchProc)(chanPtr->instanceData, 0);
+#endif
/*
* Remove any EventScript records for this channel.