summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvasiljevic <zv@archiware.com>2005-10-14 17:33:18 (GMT)
committervasiljevic <zv@archiware.com>2005-10-14 17:33:18 (GMT)
commit78f0b0ebfa7489807bd35bac64727c5c20a465df (patch)
treea760c180d4b0f6101bfe7ab1db91c22436bc36f4
parent079fb1f82f47f738f6ebbf6408ec8254d972c238 (diff)
downloadtcl-78f0b0ebfa7489807bd35bac64727c5c20a465df.zip
tcl-78f0b0ebfa7489807bd35bac64727c5c20a465df.tar.gz
tcl-78f0b0ebfa7489807bd35bac64727c5c20a465df.tar.bz2
Backed off change from 2005-10-04 (see ChangeLog and Tcl Bug# 1323992
for more info).
-rw-r--r--generic/tclIO.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index f6c96f8..7291b1c 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.97 2005/10/13 21:01:28 vasiljevic Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.98 2005/10/14 17:33:18 vasiljevic Exp $
*/
#include "tclInt.h"
@@ -2922,21 +2922,9 @@ Tcl_ClearChannelHandlers(channel)
* will occur if Tcl_DoOneEvent is called before the channel is
* finally deleted in FlushChannel. This can happen if the channel
* has a background flush active.
- * Also, delete all registered file handlers for this channel
- * (and for the current thread). This prevents executing of pending
- * file-events still sitting in the event queue of the current thread.
- * We deliberately do not call UpdateInterest() because this could
- * re-schedule new events if the channel still needs to be flushed.
- * This should happen all the time, but Linux 2.4 systems seem to lose
- * the flush on close in some cases (socket-9.2 socket-11.13) if this is
- * used, so restrict it to TCL_THREADS, where you can otherwise crash
- * numerous systems. [Bug 1323992]
*/
statePtr->interestMask = 0;
-#ifdef TCL_THREADS
- (chanPtr->typePtr->watchProc)(chanPtr->instanceData, 0);
-#endif
/*
* Remove any EventScript records for this channel.