]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorDmitry Stogov <dmitry@zend.com>
Thu, 24 Sep 2015 19:41:45 +0000 (22:41 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 24 Sep 2015 19:41:45 +0000 (22:41 +0300)
* PHP-7.0:
  Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
  Fix missing LOAD_OPLINE() for ZEND_USER_OPCODE_LEAVE


Trivial merge