Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbeeafb1

Browse files
committed
bug#39092 Fix critical extension when reseting paged control (jderusse)
This PR was merged into the 4.4 branch.Discussion----------Fix critical extension when reseting paged control| Q | A| ------------- | ---| Branch? | 4.4| Bug fix? | yes| New feature? | no| Deprecations? | no| Tickets | -| License | MIT| Doc PR | -The issue has been introduced here in#38392 and prevent performing an operation after fetched a paginated result => ldap throws an `Could not XXX: Critical extension is unavailable`At this line:https://github.com/symfony/symfony/pull/38392/files#diff-24b79f3ac1a99938f5acb158a450e38d30c1984a5d333b5b20f2c38a73d10e31L183, the previous code called `ldap_control_paged_result($con, 0);` using the default value (`false`) for the `$critical` argument.The replaced version always use `true`.This PR restore the previous behavior by using `false` when reseting the pagination.Commits-------a2b7476 Fix critical extension when reseting paged control
2 parents091265b +a2b7476 commitbeeafb1

File tree

1 file changed

+5
-5
lines changed
  • src/Symfony/Component/Ldap/Adapter/ExtLdap

1 file changed

+5
-5
lines changed

‎src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function execute()
100100
$cookie ='';
101101
do {
102102
if ($pageControl) {
103-
$this->controlPagedResult($con,$pageSize,$cookie);
103+
$this->controlPagedResult($con,$pageSize,true,$cookie);
104104
}
105105
$sizeLimit =$itemsLeft;
106106
if ($pageSize >0 &&$sizeLimit >=$pageSize) {
@@ -174,7 +174,7 @@ public function getResources(): array
174174
privatefunctionresetPagination()
175175
{
176176
$con =$this->connection->getResource();
177-
$this->controlPagedResult($con,0,'');
177+
$this->controlPagedResult($con,0,false,'');
178178
$this->serverctrls = [];
179179

180180
// This is a workaround for a bit of a bug in the above invocation
@@ -204,15 +204,15 @@ private function resetPagination()
204204
*
205205
* @param resource $con
206206
*/
207-
privatefunctioncontrolPagedResult($con,int$pageSize,string$cookie):bool
207+
privatefunctioncontrolPagedResult($con,int$pageSize,bool$critical,string$cookie):bool
208208
{
209209
if (\PHP_VERSION_ID <70300) {
210-
returnldap_control_paged_result($con,$pageSize,true,$cookie);
210+
returnldap_control_paged_result($con,$pageSize,$critical,$cookie);
211211
}
212212
$this->serverctrls = [
213213
[
214214
'oid' => \LDAP_CONTROL_PAGEDRESULTS,
215-
'isCritical' =>true,
215+
'isCritical' =>$critical,
216216
'value' => [
217217
'size' =>$pageSize,
218218
'cookie' =>$cookie,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp