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

diff --git a/ext/gd/tests/image_type_to_mime_type_basic.phpt b/ext/gd/tests/image_type_to_mime_type_basic.phpt
index 7384c463288d74f5f1a6944776806b446b232ccb..5199fd2c460ea5eed3fa3f94974825131967eae8 100644 (file)
--- a/ext/gd/tests/image_type_to_mime_type_basic.phpt
+++ b/ext/gd/tests/image_type_to_mime_type_basic.phpt
@@ -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"

diff --git a/ext/gd/tests/image_type_to_mime_type_variation3.phpt b/ext/gd/tests/image_type_to_mime_type_variation3.phpt
index a1c042a060022eaa91635f01513adc36f939a5ea..8383facb091a9202d39d58c6d1ead920603aa54f 100644 (file)
--- a/ext/gd/tests/image_type_to_mime_type_variation3.phpt
+++ b/ext/gd/tests/image_type_to_mime_type_variation3.phpt
@@ -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"

diff --git a/ext/standard/image.c b/ext/standard/image.c
index 9f76de953cc070296eab067d4575585d7f8b7fae..cbafe00315e529e4dfa228e1a276de867d5d41a3 100644 (file)
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -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";

diff --git a/ext/standard/tests/image/getimagesize.phpt b/ext/standard/tests/image/getimagesize.phpt
index 46003cffac39d2e9177866a8a58ccc86778df52c..ab79c9c768e8b52c7a7aabb36421aadf419648a9 100644 (file)
--- a/ext/standard/tests/image/getimagesize.phpt
+++ b/ext/standard/tests/image/getimagesize.phpt
@@ -37,7 +37,7 @@ array(11) {
     ["bits"]=>
     int(24)
     ["mime"]=>
-    string(9) "image/bmp"
+    string(14) "image/x-ms-bmp"
   }
   ["test1pix.jp2"]=>
   array(7) {

diff --git a/ext/standard/tests/image/getimagesize_basic.phpt b/ext/standard/tests/image/getimagesize_basic.phpt
index 63ae334066ad1696fca391055453afaaaf8fb578..4d472258180a2fdf976659443f6c3f30ef578a48 100644 (file)
--- a/ext/standard/tests/image/getimagesize_basic.phpt
+++ b/ext/standard/tests/image/getimagesize_basic.phpt
@@ -138,7 +138,7 @@ array(6) {
   ["bits"]=>
   int(24)
   ["mime"]=>
-  string(9) "image/bmp"
+  string(14) "image/x-ms-bmp"
 }
 array(0) {
 }

diff --git a/ext/standard/tests/image/image_type_to_mime_type.phpt b/ext/standard/tests/image/image_type_to_mime_type.phpt
index 94aabba0b99b10375c19bbc9fde957c7c4b6ebfc..5d94a6fe5d11d708e9ded4bf4f3beab8df45c88c 100644 (file)
--- a/ext/standard/tests/image/image_type_to_mime_type.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type.phpt
@@ -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"]=>

diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
index 5b432f48999d1f072327e2e4305b09fef92c45b7..192f23dcee9627498d0747e01b73b166cbc855ef 100755 (executable)
--- a/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
@@ -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"