]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2005a15 43ab915)
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Tue, 23 Apr 2013 19:59:00 +0000 (23:59 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 23 Apr 2013 19:59:00 +0000 (23:59 +0400)
commit758b666c0ad6edb48274858d2e11c53460787b88
tree80a6be126ecd1359ceb7dcefe9995adcc460f0e9tree | snapshot
parent2005a15caa36bc7974959885f837b9a3ebb78380commit | diff
parent43ab915b41bbb236ca0aa1966c946c9c36fa2a2bcommit | diff
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.

Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Zend/zend_vm_def.h diff1 | diff2 | blob | history
Zend/zend_vm_execute.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.