Merge pull request #10633 from nupplaphil/task/httprequest_optimiziations

[friendica.git] / src / Protocol / OStatus.php

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 8d818471bfbbc23fafba7cf619f0af4a1de22b68..5a0135f9cb4b90c454b11d6af1990e5bd1ee7b9c 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -727,7 +727,7 @@ class OStatus
 
                self::$conv_list[$conversation] = true;
 
-               $curlResult = DI::httpRequest()->get($conversation, ['accept_content' => 'application/atom+xml, text/html']);
+               $curlResult = DI::httpRequest()->get($conversation, ['accept_content' => ['application/atom+xml', 'text/html']]);
 
                if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
                        return;
@@ -736,7 +736,7 @@ class OStatus
                $xml = '';
 
                if ($curlResult->inHeader('Content-Type') &&
-                       stristr($curlResult->getHeader('Content-Type'), 'application/atom+xml')) {
+                       in_array('application/atom+xml', $curlResult->getHeader('Content-Type'))) {
                        $xml = $curlResult->getBody();
                }
 
@@ -921,7 +921,7 @@ class OStatus
                }
 
                $stored = false;
-               $curlResult = DI::httpRequest()->get($related, ['accept_content' => 'application/atom+xml, text/html']);
+               $curlResult = DI::httpRequest()->get($related, ['accept_content' => ['application/atom+xml', 'text/html']]);
 
                if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
                        return;
@@ -930,7 +930,7 @@ class OStatus
                $xml = '';
 
                if ($curlResult->inHeader('Content-Type') &&
-                       stristr($curlResult->getHeader('Content-Type'), 'application/atom+xml')) {
+                       in_array('application/atom+xml', $curlResult->getHeader('Content-Type'))) {
                        Logger::log('Directly fetched XML for URI ' . $related_uri, Logger::DEBUG);
                        $xml = $curlResult->getBody();
                }