Skip to content
This repository was archived by the owner on May 16, 2018. It is now read-only.

Cast int and float to string when creating headers #567

Merged
merged 2 commits into from
May 20, 2015
Merged

Cast int and float to string when creating headers #567

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d8e6c6
Cast int and float to string when creating headers
weierophinney May 19, 2015
b07f4ea
Fixes for unit tests
weierophinney May 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions library/Zend/Http/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1592,6 +1592,11 @@ protected function _validateHeaderValue($value, $recurse = true)
return;
}

// Cast integers and floats to strings for purposes of header representation.
if (is_int($value) || is_float($value)) {
$value = (string) $value;
}

if (! is_string($value) && (! is_object($value) || ! method_exists($value, '__toString'))) {
Copy link
Member

@Maks3w Maks3w May 19, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/is_string/is_scalar/ could be enough

Copy link
Member Author

@weierophinney weierophinney May 19, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As noted in IRC, the only other scalar types we can safely cast to string are floats and integers. Booleans should not be cast.

require_once 'Zend/Http/Exception.php';
throw new Zend_Http_Exception('Invalid header value detected');
Expand Down