Browse Source

port hubzillas OpenWebAuth - rework the HTTPHeaders class

pull/5253/head
rabuzarus 3 years ago
parent
commit
863a49d8e7
2 changed files with 5 additions and 19 deletions
  1. +4
    -18
      src/Util/HTTPHeaders.php
  2. +1
    -1
      src/Util/HTTPSignature.php

+ 4
- 18
src/Util/HTTPHeaders.php View File

@ -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;
}
}

+ 1
- 1
src/Util/HTTPSignature.php View File

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


Loading…
Cancel
Save