From f308b0e321416620156a661f25ec3873aec9a6dd Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Fri, 29 Mar 2013 15:37:39 +0000 Subject: [PATCH] Improve internet connection check with proxy --- lib/util.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/util.php b/lib/util.php index 6d641bc472b..aaa52442d57 100755 --- a/lib/util.php +++ b/lib/util.php @@ -630,16 +630,26 @@ class OC_Util { * Check if the ownCloud server can connect to the internet */ public static function isinternetconnectionworking() { - + $proxy = OC_Config::getValue('proxy', ''); + if($proxy <> '') { + list($proxy_host, $proxy_port) = explode(':',$proxy); + $connected = @fsockopen($proxy_host, $proxy_port, $errno, $errstr, 5); + if ($connected) { + fclose($connected); + return true; + } + \OC_Log::write('core', 'Couldn\'t connect to proxy server', \OC_log::WARN); + return false; + } // try to connect to owncloud.org to see if http connections to the internet are possible. - $connected = @fsockopen("www.owncloud.org", 80); + $connected = @fsockopen("www.owncloud.org", 80, $errno, $errstr, 10); if ($connected) { fclose($connected); return true; }else{ // second try in case one server is down - $connected = @fsockopen("apps.owncloud.com", 80); + $connected = @fsockopen("apps.owncloud.com", 80, $errno, $errstr, 10); if ($connected) { fclose($connected); return true; -- 2.39.5