Merge branch 'PHP-8.1' into PHP-8.2

dstogov · dstogov · commit fed7937d2702 · 2023-10-23T12:10:54.000+03:00
* PHP-8.1:
  memory_consumption must be page aligned
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
@@ -72,7 +72,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
`@@ -72,7 +72,7 @@ static ZEND_INI_MH(OnUpdateMemoryConsumption)`
`72`	`72`	`return FAILURE;`
`73`	`73`	`}`
`74`	`74`	`if (UNEXPECTED(memsize > ZEND_LONG_MAX / (1024 * 1024))) {`
`75`		`- *p = ZEND_LONG_MAX;`
	`75`	`+ p = ZEND_LONG_MAX & ~(1024 1024 - 1);`
`76`	`76`	`} else {`
`77`	`77`	`p = memsize (1024 * 1024);`
`78`	`78`	`}`