makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3085 from naderman/ticket/13227

Browse source 
[ticket/13227] Properly handle curlwrapper headers in remote avatars
This commit is contained in:
Nils Adermann 2014-10-27 18:58:11 -07:00
commit efe3aaaf0b
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/phpbb/avatar/driver/remote.php
View file

@ -130,8 +130,24 @@ class remote extends \phpbb\avatar\driver\driver
{ {
// Timeout after 1 second // Timeout after 1 second
stream_set_timeout($file_stream, 1); stream_set_timeout($file_stream, 1);
// read some data to ensure headers are present
fread($file_stream, 1024);
$meta = stream_get_meta_data($file_stream); $meta = stream_get_meta_data($file_stream);
foreach ($meta['wrapper_data'] as $header)
if (isset($meta['wrapper_data']['headers']) && is_array($meta['wrapper_data']['headers']))
{
$headers = $meta['wrapper_data']['headers'];
}
else if (isset($meta['wrapper_data']) && is_array($meta['wrapper_data']))
{
$headers = $meta['wrapper_data'];
}
else
{
$headers = array();
}
foreach ($headers as $header)
{ {
$header = preg_split('/ /', $header, 2); $header = preg_split('/ /', $header, 2);
if (strtr(strtolower(trim($header[0], ':')), '_', '-') === 'content-type') if (strtr(strtolower(trim($header[0], ':')), '_', '-') === 'content-type')