Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
[http] Allow headers without whitespace after ":"
Browse files Browse the repository at this point in the history
  • Loading branch information
Maks3w committed Oct 29, 2013
154 parents 777a056 + d222b5d + 4c82c64 + 593b71b + 8cc68f1 + 1642118 + 89a44d0 + 5c10b75 + db7d808 + 4ee93be + 9ecbeb2 + d240054 + 78d3205 + 8903b2d + 464835b + c59b54d + 14ad3a0 + f4ac37b + 0ec8036 + 8839d0e + 07564e2 + a65cb66 + ecb09fb + 6de3f68 + cb8f354 + d7ffaed + 1819a00 + e2ca906 + f897f74 + 0568c55 + d7f0623 + 8b4896f + 2f83acc + a44d7dd + 6bce797 + 6ad2b62 + 1e41fbd + a0078e6 + 9db875b + 2879406 + 9acc850 + eddeb7d + 5a77057 + 33c15ff + 9f13ebf + a2ad2a5 + c0ba21c + 94e82a8 + 459f1f9 + e0c8424 + 5ef6a39 + 58fd018 + 65e3b0b + d21655a + 1d20fd1 + fe81bc5 + 96fadae + 072c64d + d3c9780 + 9c15ae8 + 66a4342 + 85c9491 + 8ec8384 + 004366f + 55a086d + ac7c7af + f02a226 + 00c4ac3 + 3f52720 + 5508474 + 49ed2f6 + d562686 + 67b42b2 + bdb1dae + 9809630 + 7304e37 + 752a5af + 8181c8f + 53bdac2 + c2f9414 + f6341e9 + 57cde95 + c750616 + 293054e + 7432649 + 63f13f6 + 927c00d + 44e0d4b + bc03833 + 1fd7c61 + de0cb77 + 66e902f + 24354dc + 9f886a2 + 845333c + 96e9a1e + 52fbeb6 + 7f76d90 + fec4cec + 24efdcc + 219c9ad + 3025666 + 17d48b4 + 00f4506 + 0800032 + fc89677 + e89d79b + f329014 + a1bfde3 + 7dec05c + 734f9f2 + 2756031 + 408f714 + fd53447 + f1f6e0d + e193ac7 + dad06c3 + 03ab3c8 + d0b9eec + e47995d + 411b935 + ddc8029 + a6c1451 + e823524 + eb63995 + 2de2423 + a95575b + 03a862c + e195cc6 + f4ac757 + a53de82 + 42763a8 + 6b14b45 + 2c344a8 + ff8337b + 18b53cb + e669f19 + 592011d + 076244a + df3d273 + df0ceea + 52b821e + b5e6fa9 + be5e28e + d9404b8 + e77747f + c2783a1 + 40c699b + 78c73ae + b0a1695 + 03dc917 + 615fcf5 + 2558f0c + 67c0313 commit d458235
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
14 changes: 9 additions & 5 deletions src/Header/AbstractAccept.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,22 @@ abstract class AbstractAccept implements HeaderInterface


/**
* Parse a full header line or just the field value part.
*
* @param string $headerLine
*/
public function parseHeaderLine($headerLine)
{
$fieldName = $this->getFieldName();
$pos = strlen($fieldName) + 2;
if (strtolower(substr($headerLine, 0, $pos)) == strtolower($fieldName) . ': ') {
$headerLine = substr($headerLine, $pos);
if (strpos($headerLine, ':') !== false) {
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
if (strtolower($name) !== strtolower($this->getFieldName())) {
$value = $headerLine; // This is just for preserve the BC.
}
} else {
$value = $headerLine;
}

foreach ($this->getFieldValuePartsFromHeaderLine($headerLine) as $value) {
foreach ($this->getFieldValuePartsFromHeaderLine($value) as $value) {
$this->addFieldValuePartToQueue($value);
}
}
Expand Down
6 changes: 6 additions & 0 deletions test/Header/AcceptTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ public function testAcceptGetFieldValueReturnsProperValue()
$this->assertEquals('xxx', $acceptHeader->getFieldValue());
}

public function testAcceptGetFieldValueReturnsProperValueWithAHeaderWithoutSpaces()
{
$acceptHeader = Accept::fromString('Accept:xxx');
$this->assertEquals('xxx', $acceptHeader->getFieldValue());
}

public function testAcceptToStringReturnsHeaderFormattedString()
{
$acceptHeader = new Accept();
Expand Down

0 comments on commit d458235

Please sign in to comment.