Merge pull request #7997 from annando/zot-aliases

[friendica.git] / src / Network / CurlResult.php

diff --git a/src/Network/CurlResult.php b/src/Network/CurlResult.php
index 2f5c94187e82ea7e59dae71802d9830379245cb0..5b77c3963c7e69e7593107f0c69f8d6d5f2d7877 100644 (file)
--- a/src/Network/CurlResult.php
+++ b/src/Network/CurlResult.php
@@ -134,6 +134,7 @@ class CurlResult
 
                $this->body = substr($result, strlen($header));
                $this->header = $header;
+               $this->header_fields = []; // Is filled on demand
        }
 
        private function checkSuccess()
@@ -166,7 +167,7 @@ class CurlResult
                }
 
                if ($this->returnCode == 301 || $this->returnCode == 302 || $this->returnCode == 303 || $this->returnCode== 307) {
-                       $redirect_parts = parse_url(defaults($this->info, 'redirect_url', ''));
+                       $redirect_parts = parse_url($this->info['redirect_url'] ?? '');
                        if (empty($redirect_parts)) {
                                $redirect_parts = [];
                        }
@@ -178,7 +179,7 @@ class CurlResult
                                }
                        }
 
-                       $parts = parse_url(defaults($this->info, 'url', ''));
+                       $parts = parse_url($this->info['url'] ?? '');
                        if (empty($parts)) {
                                $parts = [];
                        }
@@ -248,6 +249,8 @@ class CurlResult
                if (isset($headers[$field])) {
                        return $headers[$field];
                }
+
+               return '';
        }
 
        /**
@@ -257,7 +260,7 @@ class CurlResult
         *
         * @return boolean "true" if header exists
         */
-       public function headerExists(string $field)
+       public function inHeader(string $field)
        {
                $field = strtolower(trim($field));