Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

1 files changed, 10 insertions, 14 deletions

diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php
index 18ae7719b..de4d55012 100644
--- a/lib/Shorturl_api.php
+++ b/lib/Shorturl_api.php
@@ -41,22 +41,18 @@ abstract class ShortUrlApi
         return strlen($url) >= common_config('site', 'shorturllength');
     }
 
-    protected function http_post($data) {
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $this->service_url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-        $response = curl_exec($ch);
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
-        if (($code < 200) || ($code >= 400)) return false;
-        return $response;
+    protected function http_post($data)
+    {
+        $request = HTTPClient::start();
+        $response = $request->post($this->service_url, null, $data);
+        return $response->getBody();
     }
 
-    protected function http_get($url) {
-        $encoded_url = urlencode($url);
-        return file_get_contents("{$this->service_url}$encoded_url");
+    protected function http_get($url)
+    {
+        $request = HTTPClient::start();
+        $response = $request->get($this->service_url . urlencode($url));
+        return $response->getBody();
     }
 
     protected function tidy($response) {