Browse Source

Merge pull request #21108 from nextcloud/fix/20745/eor-old-php-api

fixes infinitely repeating LDPA search results with PHP <= 7.2
tags/v20.0.0beta1
Roeland Jago Douma 4 years ago
parent
commit
69e2aa029b
No account linked to committer's email address
1 changed files with 6 additions and 0 deletions
  1. 6
    0
      apps/user_ldap/lib/Access.php

+ 6
- 0
apps/user_ldap/lib/Access.php View File

@@ -2049,6 +2049,12 @@ class Access extends LDAPUtility {
// of '0' is valid, because 389ds
$reOffset = ($offset - $limit) < 0 ? 0 : $offset - $limit;
$this->search($filter, $base, $attr, $limit, $reOffset, true);
if (!$this->hasMoreResults()) {
// when the cookie is reset with != 0 offset, there are no further
// results, so stop. This if block is not necessary with new API
// and can be removed with dropping PHP 7.2
return false;
}
}
if ($this->lastCookie !== '' && $offset === 0) {
//since offset = 0, this is a new search. We abandon other searches that might be ongoing.

Loading…
Cancel
Save