port hubzillas OpenWebAuth - rework the HTTPHeaders class

diff --git a/src/Util/HTTPHeaders.php b/src/Util/HTTPHeaders.php
index ac2d41be4e40608e3986688ab102e772169f717e..9b0c4529d84de8ec46b042077fb292afba960c9e 100644 (file)
--- a/src/Util/HTTPHeaders.php
+++ b/src/Util/HTTPHeaders.php
@@ -19,12 +19,12 @@ class HTTPHeaders
                if ($lines) {
                        foreach ($lines as $line) {
                                if (preg_match('/^\s+/', $line, $matches) && trim($line)) {
-                                       if ($this->in_progress['k']) {
+                                       if (!empty($this->in_progress['k'])) {
                                                $this->in_progress['v'] .= ' ' . ltrim($line);
                                                continue;
                                        }
                                } else {
-                                       if ($this->in_progress['k']) {
+                                       if (!empty($this->in_progress['k'])) {
                                                $this->parsed[] = [$this->in_progress['k'] => $this->in_progress['v']];
                                                $this->in_progress = [];
                                        }
@@ -34,8 +34,8 @@ class HTTPHeaders
                                }
                        }
 
-                       if ($this->in_progress['k']) {
-                               $this->parsed[] = [$this->in_progress['k'] => $this->in_progress['v']];
+                       if (!empty($this->in_progress['k'])) {
+                               $this->parsed[$this->in_progress['k']] = $this->in_progress['v'];
                                $this->in_progress = [];
                        }
                }
@@ -45,18 +45,4 @@ class HTTPHeaders
        {
                return $this->parsed;
        }
-
-       function fetcharr()
-       {
-               $ret = [];
-
-               if ($this->parsed) {
-                       foreach ($this->parsed as $x) {
-                               foreach ($x as $y => $z) {
-                                       $ret[$y] = $z;
-                               }
-                       }
-               }
-               return $ret;
-       }
 }

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index d6152075e4dd8caeacfcf53b14c4c5d9b5bc4d21..731357f757e5d3502db1ca0c808e44c40b20cc09 100644 (file)
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -63,7 +63,7 @@ class HTTPSignature
                        }
 
                        $h = new HTTPHeaders($data['header']);
-                       $headers = $h->fetcharr();
+                       $headers = $h->fetch();
                        $body = $data['body'];
                } else {
                        $headers = [];