aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/profile.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2002-01-27 14:13:59 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2002-01-27 14:13:59 +0000
commit11d212a83f3f52cb562d2d7b782511e6ce059648 (patch)
tree54a906225a8882219e3ab73df07175233e03038b /phpBB/profile.php
parenteba70d3bb9e168dd4b3bd2c2bb8bf020a7cdb5c7 (diff)
downloadforums-11d212a83f3f52cb562d2d7b782511e6ce059648.tar
forums-11d212a83f3f52cb562d2d7b782511e6ce059648.tar.gz
forums-11d212a83f3f52cb562d2d7b782511e6ce059648.tar.bz2
forums-11d212a83f3f52cb562d2d7b782511e6ce059648.tar.xz
forums-11d212a83f3f52cb562d2d7b782511e6ce059648.zip
Fixed content-type/length bugs
git-svn-id: file:///svn/phpbb/trunk@1970 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/profile.php')
-rw-r--r--phpBB/profile.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/profile.php b/phpBB/profile.php
index 42be984914..fa4ce327bc 100644
--- a/phpBB/profile.php
+++ b/phpBB/profile.php
@@ -881,15 +881,16 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
}
@fclose($fsock);
- if( preg_match("/Content-Length\: ([0-9]+)[^\/]+Content-Type\: image\/[x\-]*([a-z]+)[\s]+/i", $avatar_data, $file_data) )
+ if( preg_match("/Content-Length\: ([0-9]+)[^\/ ][\s]+/i", $avatar_data, $file_data1) && preg_match("/Content-Type\: image\/[x\-]*([a-z]+)[\s]+/i", $avatar_data, $file_data2) )
{
- $file_size = $file_data[1];
- $file_type = $file_data[2];
+ $file_size = $file_data1[1];
+ $file_type = $file_data2[1];
switch( $file_type )
{
case "jpeg":
case "pjpeg":
+ case "jpg":
$imgtype = '.jpg';
break;
case "gif":