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

HTTPClient would return null instead of exception

Browse Source 
This caused $response->isOK() tests to call a function on a non-existing object, causing all hell to break loose.
This commit is contained in:
Mikael Nordfeldth
2016-01-11 02:36:59 +01:00
parent 87ae5292b8
commit b13f8df79b
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,9 +58,14 @@ class DiscoveryHints {
{
$client = new HTTPClient();
$client->setHeader('Accept', 'text/html,application/xhtml+xml');
$response = $client->get($url);
try {
$response = $client->get($url);
if (!$response->isOk()) {
if (!$response->isOk()) {
return null;
}
} catch (HTTP_Request2_Exception $e) {
// Any HTTPClient error that might've been thrown
return null;
}

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

@@ -75,10 +75,14 @@ if (have_option('--verify')) {
print "Sending for verification to $url ...\n";
$client = new HTTPClient();
$response = $client->post($url, array(), array('magic_env' => $envxml));
try {
$response = $client->post($url, array(), array('magic_env' => $envxml));
print $response->getStatus() . "\n\n";
print $response->getBody() . "\n\n";
print $response->getStatus() . "\n\n";
print $response->getBody() . "\n\n";
} catch (HTTP_Request2_Exception $e) {
print 'Failed POST to URL '.var_export($url, true).': '.$e->getMessage();
}
}
if (have_option('--slap')) {