Merge pull request #2742 from remicollet/issue-php85

xrmx · web-flow · commit 84aa2bdce560 · 2025-10-07T20:40:14.000+02:00
STR_EMPTY_ALLOC removed in PHP 8.5
diff --git a/plugins/php/session.c b/plugins/php/session.c
@@ -14,7 +14,7 @@ PS_READ_FUNC(uwsgi) {
 	uint64_t valsize = 0;
 	char *value = uwsgi_cache_magic_get(key->val, key->len , &valsize, NULL, cache);
 	if (!value) {
-		*val = STR_EMPTY_ALLOC();
+		*val = ZSTR_EMPTY_ALLOC();
 		return SUCCESS;
 	}
 	*val = zend_string_init(value, valsize, 0);

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ PS_READ_FUNC(uwsgi) {`
`14`	`14`	`uint64_t valsize = 0;`
`15`	`15`	`char *value = uwsgi_cache_magic_get(key->val, key->len , &valsize, NULL, cache);`
`16`	`16`	`if (!value) {`
`17`		`- *val = STR_EMPTY_ALLOC();`
	`17`	`+ *val = ZSTR_EMPTY_ALLOC();`
`18`	`18`	`return SUCCESS;`
`19`	`19`	`}`
`20`	`20`	`*val = zend_string_init(value, valsize, 0);`