GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Catch NoHttpResponseException when using HTTPClient

Browse Source
This commit is contained in:
Mikael Nordfeldth
2016-01-13 14:17:49 +01:00
parent 3ed632decf
commit 99da1ebe41
8 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/httpclient.php
View File

@@ -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();