From 483f355d30b0419ea06b53a38eb3a55936fcb375 Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Mon, 14 Oct 2002 00:16:02 +0000 Subject: [PATCH] Fix stream_eof result interpretation (and thus the user-streams test). --- main/user_streams.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/main/user_streams.c b/main/user_streams.c index bf7d1411269..9ee823f3dfc 100644 --- a/main/user_streams.c +++ b/main/user_streams.c @@ -477,11 +477,12 @@ static size_t php_userstreamop_read(php_stream *stream, char *buf, size_t count &retval, 0, NULL, 0, NULL TSRMLS_CC); - if (!(call_result == SUCCESS && retval != NULL && zval_is_true(retval))) { - if (call_result == FAILURE) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_EOF " is not implemented! Assuming EOF", - us->wrapper->classname); - } + if (call_result == SUCCESS && retval != NULL && zval_is_true(retval)) { + stream->eof = 1; + } else if (call_result == FAILURE) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, + "%s::" USERSTREAM_EOF " is not implemented! Assuming EOF", + us->wrapper->classname); stream->eof = 1; }