Skip to content

fix(activesync): do not buffer Search keep-alive output #223

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

Open
TDannhauer wants to merge 2 commits into
base: FRAMEWORK_6_0
Choose a base branch
from
Open

fix(activesync): do not buffer Search keep-alive output #223

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
364e3e2
fix(activesync): do not buffer Search keep-alive output
TDannhauer Sep 9, 2026
498cc45
fix(activesync): exclude Search time-budget options from the result c…
TDannhauer Sep 10, 2026
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
22 changes: 18 additions & 4 deletions lib/Horde/Core/ActiveSync/Driver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2789,9 +2789,12 @@ public function getSearchResults(Horde_ActiveSync_Search_Params $params): Horde_
{
$type = Horde_String::lower($params->type);
$rows = null;
$progress = $params->options['progress'] ?? null;
$cacheOptions = $params->options;
unset($cacheOptions['progress'], $cacheOptions['deadline'], $cacheOptions['stats']);

if ($this->_cache) {
$cache_key = 'HCASD:' . $type . ':' . $GLOBALS['registry']->getAuth() . ':' . hash('md5', serialize([$params->query, $params->deepTraversal, $params->options]));
$cache_key = 'HCASD:' . $type . ':' . $GLOBALS['registry']->getAuth() . ':' . hash('md5', serialize([$params->query, $params->deepTraversal, $cacheOptions]));
if ($this->_cache->exists($cache_key, 0)) {
if ($params->rebuildResults) {
$this->_cache->expire($cache_key);
Expand All @@ -2802,7 +2805,12 @@ public function getSearchResults(Horde_ActiveSync_Search_Params $params): Horde_
}

if ($rows === null) {
ob_start();
// A progress callback writes WBXML keep-alives to the client;
// capturing stdout would swallow them.
$captureOutput = !is_callable($progress);
if ($captureOutput) {
ob_start();
}
try {
switch ($type) {
case 'gal':
Expand All @@ -2824,10 +2832,16 @@ public function getSearchResults(Horde_ActiveSync_Search_Params $params): Horde_
$rows = null;
}

$this->_endBuffer();
if ($captureOutput) {
$this->_endBuffer();
}

if ($rows !== null && $this->_cache) {
$this->_cache->set($cache_key, json_encode($rows));
$truncated = is_object($params->options['stats'] ?? null)
&& !empty($params->options['stats']->truncated);
if (!$truncated) {
$this->_cache->set($cache_key, json_encode($rows));
}
}
}

Expand Down
Loading