diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-12-26 11:53:03 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-12-26 11:53:03 +0400 |
| commit | ef56cfb9916bb24ad2f44deb2125b2d6fe3499d2 (patch) | |
| tree | 2bbb8fbd8c827266d106a55a45d9e3b170595950 /Zend/zend_alloc.c | |
| parent | c676f5b36d3d4ac485982699e5c86a9f22c2f0c3 (diff) | |
| parent | 0ff0e82f26fcae352007c08873ab408c12948ad9 (diff) | |
| download | php-git-ef56cfb9916bb24ad2f44deb2125b2d6fe3499d2.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed ZEND_MM_MEM_TYPE=mmap_zero
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index e9d8a1d837..85989b9bcc 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -201,7 +201,7 @@ static int zend_mm_dev_zero_fd = -1; static zend_mm_storage* zend_mm_mem_mmap_zero_init(void *params) { - if (zend_mm_dev_zero_fd != -1) { + if (zend_mm_dev_zero_fd == -1) { zend_mm_dev_zero_fd = open("/dev/zero", O_RDWR, S_IRUSR | S_IWUSR); } if (zend_mm_dev_zero_fd >= 0) { |