]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorDmitry Stogov <dmitry@zend.com>
Thu, 17 Mar 2016 19:44:23 +0000 (22:44 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 17 Mar 2016 19:44:23 +0000 (22:44 +0300)
* PHP-7.0:
  Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.


Trivial merge