Commit 99da1ebe authored by mmn's avatar mmn

Catch NoHttpResponseException when using HTTPClient

parent 3ed632de
......@@ -27,12 +27,7 @@
* @link http://status.net/
*/
if (!defined('GNUSOCIAL')) {
exit(1);
}
require_once 'HTTP/Request2.php';
require_once 'HTTP/Request2/Response.php';
if (!defined('GNUSOCIAL')) { exit(1); }
/**
* Useful structure for HTTP responses
......@@ -332,7 +327,7 @@ class HTTPClient extends HTTP_Request2
do {
try {
$response = parent::send();
} catch (HTTP_Request2_Exception $e) {
} catch (Exception $e) {
$this->log(LOG_ERR, $e->getMessage());
throw $e;
}
......@@ -355,6 +350,8 @@ class HTTPClient extends HTTP_Request2
continue;
} catch (HTTP_Request2_Exception $e) {
common_log(LOG_ERR, __CLASS__ . ": Invalid $code redirect from $url to $target");
} catch (NoHttpResponseException $e) {
common_log(LOG_ERR, __CLASS__ . ": {$e->getMessage()}");
}
} else {
$reason = $response->getReasonPhrase();
......
......@@ -240,7 +240,7 @@ class DiasporaPlugin extends Plugin
$client = new HTTPClient();
$client->setBody('xml=' . Magicsig::base64_url_encode($envxml));
$response = $client->post($endpoint_uri, $headers);
} catch (HTTP_Request2_Exception $e) {
} catch (Exception $e) {
common_log(LOG_ERR, "Diaspora-flavoured Salmon post to $endpoint_uri failed: " . $e->getMessage());
return false;
}
......
......@@ -107,7 +107,7 @@ class GeoURLPlugin extends Plugin
$request->post($this->ping,
null,
array('p' => $url));
} catch (HTTP_Request2_Exception $e) {
} catch (Exception $e) {
common_log(LOG_WARNING,
"GeoURL.org ping failed for '$url' ($this->ping)");
}
......
......@@ -182,9 +182,8 @@ class LinkbackPlugin extends Plugin
common_log(LOG_WARNING,
"Webmention request failed for '$url' ($endpoint)");
}
} catch (HTTP_Request2_Exception $e) {
common_log(LOG_WARNING,
"Webmention request failed for '$url' ($endpoint)");
} catch (Exception $e) {
common_log(LOG_WARNING, "Webmention request failed for '{$url}' ({$endpoint}): {$e->getMessage()}");
}
}
......@@ -224,9 +223,8 @@ class LinkbackPlugin extends Plugin
"Pingback success for '$url' ($endpoint): ".
"'$response'");
}
} catch (HTTP_Request2_Exception $e) {
common_log(LOG_WARNING,
"Pingback request failed for '$url' ($endpoint)");
} catch (Exception $e) {
common_log(LOG_WARNING, "Pingback request failed for '{$url}' ({$endpoint}): {$e->getMessage()}");
}
}
......
......@@ -1404,7 +1404,7 @@ class OStatusPlugin extends Plugin
$client = new HTTPClient();
$client->setBody($envxml);
$response = $client->post($endpoint_uri, $headers);
} catch (HTTP_Request2_Exception $e) {
} catch (Exception $e) {
common_log(LOG_ERR, "Salmon post to $endpoint_uri failed: " . $e->getMessage());
return false;
}
......
......@@ -118,7 +118,7 @@ class FeedDiscovery
try {
$client = new HTTPClient();
$response = $client->get($url);
} catch (HTTP_Request2_Exception $e) {
} catch (Exception $e) {
common_log(LOG_ERR, __METHOD__ . " Failure for $url - " . $e->getMessage());
throw new FeedSubBadURLException($e->getMessage());
}
......
......@@ -63,7 +63,7 @@ class RSSCloudNotifier
try {
$client = new HTTPClient();
$response = $client->get($url);
} catch (HTTP_Request2_Exception $e) {
} catch (Exception $e) {
common_log(LOG_INFO,
'RSSCloud plugin - failure testing notify handler ' .
$endpoint . ' - ' . $e->getMessage());
......@@ -118,7 +118,7 @@ class RSSCloudNotifier
try {
$client = new HTTPClient();
$response = $client->post($endpoint, $headers, $postdata);
} catch (HTTP_Request2_Exception $e) {
} catch (Exception $e) {
common_log(LOG_INFO, 'RSSCloud plugin - failure notifying ' .
$endpoint . ' that feed ' . $feed .
' has changed: ' . $e->getMessage());
......
......@@ -108,7 +108,7 @@ function getTweetHtml($url)
try {
$client = new HTTPClient();
$response = $client->get($url);
} catch (HTTP_Request2_Exception $e) {
} catch (Exception $e) {
print "ERROR: HTTP response " . $e->getMessage() . "\n";
return false;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment