]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 689cf8b 7bd4e72)
Merge branch 'PHP-7.0' into PHP-7.1
authorDmitry Stogov <dmitry@zend.com>
Tue, 18 Oct 2016 12:09:44 +0000 (15:09 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 18 Oct 2016 12:09:44 +0000 (15:09 +0300)
commitc31d66b3fdab3c7ab8e71ef7e02f90421851a495
treee0c9b178c90c31243c4c7d810ffc9fd0b63daacbtree | snapshot
parent689cf8b2666e0bc9dff5c9216fedbf491890d3dacommit | diff
parent7bd4e7208e26e3e441717c0f33a154a385764d06commit | diff
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)
  Revert "Fix bug #47890 #73215 uniqid() should use better random source"
  Update NEWS
NEWS diff1 | diff2 | blob | history
Zend/zend_execute_API.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.