Merge pull request #1441 from Scheirle/ispdb_timeout

Adds a timeout to the ispdb autoconfig query.
owncloud-archive · Apr 23, 2016 · c3c435b · c3c435b
2 parents edeca8a + 0ae83db
commit c3c435b
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/lib/service/autoconfig/ispdb.php b/lib/service/autoconfig/ispdb.php
@@ -48,8 +48,19 @@ public function __construct(Logger $logger) {
 
 	private function queryUrl($url) {
 		try {
-			$xml = @simplexml_load_file($url);
-			if (libxml_get_last_error() !== False || !is_object($xml) || !$xml->emailProvider) {
+			$content = @file_get_contents($url, false, stream_context_create([
+				'http' => [
+					'timeout' => 7
+				]
+			]));
+			if ($content !== false) {
+				$xml = @simplexml_load_string($content);
+			} else {
+				$this->logger->debug("IsbDb: <$url> request timed out");
+				return [];
+			}
+
+			if (libxml_get_last_error() !== false || !is_object($xml) || !$xml->emailProvider) {
 				libxml_clear_errors();
 				return [];
 			}