From: Sara Golemon <pollita@php.net>
Date: Wed, 11 Jun 2014 20:51:53 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~198^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2ef56f760c6425d002454234c45c5e777d85058;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

e2ef56f760c6425d002454234c45c5e777d85058