scottmac Tue Mar 17 03:25:44 2009 UTC
Modified files:
/php-src/ext/gd/tests image_type_to_mime_type_basic.phpt
image_type_to_mime_type_variation3.phpt
/php-src/ext/standard image.c
/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:
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/gd/tests/image_type_to_mime_type_basic.phpt?r1=1.2&r2=1.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.2
php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt:1.3
--- php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt:1.2 Tue May 27
18:16:01 2008
+++ php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt Tue Mar 17
03:25:44 2009
@@ -49,7 +49,7 @@
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"
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/image_type_to_mime_type_variation3.phpt?r1=1.2&r2=1.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.2
php-src/ext/gd/tests/image_type_to_mime_type_variation3.phpt:1.3
--- php-src/ext/gd/tests/image_type_to_mime_type_variation3.phpt:1.2 Thu Jan
22 13:27:29 2009
+++ php-src/ext/gd/tests/image_type_to_mime_type_variation3.phpt Tue Mar
17 03:25:44 2009
@@ -39,7 +39,7 @@
unicode\(9\) "image\/psd"
-- Iteration 6 --
-unicode\(9\) "image\/bmp"
+unicode\(14\) "image\/x-ms-bmp"
-- Iteration 7 --
unicode\(10\) "image\/tiff"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/image.c?r1=1.136&r2=1.137&diff_format=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.136 php-src/ext/standard/image.c:1.137
--- php-src/ext/standard/image.c:1.136 Tue Mar 10 23:39:39 2009
+++ php-src/ext/standard/image.c Tue Mar 17 03:25:44 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: image.c,v 1.136 2009/03/10 23:39:39 helly Exp $ */
+/* $Id: image.c,v 1.137 2009/03/17 03:25:44 scottmac Exp $ */
#include "php.h"
#include <stdio.h>
@@ -1134,7 +1134,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/standard/tests/image/getimagesize.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/standard/tests/image/getimagesize.phpt
diff -u php-src/ext/standard/tests/image/getimagesize.phpt:1.8
php-src/ext/standard/tests/image/getimagesize.phpt:1.9
--- php-src/ext/standard/tests/image/getimagesize.phpt:1.8 Tue May 27
00:08:03 2008
+++ php-src/ext/standard/tests/image/getimagesize.phpt Tue Mar 17 03:25:44 2009
@@ -37,7 +37,7 @@
[u"bits"]=>
int(24)
[u"mime"]=>
- unicode(9) "image/bmp"
+ unicode(14) "image/x-ms-bmp"
}
[u"test1pix.jp2"]=>
array(7) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/image/getimagesize_basic.phpt?r1=1.3&r2=1.4&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.3
php-src/ext/standard/tests/image/getimagesize_basic.phpt:1.4
--- php-src/ext/standard/tests/image/getimagesize_basic.phpt:1.3 Fri Jan
23 11:18:37 2009
+++ php-src/ext/standard/tests/image/getimagesize_basic.phpt Tue Mar 17
03:25:44 2009
@@ -138,7 +138,7 @@
[u"bits"]=>
int(24)
[u"mime"]=>
- unicode(9) "image/bmp"
+ unicode(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.7&r2=1.8&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.7
php-src/ext/standard/tests/image/image_type_to_mime_type.phpt:1.8
--- php-src/ext/standard/tests/image/image_type_to_mime_type.phpt:1.7 Tue May
27 00:08:03 2008
+++ php-src/ext/standard/tests/image/image_type_to_mime_type.phpt Tue Mar
17 03:25:44 2009
@@ -27,7 +27,7 @@
--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"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt?r1=1.3&r2=1.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.3
php-src/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt:1.4
---
php-src/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt:1.3
Tue May 27 00:08:03 2008
+++ php-src/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
Tue Mar 17 03:25:44 2009
@@ -39,7 +39,7 @@
unicode\(9\) "image\/psd"
-- Iteration 6 --
-unicode\(9\) "image\/bmp"
+unicode\(14\) "image\/x-ms-bmp"
-- Iteration 7 --
unicode\(10\) "image\/tiff"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
