Fix #18049 - Also check that curl_exec is enabled

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Mar 13, 2024 · 69f9172 · 69f9172 · joho1968 · Mar 13, 2024
1 parent 85d1b2d
commit 69f9172
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -69,6 +69,7 @@ phpMyAdmin - ChangeLog
 - issue #15670 Fix case where the data is truncated after changing a longtext column's collation
 - issue #18865 Fix missing text-nowrap for timestamps columns
 - issue #19022 Fix case where tables from wrong database is loaded in navigation tree
+- issue #18049 Also check that curl_exec is enabled for the new version check
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid

diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
@@ -252,7 +252,7 @@ public function readCredentials(): bool
 
                 $captchaSiteVerifyURL = $GLOBALS['cfg']['CaptchaSiteVerifyURL'] ?? '';
                 $captchaSiteVerifyURL = empty($captchaSiteVerifyURL) ? null : $captchaSiteVerifyURL;
-                if (function_exists('curl_init')) {
+                if (function_exists('curl_init') && function_exists('curl_exec')) {
                     $reCaptcha = new ReCaptcha\ReCaptcha(
                         $GLOBALS['cfg']['CaptchaLoginPrivateKey'],
                         new ReCaptcha\RequestMethod\CurlPost(null, $captchaSiteVerifyURL)

diff --git a/libraries/classes/Utils/HttpRequest.php b/libraries/classes/Utils/HttpRequest.php
@@ -295,7 +295,7 @@ public function create(
         $content = null,
         $header = ''
     ) {
-        if (function_exists('curl_init')) {
+        if (function_exists('curl_init') && function_exists('curl_exec')) {
             return $this->curl($url, $method, $returnOnlyStatus, $content, $header);
         }