summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvasiljevic <zv@archiware.com>2005-10-14 17:12:32 (GMT)
committervasiljevic <zv@archiware.com>2005-10-14 17:12:32 (GMT)
commit41ccd3c8b08e1da5660979e6bc9450800f08d1cd (patch)
treed766951fea2265f1398485d843a966870f43f398
parent06be524fb096bbdcf2eb156ca47dfd09cdf92fbe (diff)
downloadtcl-41ccd3c8b08e1da5660979e6bc9450800f08d1cd.zip
tcl-41ccd3c8b08e1da5660979e6bc9450800f08d1cd.tar.gz
tcl-41ccd3c8b08e1da5660979e6bc9450800f08d1cd.tar.bz2
Backed off change from 2005-10-04 (see ChangeLog and Tcl Bug# 1323992
for more info.
-rw-r--r--generic/tclIO.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index e3abd8a..4cf62ad 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.14 2005/10/13 21:01:41 vasiljevic Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.61.2.15 2005/10/14 17:12:32 vasiljevic Exp $
*/
#include "tclInt.h"
@@ -2702,21 +2702,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.