]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Sun, 6 Jan 2013 02:20:00 +0000 (10:20 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 6 Jan 2013 02:20:00 +0000 (10:20 +0800)
commitc2f8e9050439a2987d18a8ec4c060805ddc0dc8a
treec56be30218d2deee6c8fe56f8bf905abdc0719c8
parent2feea39a3320d100bae8a1193aba9022726a24ea
parentbc11e6fdbbafbd0969fc47fa087c2245317cd31f
Merge branch 'PHP-5.3' into PHP-5.4
31 files changed:
ext/mysqlnd/mysqlnd.c
ext/mysqlnd/mysqlnd.h
ext/mysqlnd/mysqlnd_charset.c
ext/mysqlnd/mysqlnd_charset.h
ext/mysqlnd/mysqlnd_debug.c
ext/mysqlnd/mysqlnd_debug.h
ext/mysqlnd/mysqlnd_enum_n_def.h
ext/mysqlnd/mysqlnd_loaddata.c
ext/mysqlnd/mysqlnd_net.c
ext/mysqlnd/mysqlnd_net.h
ext/mysqlnd/mysqlnd_priv.h
ext/mysqlnd/mysqlnd_ps.c
ext/mysqlnd/mysqlnd_ps_codec.c
ext/mysqlnd/mysqlnd_result.c
ext/mysqlnd/mysqlnd_result.h
ext/mysqlnd/mysqlnd_result_meta.c
ext/mysqlnd/mysqlnd_result_meta.h
ext/mysqlnd/mysqlnd_statistics.c
ext/mysqlnd/mysqlnd_statistics.h
ext/mysqlnd/mysqlnd_structs.h
ext/mysqlnd/mysqlnd_wireprotocol.c
ext/mysqlnd/mysqlnd_wireprotocol.h
ext/mysqlnd/php_mysqlnd.c
ext/mysqlnd/php_mysqlnd.h
ext/phar/func_interceptors.c
ext/phar/phar.c
ext/phar/phar_internal.h
ext/phar/phar_object.c
ext/phar/phar_path_check.c
ext/phar/stream.c
ext/phar/util.c