]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 02fcbe0 6a960b6)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 05:50:08 +0000 (21:50 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 05:50:08 +0000 (21:50 -0800)
commit141b14454c499d8549067cf9ba704c96ce8d0f8c
tree867f7284337306c6c352b2761902ce0589f666a1tree | snapshot
parent02fcbe08028361d13785fc90ed9460385af4e549commit | diff
parent6a960b6d1b2b3cdbce7d6faf9e58087297a45887commit | diff
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
ext/sockets/sockaddr_conv.c diff1 | diff2 | blob | history
ext/standard/dns.c diff1 | diff2 | blob | history
main/network.c diff1 | diff2 | blob | history
main/php_network.h diff1 | diff2 | blob | history
sapi/cgi/fastcgi.c diff1 | diff2 | blob | history
sapi/litespeed/lsapilib.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.