iliaa Tue May 11 09:34:31 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/standard dir.c
Log:
MFH: Fixed bug #28355 (glob() does not return error on Linux when it does
not have permission to open the directory).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.658&r2=1.1247.2.659&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.658 php-src/NEWS:1.1247.2.659
--- php-src/NEWS:1.1247.2.658 Mon May 10 18:13:38 2004
+++ php-src/NEWS Tue May 11 09:34:30 2004
@@ -10,6 +10,8 @@
with multiple result sets returned. (Frank)
- Fixed logic bug in session_register() which allowed registering _SESSION
and/or HTTP_SESSION_VARS. (Sara)
+- Fixed bug #28355 (glob() does not return error on Linux when it does not
+ have permission to open the directory). (Ilia)
- Fixed bug #28289 (incorrect resolving of relative paths by glob() in
windows). (Ilia)
- Fixed bug #28229 (run-tests tripped up by spaces in names). (Marcus)
http://cvs.php.net/diff.php/php-src/ext/standard/dir.c?r1=1.109.2.15&r2=1.109.2.16&ty=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.109.2.15 php-src/ext/standard/dir.c:1.109.2.16
--- php-src/ext/standard/dir.c:1.109.2.15 Sun May 9 15:01:27 2004
+++ php-src/ext/standard/dir.c Tue May 11 09:34:31 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.109.2.15 2004/05/09 19:01:27 iliaa Exp $ */
+/* $Id: dir.c,v 1.109.2.16 2004/05/11 13:34:31 iliaa Exp $ */
/* {{{ includes/startup/misc */
@@ -391,8 +391,12 @@
* doesn't. This ensure that if no match is found, an empty
array
* is always returned so it can be used without worrying in
e.g.
* foreach() */
+#if __linux__
+ RETURN_FALSE;
+#else
array_init(return_value);
return;
+#endif
}
#endif
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
