Merge branch 'pull-request/2670'

* pull-request/2670:
  Change getimagesize() and friends to report image/bmp

Author: cmb69

UPGRADING

@@ -24,6 +24,11 @@ Core:
     some old options removed. This is now written in PHP and have no external 
 	dependencies.
 
+Standard:
+  . getimagesize() and related functions now report the mime type of BMP images
+	  as image/bmp instead of image/x-ms-bmp, since the former has been registered
+		with the IANA (see RFC 7903).
+
 ========================================
 2. New Features
 ========================================

ext/standard/image.c

@@ -1186,7 +1186,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/x-ms-bmp";
+			return "image/bmp";
 		case IMAGE_FILETYPE_TIFF_II:
 		case IMAGE_FILETYPE_TIFF_MM:
 			return "image/tiff";

ext/standard/tests/image/getimagesize.phpt

@@ -37,7 +37,7 @@ array(16) {
     ["bits"]=>
     int(24)
     ["mime"]=>
-    string(14) "image/x-ms-bmp"
+    string(9) "image/bmp"
   }
   ["test12pix.webp"]=>
   array(6) {
@@ -67,7 +67,7 @@ array(16) {
     ["bits"]=>
     int(32)
     ["mime"]=>
-    string(14) "image/x-ms-bmp"
+    string(9) "image/bmp"
   }
   ["test1pix.bmp"]=>
   array(6) {
@@ -82,7 +82,7 @@ array(16) {
     ["bits"]=>
     int(24)
     ["mime"]=>
-    string(14) "image/x-ms-bmp"
+    string(9) "image/bmp"
   }
   ["test1pix.jp2"]=>
   array(7) {

ext/standard/tests/image/getimagesize_basic.phpt

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

ext/standard/tests/image/image_type_to_mime_type.phpt

@@ -27,13 +27,13 @@ image_type_to_mime_type()
 --EXPECT--
 array(16) {
   ["test-1pix.bmp"]=>
-  string(14) "image/x-ms-bmp"
+  string(9) "image/bmp"
   ["test12pix.webp"]=>
   string(10) "image/webp"
   ["test1bpix.bmp"]=>
-  string(14) "image/x-ms-bmp"
+  string(9) "image/bmp"
   ["test1pix.bmp"]=>
-  string(14) "image/x-ms-bmp"
+  string(9) "image/bmp"
   ["test1pix.jp2"]=>
   string(9) "image/jp2"
   ["test1pix.jpc"]=>

ext/standard/tests/image/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(14) "image/x-ms-bmp"
+string(9) "image/bmp"
 string(10) "image/tiff"
 string(10) "image/tiff"
 string(24) "application/octet-stream"

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\(14\) "image\/x-ms-bmp"
+string\(9\) "image\/bmp"
 
 -- Iteration 7 --
 string\(10\) "image\/tiff"