diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-03-05 16:44:25 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-03-05 16:44:25 +0100 |
| commit | 8a134c9a26087526fd6f75acc880a8d0596e09ae (patch) | |
| tree | a2878b7621206689249c9e675b8ed58512e09dc8 /ext/opcache | |
| parent | 08ad9af2ca7121e51075b9bbeca18d11d2c0f2dc (diff) | |
| parent | ae23852e41ca695e866832b4339905a172d0d913 (diff) | |
| download | php-git-8a134c9a26087526fd6f75acc880a8d0596e09ae.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Add supports for FreeBSD's PROT_MAX to let mprotect knows X flag can be applied in addition.
Diffstat (limited to 'ext/opcache')
| -rw-r--r-- | ext/opcache/shared_alloc_mmap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/opcache/shared_alloc_mmap.c b/ext/opcache/shared_alloc_mmap.c index 6627633694..18f2268a67 100644 --- a/ext/opcache/shared_alloc_mmap.c +++ b/ext/opcache/shared_alloc_mmap.c @@ -52,6 +52,9 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_ /* allows tracking segments via tools such as vmmap */ fd = VM_MAKE_TAG(251U); #endif +#ifdef PROT_MAX + flags |= PROT_MAX(PROT_READ | PROT_WRITE | PROT_EXEC); +#endif #ifdef MAP_HUGETLB size_t huge_page_size = 2 * 1024 * 1024; |