mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #10631 from MrPetovan/bug/10625-guzzleresponse-body-stream

Browse source 
Allow a GuzzleResponse body to be queried more than once
This commit is contained in:
Michael Vogel 2021-08-24 18:56:00 +02:00 committed by GitHub
parent e7fdf3c0c3 7a8d800024
commit 73e8db24f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mod/follow.php
View file

@ -60,8 +60,7 @@ function follow_content(App $a)
$uid = local_user(); $uid = local_user();
// Issue 4815: Silently removing a prefixing @ $url = Probe::cleanURI(trim($_REQUEST['url'] ?? ''));
$url = ltrim(Strings::escapeTags(trim($_REQUEST['url'] ?? '')), '@!');
// Issue 6874: Allow remote following from Peertube // Issue 6874: Allow remote following from Peertube
if (strpos($url, 'acct:') === 0) { if (strpos($url, 'acct:') === 0) {

3
src/Console/Contact.php
View file

@ -25,6 +25,7 @@ use Console_Table;
use Friendica\App; use Friendica\App;
use Friendica\Model\Contact as ContactModel; use Friendica\Model\Contact as ContactModel;
use Friendica\Model\User as UserModel; use Friendica\Model\User as UserModel;
use Friendica\Network\Probe;
use Friendica\Util\Temporal; use Friendica\Util\Temporal;
use RuntimeException; use RuntimeException;
use Seld\CliPrompt\CliPrompt; use Seld\CliPrompt\CliPrompt;
@ -153,6 +154,8 @@ HELP;
} }
} }
$url = Probe::cleanURI($url);
$contact = ContactModel::getByURLForUser($url, $user['uid']); $contact = ContactModel::getByURLForUser($url, $user['uid']);
if (!empty($contact)) { if (!empty($contact)) {
throw new RuntimeException('Contact already exists'); throw new RuntimeException('Contact already exists');

1
src/Module/Debug/Probe.php
View file

@ -44,6 +44,7 @@ class Probe extends BaseModule
$res = ''; $res = '';
if (!empty($addr)) { if (!empty($addr)) {
$addr = NetworkProbe::cleanURI($addr);
$res = NetworkProbe::uri($addr, '', 0); $res = NetworkProbe::uri($addr, '', 0);
$res = print_r($res, true); $res = print_r($res, true);
} }

4
src/Network/GuzzleResponse.php
View file

@ -147,8 +147,8 @@ class GuzzleResponse extends Response implements IHTTPResult, ResponseInterface
} }
/// @todo - fix mismatching use of "getBody()" as string here and parent "getBody()" as streaminterface /// @todo - fix mismatching use of "getBody()" as string here and parent "getBody()" as streaminterface
public function getBody() public function getBody(): string
{ {
return parent::getBody()->getContents(); return (string) parent::getBody();
} }
} }