clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 03:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4'

Browse Source 
* PHP-5.4:
  Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails
This commit is contained in:
Anatoliy Belsky 2012-05-10 15:40:17 +02:00
commit f6558a295d
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/standard/filestat.c
View File

@ -1208,7 +1208,12 @@ PHP_FUNCTION(realpath_cache_get)
MAKE_STD_ZVAL(entry); MAKE_STD_ZVAL(entry);
array_init(entry); array_init(entry);
/* bucket->key is unsigned long */
if (LONG_MAX >= bucket->key) {
add_assoc_long(entry, "key", bucket->key); add_assoc_long(entry, "key", bucket->key);
} else {
add_assoc_double(entry, "key", (double)bucket->key);
}
add_assoc_bool(entry, "is_dir", bucket->is_dir); add_assoc_bool(entry, "is_dir", bucket->is_dir);
add_assoc_stringl(entry, "realpath", bucket->realpath, bucket->realpath_len, 1); add_assoc_stringl(entry, "realpath", bucket->realpath, bucket->realpath_len, 1);
add_assoc_long(entry, "expires", bucket->expires); add_assoc_long(entry, "expires", bucket->expires);

2
ext/standard/tests/file/realpath_cache.phpt
View File

@ -19,7 +19,7 @@ echo "Done\n";
int(%d) int(%d)
array(4) { array(4) {
["key"]=> ["key"]=>
int(%i) %s(%d)
["is_dir"]=> ["is_dir"]=>
bool(true) bool(true)
["realpath"]=> ["realpath"]=>

2
ext/standard/tests/file/realpath_cache_win32.phpt
View File

@ -19,7 +19,7 @@ echo "Done\n";
int(%d) int(%d)
array(8) { array(8) {
["key"]=> ["key"]=>
int(%d) %s(%d)
["is_dir"]=> ["is_dir"]=>
bool(true) bool(true)
["realpath"]=> ["realpath"]=>