]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorDmitry Stogov <dmitry@zend.com>
Fri, 18 Sep 2015 07:37:25 +0000 (10:37 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 18 Sep 2015 07:37:25 +0000 (10:37 +0300)
* PHP-7.0:
  Use Zend MM to keep statistic of non-persistent connections (calloc/free->pecalloc/pefree)


Trivial merge