summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJoan <aseques@gmail.com>2014-01-10 09:33:35 +0100
committerJoan <aseques@gmail.com>2014-01-10 09:33:35 +0100
commit2abea964625713180d811e4fd1cfd25a92ee2c88 (patch)
treeefcf9958c7aebd5593ab87b2c4123cbbce4367bd /lib
parent6be2dee5bca4a38d621f5f5c408b1bd021722f29 (diff)
downloadnextcloud-server-2abea964625713180d811e4fd1cfd25a92ee2c88.tar.gz
nextcloud-server-2abea964625713180d811e4fd1cfd25a92ee2c88.zip
Disabled internet checking as mentioned when in proxy mode
Diffstat (limited to 'lib')
-rwxr-xr-xlib/private/util.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/private/util.php b/lib/private/util.php
index c0e618cc863..9b37dccb507 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) {