Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  Fix phpGH-9949: Partial content on incomplete POST request

Author: cmb69

NEWS

@@ -12,6 +12,9 @@ PHP                                                                        NEWS
   . Fixed potentially undefined behavior in Windows ftok(3) emulation. (cmb)
   . Fixed GH-9769 (Misleading error message for unpacking of objects). (jhdxr)
 
+- Apache:
+  . Fixed bug GH-9949 (Partial content on incomplete POST request). (cmb)
+
 - FPM:
   . Fixed bug GH-9959 (Solaris port event mechanism is still broken after bug
     #66694). (Petr Sumbera)

sapi/apache2handler/sapi_apache2.c

@@ -182,6 +182,7 @@ php_apache_sapi_read_post(char *buf, size_t count_bytes)
 	php_struct *ctx = SG(server_context);
 	request_rec *r;
 	apr_bucket_brigade *brigade;
+	apr_status_t status;
 
 	r = ctx->r;
 	brigade = ctx->brigade;
@@ -193,7 +194,7 @@ php_apache_sapi_read_post(char *buf, size_t count_bytes)
 	 * need to make sure that if data is available we fill the buffer completely.
 	 */
 
-	while (ap_get_brigade(r->input_filters, brigade, AP_MODE_READBYTES, APR_BLOCK_READ, len) == APR_SUCCESS) {
+	while ((status = ap_get_brigade(r->input_filters, brigade, AP_MODE_READBYTES, APR_BLOCK_READ, len)) == APR_SUCCESS) {
 		apr_brigade_flatten(brigade, buf, &len);
 		apr_brigade_cleanup(brigade);
 		tlen += len;
@@ -204,6 +205,10 @@ php_apache_sapi_read_post(char *buf, size_t count_bytes)
 		len = count_bytes - tlen;
 	}
 
+	if (status != APR_SUCCESS) {
+		return 0;
+	}
+
 	return tlen;
 }