Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / lib / httpclient.php

diff --git a/lib/httpclient.php b/lib/httpclient.php
index 865fc9029e847134b0668fc3ba9eee7b8eab33aa..fc3f0ec0872ae6e90077be786095204166461e24 100644 (file)
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -220,13 +220,16 @@ class HTTPClient extends HTTP_Request2
             $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;
+
+            // Let the exception go on its merry way.
+            throw $e;
         }
         //we've either returned or thrown exception here
+
+        // reset to the old value
+        $this->config['follow_redirects'] = $old_follow;
     }
 
     /**