aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2022-08-17 00:10:24 +0200
committerGitHub <noreply@github.com>2022-08-17 00:10:24 +0200
commit431144c72271a8dc2ce9b0944aeb0dad3c680ca2 (patch)
tree0407f81bdbdcfd646f42784ee1386704519ba737
parent999dced07c39caabbb8a4f13045eab797912d436 (diff)
parent61b55c88dae27279ffe825a2ef69024af78f4874 (diff)
downloadnextcloud-server-431144c72271a8dc2ce9b0944aeb0dad3c680ca2.tar.gz
nextcloud-server-431144c72271a8dc2ce9b0944aeb0dad3c680ca2.zip
Merge pull request #33549 from nextcloud/enh/perfopt-for-carddav
Performance optimisation for carddav backend blob data read
-rw-r--r--apps/dav/lib/CardDAV/CardDavBackend.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php
index a9ca2eb30a3..6b60d6701d4 100644
--- a/apps/dav/lib/CardDAV/CardDavBackend.php
+++ b/apps/dav/lib/CardDAV/CardDavBackend.php
@@ -933,6 +933,12 @@ class CardDavBackend implements BackendInterface, SyncSupport {
$cardData = stream_get_contents($cardData);
}
+ // Micro optimisation
+ // don't loop through
+ if (strpos($cardData, 'PHOTO:data:') === 0) {
+ return $cardData;
+ }
+
$cardDataArray = explode("\r\n", $cardData);
$cardDataFiltered = [];
@@ -956,7 +962,6 @@ class CardDavBackend implements BackendInterface, SyncSupport {
$cardDataFiltered[] = $line;
}
-
return implode("\r\n", $cardDataFiltered);
}