upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #30046 from nextcloud/fix/dav-back-end-missing-close-cursor

Browse source 
Close open cursor in the caldav back-end
This commit is contained in:
Christoph Wurst 2021-12-02 16:01:10 +01:00 committed by GitHub
commit 9cb90b3d1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/dav/lib/CalDAV/CalDavBackend.php
View file

@ -1916,6 +1916,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$result = $outerQuery->executeQuery();
$calendarObjects = $result->fetchAll();
$result->closeCursor();
return array_map(function ($o) {
$calendarData = Reader::read($o['calendardata']);
@ -2630,6 +2631,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
'size' => (int)$row['size'],
];
}
$stmt->closeCursor();
return $result;
}
@ -3009,6 +3011,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
->executeQuery();
$ids = $result->fetchAll();
$result->closeCursor();
foreach ($ids as $id) {
$this->deleteCalendar(
$id['id'],