Merge pull request #11359 from udan11/curl_fix

Fixes cURL timeout.
2015-08-06 08:17:58 -04:00 · 2015-08-06 08:17:58 -04:00 · e7028ad263
commit e7028ad263
parent 687d8d9c9c 63b1d1c005
1 changed files with 1 additions and 0 deletions
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@ -778,6 +778,7 @@ class PMA_Config
        curl_setopt($handle, CURLOPT_SSL_VERIFYPEER, 0);
        curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, 5);
        curl_setopt($handle, CURLOPT_TIMEOUT, 5);
+        curl_setopt($handle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
        if (! defined('TESTSUITE')) {
            session_write_close();
        }