EOF related fixes.

Author: wez

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);

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;

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)