diff options
| author | Wez Furlong <wez@php.net> | 2002-10-05 10:59:35 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2002-10-05 10:59:35 +0000 |
| commit | 9d5bab5a0dac4ef007c92a4c46f2038d69655dbf (patch) | |
| tree | b15fcf1fcb674924d2b7e9860dec4b7162a7698b | |
| parent | 93f9eea77dd33cf9d1d04d534e3b7af4dc37513a (diff) | |
| download | php-git-9d5bab5a0dac4ef007c92a4c46f2038d69655dbf.tar.gz | |
EOF related fixes.
| -rw-r--r-- | ext/standard/file.c | 2 | ||||
| -rw-r--r-- | main/php_network.h | 1 | ||||
| -rwxr-xr-x | main/streams.c | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index 94945183e6..ab778e4c78 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -633,7 +633,7 @@ PHP_FUNCTION(stream_get_meta_data) add_assoc_bool(return_value, "timed_out", sock->timeout_event); add_assoc_bool(return_value, "blocked", sock->is_blocked); - add_assoc_bool(return_value, "eof", sock->eof); + add_assoc_bool(return_value, "eof", stream->eof); } else { add_assoc_bool(return_value, "timed_out", 0); add_assoc_bool(return_value, "blocked", 1); diff --git a/main/php_network.h b/main/php_network.h index d9055a15a6..59c6bdf069 100644 --- a/main/php_network.h +++ b/main/php_network.h @@ -103,7 +103,6 @@ int php_sockaddr_size(php_sockaddr_storage *addr); struct _php_netstream_data_t { int socket; - char eof; char is_blocked; struct timeval timeout; char timeout_event; diff --git a/main/streams.c b/main/streams.c index 1620628801..4818230cb0 100755 --- a/main/streams.c +++ b/main/streams.c @@ -1246,6 +1246,7 @@ static size_t php_stdiop_read(php_stream *stream, char *buf, size_t count TSRMLS if (ret == 0 && feof(data->file)) stream->eof = 1; } + return ret; } static int php_stdiop_close(php_stream *stream, int close_handle TSRMLS_DC) |