scottmac Tue Mar 17 03:25:57 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard image.c
/php-src/ext/gd/tests image_type_to_mime_type_basic.phpt
image_type_to_mime_type_variation3.phpt
/php-src/ext/standard/tests/image getimagesize.phpt
getimagesize_basic.phpt
image_type_to_mime_type.phpt
image_type_to_mime_type_variation3.phpt
Log:
MFH Fix bug #47359 - Use the official unofficial mimetype for bmp files, this
stops IE from getting confused.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/image.c?r1=1.114.2.2.2.5.2.7&r2=1.114.2.2.2.5.2.8&diff_format=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.114.2.2.2.5.2.7
php-src/ext/standard/image.c:1.114.2.2.2.5.2.8
--- php-src/ext/standard/image.c:1.114.2.2.2.5.2.7 Wed Dec 31 11:15:45 2008
+++ php-src/ext/standard/image.c Tue Mar 17 03:25:57 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: image.c,v 1.114.2.2.2.5.2.7 2008/12/31 11:15:45 sebastian Exp $ */
+/* $Id: image.c,v 1.114.2.2.2.5.2.8 2009/03/17 03:25:57 scottmac Exp $ */
#include "php.h"
#include <stdio.h>
@@ -1133,7 +1133,7 @@
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";
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt
diff -u php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt:1.1.2.2
php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt:1.1.2.3
--- php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt:1.1.2.2 Fri Feb
1 16:33:17 2008
+++ php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt Tue Mar 17
03:25:57 2009
@@ -49,7 +49,7 @@
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"
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/image_type_to_mime_type_variation3.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/gd/tests/image_type_to_mime_type_variation3.phpt
diff -u php-src/ext/gd/tests/image_type_to_mime_type_variation3.phpt:1.1.4.2
php-src/ext/gd/tests/image_type_to_mime_type_variation3.phpt:1.1.4.3
--- php-src/ext/gd/tests/image_type_to_mime_type_variation3.phpt:1.1.4.2
Thu Jan 22 13:27:25 2009
+++ php-src/ext/gd/tests/image_type_to_mime_type_variation3.phpt Tue Mar
17 03:25:57 2009
@@ -39,7 +39,7 @@
string\(9\) "image\/psd"
-- Iteration 6 --
-string\(9\) "image\/bmp"
+string\(14\) "image\/x-ms-bmp"
-- Iteration 7 --
string\(10\) "image\/tiff"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/image/getimagesize.phpt?r1=1.6&r2=1.6.8.1&diff_format=u
Index: php-src/ext/standard/tests/image/getimagesize.phpt
diff -u php-src/ext/standard/tests/image/getimagesize.phpt:1.6
php-src/ext/standard/tests/image/getimagesize.phpt:1.6.8.1
--- php-src/ext/standard/tests/image/getimagesize.phpt:1.6 Fri Jan 17
23:57:43 2003
+++ php-src/ext/standard/tests/image/getimagesize.phpt Tue Mar 17 03:25:57 2009
@@ -37,7 +37,7 @@
["bits"]=>
int(24)
["mime"]=>
- string(9) "image/bmp"
+ string(14) "image/x-ms-bmp"
}
["test1pix.jp2"]=>
array(7) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/image/getimagesize_basic.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/image/getimagesize_basic.phpt
diff -u php-src/ext/standard/tests/image/getimagesize_basic.phpt:1.1.2.2
php-src/ext/standard/tests/image/getimagesize_basic.phpt:1.1.2.3
--- php-src/ext/standard/tests/image/getimagesize_basic.phpt:1.1.2.2 Fri Jan
23 11:18:36 2009
+++ php-src/ext/standard/tests/image/getimagesize_basic.phpt Tue Mar 17
03:25:57 2009
@@ -138,7 +138,7 @@
["bits"]=>
int(24)
["mime"]=>
- string(9) "image/bmp"
+ string(14) "image/x-ms-bmp"
}
array(0) {
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/image/image_type_to_mime_type.phpt?r1=1.5&r2=1.5.8.1&diff_format=u
Index: php-src/ext/standard/tests/image/image_type_to_mime_type.phpt
diff -u php-src/ext/standard/tests/image/image_type_to_mime_type.phpt:1.5
php-src/ext/standard/tests/image/image_type_to_mime_type.phpt:1.5.8.1
--- php-src/ext/standard/tests/image/image_type_to_mime_type.phpt:1.5 Fri Jan
17 18:51:30 2003
+++ php-src/ext/standard/tests/image/image_type_to_mime_type.phpt Tue Mar
17 03:25:57 2009
@@ -27,7 +27,7 @@
--EXPECT--
array(11) {
["test1pix.bmp"]=>
- string(9) "image/bmp"
+ string(14) "image/x-ms-bmp"
["test1pix.jp2"]=>
string(9) "image/jp2"
["test1pix.jpc"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
diff -u
php-src/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt:1.1.2.3
php-src/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt:1.1.2.4
---
php-src/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt:1.1.2.3
Sat May 24 15:22:20 2008
+++ php-src/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
Tue Mar 17 03:25:57 2009
@@ -39,7 +39,7 @@
string\(9\) "image\/psd"
-- Iteration 6 --
-string\(9\) "image\/bmp"
+string\(14\) "image\/x-ms-bmp"
-- Iteration 7 --
string\(10\) "image\/tiff"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
