]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorJoe Watkins <krakjoe@php.net>
Wed, 18 Jan 2017 17:25:52 +0000 (17:25 +0000)
committerJoe Watkins <krakjoe@php.net>
Wed, 18 Jan 2017 17:25:52 +0000 (17:25 +0000)
* PHP-7.1:
  DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850

1  2 
ext/standard/dns.c

Simple merge