From: Stanislav Malyshev <stas@php.net>
Date: Tue, 24 Jun 2014 17:33:40 +0000 (-0700)
Subject: Merge branch 'PHp-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4454ac31b6c93ed52652f7b8fb1614965fcaa71;p=php

Merge branch 'PHp-5.6'

* PHp-5.6:
  Better fix for bug #67072 with more BC provisions
  Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
  Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
  Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
  Fix bug #67349: Locale::parseLocale Double Free
  update NEWS
  5.4.30
  Better fix for bug #67072 with more BC provisions
  Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
  update CVE
  Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
  Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
  Fix bug #67349: Locale::parseLocale Double Free
  add CVEs
  Fix potential segfault in dns_get_record()
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.30 rc1

Conflicts:
	ext/intl/locale/locale_methods.c
---

d4454ac31b6c93ed52652f7b8fb1614965fcaa71