diff options
author | Jani Taskinen <jani@php.net> | 2007-07-17 13:29:33 +0000 |
---|---|---|
committer | Jani Taskinen <jani@php.net> | 2007-07-17 13:29:33 +0000 |
commit | 2c05c8c6b3b9262788ce17d0be4e81de7ad62175 (patch) | |
tree | e9ec21cb8ce63e3284d4b39c733f142ecbfbed7b /main | |
parent | dd23eb0c88cc1185aff43b09b1166fc6162c19dc (diff) | |
download | php-git-2c05c8c6b3b9262788ce17d0be4e81de7ad62175.tar.gz |
MFH: ws fix
Diffstat (limited to 'main')
-rw-r--r-- | main/network.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/main/network.c b/main/network.c index d4bee77bdf..cfc80148a7 100644 --- a/main/network.c +++ b/main/network.c @@ -1026,32 +1026,32 @@ PHPAPI php_stream *_php_stream_sock_open_host(const char *host, unsigned short p PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC) { - int ret = SUCCESS; - int flags; - int myflag = 0; + int ret = SUCCESS; + int flags; + int myflag = 0; #ifdef PHP_WIN32 - /* with ioctlsocket, a non-zero sets nonblocking, a zero sets blocking */ - flags = !block; - if (ioctlsocket(socketd, FIONBIO, &flags)==SOCKET_ERROR){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", WSAGetLastError()); - ret = FALSE; - } + /* with ioctlsocket, a non-zero sets nonblocking, a zero sets blocking */ + flags = !block; + if (ioctlsocket(socketd, FIONBIO, &flags) == SOCKET_ERROR) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", WSAGetLastError()); + ret = FALSE; + } #else - flags = fcntl(socketd, F_GETFL); + flags = fcntl(socketd, F_GETFL); #ifdef O_NONBLOCK - myflag = O_NONBLOCK; /* POSIX version */ + myflag = O_NONBLOCK; /* POSIX version */ #elif defined(O_NDELAY) - myflag = O_NDELAY; /* old non-POSIX version */ + myflag = O_NDELAY; /* old non-POSIX version */ #endif - if (!block) { - flags |= myflag; - } else { + if (!block) { + flags |= myflag; + } else { flags &= ~myflag; - } - fcntl(socketd, F_SETFL, flags); + } + fcntl(socketd, F_SETFL, flags); #endif - return ret; + return ret; } PHPAPI void _php_emit_fd_setsize_warning(int max_fd) |