mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fixed error handling for ext/sockets under win
This commit is contained in:
commit
d565e8f0eb
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user