Fixed reading in streamed body using fastcgi

fixes #51191
php · Sep 23, 2021 · 0dd2092 · 0dd2092
1 parent 082c5b8
commit 0dd2092
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 7 deletions.
diff --git a/main/fastcgi.c b/main/fastcgi.c
@@ -1229,6 +1229,7 @@ int fcgi_read(fcgi_request *req, char *str, int len)
 			req->in_len = (hdr.contentLengthB1 << 8) | hdr.contentLengthB0;
 			req->in_pad = hdr.paddingLength;
 			if (req->in_len == 0) {
+				req->in_len = -1;
 				return n;
 			}
 		}
@@ -1319,6 +1320,11 @@ int fcgi_is_closed(fcgi_request *req)
 	return (req->fd < 0);
 }
 
+int fcgi_is_eof(fcgi_request *req)
+{
+	return (req->in_len == -1);
+}
+
 static int fcgi_is_allowed(void) {
 	int i;
 

diff --git a/main/fastcgi.h b/main/fastcgi.h
@@ -88,6 +88,7 @@ void fcgi_shutdown(void);
 int fcgi_is_fastcgi(void);
 int fcgi_is_closed(fcgi_request *req);
 void fcgi_close(fcgi_request *req, int force, int destroy);
+int fcgi_is_eof(fcgi_request *req);
 int fcgi_in_shutdown(void);
 void fcgi_terminate(void);
 int fcgi_listen(const char *path, int backlog);

diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
@@ -429,11 +429,6 @@ static size_t sapi_cgi_read_post(char *buffer, size_t count_bytes) /* {{{ */
 {
 	uint32_t read_bytes = 0;
 	int tmp_read_bytes;
-	size_t remaining = SG(request_info).content_length - SG(read_post_bytes);
-
-	if (remaining < count_bytes) {
-		count_bytes = remaining;
-	}
 	while (read_bytes < count_bytes) {
 		fcgi_request *request = (fcgi_request*) SG(server_context);
 		if (request_body_fd == -1) {
@@ -450,6 +445,9 @@ static size_t sapi_cgi_read_post(char *buffer, size_t count_bytes) /* {{{ */
 			}
 		}
 
+		if (fcgi_is_eof(request)) {
+			break;
+		}
 		/* If REQUEST_BODY_FILE variable not available - read post body from fastcgi stream */
 		if (request_body_fd < 0) {
 			tmp_read_bytes = fcgi_read(request, buffer + read_bytes, count_bytes - read_bytes);

diff --git a/sapi/fpm/tests/request-body-chunked-51191.phpt b/sapi/fpm/tests/request-body-chunked-51191.phpt
@@ -0,0 +1,60 @@
+--TEST--
+FPM: Test reading in request body without Content-Length header
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+[global]
+error_log = {{FILE:LOG}}
+[unconfined]
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+EOT;
+
+$code = <<<EOT
+<?php
+echo "Test Start\n";
+var_dump(file_get_contents("php://input"));
+echo "Test End\n";
+EOT;
+
+$headers = [];
+$tester = new FPM\Tester($cfg, $code);
+$tester->start();
+$tester->expectLogStartNotices();
+$tester->request(
+        '',
+        [],
+        null,
+        null,
+        null,
+        null,
+        false,
+        "The body"
+    )->expectBody(
+        [
+            'Test Start',
+            'string(8) "The body"',
+            'Test End',
+        ]
+    );
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>
diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc
@@ -540,7 +540,8 @@ class Tester
         string $address = null,
         string $successMessage = null,
         string $errorMessage = null,
-        bool $connKeepAlive = false
+        bool $connKeepAlive = false,
+        $stdin = false
     ) {
         if ($this->hasError()) {
             return new Response(null, true);
@@ -577,7 +578,7 @@ class Tester
 
         try {
             $this->response = new Response(
-                $this->getClient($address, $connKeepAlive)->request_data($params, false)
+                $this->getClient($address, $connKeepAlive)->request_data($params, $stdin)
             );
             $this->message($successMessage);
         } catch (\Exception $exception) {