Merge pull request #14694 from nextcloud/backport/14684/stable15

rullzer · web-flow · commit d9119c0c6474 · 2019-03-15T01:29:57.000+01:00
[stable15] handle long etags from dav external storage
diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php
@@ -726,7 +726,11 @@ public function getETag($path) {
 			return null;
 		}
 		if (isset($response['{DAV:}getetag'])) {
-			return trim($response['{DAV:}getetag'], '"');
+			$etag = trim($response['{DAV:}getetag'], '"');
+			if (strlen($etag) > 40) {
+				$etag = md5($etag);
+			}
+			return $etag;
 		}
 		return parent::getEtag($path);
 	}

Original file line number	Diff line number	Diff line change
`@@ -726,7 +726,11 @@ public function getETag($path) {`
`726`	`726`	`return null;`
`727`	`727`	`}`
`728`	`728`	`if (isset($response['{DAV:}getetag'])) {`
`729`		`- return trim($response['{DAV:}getetag'], '"');`
	`729`	`+ $etag = trim($response['{DAV:}getetag'], '"');`
	`730`	`+ if (strlen($etag) > 40) {`
	`731`	`+ $etag = md5($etag);`
	`732`	`+ }`
	`733`	`+ return $etag;`
`730`	`734`	`}`
`731`	`735`	`return parent::getEtag($path);`
`732`	`736`	`}`