diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2014-06-06 08:46:58 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2014-06-06 08:46:58 (GMT) |
| commit | fae85d1af5cabacd46503694edf3c74cc2fe2346 (patch) | |
| tree | dfddf6c597119ff9ee8b53992ab0180b0adbb0fe /unix/tclUnixSock.c | |
| parent | 6a91e192f8c18d0a05947f6a8129357fe145d945 (diff) | |
| parent | 45fd54872fa0bcff3d89f8077d9a7ca220bba89f (diff) | |
| download | tcl-fae85d1af5cabacd46503694edf3c74cc2fe2346.zip tcl-fae85d1af5cabacd46503694edf3c74cc2fe2346.tar.gz tcl-fae85d1af5cabacd46503694edf3c74cc2fe2346.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix/tclUnixSock.c')
| -rw-r--r-- | unix/tclUnixSock.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index 08a14d3..a9323c4 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -1024,7 +1024,7 @@ TcpConnect( { socklen_t optlen; int async_callback = statePtr->flags & TCP_ASYNC_PENDING; - int ret = -1, error; + int ret = -1, error = errno; int async = statePtr->flags & TCP_ASYNC_CONNECT; if (async_callback) { @@ -1160,11 +1160,9 @@ out: * the event mechanism one roundtrip through select(). */ - /* Note: disabling this for now as it causes spurious event triggering - * under Linux (see test socket-14.15). */ -#if 0 - Tcl_NotifyChannel(statePtr->channel, TCL_WRITABLE); -#endif + if (statePtr->cachedBlocking == TCL_MODE_NONBLOCKING) { + Tcl_NotifyChannel(statePtr->channel, TCL_WRITABLE); + } } if (error != 0) { /* |