iliaa Tue Sep 9 20:22:21 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard file.c
/php-src NEWS
Log:
MFH: Fixed bug #14049 (realpath() w/ZTS returns invalid results for non-existent
paths)
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.279.2.34 php-src/ext/standard/file.c:1.279.2.35
--- php-src/ext/standard/file.c:1.279.2.34 Tue Jul 29 14:26:59 2003
+++ php-src/ext/standard/file.c Tue Sep 9 20:22:19 2003
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.279.2.34 2003/07/29 18:26:59 iliaa Exp $ */
+/* $Id: file.c,v 1.279.2.35 2003/09/10 00:22:19 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -43,6 +43,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#ifdef PHP_WIN32
+#include <io.h>
#include <windows.h>
#include <winsock.h>
#define O_RDONLY _O_RDONLY
@@ -2378,6 +2379,15 @@
convert_to_string_ex(path);
if (VCWD_REALPATH(Z_STRVAL_PP(path), resolved_path_buff)) {
+#if ZTS
+# if PHP_WIN32
+ if (_access(resolved_path_buff, 0))
+ RETURN_FALSE;
+# else
+ if (access(resolved_path_buff, F_OK))
+ RETURN_FALSE;
+# endif
+#endif
RETURN_STRING(resolved_path_buff, 1);
} else {
RETURN_FALSE;
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.382 php-src/NEWS:1.1247.2.383
--- php-src/NEWS:1.1247.2.382 Tue Sep 9 17:47:20 2003
+++ php-src/NEWS Tue Sep 9 20:22:20 2003
@@ -28,6 +28,8 @@
- Fixed bug #23326 (ext/domxml: Attributes via append_child not supported).
(Melvyn)
- Fixed bug #21220 (Wrong Apache version shown in phpinfo() output). (Jani)
+- Fixed bug #14049 (realpath() w/ZTS returns invalid results for non-existent
+ paths). (Ilia)
25 Aug 2003, Version 4.3.3
- Upgraded the bundled Expat library to version 1.95.6. (Jani)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
