port hubzillas OpenWebAuth - rework the HTTPHeaders class
This commit is contained in:
parent
1148c29916
commit
863a49d8e7
2 changed files with 5 additions and 19 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -63,7 +63,7 @@ class HTTPSignature
|
|||
}
|
||||
|
||||
$h = new HTTPHeaders($data['header']);
|
||||
$headers = $h->fetcharr();
|
||||
$headers = $h->fetch();
|
||||
$body = $data['body'];
|
||||
} else {
|
||||
$headers = [];
|
||||
|
|
Loading…
Reference in a new issue