X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fhttpclient.php;h=865fc9029e847134b0668fc3ba9eee7b8eab33aa;hb=1cbf2510e7326086a16106eb6566bcfaa330179c;hp=3e9f5d3ea746c562c9e5f6d42767d02cf389379b;hpb=964d13792b91223b2a184c111441673b35776f9c;p=quix0rs-gnu-social.git

diff --git a/lib/httpclient.php b/lib/httpclient.php
index 3e9f5d3ea7..865fc9029e 100644
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -103,7 +103,7 @@ class GNUsocial_HTTPResponse extends HTTP_Request2_Response
  *
  * This extends the PEAR HTTP_Request2 package:
  * - sends StatusNet-specific User-Agent header
- * - 'follow_redirects' config option, defaulting off
+ * - 'follow_redirects' config option, defaulting on
  * - 'max_redirs' config option, defaulting to 10
  * - extended response class adds getRedirectCount() and getUrl() methods
  * - get() and post() convenience functions return body content directly
@@ -177,10 +177,12 @@ class HTTPClient extends HTTP_Request2
     /**
      * Quick static function to GET a URL
      */
-    public static function quickGet($url, $accept='text/html,application/xhtml+xml')
+    public static function quickGet($url, $accept=null)
     {
         $client = new HTTPClient();
-        $client->setHeader('Accept', $accept);
+        if (!is_null($accept)) {
+            $client->setHeader('Accept', $accept);
+        }
         $response = $client->get($url);
         if (!$response->isOk()) {
             // TRANS: Exception. %s is a profile URL.
@@ -203,12 +205,28 @@ class HTTPClient extends HTTP_Request2
     /**
      * Convenience function to run a HEAD request.
      *
+     * NOTE: Will probably turn into a GET request if you let it follow redirects!
+     *       That option is only there to be flexible and may be removed in the future!
+     *
      * @return GNUsocial_HTTPResponse
      * @throws HTTP_Request2_Exception
      */
-    public function head($url, $headers=array())
+    public function head($url, $headers=array(), $follow_redirects=false)
     {
-        return $this->doRequest($url, self::METHOD_HEAD, $headers);
+        // Save the configured value for follow_redirects
+        $old_follow = $this->config['follow_redirects'];
+        try {
+            // Temporarily (possibly) override the follow_redirects setting
+            $this->config['follow_redirects'] = $follow_redirects;
+            return $this->doRequest($url, self::METHOD_HEAD, $headers);
+        } catch (Exception $e) {
+            // Let the exception go on its merry way.
+            throw $e;
+        } finally {
+            // reset to the old value
+            $this->config['follow_redirects'] = $old_follow;
+        }
+        //we've either returned or thrown exception here
     }
 
     /**