Rename HTTPRequestOptions to HTTPClientOptions

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 7944da5b93eabf69f90b44ac84ce1c1be94ac8f5..17be02d22f518d9ce206ded97dab387843afb614 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -39,7 +39,7 @@ use Friendica\Model\Event;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
-use Friendica\Network\HTTPRequestOptions;
+use Friendica\Network\HTTPClientOptions;
 use Friendica\Object\Image;
 use Friendica\Protocol\Activity;
 use Friendica\Util\Images;
@@ -1194,7 +1194,7 @@ class BBCode
                $text = DI::cache()->get($cache_key);
 
                if (is_null($text)) {
-                       $curlResult = DI::httpRequest()->head($match[1], [HTTPRequestOptions::TIMEOUT => DI::config()->get('system', 'xrd_timeout')]);
+                       $curlResult = DI::httpRequest()->head($match[1], [HTTPClientOptions::TIMEOUT => DI::config()->get('system', 'xrd_timeout')]);
                        if ($curlResult->isSuccess()) {
                                $mimetype = $curlResult->getHeader('Content-Type')[0] ?? '';
                        } else {
@@ -1265,7 +1265,7 @@ class BBCode
                        return $text;
                }
 
-               $curlResult = DI::httpRequest()->head($match[1], [HTTPRequestOptions::TIMEOUT => DI::config()->get('system', 'xrd_timeout')]);
+               $curlResult = DI::httpRequest()->head($match[1], [HTTPClientOptions::TIMEOUT => DI::config()->get('system', 'xrd_timeout')]);
                if ($curlResult->isSuccess()) {
                        $mimetype = $curlResult->getHeader('Content-Type')[0] ?? '';
                } else {

diff --git a/src/Core/Search.php b/src/Core/Search.php
index 0d1460bb21f63d191f7bd8bbc02b3e80f89e05a2..d3bf0b5ba52afde51db4a6c913d40e1d75cf3f93 100644 (file)
--- a/src/Core/Search.php
+++ b/src/Core/Search.php
@@ -24,7 +24,7 @@ namespace Friendica\Core;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Network\HTTPException;
-use Friendica\Network\HTTPRequestOptions;
+use Friendica\Network\HTTPClientOptions;
 use Friendica\Object\Search\ContactResult;
 use Friendica\Object\Search\ResultList;
 use Friendica\Util\Network;
@@ -228,7 +228,7 @@ class Search
                        $return = Contact::searchByName($search, $mode);
                } else {
                        $p = $page > 1 ? 'p=' . $page : '';
-                       $curlResult = DI::httpRequest()->get(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), [HTTPRequestOptions::ACCEPT_CONTENT => ['application/json']]);
+                       $curlResult = DI::httpRequest()->get(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), [HTTPClientOptions::ACCEPT_CONTENT => ['application/json']]);
                        if ($curlResult->isSuccess()) {
                                $searchResult = json_decode($curlResult->getBody(), true);
                                if (!empty($searchResult['profiles'])) {

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index a68fd6f64bb654e0786d6569fb82d951302498e4..da4867e03e73550581bb8952fc758784552927d7 100644 (file)
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -32,7 +32,7 @@ use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module\Register;
-use Friendica\Network\HTTPRequestOptions;
+use Friendica\Network\HTTPClientOptions;
 use Friendica\Network\IHTTPResult;
 use Friendica\Protocol\Relay;
 use Friendica\Util\DateTimeFormat;
@@ -315,7 +315,7 @@ class GServer
 
                // When a nodeinfo is present, we don't need to dig further
                $xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-               $curlResult = DI::httpRequest()->get($url . '/.well-known/nodeinfo', [HTTPRequestOptions::TIMEOUT => $xrd_timeout]);
+               $curlResult = DI::httpRequest()->get($url . '/.well-known/nodeinfo', [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
                if ($curlResult->isTimeout()) {
                        self::setFailure($url);
                        return false;
@@ -323,7 +323,7 @@ class GServer
 
                // On a redirect follow the new host but mark the old one as failure
                if ($curlResult->isSuccess() && (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
-                       $curlResult = DI::httpRequest()->get($url, [HTTPRequestOptions::TIMEOUT => $xrd_timeout]);
+                       $curlResult = DI::httpRequest()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
                        if (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST)) {
                                Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
                                self::setFailure($url);
@@ -359,7 +359,7 @@ class GServer
                                        $basedata = ['detection-method' => self::DETECT_MANUAL];
                                }
 
-                               $curlResult = DI::httpRequest()->get($baseurl, [HTTPRequestOptions::TIMEOUT => $xrd_timeout]);
+                               $curlResult = DI::httpRequest()->get($baseurl, [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
                                if ($curlResult->isSuccess()) {
                                        if ((parse_url($baseurl, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
                                                Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
@@ -383,7 +383,7 @@ class GServer
                                        // When the base path doesn't seem to contain a social network we try the complete path.
                                        // Most detectable system have to be installed in the root directory.
                                        // We checked the base to avoid false positives.
-                                       $curlResult = DI::httpRequest()->get($url, [HTTPRequestOptions::TIMEOUT => $xrd_timeout]);
+                                       $curlResult = DI::httpRequest()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
                                        if ($curlResult->isSuccess()) {
                                                $urldata = self::analyseRootHeader($curlResult, $serverdata);
                                                $urldata = self::analyseRootBody($curlResult, $urldata, $url);
@@ -959,7 +959,7 @@ class GServer
        private static function validHostMeta(string $url)
        {
                $xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-               $curlResult = DI::httpRequest()->get($url . '/.well-known/host-meta', [HTTPRequestOptions::TIMEOUT => $xrd_timeout]);
+               $curlResult = DI::httpRequest()->get($url . '/.well-known/host-meta', [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
                if (!$curlResult->isSuccess()) {
                        return false;
                }
@@ -1729,7 +1729,7 @@ class GServer
 
                if (!empty($accesstoken)) {
                        $api = 'https://instances.social/api/1.0/instances/list?count=0';
-                       $curlResult = DI::httpRequest()->get($api, [HTTPRequestOptions::HEADERS => ['Authorization' => ['Bearer ' . $accesstoken]]]);
+                       $curlResult = DI::httpRequest()->get($api, [HTTPClientOptions::HEADERS => ['Authorization' => ['Bearer ' . $accesstoken]]]);
 
                        if ($curlResult->isSuccess()) {
                                $servers = json_decode($curlResult->getBody(), true);

diff --git a/src/Model/Post/Link.php b/src/Model/Post/Link.php
index cc40a31da935370f0c1f5746d34c69408b0774ee..c724eff259302f81e0c32a39472465d3916d8cbc 100644 (file)
--- a/src/Model/Post/Link.php
+++ b/src/Model/Post/Link.php
@@ -26,7 +26,7 @@ use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Network\HTTPRequestOptions;
+use Friendica\Network\HTTPClientOptions;
 use Friendica\Util\Proxy;
 
 /**
@@ -88,7 +88,7 @@ class Link
        {
                $timeout = DI::config()->get('system', 'xrd_timeout');
 
-               $curlResult = DI::httpRequest()->head($url, [HTTPRequestOptions::TIMEOUT => $timeout]);
+               $curlResult = DI::httpRequest()->head($url, [HTTPClientOptions::TIMEOUT => $timeout]);
                if ($curlResult->isSuccess()) {
                        if (empty($media['mimetype'])) {
                                return $curlResult->getHeader('Content-Type')[0] ?? '';

diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php
index 47a464e4fa94e5344019c123cbea280f3924ab55..fd6ca40250769952b9b5865018f9385467d5b82a 100644 (file)
--- a/src/Model/Post/Media.php
+++ b/src/Model/Post/Media.php
@@ -30,7 +30,7 @@ use Friendica\DI;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
-use Friendica\Network\HTTPRequestOptions;
+use Friendica\Network\HTTPClientOptions;
 use Friendica\Util\Images;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
@@ -168,7 +168,7 @@ class Media
                // Fetch the mimetype or size if missing.
                if (empty($media['mimetype']) || empty($media['size'])) {
                        $timeout = DI::config()->get('system', 'xrd_timeout');
-                       $curlResult = DI::httpRequest()->head($media['url'], [HTTPRequestOptions::TIMEOUT => $timeout]);
+                       $curlResult = DI::httpRequest()->head($media['url'], [HTTPClientOptions::TIMEOUT => $timeout]);
                        if ($curlResult->isSuccess()) {
                                if (empty($media['mimetype'])) {
                                        $media['mimetype'] = $curlResult->getHeader('Content-Type')[0] ?? '';

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 251aa87156aa5597ada1d41c1d96ef9589b1889b..5aeced8d7f2bb50b5fbeb1d6cb2439cede330362 100644 (file)
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -28,7 +28,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
-use Friendica\Network\HTTPRequestOptions;
+use Friendica\Network\HTTPClientOptions;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Strings;
 
@@ -102,7 +102,7 @@ class Magic extends BaseModule
                        );
 
                        // Try to get an authentication token from the other instance.
-                       $curlResult = DI::httpRequest()->get($basepath . '/owa', [HTTPRequestOptions::HEADERS => $header]);
+                       $curlResult = DI::httpRequest()->get($basepath . '/owa', [HTTPClientOptions::HEADERS => $header]);
 
                        if ($curlResult->isSuccess()) {
                                $j = json_decode($curlResult->getBody(), true);

diff --git a/src/Network/HTTPClient.php b/src/Network/HTTPClient.php
index 44f7f7974cf91c117ef6ca8515efdda4fb102c2c..d265411c2cd12122f6b719f1add27a32edda3b04 100644 (file)
--- a/src/Network/HTTPClient.php
+++ b/src/Network/HTTPClient.php
@@ -95,39 +95,39 @@ class HTTPClient implements IHTTPClient
 
                $conf = [];
 
-               if (!empty($opts[HTTPRequestOptions::COOKIEJAR])) {
-                       $jar                           = new FileCookieJar($opts[HTTPRequestOptions::COOKIEJAR]);
+               if (!empty($opts[HTTPClientOptions::COOKIEJAR])) {
+                       $jar                           = new FileCookieJar($opts[HTTPClientOptions::COOKIEJAR]);
                        $conf[RequestOptions::COOKIES] = $jar;
                }
 
                $headers = [];
 
-               if (!empty($opts[HTTPRequestOptions::ACCEPT_CONTENT])) {
-                       $headers['Accept'] = $opts[HTTPRequestOptions::ACCEPT_CONTENT];
+               if (!empty($opts[HTTPClientOptions::ACCEPT_CONTENT])) {
+                       $headers['Accept'] = $opts[HTTPClientOptions::ACCEPT_CONTENT];
                }
 
-               if (!empty($opts[HTTPRequestOptions::LEGACY_HEADER])) {
+               if (!empty($opts[HTTPClientOptions::LEGACY_HEADER])) {
                        $this->logger->notice('Wrong option \'headers\' used.');
-                       $headers = array_merge($opts[HTTPRequestOptions::LEGACY_HEADER], $headers);
+                       $headers = array_merge($opts[HTTPClientOptions::LEGACY_HEADER], $headers);
                }
 
-               if (!empty($opts[HTTPRequestOptions::HEADERS])) {
-                       $headers = array_merge($opts[HTTPRequestOptions::HEADERS], $headers);
+               if (!empty($opts[HTTPClientOptions::HEADERS])) {
+                       $headers = array_merge($opts[HTTPClientOptions::HEADERS], $headers);
                }
 
                $conf[RequestOptions::HEADERS] = array_merge($this->client->getConfig(RequestOptions::HEADERS), $headers);
 
-               if (!empty($opts[HTTPRequestOptions::TIMEOUT])) {
-                       $conf[RequestOptions::TIMEOUT] = $opts[HTTPRequestOptions::TIMEOUT];
+               if (!empty($opts[HTTPClientOptions::TIMEOUT])) {
+                       $conf[RequestOptions::TIMEOUT] = $opts[HTTPClientOptions::TIMEOUT];
                }
 
-               if (!empty($opts[HTTPRequestOptions::BODY])) {
-                       $conf[RequestOptions::BODY] = $opts[HTTPRequestOptions::BODY];
+               if (!empty($opts[HTTPClientOptions::BODY])) {
+                       $conf[RequestOptions::BODY] = $opts[HTTPClientOptions::BODY];
                }
 
                $conf[RequestOptions::ON_HEADERS] = function (ResponseInterface $response) use ($opts) {
-                       if (!empty($opts[HTTPRequestOptions::CONTENT_LENGTH]) &&
-                               (int)$response->getHeaderLine('Content-Length') > $opts[HTTPRequestOptions::CONTENT_LENGTH]) {
+                       if (!empty($opts[HTTPClientOptions::CONTENT_LENGTH]) &&
+                               (int)$response->getHeaderLine('Content-Length') > $opts[HTTPClientOptions::CONTENT_LENGTH]) {
                                throw new TransferException('The file is too big!');
                        }
                };
@@ -185,14 +185,14 @@ class HTTPClient implements IHTTPClient
        {
                $opts = [];
 
-               $opts[HTTPRequestOptions::BODY] = $params;
+               $opts[HTTPClientOptions::BODY] = $params;
 
                if (!empty($headers)) {
-                       $opts[HTTPRequestOptions::HEADERS] = $headers;
+                       $opts[HTTPClientOptions::HEADERS] = $headers;
                }
 
                if (!empty($timeout)) {
-                       $opts[HTTPRequestOptions::TIMEOUT] = $timeout;
+                       $opts[HTTPClientOptions::TIMEOUT] = $timeout;
                }
 
                return $this->request('post', $url, $opts);

diff --git a/src/Network/HTTPClientOptions.php b/src/Network/HTTPClientOptions.php
new file mode 100644 (file)
index 0000000..f199360
--- /dev/null
+++ b/src/Network/HTTPClientOptions.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Friendica\Network;
+
+use GuzzleHttp\RequestOptions;
+
+/**
+ * This class contains a list of possible HTTPClient request options.
+ */
+class HTTPClientOptions
+{
+       /**
+        * accept_content: (array) supply Accept: header with 'accept_content' as the value
+        */
+       const ACCEPT_CONTENT = 'accept_content';
+       /**
+        * timeout: (int) out in seconds, default system config value or 60 seconds
+        */
+       const TIMEOUT = RequestOptions::TIMEOUT;
+       /**
+        * cookiejar: (string) path to cookie jar file
+        */
+       const COOKIEJAR = 'cookiejar';
+       /**
+        * headers: (array) header array
+        */
+       const HEADERS = RequestOptions::HEADERS;
+       /**
+        * header: (array) header array (legacy version)
+        */
+       const LEGACY_HEADER = 'header';
+       /**
+        * content_length: (int) maximum File content length
+        */
+       const CONTENT_LENGTH = 'content_length';
+       /**
+        * body: (mixed) Setting the body for sending data
+        */
+       const BODY = RequestOptions::BODY;
+}

diff --git a/src/Network/HTTPRequestOptions.php b/src/Network/HTTPRequestOptions.php
deleted file mode 100644 (file)
index 7cfee89..0000000
--- a/src/Network/HTTPRequestOptions.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Friendica\Network;
-
-use GuzzleHttp\RequestOptions;
-
-/**
- * This class contains a list of possible HTTPClient request options.
- */
-class HTTPRequestOptions
-{
-       /**
-        * accept_content: (array) supply Accept: header with 'accept_content' as the value
-        */
-       const ACCEPT_CONTENT = 'accept_content';
-       /**
-        * timeout: (int) out in seconds, default system config value or 60 seconds
-        */
-       const TIMEOUT = RequestOptions::TIMEOUT;
-       /**
-        * cookiejar: (string) path to cookie jar file
-        */
-       const COOKIEJAR = 'cookiejar';
-       /**
-        * headers: (array) header array
-        */
-       const HEADERS = RequestOptions::HEADERS;
-       /**
-        * header: (array) header array (legacy version)
-        */
-       const LEGACY_HEADER = 'header';
-       /**
-        * content_length: (int) maximum File content length
-        */
-       const CONTENT_LENGTH = 'content_length';
-       /**
-        * body: (mixed) Setting the body for sending data
-        */
-       const BODY = RequestOptions::BODY;
-}

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index d5911d83b82326be3a7bf05740f80aa6c35bc286..961a96e16af9a64a0e0e386ed3e395a0873ef889 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -170,7 +170,7 @@ class Probe
                Logger::info('Probing', ['host' => $host, 'ssl_url' => $ssl_url, 'url' => $url, 'callstack' => System::callstack(20)]);
                $xrd = null;
 
-               $curlResult = DI::httpRequest()->get($ssl_url, [HTTPRequestOptions::TIMEOUT => $xrd_timeout, HTTPRequestOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
+               $curlResult = DI::httpRequest()->get($ssl_url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
                $ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
                if ($curlResult->isSuccess()) {
                        $xml = $curlResult->getBody();
@@ -187,7 +187,7 @@ class Probe
                }
 
                if (!is_object($xrd) && !empty($url)) {
-                       $curlResult = DI::httpRequest()->get($url, [HTTPRequestOptions::TIMEOUT => $xrd_timeout, HTTPRequestOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
+                       $curlResult = DI::httpRequest()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
                        $connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
                        if ($curlResult->isTimeout()) {
                                Logger::info('Probing timeout', ['url' => $url]);
@@ -424,7 +424,7 @@ class Probe
         */
        private static function getHideStatus($url)
        {
-               $curlResult = DI::httpRequest()->get($url, [HTTPRequestOptions::CONTENT_LENGTH => 1000000]);
+               $curlResult = DI::httpRequest()->get($url, [HTTPClientOptions::CONTENT_LENGTH => 1000000]);
                if (!$curlResult->isSuccess()) {
                        return false;
                }
@@ -940,7 +940,7 @@ class Probe
        {
                $xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20);
 
-               $curlResult = DI::httpRequest()->get($url, [HTTPRequestOptions::TIMEOUT => $xrd_timeout, HTTPRequestOptions::ACCEPT_CONTENT => [$type]]);
+               $curlResult = DI::httpRequest()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => [$type]]);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return [];

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 253d6190d473ce3cd1430b2af705417d4cf8e3c9..367ebabc83148c65c83b8c48169f6c9072ec55d6 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -38,7 +38,7 @@ use Friendica\Model\ItemURI;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
-use Friendica\Network\HTTPRequestOptions;
+use Friendica\Network\HTTPClientOptions;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
@@ -728,7 +728,7 @@ class OStatus
 
                self::$conv_list[$conversation] = true;
 
-               $curlResult = DI::httpRequest()->get($conversation, [HTTPRequestOptions::ACCEPT_CONTENT => ['application/atom+xml', 'text/html']]);
+               $curlResult = DI::httpRequest()->get($conversation, [HTTPClientOptions::ACCEPT_CONTENT => ['application/atom+xml', 'text/html']]);
 
                if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
                        return;
@@ -922,7 +922,7 @@ class OStatus
                }
 
                $stored = false;
-               $curlResult = DI::httpRequest()->get($related, [HTTPRequestOptions::ACCEPT_CONTENT => ['application/atom+xml', 'text/html']]);
+               $curlResult = DI::httpRequest()->get($related, [HTTPClientOptions::ACCEPT_CONTENT => ['application/atom+xml', 'text/html']]);
 
                if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
                        return;

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index 24827b7477d6e6023babfaf18453099b2688c24c..d96b6791174ea64ded05f955adbf1caa51069828 100644 (file)
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -29,7 +29,7 @@ use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
 use Friendica\Network\CurlResult;
-use Friendica\Network\HTTPRequestOptions;
+use Friendica\Network\HTTPClientOptions;
 use Friendica\Network\IHTTPResult;
 
 /**
@@ -449,8 +449,8 @@ class HTTPSignature
                        $header['Signature'] = 'keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) date host",signature="' . $signature . '"';
                }
 
-               $curl_opts = $opts;
-               $curl_opts[HTTPRequestOptions::HEADERS] = $header;
+               $curl_opts                             = $opts;
+               $curl_opts[HTTPClientOptions::HEADERS] = $header;
 
                if (!empty($opts['nobody'])) {
                        $curlResult = DI::httpRequest()->head($request, $curl_opts);

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 0bbb5960c58aee789f7655ee9f4447566f0aa563..3b341bddbb78ba01be4cfeff6b8d7918ff46449d 100644 (file)
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -30,7 +30,7 @@ use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Network\HTTPException;
-use Friendica\Network\HTTPRequestOptions;
+use Friendica\Network\HTTPClientOptions;
 
 /**
  * Get information about a given URL
@@ -214,7 +214,7 @@ class ParseUrl
                        return $siteinfo;
                }
 
-               $curlResult = DI::httpRequest()->get($url, [HTTPRequestOptions::CONTENT_LENGTH => 1000000]);
+               $curlResult = DI::httpRequest()->get($url, [HTTPClientOptions::CONTENT_LENGTH => 1000000]);
                if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
                        return $siteinfo;
                }

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 0346bda03c4d315ff0acef3128e0a33650833098..9e99edafa65144f8c48a98e40cec1f9485aa39a2 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -29,7 +29,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\User;
-use Friendica\Network\HTTPRequestOptions;
+use Friendica\Network\HTTPClientOptions;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Email;
@@ -153,7 +153,7 @@ class OnePoll
                }
 
                $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
-               $curlResult = DI::httpRequest()->get($contact['poll'], [HTTPRequestOptions::COOKIEJAR => $cookiejar]);
+               $curlResult = DI::httpRequest()->get($contact['poll'], [HTTPClientOptions::COOKIEJAR => $cookiejar]);
                unlink($cookiejar);
 
                if ($curlResult->isTimeout()) {