cvs: /php4/ext/standard exec.c
| From: | Andrei Zmievski | Date: | Fri, 11 Feb 2000 19:17:06 +0000 |
| Subject: | cvs: /php4/ext/standard exec.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-10140@lists.php.net to get a copy of this message | ||
andrei Fri Feb 11 11:17:06 2000 EDT
Modified files:
/php4/ext/standard exec.c
Log:
(PHP passthru) Shouldn't return anything.
This fixes bugs #3428 and #3430.
Index: php4/ext/standard/exec.c
diff -u php4/ext/standard/exec.c:1.24 php4/ext/standard/exec.c:1.25
--- php4/ext/standard/exec.c:1.24 Fri Feb 11 07:59:29 2000
+++ php4/ext/standard/exec.c Fri Feb 11 11:16:36 2000
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf |
+----------------------------------------------------------------------+
*/
-/* $Id: exec.c,v 1.24 2000/02/11 15:59:29 zeev Exp $ */
+/* $Id: exec.c,v 1.25 2000/02/11 19:16:36 andrei Exp $ */
#include <stdio.h>
#include "php.h"
@@ -169,7 +169,7 @@
} else {
int b, i;
- while ((b = fread(buf, 1, sizeof(buf), fp)) > 0) {
+ while ((b = fread(buf, 1, buflen, fp)) > 0) {
for (i = 0; i < b; i++)
if (output) (void)PUTC(buf[i]);
}
@@ -181,8 +181,6 @@
tmp = php_addslashes(buf, 0, &len, 0);
RETVAL_STRINGL(tmp,len,0);
- } else {
- RETVAL_STRING(buf,1);
}
ret = pclose(fp);