com php-src: Merge branch 'PHP-7.2' into PHP-7.3: Zend/zend_a lloc.c
| From: | Nikita Popov | Date: | Mon, 18 Feb 2019 13:04:15 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: Zend/zend_a lloc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104691@lists.php.net to get a copy of this message | ||
Commit: 3b3fafa637914d59c5588d72ddd0f6016642be0a
Author: Nikita Popov <nikita.ppv@gmail.com> Mon, 18 Feb 2019 14:04:15 +0100
Parents: 767fa3dc02f39b64015539d9948874947cf20d5d 928c42211f737640e4dc3c9702ba833c3059bddf
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3b3fafa637914d59c5588d72ddd0f6016642be0a
Log:
Merge branch 'PHP-7.2' into PHP-7.3
Changed paths:
MM Zend/zend_alloc.c
Diff:
diff --cc Zend/zend_alloc.c
index 0039228,3744a83..11f5b46
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@@ -2668,12 -2602,10 +2670,10 @@@ ZEND_API void shutdown_memory_manager(i
static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)
{
- #if ZEND_MM_CUSTOM || MAP_HUGETLB
char *tmp;
- #endif
+
#if ZEND_MM_CUSTOM
tmp = getenv("USE_ZEND_ALLOC");
-
if (tmp && !zend_atoi(tmp, 0)) {
alloc_globals->mm_heap = malloc(sizeof(zend_mm_heap));
memset(alloc_globals->mm_heap, 0, sizeof(zend_mm_heap));
@@@ -2684,7 -2616,6 +2684,7 @@@
return;
}
#endif
- #ifdef MAP_HUGETLB
++
tmp = getenv("USE_ZEND_ALLOC_HUGE_PAGES");
if (tmp && zend_atoi(tmp, 0)) {
zend_mm_use_huge_pages = 1;