]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47e21a2 e4a28b7)
Merge branch 'PHP-5.4' into PHP-5.5
authorRob Richards <rrichards@php.net>
Sat, 6 Jul 2013 12:00:58 +0000 (08:00 -0400)
committerRob Richards <rrichards@php.net>
Sat, 6 Jul 2013 12:00:58 +0000 (08:00 -0400)
# By Nuno Lopes (2) and Rob Richards (1)
* PHP-5.4:
  truncate results at depth of 255 to prevent corruption
  fix assembly of safe_address() for x86 and x86_64
  fix assembly of safe_address() for x86 and x86_64


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