mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 11:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

MFH Fix bug #47359 - Use the official unofficial mimetype for bmp files, this stops IE from getting confused.

Browse Source
This commit is contained in:
Scott MacVicar 2009-03-17 03:25:57 +00:00
parent df199c2e75
commit bb2283bf4e
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/gd/tests/image_type_to_mime_type_basic.phpt
View File

@ -49,7 +49,7 @@ string(10) "image/jpeg"
string(9) "image/png"
string(29) "application/x-shockwave-flash"
string(9) "image/psd"
string(9) "image/bmp"
string(14) "image/x-ms-bmp"
string(10) "image/tiff"
string(10) "image/tiff"
string(24) "application/octet-stream"

2
ext/gd/tests/image_type_to_mime_type_variation3.phpt
View File

@ -39,7 +39,7 @@ string\(29\) "application\/x-shockwave-flash"
string\(9\) "image\/psd"
-- Iteration 6 --
string\(9\) "image\/bmp"
string\(14\) "image\/x-ms-bmp"
-- Iteration 7 --
string\(10\) "image\/tiff"

2
ext/standard/image.c
View File

@ -1133,7 +1133,7 @@ PHPAPI char * php_image_type_to_mime_type(int image_type)
case IMAGE_FILETYPE_PSD:
return "image/psd";
case IMAGE_FILETYPE_BMP:
return "image/bmp";
return "image/x-ms-bmp";
case IMAGE_FILETYPE_TIFF_II:
case IMAGE_FILETYPE_TIFF_MM:
return "image/tiff";

2
ext/standard/tests/image/getimagesize.phpt
View File

@ -37,7 +37,7 @@ array(11) {
["bits"]=>
int(24)
["mime"]=>
string(9) "image/bmp"
string(14) "image/x-ms-bmp"
}
["test1pix.jp2"]=>
array(7) {

2
ext/standard/tests/image/getimagesize_basic.phpt
View File

@ -138,7 +138,7 @@ array(6) {
["bits"]=>
int(24)
["mime"]=>
string(9) "image/bmp"
string(14) "image/x-ms-bmp"
}
array(0) {
}

2
ext/standard/tests/image/image_type_to_mime_type.phpt
View File

@ -27,7 +27,7 @@ image_type_to_mime_type()
--EXPECT--
array(11) {
["test1pix.bmp"]=>
string(9) "image/bmp"
string(14) "image/x-ms-bmp"
["test1pix.jp2"]=>
string(9) "image/jp2"
["test1pix.jpc"]=>

2
ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
View File

@ -39,7 +39,7 @@ string\(29\) "application\/x-shockwave-flash"
string\(9\) "image\/psd"
-- Iteration 6 --
string\(9\) "image\/bmp"
string\(14\) "image\/x-ms-bmp"
-- Iteration 7 --
string\(10\) "image\/tiff"