diff options
| author | Michael Wallner <mike@php.net> | 2013-10-02 15:55:38 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2013-10-02 15:55:38 +0200 |
| commit | 2ba39268151549f03140ec3d260cf9489336ec93 (patch) | |
| tree | 8e17ec062b521a83525ee9d39304fdfe94ef72aa /ext/xmlreader/php_xmlreader.c | |
| parent | 60e38b3243577abc80ce6bbcfb0b4125b08acb85 (diff) | |
| parent | 9209c19f8f7eef807cb457b32d3ab517ff8dc178 (diff) | |
| download | php-git-2ba39268151549f03140ec3d260cf9489336ec93.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix bug #65808 the socket_connect() won't work with IPv6 address
5.4.22-dev now
Conflicts:
configure.in
ext/sockets/sockets.c
main/php_version.h
Diffstat (limited to 'ext/xmlreader/php_xmlreader.c')
0 files changed, 0 insertions, 0 deletions