diff options
| author | Anatol Belski <ab@php.net> | 2013-05-16 19:29:25 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-05-16 19:29:25 +0200 |
| commit | d565e8f0eb329cee8430cd79f8e149998b389928 (patch) | |
| tree | 7034a3c3c3477c3a6a2d574b5e4fa2936b589024 | |
| parent | 07bd1fac57b1f608c15c5d5ebaa6d9383c7cc564 (diff) | |
| parent | 8dec06ea2afbe577191b13152e8f4622a80aeb0c (diff) | |
| download | php-git-d565e8f0eb329cee8430cd79f8e149998b389928.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed error handling for ext/sockets under win
| -rw-r--r-- | ext/sockets/sockets.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index b1d0b7928d..9b519b2288 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -1663,8 +1663,8 @@ PHP_FUNCTION(socket_recvfrom) retval = recvfrom(php_sock->bsd_socket, recv_buf, arg3, arg4, (struct sockaddr *)&s_un, (socklen_t *)&slen); if (retval < 0) { - efree(recv_buf); PHP_SOCKET_ERROR(php_sock, "unable to recvfrom", errno); + efree(recv_buf); RETURN_FALSE; } @@ -1688,8 +1688,8 @@ PHP_FUNCTION(socket_recvfrom) retval = recvfrom(php_sock->bsd_socket, recv_buf, arg3, arg4, (struct sockaddr *)&sin, (socklen_t *)&slen); if (retval < 0) { - efree(recv_buf); PHP_SOCKET_ERROR(php_sock, "unable to recvfrom", errno); + efree(recv_buf); RETURN_FALSE; } @@ -1717,8 +1717,8 @@ PHP_FUNCTION(socket_recvfrom) retval = recvfrom(php_sock->bsd_socket, recv_buf, arg3, arg4, (struct sockaddr *)&sin6, (socklen_t *)&slen); if (retval < 0) { - efree(recv_buf); PHP_SOCKET_ERROR(php_sock, "unable to recvfrom", errno); + efree(recv_buf); RETURN_FALSE; } |