]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Mon, 13 Jun 2016 13:08:23 +0000 (21:08 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 13 Jun 2016 13:08:23 +0000 (21:08 +0800)
* PHP-7.0:
  Fixed bug #72306 (Heap overflow through proc_open and $env parameter)


Trivial merge