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 #30053 from nextcloud/backport/30046/stable23

Browse source 
[stable23] Close open cursor in the caldav back-end
This commit is contained in:
MichaIng 2021-12-03 02:56:21 +01:00 committed by GitHub
commit d622dc63b9
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

@ -1901,6 +1901,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']);
@ -2615,6 +2616,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
'size' => (int)$row['size'],
];
}
$stmt->closeCursor();
return $result;
}
@ -2994,6 +2996,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
->executeQuery();
$ids = $result->fetchAll();
$result->closeCursor();
foreach ($ids as $id) {
$this->deleteCalendar(
$id['id'],