In case of 204 status stop reading and consider the content to be clean

owncloud · May 27, 2021 · 7bc4744 · 7bc4744
1 parent dd04ef1
commit 7bc4744
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/Scanner/ICAPClient.php b/lib/Scanner/ICAPClient.php
@@ -110,12 +110,17 @@ private function send(string $request): array {
 			);
 		}
 
-		// read header
-		$protocol = $this->readIcapStatusLine();
-		$headers = $this->readHeaders();
+		$headers = [];
 		$resHdr = [];
-		if (isset($headers['Encapsulated'])) {
-			$resHdr = $this->parseResHdr($headers['Encapsulated']);
+		$protocol = $this->readIcapStatusLine();
+
+		// McAfee seems to not properly close the socket once all response bytes are sent to the client
+		// So if ICAP status is 204 we just stop reading
+		if ($protocol['code'] !== 204) {
+			$headers = $this->readHeaders();
+			if (isset($headers['Encapsulated'])) {
+				$resHdr = $this->parseResHdr($headers['Encapsulated']);
+			}
 		}
 
 		$this->disconnect();