diff options
| author | Anatol Belski <ab@php.net> | 2016-03-22 21:48:11 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-03-22 21:48:11 +0100 |
| commit | 76d612129bb6b67171308f43c19d7e4791d7919e (patch) | |
| tree | f533eb018b178ffd843f46937dfb7de8c1b64c24 | |
| parent | 94812fa6cde18f67adeb13adcb138c7895a62c38 (diff) | |
| parent | 241ba9dcb195160e323847757413603a3cc72a1f (diff) | |
| download | php-git-76d612129bb6b67171308f43c19d7e4791d7919e.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
if there's no JIT support, no RINIT is really needed
Disable huge pages in the Zend allocator by default As per the discussion on internals, this is an expert feature that needs special system-level configuration and care.
| -rw-r--r-- | Zend/zend_alloc.c | 6 | ||||
| -rw-r--r-- | ext/pcre/php_pcre.c | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 4cf1178c57..1876559317 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -201,7 +201,7 @@ typedef struct _zend_mm_huge_list zend_mm_huge_list; #endif #ifdef MAP_HUGETLB -int zend_mm_use_huge_pages = 1; +int zend_mm_use_huge_pages = 0; #endif /* @@ -2654,8 +2654,8 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals) #endif #ifdef MAP_HUGETLB tmp = getenv("USE_ZEND_ALLOC_HUGE_PAGES"); - if (tmp && !zend_atoi(tmp, 0)) { - zend_mm_use_huge_pages = 0; + if (tmp && zend_atoi(tmp, 0)) { + zend_mm_use_huge_pages = 1; } #endif ZEND_TSRMLS_CACHE_UPDATE(); diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 24ed6ca5d6..f6f86304e5 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -212,18 +212,18 @@ static PHP_MSHUTDOWN_FUNCTION(pcre) } /* }}} */ +#ifdef PCRE_STUDY_JIT_COMPILE /* {{{ PHP_RINIT_FUNCTION(pcre) */ static PHP_RINIT_FUNCTION(pcre) { -#ifdef PCRE_STUDY_JIT_COMPILE if (PCRE_G(jit)) { jit_stack = pcre_jit_stack_alloc(PCRE_JIT_STACK_MIN_SIZE,PCRE_JIT_STACK_MAX_SIZE); } -#endif return SUCCESS; } /* }}} */ +#endif /* {{{ static pcre_clean_cache */ static int pcre_clean_cache(zval *data, void *arg) @@ -2232,7 +2232,11 @@ zend_module_entry pcre_module_entry = { pcre_functions, PHP_MINIT(pcre), PHP_MSHUTDOWN(pcre), +#ifdef PCRE_STUDY_JIT_COMPILE PHP_RINIT(pcre), +#else + NULL +#endif NULL, PHP_MINFO(pcre), PHP_PCRE_VERSION, |