extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-15 11:11:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

* CalDAV/InfoLog: fix infinit loop causing high database load, if sync-collection report did not query calendar-data

Browse Source
This commit is contained in:
ralf 2023-04-24 12:15:02 +02:00
parent 3203a2b90e
commit c431057f56
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
infolog/inc/class.infolog_groupdav.inc.php
View File

@ -300,8 +300,14 @@ class infolog_groupdav extends Api\CalDAV\Handler
$files = array();
// ToDo: add parameter to only return id & etag
// Please note: $query['start'] get incremented automatically by bo->search() with number of returned rows!
while(($tasks =& $this->bo->search($query)))
while(($tasks =& $this->bo->search($query)) &&
// if $query[cols] is set, bo->search() returns an iterator, which might be empty, in which case we have to stop
(is_array($tasks) || $tasks->NumRows()))
{
if ($this->debug)
{
error_log(__METHOD__ . "(): called bo->search(" . json_encode($query) . ") returned ".(is_array($tasks) ? count($tasks) : $tasks->NumRows())." entries");
}
foreach($tasks as $task)
{
// remove task from requested multiget ids, to be able to report not found urls
@ -366,7 +372,7 @@ class infolog_groupdav extends Api\CalDAV\Handler
}
if ($this->debug)
{
error_log(__METHOD__."($path) took ".(microtime(true) - $starttime)." to return $yielded resources");
error_log(__METHOD__."($path) took ".(microtime(true) - $starttime)." to return $yielded resources, filter[sync-collection]=$sync_collection_report, sync-token=$this->sync_collection_token");
}
}