]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorJoe Watkins <krakjoe@php.net>
Thu, 31 Mar 2016 11:39:45 +0000 (12:39 +0100)
committerJoe Watkins <krakjoe@php.net>
Thu, 31 Mar 2016 11:39:45 +0000 (12:39 +0100)
* PHP-7.0:
  fix #71609: Segmentation fault on ZTS with gethostbyname

1  2 
ext/standard/file.c

Simple merge