diff options
author | Christopher Jones <sixd@php.net> | 2013-07-25 08:53:29 -0700 |
---|---|---|
committer | Christopher Jones <sixd@php.net> | 2013-07-25 08:53:29 -0700 |
commit | 42e8f3ca288cd40ffb72a5d37d13754263348dd7 (patch) | |
tree | 4c0b8098dd0d0a11119c4dfafacf1da3d0ff6479 /ext/mysql/php_mysql.c | |
parent | 024972e3b957270f7e233794376b36c1e5081c78 (diff) | |
parent | 9776504c5bfa036608fc3fd1ae308c99615972b1 (diff) | |
download | php-git-42e8f3ca288cd40ffb72a5d37d13754263348dd7.tar.gz |
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Johannes Schlüter (3) and others
# Via Xinchen Hui (3) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Upper section name
Update NEWs
Fixed bug #65328 (Segfault when getting SplStack object Value)
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
fix missing include
Fix bug 65299
Fix compiler warning on redefined constant
Fix comment
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions