cvs: php-src(PHP_4_3) / NEWS /ext/standard filestat.c

From: Date: Tue, 02 Sep 2003 01:23:22 +0000
Subject: cvs: php-src(PHP_4_3) / NEWS /ext/standard filestat.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-23559@lists.php.net to get a copy of this message
sniper Mon Sep 1 21:23:22 2003 EDT Modified files: (Branch: PHP_4_3) /php-src NEWS /php-src/ext/standard filestat.c Log: MFH: - Fixed bug #25343 (is_dir() gives warning on FreeBSD). Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.368 php-src/NEWS:1.1247.2.369 --- php-src/NEWS:1.1247.2.368 Mon Sep 1 19:02:46 2003 +++ php-src/NEWS Mon Sep 1 21:23:20 2003 @@ -5,6 +5,7 @@ - Fixed disk_total_space() and disk_free_space() under FreeBSD. (Jon Parise) - Fixed crash bug when non-existing save/serializer handler was used. (Jani) - Fixed memory leak in gethostbynamel() if an error occurs. (Sara) +- Fixed bug #25343 (is_dir() gives warning on FreeBSD). (Jani) - Fixed bug #25308 (php -m crashes when zend extensions are loaded). (Stas) - Fixed bug #25307 (Crash with WDDX serializer). (Sascha, Jani) - Fixed bug #25239 (ftp_fopen_wrapper not RFC compliant). (Sara) Index: php-src/ext/standard/filestat.c diff -u php-src/ext/standard/filestat.c:1.112.2.8 php-src/ext/standard/filestat.c:1.112.2.9 --- php-src/ext/standard/filestat.c:1.112.2.8 Fri Aug 22 01:11:31 2003 +++ php-src/ext/standard/filestat.c Mon Sep 1 21:23:21 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filestat.c,v 1.112.2.8 2003/08/22 05:11:31 jon Exp $ */ +/* $Id: filestat.c,v 1.112.2.9 2003/09/02 01:23:21 sniper Exp $ */ #include "php.h" #include "safe_mode.h" @@ -610,7 +610,7 @@ BG(lsb).st_mode = 0; /* mark lstat buf invalid */ #endif if (VCWD_STAT(BG(CurrentStatFile), &BG(sb)) == -1) { - if (!IS_LINK_OPERATION(type) && (!IS_EXISTS_CHECK(type) || errno != ENOENT)) { /* fileexists() test must print no error */ + if (!IS_LINK_OPERATION(type) && (!IS_EXISTS_CHECK(type) || (errno != ENOENT && errno != ENOTDIR))) { /* fileexists() test must print no error */ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Stat failed for %s (errno=%d - %s)", BG(CurrentStatFile), errno, strerror(errno)); } efree(BG(CurrentStatFile)); @@ -626,7 +626,7 @@ if (IS_LINK_OPERATION(type) && !BG(lsb).st_mode) { /* do lstat if the buffer is empty */ if (VCWD_LSTAT(filename, &BG(lsb)) == -1) { - if (!IS_EXISTS_CHECK(type) || errno != ENOENT) { /* fileexists() test must print no error */ + if (!IS_EXISTS_CHECK(type) || (errno != ENOENT && errno != ENOTDIR)) { /* fileexists() test must print no error */ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Lstat failed for %s (errno=%d - %s)", BG(CurrentStatFile), errno, strerror(errno)); } RETURN_FALSE;

« previous php.cvs (#23559) next »