Fixed bug #67717 - segfault in dns_get_record
fix wrong pointer indirection
Merge branch 'master' of git.php.net:php-src

# By Dmitry Stogov
# Via Dmitry Stogov
* 'master' of git.php.net:php-src:
  Fixed encoding support
Fix bug #67730 - Null byte injection possible with imagexxx functions
added missing define
fix potentially missing NUL termination
c89 compat
basic macro replacements, all at once
C89 compat
Merge remote-tracking branch 'php/master'

Conflicts:
	ext/date/lib/parse_date.c
Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597

Incomplete fix for CVE-2014-4049

Check possible buffer overflow
- pass real buffer end to dn_expand calls
- check buffer len before each read
NEWS
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
NEWS
fix merge for #67717
fixes to iconv
fix merge issue in previous
fix merge issue in previous (again)