diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2006-08-31 23:39:24 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2006-08-31 23:39:24 +0000 |
| commit | 246dc62e9cc104d67af7bc85c75d8d343026bcf4 (patch) | |
| tree | ba5c7396394053a2f4a9dc3236c0eb8693d039a2 /lib/server | |
| parent | e694703be46f51b88c8b3dc1497b905edaedceea (diff) | |
Revert to trunk
Diffstat (limited to 'lib/server')
| -rw-r--r-- | lib/server/SocketStreamTLS.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/server/SocketStreamTLS.cpp b/lib/server/SocketStreamTLS.cpp index af4ad460..94aa3868 100644 --- a/lib/server/SocketStreamTLS.cpp +++ b/lib/server/SocketStreamTLS.cpp @@ -137,12 +137,8 @@ void SocketStreamTLS::Handshake(const TLSContext &rContext, bool IsServer) THROW_EXCEPTION(ServerException, TLSAllocationFailed) } +#ifndef WIN32 // Make the socket non-blocking so timeouts on Read work - -#ifdef WIN32 - u_long nonblocking = 1; - ioctlsocket(socket, FIONBIO, &nonblocking); -#else // !WIN32 // This is more portable than using ioctl with FIONBIO int statusFlags = 0; if(::fcntl(socket, F_GETFL, &statusFlags) < 0 @@ -313,7 +309,7 @@ int SocketStreamTLS::Read(void *pBuffer, int NBytes, int Timeout) case SSL_ERROR_WANT_READ: case SSL_ERROR_WANT_WRITE: - // wait for the required data + // wait for the requried data // Will only get once around this loop, so don't need to calculate timeout values if(WaitWhenRetryRequired(se, Timeout) == false) { |