derick Wed Oct 8 09:44:24 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/fileinfo/libmagic ascmagic.c
/php-src/ext/fileinfo/tests finfo_buffer_basic.phpt
finfo_buffer_variation1.phpt
finfo_file_basic.phpt
Log:
- MFH: Fixed mime-type generation.
#- Charset markers need to be prepended with ; -- the tests were also wrong.
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/ascmagic.c?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/fileinfo/libmagic/ascmagic.c
diff -u php-src/ext/fileinfo/libmagic/ascmagic.c:1.1.2.1
php-src/ext/fileinfo/libmagic/ascmagic.c:1.1.2.2
--- php-src/ext/fileinfo/libmagic/ascmagic.c:1.1.2.1 Tue Aug 26 12:23:29 2008
+++ php-src/ext/fileinfo/libmagic/ascmagic.c Wed Oct 8 09:44:24 2008
@@ -264,7 +264,7 @@
if ((mime == 0 || mime == MAGIC_MIME) && code_mime) {
if ((mime & MAGIC_MIME_TYPE) &&
- file_printf(ms, " charset=") == -1)
+ file_printf(ms, "; charset=") == -1)
goto done;
if (file_printf(ms, code_mime) == -1)
goto done;
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt
diff -u php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt:1.1.2.1
php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt:1.1.2.2
--- php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt:1.1.2.1 Fri Aug 29
10:29:55 2008
+++ php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt Wed Oct 8 09:44:24 2008
@@ -44,10 +44,10 @@
string(12) "xo65 object,"
string(15) "MIFF image data"
string(25) "RIFF (little-endian) data"
-string(27) "text/plain charset=us-ascii"
-string(25) "text/plain charset=ebcdic"
+string(28) "text/plain; charset=us-ascii"
+string(26) "text/plain; charset=ebcdic"
string(24) "application/octet-stream"
-string(27) "text/plain charset=us-ascii"
-string(27) "text/plain charset=us-ascii"
-string(24) "text/plain charset=utf-8"
+string(28) "text/plain; charset=us-ascii"
+string(28) "text/plain; charset=us-ascii"
+string(25) "text/plain; charset=utf-8"
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt
diff -u php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt:1.1.2.1
php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt:1.1.2.2
--- php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt:1.1.2.1 Fri Aug
29 10:29:55 2008
+++ php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt Wed Oct 8
09:44:24 2008
@@ -43,10 +43,10 @@
string(12) "xo65 object,"
string(15) "MIFF image data"
string(25) "RIFF (little-endian) data"
-string(27) "text/plain charset=us-ascii"
-string(25) "text/plain charset=ebcdic"
+string(28) "text/plain; charset=us-ascii"
+string(26) "text/plain; charset=ebcdic"
string(24) "application/octet-stream"
-string(27) "text/plain charset=us-ascii"
-string(27) "text/plain charset=us-ascii"
-string(24) "text/plain charset=utf-8"
+string(28) "text/plain; charset=us-ascii"
+string(28) "text/plain; charset=us-ascii"
+string(25) "text/plain; charset=utf-8"
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/tests/finfo_file_basic.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/fileinfo/tests/finfo_file_basic.phpt
diff -u php-src/ext/fileinfo/tests/finfo_file_basic.phpt:1.1.2.1
php-src/ext/fileinfo/tests/finfo_file_basic.phpt:1.1.2.2
--- php-src/ext/fileinfo/tests/finfo_file_basic.phpt:1.1.2.1 Fri Aug 29
10:29:55 2008
+++ php-src/ext/fileinfo/tests/finfo_file_basic.phpt Wed Oct 8 09:44:24 2008
@@ -22,7 +22,7 @@
===DONE===
--EXPECTF--
*** Testing finfo_file() : basic functionality ***
-string(25) "text/x-c charset=us-ascii"
+string(26) "text/x-c; charset=us-ascii"
string(15) "PHP script text"
-string(26) "text/plain charset=unknown"
+string(27) "text/plain; charset=unknown"
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
