pollita Tue Dec 16 14:45:35 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/ftp ftp.c
Log:
MFH: Fail loudly. This is too often reported as a "bug".
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.504 php-src/NEWS:1.1247.2.505
--- php-src/NEWS:1.1247.2.504 Mon Dec 15 20:00:44 2003
+++ php-src/NEWS Tue Dec 16 14:45:34 2003
@@ -5,6 +5,7 @@
(Edin)
- Added support for --program-prefix and --program-suffix configure options.
(Jani)
+- Added warning when unable to create temp stream for ftp_(n)list(). (Sara)
- Fixed header handler in NSAPI SAPI module (header->replace was ignored,
send_default_content_type now sends value from php.ini). (Uwe Schindler)
- Fixed bug #26635 (fixed look up for fonts in the current directory w/ZTS).
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.68.2.10 php-src/ext/ftp/ftp.c:1.68.2.11
--- php-src/ext/ftp/ftp.c:1.68.2.10 Tue Sep 9 17:15:20 2003
+++ php-src/ext/ftp/ftp.c Tue Dec 16 14:45:35 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ftp.c,v 1.68.2.10 2003/09/09 21:15:20 pollita Exp $ */
+/* $Id: ftp.c,v 1.68.2.11 2003/12/16 19:45:35 pollita Exp $ */
#include "php.h"
@@ -1460,8 +1460,10 @@
char **entry;
char *text;
- if ((tmpfp = tmpfile()) == NULL)
+ if ((tmpfp = tmpfile()) == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create
temporary file. Check permissions in temporary files directory.");
return NULL;
+ }
if (!ftp_type(ftp, FTPTYPE_ASCII))
goto bail;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
