From: Sara Golemon <pollita@php.net>
Date: Wed, 11 Jun 2014 20:37:40 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1978f41c8a8c205421e574e35313f1037c4d5466;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

1978f41c8a8c205421e574e35313f1037c4d5466