Stanislav Malyshev e2ed4874b5 Merge branch 'PHP-5.4' into PHP-5.5 ...

* PHP-5.4:
  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

2014-06-24 10:25:09 -07:00

..

locale_class.c

Merge branch '5.3' into 5.4

2012-07-30 10:31:10 +02:00

locale_class.h

Remove executable bit from files

2012-07-30 10:25:17 +02:00

locale_methods.c

Merge branch 'PHP-5.4' into PHP-5.5

2014-06-24 10:25:09 -07:00

locale_methods.h

Remove executable bit from files

2012-07-30 10:25:17 +02:00

locale.c

Remove executable bit from files

2012-07-30 10:25:17 +02:00

locale.h

Remove executable bit from files

2012-07-30 10:25:17 +02:00