diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-05-02 07:15:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-05-02 07:15:49 (GMT) |
| commit | e338d72a45468bad9139adc4d43a4167d4e244c6 (patch) | |
| tree | 870a6a99179fa39483426248efdf8be62fc04f2e /unix/tclUnixSock.c | |
| parent | b9c49065a55f1a7ddbda005962a9d0847045c274 (diff) | |
| parent | ccc37a91935f90ede0be48b9a71b93f54267e608 (diff) | |
| download | tcl-e338d72a45468bad9139adc4d43a4167d4e244c6.zip tcl-e338d72a45468bad9139adc4d43a4167d4e244c6.tar.gz tcl-e338d72a45468bad9139adc4d43a4167d4e244c6.tar.bz2 | |
merge novem
Diffstat (limited to 'unix/tclUnixSock.c')
| -rw-r--r-- | unix/tclUnixSock.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index a964653..f4d17fc 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -737,7 +737,10 @@ TcpGetOptionProc( if (statePtr->status == 0) { ret = getsockopt(statePtr->fds.fd, SOL_SOCKET, SO_ERROR, - (char *) &err, &optlen); + (char *) &err, &optlen); + if (statePtr->flags & TCP_ASYNC_CONNECT) { + statePtr->status = err; + } if (ret < 0) { err = errno; } @@ -1054,12 +1057,17 @@ CreateClientSocket( */ optlen = sizeof(int); - getsockopt(state->fds.fd, SOL_SOCKET, SO_ERROR, - (char *) &status, &optlen); - state->status = status; + + if (state->status == 0) { + getsockopt(state->fds.fd, SOL_SOCKET, SO_ERROR, + (char *) &status, &optlen); + state->status = status; + } else { + status = state->status; + state->status = 0; + } } if (status == 0) { - CLEAR_BITS(state->flags, TCP_ASYNC_CONNECT); goto out; } } @@ -1067,6 +1075,7 @@ CreateClientSocket( out: + CLEAR_BITS(state->flags, TCP_ASYNC_CONNECT); if (async_callback) { /* * An asynchonous connection has finally succeeded or failed. @@ -1357,6 +1366,7 @@ Tcl_OpenTcpServer( my_errno = errno; } close(sock); + sock = -1; continue; } if (port == 0 && chosenport == 0) { @@ -1379,6 +1389,7 @@ Tcl_OpenTcpServer( my_errno = errno; } close(sock); + sock = -1; continue; } if (statePtr == NULL) { |