diff options
| author | Anatol Belski <ab@php.net> | 2017-02-15 14:51:38 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-02-15 14:51:38 +0100 |
| commit | e7b4ee31650818b91d56cb8373624616f04414de (patch) | |
| tree | f94b59764ede798a473af01d344eeb07988de851 /main/streams | |
| parent | b4fd233be03b150fbe9cabb8d2e7a1c3be8e2ed3 (diff) | |
| parent | 2a61e5495affef963f04a3322412c1d316d83ab5 (diff) | |
| download | php-git-e7b4ee31650818b91d56cb8373624616f04414de.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #74090 stream_get_contents maxlength>-1 returns empty string
Diffstat (limited to 'main/streams')
| -rw-r--r-- | main/streams/php_streams_int.h | 4 | ||||
| -rw-r--r-- | main/streams/xp_socket.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/main/streams/php_streams_int.h b/main/streams/php_streams_int.h index 42fdfcb4c7..13a817833f 100644 --- a/main/streams/php_streams_int.h +++ b/main/streams/php_streams_int.h @@ -53,6 +53,10 @@ # undef EWOULDBLOCK # endif # define EWOULDBLOCK WSAEWOULDBLOCK +# ifdef EMSGSIZE +# undef EMSGSIZE +# endif +# define EMSGSIZE WSAEMSGSIZE #endif /* This functions transforms the first char to 'w' if it's not 'r', 'a' or 'w' diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index 59ece7d27e..8efc4cdbc3 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -336,7 +336,7 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void ret = recv(sock->socket, &buf, sizeof(buf), MSG_PEEK); err = php_socket_errno(); if (0 == ret || /* the counterpart did properly shutdown*/ - (0 > ret && err != EWOULDBLOCK && err != EAGAIN)) { /* there was an unrecoverable error */ + (0 > ret && err != EWOULDBLOCK && err != EAGAIN && err != EMSGSIZE)) { /* there was an unrecoverable error */ alive = 0; } } |