diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-19 12:08:55 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-19 12:08:55 -0800 |
| commit | 39be83ca8b4969d5a9a34500d59b2cf49f789688 (patch) | |
| tree | ac7b45d0e2cab317d6c62fe722b174dcdf12729e /lib | |
| parent | f354717c4cdda8fb2910fec56b5663283ca9d893 (diff) | |
| parent | 2abea964625713180d811e4fd1cfd25a92ee2c88 (diff) | |
| download | nextcloud-server-39be83ca8b4969d5a9a34500d59b2cf49f789688.tar.gz nextcloud-server-39be83ca8b4969d5a9a34500d59b2cf49f789688.zip | |
Merge pull request #6676 from aseques/check_internet_proxy
Fix internet detection to use OC_Util::getUrlContent
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/private/util.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index a4b3761dbd3..b8d2da8a072 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -892,6 +892,11 @@ class OC_Util { return false; } + // in case the connection is via proxy return true to avoid connecting to owncloud.org + if(OC_Config::getValue('proxy', '') != '') { + return true; + } + // try to connect to owncloud.org to see if http connections to the internet are possible. $connected = @fsockopen("www.owncloud.org", 80); if ($connected) { |