diff options
author | Stanislav Malyshev <stas@php.net> | 2015-01-31 21:50:08 -0800 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2015-01-31 21:50:08 -0800 |
commit | 141b14454c499d8549067cf9ba704c96ce8d0f8c (patch) | |
tree | 867f7284337306c6c352b2761902ce0589f666a1 /README.TESTING2 | |
parent | 02fcbe08028361d13785fc90ed9460385af4e549 (diff) | |
parent | 6a960b6d1b2b3cdbce7d6faf9e58087297a45887 (diff) | |
download | php-git-141b14454c499d8549067cf9ba704c96ce8d0f8c.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
Conflicts:
ext/sockets/sockaddr_conv.c
ext/standard/dns.c
Diffstat (limited to 'README.TESTING2')
0 files changed, 0 insertions, 0 deletions