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

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 e24a947e72268fcb872f20a99f1d3cb613891a37..c06c924e108f4d5a6ce3f5c82fe6fe6eb68bda67 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 @@ unicode(10) "image/jpeg"
 unicode(9) "image/png"
 unicode(29) "application/x-shockwave-flash"
 unicode(9) "image/psd"
-unicode(9) "image/bmp"
+unicode(14) "image/x-ms-bmp"
 unicode(10) "image/tiff"
 unicode(10) "image/tiff"
 unicode(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 167e7eefea0c14f8fcf317272ce03f40ded93995..442f833aed1d50836d181494b896d39f7901d728 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 @@ unicode\(29\) "application\/x-shockwave-flash"
 unicode\(9\) "image\/psd"
 
 -- Iteration 6 --
-unicode\(9\) "image\/bmp"
+unicode\(14\) "image\/x-ms-bmp"
 
 -- Iteration 7 --
 unicode\(10\) "image\/tiff"

diff --git a/ext/standard/image.c b/ext/standard/image.c
index caf640afe8a295cff1cb7034a886b6ec63499d13..eb532ee97d0958d6895f97a336867ffca425429e 100644 (file)
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -1134,7 +1134,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 eeb82f059956bd525415881a7fa817eacb2e08b8..71042fd88b6bd2a58419afcaa64ff426bde32621 100644 (file)
--- a/ext/standard/tests/image/getimagesize.phpt
+++ b/ext/standard/tests/image/getimagesize.phpt
@@ -37,7 +37,7 @@ array(11) {
     [u"bits"]=>
     int(24)
     [u"mime"]=>
-    unicode(9) "image/bmp"
+    unicode(14) "image/x-ms-bmp"
   }
   [u"test1pix.jp2"]=>
   array(7) {

diff --git a/ext/standard/tests/image/getimagesize_basic.phpt b/ext/standard/tests/image/getimagesize_basic.phpt
index 51e6ba361362d440dbc3678a61803c52bb046f0f..2bdbf02015ac531d96ebbf936b6f50e91301fbe3 100644 (file)
--- a/ext/standard/tests/image/getimagesize_basic.phpt
+++ b/ext/standard/tests/image/getimagesize_basic.phpt
@@ -138,7 +138,7 @@ array(6) {
   [u"bits"]=>
   int(24)
   [u"mime"]=>
-  unicode(9) "image/bmp"
+  unicode(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 c713f929c467272ea9f6572936de8f1ffab0413e..8c8568a012dfa2c18f5e131b40d3b6e6b67aed58 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) {
   [u"test1pix.bmp"]=>
-  unicode(9) "image/bmp"
+  unicode(14) "image/x-ms-bmp"
   [u"test1pix.jp2"]=>
   unicode(9) "image/jp2"
   [u"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 77a0f177782af3c13d199b46e71a39d2c9c8351f..410ab92aef0cd225c06bb33dd13639ec7e1720fe 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 @@ unicode\(29\) "application\/x-shockwave-flash"
 unicode\(9\) "image\/psd"
 
 -- Iteration 6 --
-unicode\(9\) "image\/bmp"
+unicode\(14\) "image\/x-ms-bmp"
 
 -- Iteration 7 --
 unicode\(10\) "image\/tiff"