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

Catch http exception in StoreRemoteMedia

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-02-07 01:54:37 +01:00
parent 098c8b1df4
commit 25f623565a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/StoreRemoteMedia/StoreRemoteMediaPlugin.php
View File

@ -77,8 +77,13 @@ class StoreRemoteMediaPlugin extends Plugin
$this->checkWhitelist($file->getUrl()); $this->checkWhitelist($file->getUrl());
// First we download the file to memory and test whether it's actually an image file // First we download the file to memory and test whether it's actually an image file
$imgData = HTTPClient::quickGet($file->getUrl()); common_debug(sprintf('Downloading remote file id==%u with URL: %s', $file->getID(), _ve($file->getUrl())));
common_debug(sprintf('Downloading remote file id==%u with URL: %s', $file->id, $file->getUrl())); try {
$imgData = HTTPClient::quickGet($file->getUrl());
} catch (HTTP_Request2_ConnectionException $e) {
common_log(LOG_ERR, __CLASS__.': quickGet on URL: '._ve($file->getUrl()).' threw exception: '.$e->getMessage());
return true;
}
$info = @getimagesizefromstring($imgData); $info = @getimagesizefromstring($imgData);
if ($info === false) { if ($info === false) {
throw new UnsupportedMediaException(_('Remote file format was not identified as an image.'), $file->getUrl()); throw new UnsupportedMediaException(_('Remote file format was not identified as an image.'), $file->getUrl());