com php-src: Fixed bug #67731 finfo::file() returns invalid mime type for binary files: ext/fileinfo/libmagic/funcs.c ext/fileinfo/tests/
finfo_buffer_basic.phpt ext/fileinfo/tests/finfo_buff er_variation1.phpt
| From: | Anatol Belski | Date: | Sat, 30 Aug 2014 02:04:42 +0000 |
| Subject: | com php-src: Fixed bug #67731 finfo::file() returns invalid mime type for binary files: ext/fileinfo/libmagic/funcs.c ext/fileinfo/tests/ finfo_buffer_basic.phpt ext/fileinfo/tests/finfo_buff er_variation1.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81311@lists.php.net to get a copy of this message | ||
Commit: c301467f9ba07384386fa0f61c0c63cb4da037d0
Author: Anatol Belski <ab@php.net> Sat, 30 Aug 2014 04:04:42 +0200
Parents: 13b45a36f073df212408d47a595b25ac494e5af2
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c301467f9ba07384386fa0f61c0c63cb4da037d0
Log:
Fixed bug #67731 finfo::file() returns invalid mime type for binary files
Bugs:
https://bugs.php.net/67731
Changed paths:
M ext/fileinfo/libmagic/funcs.c
M ext/fileinfo/tests/finfo_buffer_basic.phpt
M ext/fileinfo/tests/finfo_buffer_variation1.phpt
Diff:
diff --git a/ext/fileinfo/libmagic/funcs.c b/ext/fileinfo/libmagic/funcs.c
index e1aa7b9..bd6d3d5 100644
--- a/ext/fileinfo/libmagic/funcs.c
+++ b/ext/fileinfo/libmagic/funcs.c
@@ -27,7 +27,7 @@
#include "file.h"
#ifndef lint
-FILE_RCSID("@(#)$File: funcs.c,v 1.67 2014/02/12 23:20:53 christos Exp $")
+FILE_RCSID("@(#)$File: funcs.c,v 1.68 2014/02/18 11:09:31 kim Exp $")
#endif /* lint */
#include "magic.h"
@@ -173,8 +173,7 @@ file_buffer(struct magic_set *ms, php_stream *stream, const char *inname, const
const char *code_mime = "binary";
const char *type = "application/octet-stream";
const char *def = "data";
-
-
+ const char *ftype = NULL;
if (nb == 0) {
def = "empty";
@@ -187,7 +186,7 @@ file_buffer(struct magic_set *ms, php_stream *stream, const char *inname, const
if ((ms->flags & MAGIC_NO_CHECK_ENCODING) == 0) {
looks_text = file_encoding(ms, ubuf, nb, &u8buf, &ulen,
- &code, &code_mime, &type);
+ &code, &code_mime, &ftype);
}
#ifdef __EMX__
@@ -272,7 +271,7 @@ file_buffer(struct magic_set *ms, php_stream *stream, const char *inname, const
if ((ms->flags & MAGIC_NO_CHECK_ENCODING) == 0) {
if (looks_text == 0)
if ((m = file_ascmagic_with_encoding( ms, ubuf,
- nb, u8buf, ulen, code, type, looks_text))
+ nb, u8buf, ulen, code, ftype, looks_text))
!= 0) {
if ((ms->flags & MAGIC_DEBUG) != 0)
(void)fprintf(stderr,
diff --git a/ext/fileinfo/tests/finfo_buffer_basic.phpt b/ext/fileinfo/tests/finfo_buffer_basic.phpt
index d8dcfab..0c3c641 100644
--- a/ext/fileinfo/tests/finfo_buffer_basic.phpt
+++ b/ext/fileinfo/tests/finfo_buffer_basic.phpt
@@ -48,7 +48,7 @@ string(15) "MIFF image data"
string(25) "RIFF (little-endian) data"
string(28) "text/plain; charset=us-ascii"
string(26) "text/plain; charset=ebcdic"
-string(22) "binary; charset=binary"
+string(40) "application/octet-stream; charset=binary"
string(28) "text/plain; charset=us-ascii"
string(28) "text/plain; charset=us-ascii"
string(25) "text/plain; charset=utf-8"
diff --git a/ext/fileinfo/tests/finfo_buffer_variation1.phpt
b/ext/fileinfo/tests/finfo_buffer_variation1.phpt
index d9c9be0..4fdd2be 100644
--- a/ext/fileinfo/tests/finfo_buffer_variation1.phpt
+++ b/ext/fileinfo/tests/finfo_buffer_variation1.phpt
@@ -47,7 +47,7 @@ string(15) "MIFF image data"
string(25) "RIFF (little-endian) data"
string(28) "text/plain; charset=us-ascii"
string(26) "text/plain; charset=ebcdic"
-string(22) "binary; charset=binary"
+string(40) "application/octet-stream; charset=binary"
string(28) "text/plain; charset=us-ascii"
string(28) "text/plain; charset=us-ascii"
string(25) "text/plain; charset=utf-8"