diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2006-07-27 23:18:35 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2006-07-27 23:18:35 +0000 |
| commit | c7662795f519d2b6797e4b1ac7fa4a22afa26310 (patch) | |
| tree | b1737dfa78d8e7bfb2d5a7e9831bab91869ade97 /lib/server/SocketStreamTLS.cpp | |
| parent | a85b710c46ec79e968da349304f30945cb9b7bc1 (diff) | |
* merge
- This is my current patch queue. I think that all of these are safe
to apply. This is just under half of the pending changes in
chris/general (the easy half).
Diffstat (limited to 'lib/server/SocketStreamTLS.cpp')
| -rw-r--r-- | lib/server/SocketStreamTLS.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/server/SocketStreamTLS.cpp b/lib/server/SocketStreamTLS.cpp index 94aa3868..af4ad460 100644 --- a/lib/server/SocketStreamTLS.cpp +++ b/lib/server/SocketStreamTLS.cpp @@ -137,8 +137,12 @@ 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 @@ -309,7 +313,7 @@ int SocketStreamTLS::Read(void *pBuffer, int NBytes, int Timeout) case SSL_ERROR_WANT_READ: case SSL_ERROR_WANT_WRITE: - // wait for the requried data + // wait for the required data // Will only get once around this loop, so don't need to calculate timeout values if(WaitWhenRetryRequired(se, Timeout) == false) { |