com php-src: Revert "Don't report mmap failure if it is expected": Zend/zend_alloc.c
| From: | Remi Collet | Date: | Wed, 29 Aug 2018 12:40:59 +0000 |
| Subject: | com php-src: Revert "Don't report mmap failure if it is expected": Zend/zend_alloc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102921@lists.php.net to get a copy of this message | ||
Commit: 8cc7e2a2df912d86f6b9dc3f3d40e5de1d93214b
Author: Remi Collet <remi@php.net> Wed, 29 Aug 2018 14:40:59 +0200
Parents: 7728160784785771d1933f5f0a8c4d7a735470b0
Branches: PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8cc7e2a2df912d86f6b9dc3f3d40e5de1d93214b
Log:
Revert "Don't report mmap failure if it is expected"
This reverts commit 446b5b15d324dacd30f58313563a9d625fb54ac8.
Changed paths:
M Zend/zend_alloc.c
Diff:
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index d81616a..8eec54c 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -432,7 +432,7 @@ static void *zend_mm_mmap_fixed(void *addr, size_t size)
void *ptr = mmap(addr, size, PROT_READ | PROT_WRITE, flags /*| MAP_POPULATE | MAP_HUGETLB*/, -1,
0);
if (ptr == MAP_FAILED) {
-#if ZEND_MM_ERROR && !defined(MAP_FIXED_NOREPLACE) && !defined(MAP_EXCL)
+#if ZEND_MM_ERROR
fprintf(stderr, "\nmmap() failed: [%d] %s\n", errno, strerror(errno));
#endif
return NULL;