bug #39092 Fix critical extension when reseting paged control (jderusse)

chalasr · chalasr · commit beeafb1cb7c3 · 2020-11-16T14:02:21.000+01:00
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
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
@@ -100,7 +100,7 @@ public function execute()
             $cookie = '';
             do {
                 if ($pageControl) {
-                    $this->controlPagedResult($con, $pageSize, $cookie);
+                    $this->controlPagedResult($con, $pageSize, true, $cookie);
                 }
                 $sizeLimit = $itemsLeft;
                 if ($pageSize > 0 && $sizeLimit >= $pageSize) {
@@ -174,7 +174,7 @@ public function getResources(): array
     private function resetPagination()
     {
         $con = $this->connection->getResource();
-        $this->controlPagedResult($con, 0, '');
+        $this->controlPagedResult($con, 0, false, '');
         $this->serverctrls = [];
 
         // This is a workaround for a bit of a bug in the above invocation
@@ -204,15 +204,15 @@ private function resetPagination()
      *
      * @param resource $con
      */
-    private function controlPagedResult($con, int $pageSize, string $cookie): bool
+    private function controlPagedResult($con, int $pageSize, bool $critical, string $cookie): bool
     {
         if (\PHP_VERSION_ID < 70300) {
-            return ldap_control_paged_result($con, $pageSize, true, $cookie);
+            return ldap_control_paged_result($con, $pageSize, $critical, $cookie);
         }
         $this->serverctrls = [
             [
                 'oid' => \LDAP_CONTROL_PAGEDRESULTS,
-                'isCritical' => true,
+                'isCritical' => $critical,
                 'value' => [
                     'size' => $pageSize,
                     'cookie' => $cookie,

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function execute()`
`100`	`100`	`$cookie = '';`
`101`	`101`	`do {`
`102`	`102`	`if ($pageControl) {`
`103`		`- $this->controlPagedResult($con, $pageSize, $cookie);`
	`103`	`+ $this->controlPagedResult($con, $pageSize, true, $cookie);`
`104`	`104`	`}`
`105`	`105`	`$sizeLimit = $itemsLeft;`
`106`	`106`	`if ($pageSize > 0 && $sizeLimit >= $pageSize) {`
`@@ -174,7 +174,7 @@ public function getResources(): array`
`174`	`174`	`private function resetPagination()`
`175`	`175`	`{`
`176`	`176`	`$con = $this->connection->getResource();`
`177`		`- $this->controlPagedResult($con, 0, '');`
	`177`	`+ $this->controlPagedResult($con, 0, false, '');`
`178`	`178`	`$this->serverctrls = [];`
`179`	`179`
`180`	`180`	`// This is a workaround for a bit of a bug in the above invocation`
`@@ -204,15 +204,15 @@ private function resetPagination()`
`204`	`204`	`*`
`205`	`205`	`* @param resource $con`
`206`	`206`	`*/`
`207`		`- private function controlPagedResult($con, int $pageSize, string $cookie): bool`
	`207`	`+ private function controlPagedResult($con, int $pageSize, bool $critical, string $cookie): bool`
`208`	`208`	`{`
`209`	`209`	`if (\PHP_VERSION_ID < 70300) {`
`210`		`- return ldap_control_paged_result($con, $pageSize, true, $cookie);`
	`210`	`+ return ldap_control_paged_result($con, $pageSize, $critical, $cookie);`
`211`	`211`	`}`
`212`	`212`	`$this->serverctrls = [`
`213`	`213`	`[`
`214`	`214`	`'oid' => \LDAP_CONTROL_PAGEDRESULTS,`
`215`		`- 'isCritical' => true,`
	`215`	`+ 'isCritical' => $critical,`
`216`	`216`	`'value' => [`
`217`	`217`	`'size' => $pageSize,`
`218`	`218`	`'cookie' => $cookie,`