summaryrefslogtreecommitdiffstats
path: root/generic/tclIO.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-06-03 02:26:07 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-06-03 02:26:07 (GMT)
commit531a58872c0aaacf53b20fb75d45687d144ec6e8 (patch)
tree30271bb57cbf320e0346bfdfbe92e5edb9837c7a /generic/tclIO.c
parentabb4df1befac97bab990b6aefbbb6c21d330eb08 (diff)
downloadtcl-531a58872c0aaacf53b20fb75d45687d144ec6e8.zip
tcl-531a58872c0aaacf53b20fb75d45687d144ec6e8.tar.gz
tcl-531a58872c0aaacf53b20fb75d45687d144ec6e8.tar.bz2
These edits make all tests outside of socket-14.* pass on OSX Mavericks.dgp_async_socket
Several socket-14.* tests failing there, and those that pass are very slow about it. Firewall or poor networking configuration may be playing a role.
Diffstat (limited to 'generic/tclIO.c')
-rw-r--r--generic/tclIO.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 5552329..998fe5e 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -3287,7 +3287,7 @@ Tcl_Close(
stickyError = 0;
- if ((statePtr->encoding != NULL)
+ if (GotFlag(statePtr, TCL_WRITABLE) && (statePtr->encoding != NULL)
&& !(statePtr->outputEncodingFlags & TCL_ENCODING_START)) {
int code = CheckChannelErrors(statePtr, TCL_WRITABLE);
@@ -3295,6 +3295,8 @@ Tcl_Close(
if (code == 0) {
statePtr->outputEncodingFlags |= TCL_ENCODING_END;
code = WriteChars(chanPtr, "", 0);
+ statePtr->outputEncodingFlags &= ~TCL_ENCODING_END;
+ statePtr->outputEncodingFlags |= TCL_ENCODING_START;
}
if (code < 0) {
stickyError = Tcl_GetErrno();