Merge branch 'v0.11' into stable

[github/shaarli/Shaarli.git] / application / http / HttpUtils.php

diff --git a/application/HttpUtils.php b/application/http/HttpUtils.php
similarity index 99%
rename from application/HttpUtils.php
rename to application/http/HttpUtils.php
index 9c438160dccdbe022d1f5398b41f27162774643f..2ea9195d3550bfd4bfd912ef35cb4b669a5c83c2 100644 (file)
--- a/application/HttpUtils.php
+++ b/application/http/HttpUtils.php
@@ -1,4 +1,7 @@
 <?php
+
+use Shaarli\Http\Url;
+
 /**
  * GET an HTTP URL to retrieve its content
  * Uses the cURL library or a fallback method
@@ -38,7 +41,7 @@ function get_http_response($url, $timeout = 30, $maxBytes = 4194304, $curlWriteF
     $cleanUrl = $urlObj->idnToAscii();
 
     if (!filter_var($cleanUrl, FILTER_VALIDATE_URL) || !$urlObj->isHttp()) {
-        return array(array(0 => 'Invalid HTTP Url'), false);
+        return array(array(0 => 'Invalid HTTP UrlUtils'), false);
     }
 
     $userAgent =