Merge branch 'PHP-8.4' into PHP-8.5

ndossche · ndossche · commit 750c22055054 · 2026-01-10T10:49:51.000+01:00
* PHP-8.4: fastcgi: Fix compile warning wrt safe_read() (#20887)
diff --git a/main/fastcgi.c b/main/fastcgi.c
@@ -944,7 +944,7 @@ static inline ssize_t safe_write(fcgi_request *req, const void *buf, size_t coun
 	return n;
 }
 
-static inline ssize_t safe_read(fcgi_request *req, const void *buf, size_t count)
+static inline ssize_t safe_read(fcgi_request *req, void *buf, size_t count)
 {
 	int    ret;
 	size_t n = 0;

Original file line number	Diff line number	Diff line change
`@@ -944,7 +944,7 @@ static inline ssize_t safe_write(fcgi_request req, const void buf, size_t coun`
`944`	`944`	`return n;`
`945`	`945`	`}`
`946`	`946`
`947`		`-static inline ssize_t safe_read(fcgi_request req, const void buf, size_t count)`
	`947`	`+static inline ssize_t safe_read(fcgi_request req, void buf, size_t count)`
`948`	`948`	`{`
`949`	`949`	`int ret;`
`950`	`950`	`size_t n = 0;`