tony2001 Tue May 16 13:05:02 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/main/streams plain_wrapper.c
Log:
fix #37395 (recursive mkdir() fails to create nonexistent directories in root
dir)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.28&r2=1.2027.2.547.2.29&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.28 php-src/NEWS:1.2027.2.547.2.29
--- php-src/NEWS:1.2027.2.547.2.28 Tue May 16 08:21:07 2006
+++ php-src/NEWS Tue May 16 13:05:02 2006
@@ -38,7 +38,9 @@
- Added pg_field_table() function. (Edin)
- Added implementation of curl_multi_info_read(). (Brian)
- Added RFC2397 (data: stream) support. (Marcus)
-- Fixed Bug #37457 (Crash when an exception is thrown in accept() method of
+- Fixed bug #37395 (recursive mkdir() fails to create nonexistent directories
+ in root dir). (Tony)
+- Fixed bug #37457 (Crash when an exception is thrown in accept() method of
FilterIterator). (Marcus)
- Fixed bug #37416 (iterator_to_array() hides exceptions thrown in rewind()
method). (Tony)
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6&r2=1.52.2.6.2.1&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.1
--- php-src/main/streams/plain_wrapper.c:1.52.2.6 Tue Jan 17 02:32:09 2006
+++ php-src/main/streams/plain_wrapper.c Tue May 16 13:05:02 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.6 2006/01/17 02:32:09 iliaa Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.1 2006/05/16 13:05:02 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1100,7 +1100,7 @@
}
else {
/* find a top level directory we need to create */
- while ( (p = strrchr(buf + offset, DEFAULT_SLASH)) ||
(p = strrchr(buf, DEFAULT_SLASH)) ) {
+ while ( (p = strrchr(buf + offset, DEFAULT_SLASH)) || (
offset !=1 && (p = strrchr(buf, DEFAULT_SLASH))) ) {
*p = '\0';
if (VCWD_STAT(buf, &sb) == 0) {
*p = DEFAULT_SLASH;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
