mirror of
https://github.com/php/php-src.git
synced 2024-09-24 19:37:26 +00:00
Merge branch 'PHP-5.4'
* PHP-5.4: Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails
This commit is contained in:
commit
f6558a295d
@ -1208,7 +1208,12 @@ PHP_FUNCTION(realpath_cache_get)
|
||||
MAKE_STD_ZVAL(entry);
|
||||
array_init(entry);
|
||||
|
||||
/* bucket->key is unsigned long */
|
||||
if (LONG_MAX >= 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_stringl(entry, "realpath", bucket->realpath, bucket->realpath_len, 1);
|
||||
add_assoc_long(entry, "expires", bucket->expires);
|
||||
|
@ -19,7 +19,7 @@ echo "Done\n";
|
||||
int(%d)
|
||||
array(4) {
|
||||
["key"]=>
|
||||
int(%i)
|
||||
%s(%d)
|
||||
["is_dir"]=>
|
||||
bool(true)
|
||||
["realpath"]=>
|
||||
|
@ -19,7 +19,7 @@ echo "Done\n";
|
||||
int(%d)
|
||||
array(8) {
|
||||
["key"]=>
|
||||
int(%d)
|
||||
%s(%d)
|
||||
["is_dir"]=>
|
||||
bool(true)
|
||||
["realpath"]=>
|
||||
|
Loading…
Reference in New Issue
Block a user