Try to detect the connection status after flush() - this might lead to earlier detection of a broken connection

DeepDiver1975 · DeepDiver1975 · commit fb51aac8e2ae · 2020-04-22T09:48:03.000+02:00
diff --git a/changelog/unreleased/37291 b/changelog/unreleased/37291
@@ -0,0 +1,6 @@
+Bugfix: Earlier detection of connection status
+
+On public video streaming the connection is detected to reduce server load #37219
+To optimize this the connection status is queried after flush()
+
+https://github.com/owncloud/core/pull/37291
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
@@ -475,8 +475,8 @@ public function readfile($path) {
 			$size = $this->filesize($path);
 			while (!\feof($handle)) {
 				echo \fread($handle, $chunkSize);
-				$this->checkConnectionStatus();
 				\flush();
+				$this->checkConnectionStatus();
 			}
 			return $size;
 		}
@@ -505,8 +505,8 @@ public function readfilePart($path, $from, $to) {
 						$len = $chunkSize;
 					}
 					echo \fread($handle, $len);
-					$this->checkConnectionStatus();
 					\flush();
+					$this->checkConnectionStatus();
 				}
 				return \ftell($handle) - $from;
 			}

Original file line number	Diff line number	Diff line change
`@@ -475,8 +475,8 @@ public function readfile($path) {`
`475`	`475`	`$size = $this->filesize($path);`
`476`	`476`	`while (!\feof($handle)) {`
`477`	`477`	`echo \fread($handle, $chunkSize);`
`478`		`- $this->checkConnectionStatus();`
`479`	`478`	`\flush();`
	`479`	`+ $this->checkConnectionStatus();`
`480`	`480`	`}`
`481`	`481`	`return $size;`
`482`	`482`	`}`
`@@ -505,8 +505,8 @@ public function readfilePart($path, $from, $to) {`
`505`	`505`	`$len = $chunkSize;`
`506`	`506`	`}`
`507`	`507`	`echo \fread($handle, $len);`
`508`		`- $this->checkConnectionStatus();`
`509`	`508`	`\flush();`
	`509`	`+ $this->checkConnectionStatus();`
`510`	`510`	`}`
`511`	`511`	`return \ftell($handle) - $from;`
`512`	`512`	`}`