Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable21] Close open cursor in the caldav back-end #30064

Merged
merged 1 commit into from
Dec 3, 2021
Merged

[stable21] Close open cursor in the caldav back-end #30064

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions apps/dav/lib/CalDAV/CalDavBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,6 +1656,7 @@ public function search(array $calendarInfo, $pattern, array $searchProperties,

$result = $outerQuery->execute();
$calendarObjects = $result->fetchAll();
$result->closeCursor();

return array_map(function ($o) {
$calendarData = Reader::read($o['calendardata']);
Expand Down Expand Up @@ -2315,6 +2316,7 @@ public function getSchedulingObjects($principalUri) {
'size' => (int)$row['size'],
];
}
$stmt->closeCursor();

return $result;
}
Expand Down Expand Up @@ -2695,6 +2697,7 @@ public function deleteAllBirthdayCalendars() {
->execute();

$ids = $result->fetchAll();
$result->closeCursor();
foreach ($ids as $id) {
$this->deleteCalendar($id['id']);
}
Expand Down