From: Scott MacVicar <scottmac@php.net>
Date: Tue, 17 Mar 2009 03:25:44 +0000 (+0000)
Subject: Fix bug #47359 - Use the official unofficial mimetype for bmp files, this stops IE... 
X-Git-Tag: php-5.4.0alpha1~191^2~4132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43842949b79686311deae05ee210d2b6c0635b50;p=php

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

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 e24a947e72..c06c924e10 100644
--- 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 167e7eefea..442f833aed 100644
--- 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 caf640afe8..eb532ee97d 100644
--- 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 eeb82f0599..71042fd88b 100644
--- 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 51e6ba3613..2bdbf02015 100644
--- 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 c713f929c4..8c8568a012 100644
--- 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 77a0f17778..410ab92aef 100755
--- 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"