]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
authorChristopher Jones <sixd@php.net>
Fri, 4 Oct 2013 12:40:43 +0000 (05:40 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 4 Oct 2013 12:40:43 +0000 (05:40 -0700)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fix bug #65821: By-ref foreach on property access of string offset segfaults
  Fixed bug #64230 (XMLReader does not suppress errors)


Trivial merge