Merge branch 'PHP-8.2' into PHP-8.3

dstogov · dstogov · commit 1f25dea49896 · 2023-10-23T12:11:01.000+03:00
* PHP-8.2:
  memory_consumption must be page aligned
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
@@ -73,7 +73,7 @@ static ZEND_INI_MH(OnUpdateMemoryConsumption)
 		return FAILURE;
 	}
 	if (UNEXPECTED(memsize > ZEND_LONG_MAX / (1024 * 1024))) {
-		*p = ZEND_LONG_MAX;
+		*p = ZEND_LONG_MAX & ~(1024 * 1024 - 1);
 	} else {
 		*p = memsize * (1024 * 1024);
 	}

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ static ZEND_INI_MH(OnUpdateMemoryConsumption)`
`73`	`73`	`return FAILURE;`
`74`	`74`	`}`
`75`	`75`	`if (UNEXPECTED(memsize > ZEND_LONG_MAX / (1024 * 1024))) {`
`76`		`- *p = ZEND_LONG_MAX;`
	`76`	`+ p = ZEND_LONG_MAX & ~(1024 1024 - 1);`
`77`	`77`	`} else {`
`78`	`78`	`p = memsize (1024 * 1024);`
`79`	`79`	`}`