Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 04:22:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

port hubzillas OpenWebAuth - rework the HTTPHeaders class

Browse source
This commit is contained in:
rabuzarus 2018-06-20 18:52:37 +02:00
parent 1148c29916
commit 863a49d8e7
2 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Util/HTTPHeaders.php
View file

@ -19,12 +19,12 @@ class HTTPHeaders
if ($lines) { if ($lines) {
foreach ($lines as $line) { foreach ($lines as $line) {
if (preg_match('/^\s+/', $line, $matches) && trim($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); $this->in_progress['v'] .= ' ' . ltrim($line);
continue; continue;
} }
} else { } else {
if ($this->in_progress['k']) { if (!empty($this->in_progress['k'])) {
$this->parsed[] = [$this->in_progress['k'] => $this->in_progress['v']]; $this->parsed[] = [$this->in_progress['k'] => $this->in_progress['v']];
$this->in_progress = []; $this->in_progress = [];
} }
@ -34,8 +34,8 @@ class HTTPHeaders
} }
} }
if ($this->in_progress['k']) { if (!empty($this->in_progress['k'])) {
$this->parsed[] = [$this->in_progress['k'] => $this->in_progress['v']]; $this->parsed[$this->in_progress['k']] = $this->in_progress['v'];
$this->in_progress = []; $this->in_progress = [];
} }
} }
@ -45,18 +45,4 @@ class HTTPHeaders
{ {
return $this->parsed; return $this->parsed;
} }
function fetcharr()
{
$ret = [];
if ($this->parsed) {
foreach ($this->parsed as $x) {
foreach ($x as $y => $z) {
$ret[$y] = $z;
}
}
}
return $ret;
}
} }

2
src/Util/HTTPSignature.php
View file

@ -63,7 +63,7 @@ class HTTPSignature
} }
$h = new HTTPHeaders($data['header']); $h = new HTTPHeaders($data['header']);
$headers = $h->fetcharr(); $headers = $h->fetch();
$body = $data['body']; $body = $data['body'];
} else { } else {
$headers = []; $headers = [];