]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorSara Golemon <pollita@php.net>
Wed, 11 Jun 2014 20:51:53 +0000 (13:51 -0700)
committerSara Golemon <pollita@php.net>
Wed, 11 Jun 2014 20:51:53 +0000 (13:51 -0700)
commite2ef56f760c6425d002454234c45c5e777d85058
tree7c3cd0aa48d2a0aaea677fe36134cfa824ac7a5a
parentc38ab260fe3a40cce049c835fb7833de00ab977c
parent4f73394fdd95d3165b4391e1b0dedd57fced8c3b
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix potential segfault in dns_get_record()