[Pkg-owncloud-commits] [owncloud] 107/134: Disabled internet checking as mentioned when in proxy mode

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit b09614b61bfc328e03643adb90b3bf630d2e7bee
Author: Joan <aseques at gmail.com>
Date:   Fri Jan 10 09:33:35 2014 +0100

    Disabled internet checking as mentioned when in proxy mode
---
 lib/private/util.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/private/util.php b/lib/private/util.php
index 383f428..6db1727 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) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git