Merge branch 'PHP-5.5' into PHP-5.6

dstogov · dstogov · commit 0ff0e82f26fc · 2013-12-26T11:52:39.000+04:00
* PHP-5.5:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero

Conflicts:
	NEWS
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ static int zend_mm_dev_zero_fd = -1;`
`201`	`201`
`202`	`202`	`static zend_mm_storage* zend_mm_mem_mmap_zero_init(void *params)`
`203`	`203`	`{`
`204`		`- if (zend_mm_dev_zero_fd != -1) {`
	`204`	`+ if (zend_mm_dev_zero_fd == -1) {`
`205`	`205`	`zend_mm_dev_zero_fd = open("/dev/zero", O_RDWR, S_IRUSR \| S_IWUSR);`
`206`	`206`	`}`
`207`	`207`	`if (zend_mm_dev_zero_fd >= 0) {`