]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Thu, 2 Apr 2015 09:30:58 +0000 (12:30 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 2 Apr 2015 09:30:58 +0000 (12:30 +0300)
* PHP-5.5:
  Prevent GC from changing zval or object 'color' before they are actually inserted into possible roots buffer.


Trivial merge