From 6cc29ce18f7704ad1002579f1e1b7be8c2f8c7b8 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Mon, 20 Jul 2009 18:32:36 -0400 Subject: [PATCH] Don't leak Horde_Http_Client exceptions --- framework/Oauth/lib/Horde/Oauth/Consumer.php | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/framework/Oauth/lib/Horde/Oauth/Consumer.php b/framework/Oauth/lib/Horde/Oauth/Consumer.php index f4d87204a..baf4ebd27 100644 --- a/framework/Oauth/lib/Horde/Oauth/Consumer.php +++ b/framework/Oauth/lib/Horde/Oauth/Consumer.php @@ -68,10 +68,14 @@ class Horde_Oauth_Consumer $client = new Horde_Http_Client; - $response = $client->post( - $this->requestTokenUrl, - $request->buildHttpQuery() - ); + try { + $response = $client->post( + $this->requestTokenUrl, + $request->buildHttpQuery() + ); + } catch (Horde_Http_Client_Exception $e) { + throw new Horde_Oauth_Exception($e->getMessage()); + } return Horde_Oauth_Token::fromString($response->getBody()); } @@ -108,10 +112,14 @@ class Horde_Oauth_Consumer $request->sign($this->signatureMethod, $this, $token); $client = new Horde_Http_Client; - $response = $client->post( - $this->accessTokenUrl, - $request->buildHttpQuery() - ); + try { + $response = $client->post( + $this->accessTokenUrl, + $request->buildHttpQuery() + ); + } catch (Horde_Http_Client_Exception $e) { + throw new Horde_Oauth_Exception($e->getMessage()); + } return Horde_Oauth_Token::fromString($response->getBody()); } -- 2.11.0