From 87b3063593c58c467e55a99b3b8ebb44b74f4efa Mon Sep 17 00:00:00 2001
From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 25 Feb 2003 16:26:55 +0000
Subject: [PATCH] MFH

---
 ext/standard/exec.c                   | 2 +-
 ext/standard/tests/file/bug22414.phpt | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index 9445528048..f6b942e701 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -278,7 +278,7 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC)
 	} else {
 		size_t b;
 
-		while ((b = fread(buf, buflen, 1, fp)) > 0) {
+		while((b = php_stream_read(stream, buf, EXEC_INPUT_BUF)) > 0) {
 			if (output) {
 				PHPWRITE(buf, b);
 			}
diff --git a/ext/standard/tests/file/bug22414.phpt b/ext/standard/tests/file/bug22414.phpt
index c67ae2ed66..0488a137d7 100644
--- a/ext/standard/tests/file/bug22414.phpt
+++ b/ext/standard/tests/file/bug22414.phpt
@@ -2,8 +2,9 @@
 Bug #22414: passthru() does not read data correctly
 --SKIPIF--
 <?php
-	if (empty(@shell_exec("which cat")) {
-		dir('skip cat binary needed for this test is not avaliable');
+	$cat_path = @shell_exec("which cat");
+	if (empty($cat_path)) {
+		die('skip cat binary needed for this test is not avaliable');	
 	}
 ?>
 --POST--
-- 
2.50.1