diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-04-10 17:28:00 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-04-10 17:28:00 +0200 |
| commit | 85e90c33fc80e399d8c028fa15010c39c43d32c2 (patch) | |
| tree | b846f066cc16d2139555b32a50cb386c894a1689 | |
| parent | 2257ae987f773e5f59054b4b89baf8ddcf78d485 (diff) | |
| parent | b09614b61bfc328e03643adb90b3bf630d2e7bee (diff) | |
| download | nextcloud-server-85e90c33fc80e399d8c028fa15010c39c43d32c2.tar.gz nextcloud-server-85e90c33fc80e399d8c028fa15010c39c43d32c2.zip | |
Merge pull request #8148 from owncloud/backport-6676-stable6
Disabled internet checking as mentioned when in proxy mode
| -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 383f428a136..6db172710ff 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -920,6 +920,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) { |