summaryrefslogtreecommitdiff
path: root/main/network.c
diff options
context:
space:
mode:
authorGustavo André dos Santos Lopes <cataphract@php.net>2011-03-22 00:44:23 +0000
committerGustavo André dos Santos Lopes <cataphract@php.net>2011-03-22 00:44:23 +0000
commit0de2e61cab34ac6e97f2411143df933626de92cc (patch)
tree8d51271453ebd8f7ead01e4dd0360ac08678cd0f /main/network.c
parent3afdf62df00a45635f854259fdd13cf4592c09f1 (diff)
downloadphp-git-0de2e61cab34ac6e97f2411143df933626de92cc.tar.gz
- Added socket_import_stream().
- Fixed socket_strerror.phpt - Made php_set_sock_blocking return FAILURE on fcntl error. - Made socket_set_block()/socket_set_nonblock() emit warning on error.
Diffstat (limited to 'main/network.c')
-rw-r--r--main/network.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/network.c b/main/network.c
index 0cfd777e4a..0d7a30ca8b 100644
--- a/main/network.c
+++ b/main/network.c
@@ -1095,7 +1095,9 @@ PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC)
} else {
flags &= ~myflag;
}
- fcntl(socketd, F_SETFL, flags);
+ if (fcntl(socketd, F_SETFL, flags) == -1) {
+ ret = FAILURE;
+ }
#endif
return ret;
}