diff options
| author | Derick Rethans <derick@php.net> | 2008-10-08 09:44:24 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2008-10-08 09:44:24 +0000 |
| commit | bac72c60527d3c0b433e6618e5f108272f48b5ab (patch) | |
| tree | 11b71af7c827ec2112d12419530f3085f7e5b458 | |
| parent | e8f25c5b98fffa1bb4fd038ebba8da51a0abc541 (diff) | |
| download | php-git-bac72c60527d3c0b433e6618e5f108272f48b5ab.tar.gz | |
- MFH: Fixed mime-type generation.
#- Charset markers need to be prepended with ; -- the tests were also wrong.
| -rw-r--r-- | ext/fileinfo/libmagic/ascmagic.c | 2 | ||||
| -rw-r--r-- | ext/fileinfo/tests/finfo_buffer_basic.phpt | 10 | ||||
| -rw-r--r-- | ext/fileinfo/tests/finfo_buffer_variation1.phpt | 10 | ||||
| -rw-r--r-- | ext/fileinfo/tests/finfo_file_basic.phpt | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/ext/fileinfo/libmagic/ascmagic.c b/ext/fileinfo/libmagic/ascmagic.c index cb39f69087..c25d81aa65 100644 --- 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 b48871304d..565ca4ecc4 100644 --- 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(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=== diff --git a/ext/fileinfo/tests/finfo_buffer_variation1.phpt b/ext/fileinfo/tests/finfo_buffer_variation1.phpt index 1480953d8e..f9937bf019 100644 --- 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(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=== diff --git a/ext/fileinfo/tests/finfo_file_basic.phpt b/ext/fileinfo/tests/finfo_file_basic.phpt index 6ac988450b..33258dbaaf 100644 --- 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=== |