clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed mime-type generation.

Browse Source 
#- Charset markers need to be prepended with ; -- the tests were also wrong.
This commit is contained in:
Derick Rethans 2008-10-08 09:44:12 +00:00
parent e4e78cca77
commit 194577d7a6
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/fileinfo/libmagic/ascmagic.c
View File

@ -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;

10
ext/fileinfo/tests/finfo_buffer_basic.phpt
View File

@ -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===

10
ext/fileinfo/tests/finfo_buffer_variation1.phpt
View File

@ -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===

4
ext/fileinfo/tests/finfo_file_basic.phpt
View File

@ -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===