cvs: /php3 ChangeLog /php3/functions exec.c

andrei Fri Feb 11 21:37:52 2000 EDT Modified files: /php3 ChangeLog /php3/functions exec.c Log: Fixed passthru() return - nothing. Index: php3/ChangeLog diff -u php3/ChangeLog:1.821 php3/ChangeLog:1.822 --- php3/ChangeLog:1.821 Thu Feb 10 01:41:51 2000 +++ php3/ChangeLog Fri Feb 11 21:37:51 2000 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ???, Version 3.0.15 +- Fixed passthru() to no longer return any value. (Andrei) - base64_decode() will decode POST data correct. (Thies) Patch submitted by: Turadg Aleahmad <turadg@wise.berkeley.edu> - Fixed a bug in the XML module that could cause crashes (Zeev) Index: php3/functions/exec.c diff -u php3/functions/exec.c:1.88 php3/functions/exec.c:1.89 --- php3/functions/exec.c:1.88 Fri Feb 11 21:31:01 2000 +++ php3/functions/exec.c Fri Feb 11 21:37:52 2000 @@ -26,7 +26,7 @@ | Author: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: exec.c,v 1.88 2000/02/12 05:31:01 eschmid Exp $ */ +/* $Id: exec.c,v 1.89 2000/02/12 05:37:52 andrei Exp $ */ #include <stdio.h> #include "php.h" #include <ctype.h> @@ -202,7 +202,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) PUTC(buf[i]); } @@ -214,8 +214,6 @@ tmp = _php3_addslashes(buf, 0, &len, 0); RETVAL_STRINGL(tmp,len,0); - } else { - RETVAL_STRING(buf,1); } ret = pclose(fp);