- Fixed mime-type generation.

#- Charset markers need to be prepended with ; -- the tests were also wrong.

diff --git a/ext/fileinfo/libmagic/ascmagic.c b/ext/fileinfo/libmagic/ascmagic.c
index cb39f690873149e9e8b81a11d1aa3a0e0169fe04..c25d81aa65af9c5e2dbc0ba8e21651dcfb61017f 100644 (file)
--- a/ext/fileinfo/libmagic/ascmagic.c
+++ b/ext/fileinfo/libmagic/ascmagic.c
@@ -264,7 +264,7 @@ subtype_identified:
 
                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;

diff --git a/ext/fileinfo/tests/finfo_buffer_basic.phpt b/ext/fileinfo/tests/finfo_buffer_basic.phpt
index eaef80c63a8201d850a3d661409e9f9da39b03df..7bc10c272425e16cb44006ae733ef2f90469bf91 100644 (file)
--- a/ext/fileinfo/tests/finfo_buffer_basic.phpt
+++ b/ext/fileinfo/tests/finfo_buffer_basic.phpt
@@ -44,10 +44,10 @@ string(22) "old ACE/gr binary file"
 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(29) "text/plain charset=iso-8859-1"
+string(28) "text/plain; charset=us-ascii"
+string(28) "text/plain; charset=us-ascii"
+string(30) "text/plain; charset=iso-8859-1"
 ===DONE===

diff --git a/ext/fileinfo/tests/finfo_buffer_variation1.phpt b/ext/fileinfo/tests/finfo_buffer_variation1.phpt
index c2a6f1d12b2fc75052326e812e3f2d17065adef3..7616c6c789b07869c403b879b7989c762f2abd3d 100644 (file)
--- a/ext/fileinfo/tests/finfo_buffer_variation1.phpt
+++ b/ext/fileinfo/tests/finfo_buffer_variation1.phpt
@@ -43,10 +43,10 @@ string(22) "old ACE/gr binary file"
 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(29) "text/plain charset=iso-8859-1"
+string(28) "text/plain; charset=us-ascii"
+string(28) "text/plain; charset=us-ascii"
+string(30) "text/plain; charset=iso-8859-1"
 ===DONE===

diff --git a/ext/fileinfo/tests/finfo_file_basic.phpt b/ext/fileinfo/tests/finfo_file_basic.phpt
index 6ac988450b5d1c1623f63da1628d2849e3022f78..33258dbaafa714ae26676a783a5c194d79f56e8e 100644 (file)
--- a/ext/fileinfo/tests/finfo_file_basic.phpt
+++ b/ext/fileinfo/tests/finfo_file_basic.phpt
@@ -22,7 +22,7 @@ var_dump( finfo_file( $finfo, $magicFile ) );
 ===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===