summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--generic/tclIO.c3
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e48a5e..2bb5db1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-02 Jeff Hobbs <hobbs@scriptics.com>
+
+ * generic/tclIO.c (CloseChannel): removed the &ing out of
+ (TCL_READABLE|TCL_WRITABLE) from the flags, as CloseChannel does
+ this on the next pass through for the top channel, and it appeared
+ to be causing hangs by not allowing the final flush.
+
2000-06-01 Jeff Hobbs <hobbs@scriptics.com>
* generic/tclIO.c (CloseChannel): Rewrote CloseChannel code to
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 1766b9a..54120df 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.20.2.2 2000/06/02 05:20:09 hobbs Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.20.2.3 2000/06/02 20:04:06 hobbs Exp $
*/
#include "tclInt.h"
@@ -2653,7 +2653,6 @@ CloseChannel(interp, chanPtr, errorCode)
chanPtr->channelName = chanDownPtr->channelName;
chanPtr->flags = chanDownPtr->flags | CHANNEL_CLOSED;
- chanPtr->flags &= (~(TCL_READABLE|TCL_WRITABLE));
Tcl_FreeEncoding(chanDownPtr->encoding);
chanDownPtr->encoding = NULL;