diff options
author | Stanislav Malyshev <stas@php.net> | 2013-01-18 13:42:04 -0800 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2013-01-18 13:42:04 -0800 |
commit | deeacc7106186470f7873b291feaca2e474b3c74 (patch) | |
tree | c0eaa0df2eb2537a3e04cfee82de3079685c2cc2 /ext/reflection/php_reflection.c | |
parent | 6dc80f080ea97c09b36d8a05ec7ec5067f394c01 (diff) | |
parent | 9e7c2e5906d1ec943afe7f6a0daf613a36ba2137 (diff) | |
download | php-git-deeacc7106186470f7873b291feaca2e474b3c74.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix bug #63462 (Magic methods called twice for unset protected properties)
NEWS for bug #64011. See 77ee200
Fix bug #64011 (get_html_translation_table())
Fix News
Update the arguments in the prototype of fpm_socket_unix_test_connect().
fixed build
NEWS for bug #63893
Fixed inconsequential bug in strtr()
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
Revert "Update fputcsv() to escape all characters equally."
Remove _GNU_SOURCE, add local heap sort
The compiler can figure this out
Remove unused block
strtr() with 2nd param array - optimization
Refactoring, bugs & leaks
Optimize strtr w/ 2nd arg array
Diffstat (limited to 'ext/reflection/php_reflection.c')
0 files changed, 0 insertions, 0 deletions