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

NoHttpResponseException extends HTTP_Request2_ConnectionException

This commit is contained in:
Mikael Nordfeldth 2016-02-07 01:52:20 +01:00
parent 55546a5aab
commit 098c8b1df4
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/httpclient.php
View File

@ -355,8 +355,6 @@ 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();

4
lib/nohttpresponseexception.php
View File

@ -30,7 +30,7 @@
if (!defined('GNUSOCIAL')) { exit(1); }
// Can't extend HTTP_Request2_Exception since it requires an HTTP status code which we didn't get
class NoHttpResponseException extends Exception
class NoHttpResponseException extends HTTP_Request2_ConnectionException
{
public $url; // target URL
@ -38,6 +38,6 @@ class NoHttpResponseException extends Exception
{
$this->url = $url;
// We could log an entry here with the search parameters
parent::__construct(sprintf(_('No HTTP response from URL %s.'), _ve($url)));
parent::__construct(sprintf(_('No HTTP response from URL %s.'), _ve($url)), self::READ_ERROR);
}
}

2
lib/queuemonitor.php
View File

@ -104,6 +104,8 @@ class QueueMonitor
}
} catch (NoHttpResponseException $e) {
common_log(LOG_ERR, __METHOD__ . ':'.$e->getMessage());
} catch (HTTP_Request2_Exception $e) {
common_log(LOG_ERR, __CLASS__ . ": Invalid $code redirect from $url to $target");
}
}

3
plugins/OStatus/lib/discoveryhints.php
View File

@ -64,8 +64,9 @@ class DiscoveryHints {
if (!$response->isOk()) {
return null;
}
} catch (NoHttpResponseException $e) {
} catch (HTTP_Request2_Exception $e) {
// Any HTTPClient error that might've been thrown
common_log(LOG_ERR, __METHOD__ . ':'.$e->getMessage());
return null;
}

2
plugins/OStatus/tests/slap.php
View File

@ -80,7 +80,7 @@ if (have_option('--verify')) {
print $response->getStatus() . "\n\n";
print $response->getBody() . "\n\n";
} catch (NoHttpResponseException $e) {
} catch (HTTP_Request2_Exception $e) {
print 'Failed POST to URL '.var_export($url, true).': '.$e->getMessage();
}
}