[Phpbb-checkins] CVS: phpBB2 profile.php,1.173,1.174

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv17514

Modified Files:
	profile.php 
Log Message:
Fixed content-type/length bugs

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.173
retrieving revision 1.174
diff -C2 -r1.173 -r1.174
*** profile.php	2002/01/27 03:10:12	1.173
--- profile.php	2002/01/27 14:13:55	1.174
***************
*** 882,889 ****
  							@fclose($fsock);
  
! 							if( preg_match("/Content-Length\: ([0-9]+)[^\/]+Content-Type\: image\/[x\-]*([a-z]+)[\s]+/i", $avatar_data, $file_data) )
  							{
! 								$file_size = $file_data[1];
! 								$file_type = $file_data[2];
  
  								switch( $file_type )
--- 882,889 ----
  							@fclose($fsock);
  
! 							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_data1[1]; 
! 								$file_type = $file_data2[1]; 
  
  								switch( $file_type )
***************
*** 891,894 ****
--- 891,895 ----
  									case "jpeg":
  									case "pjpeg":
+ 									case "jpg":
  										$imgtype = '.jpg';
  										break;