]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4758505 9031a90)
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Mon, 1 Jun 2015 09:17:32 +0000 (12:17 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 1 Jun 2015 09:17:32 +0000 (12:17 +0300)
commitf863d89b5cc991ebfbb69caacc724ad90513924b
treebfc86167f42d781ab5140fb10e6eab887f9a0328tree | snapshot
parent4758505b27dbfbade703d80737b9d50a9c2b9deacommit | diff
parent9031a902e3393ff7dc8a02615430a7d894c740facommit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #69732 (can induce segmentation fault with basic php code).

Conflicts:
Zend/zend_vm_execute.h
NEWS diff1 | diff2 | blob | history
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.