From 863a49d8e7dbb392b9db9912ba7d42146b233562 Mon Sep 17 00:00:00 2001
From: rabuzarus <rabuzarus@t-online.de>
Date: Wed, 20 Jun 2018 18:52:37 +0200
Subject: [PATCH] port hubzillas OpenWebAuth - rework the HTTPHeaders class

---
 src/Util/HTTPHeaders.php   | 22 ++++------------------
 src/Util/HTTPSignature.php |  2 +-
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/Util/HTTPHeaders.php b/src/Util/HTTPHeaders.php
index ac2d41be4e..9b0c4529d8 100644
--- 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 d6152075e4..731357f757 100644
--- 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 = [];