]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db42f83 a03a1ab)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 14 May 2014 00:03:50 +0000 (17:03 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 14 May 2014 00:03:50 +0000 (17:03 -0700)
* PHP-5.5:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.