Remove 'headers' option occurrences and add a warning if used.

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 009816d8186c7f82f1b71a4b007de7f99fa39f5c..3a2a0bd798b8115b9e34aeed0290c93feb9a9539 100644 (file)
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -1639,7 +1639,7 @@ class GServer
                if (!empty($accesstoken)) {
                        $api = 'https://instances.social/api/1.0/instances/list?count=0';
                        $header = ['Authorization: Bearer '.$accesstoken];
-                       $curlResult = DI::httpRequest()->get($api, ['headers' => $header]);
+                       $curlResult = DI::httpRequest()->get($api, ['header' => $header]);
 
                        if ($curlResult->isSuccess()) {
                                $servers = json_decode($curlResult->getBody(), true);

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index fc37d91b4574f3069aa9359675b74eefde82629c..af8ff3605639113a9cf1164eb6777082c01ba6a0 100644 (file)
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -88,19 +88,19 @@ class Magic extends BaseModule
                                $exp = explode('/profile/', $contact['url']);
                                $basepath = $exp[0];
 
-                               $headers = [];
-                               $headers['Accept'] = 'application/x-dfrn+json, application/x-zot+json';
-                               $headers['X-Open-Web-Auth'] = Strings::getRandomHex();
+                               $header = [];
+                               $header['Accept'] = 'application/x-dfrn+json, application/x-zot+json';
+                               $header['X-Open-Web-Auth'] = Strings::getRandomHex();
 
                                // Create a header that is signed with the local users private key.
-                               $headers = HTTPSignature::createSig(
-                                       $headers,
+                               $header = HTTPSignature::createSig(
+                                       $header,
                                        $user['prvkey'],
                                        'acct:' . $user['nickname'] . '@' . DI::baseUrl()->getHostname() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : '')
                                );
 
                                // Try to get an authentication token from the other instance.
-                               $curlResult = DI::httpRequest()->get($basepath . '/owa', ['headers' => $headers]);
+                               $curlResult = DI::httpRequest()->get($basepath . '/owa', ['header' => $header]);
 
                                if ($curlResult->isSuccess()) {
                                        $j = json_decode($curlResult->getBody(), true);

diff --git a/src/Network/HTTPRequest.php b/src/Network/HTTPRequest.php
index df62ea45446f696bd076e53b2149ed8685488687..93ce86c870c829368f0ae90a8b2f58a58acbc6b4 100644 (file)
--- a/src/Network/HTTPRequest.php
+++ b/src/Network/HTTPRequest.php
@@ -141,6 +141,7 @@ class HTTPRequest implements IHTTPRequest
                curl_setopt($ch, CURLOPT_ENCODING, '');
 
                if (!empty($opts['headers'])) {
+                       $this->logger->warning('Wrong option \'headers\' used.');
                        @curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']);
                }
 

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index 2b98b1a32e3116e8074d639e4774404bd9353992..e3244fade3a7030e6ba8fc5a745fcc9cfe63d1c9 100644 (file)
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -411,7 +411,7 @@ class HTTPSignature
         */
        public static function fetchRaw($request, $uid = 0, $binary = false, $opts = [])
        {
-               $headers = [];
+               $header = [];
 
                if (!empty($uid)) {
                        $owner = User::getOwnerDataById($uid);
@@ -431,21 +431,21 @@ class HTTPSignature
                        $path = parse_url($request, PHP_URL_PATH);
                        $date = DateTimeFormat::utcNow(DateTimeFormat::HTTP);
 
-                       $headers = ['Date: ' . $date, 'Host: ' . $host];
+                       $header = ['Date: ' . $date, 'Host: ' . $host];
 
                        $signed_data = "(request-target): get " . $path . "\ndate: ". $date . "\nhost: " . $host;
 
                        $signature = base64_encode(Crypto::rsaSign($signed_data, $owner['uprvkey'], 'sha256'));
 
-                       $headers[] = 'Signature: keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) date host",signature="' . $signature . '"';
+                       $header[] = 'Signature: keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) date host",signature="' . $signature . '"';
                }
 
                if (!empty($opts['accept_content'])) {
-                       $headers[] = 'Accept: ' . $opts['accept_content'];
+                       $header[] = 'Accept: ' . $opts['accept_content'];
                }
 
                $curl_opts = $opts;
-               $curl_opts['header'] = $headers;
+               $curl_opts['header'] = $header;
 
                if ($opts['nobody']) {
                        $curlResult = DI::httpRequest()->head($request, $curl_opts);