svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/fileinfo/fileinfo.c trunk/ext/fileinfo/fileinfo.c
| From: | Scott MacVicar | Date: | Tue, 11 Aug 2009 23:05:13 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/fileinfo/fileinfo.c trunk/ext/fileinfo/fileinfo.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60110@lists.php.net to get a copy of this message | ||
scottmac Tue, 11 Aug 2009 23:05:13 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=287125
Log:
Fix BC break in mime_content_type()
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/fileinfo/fileinfo.c
U php/php-src/trunk/ext/fileinfo/fileinfo.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-08-11 22:55:19 UTC (rev 287124)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-08-11 23:05:13 UTC (rev 287125)
@@ -19,6 +19,7 @@
Stas)
- Fixed signature generation/validation for zip archives in ext/phar. (Greg)
- Fixed memory leak in stream_is_local(). (Felipe, Tony)
+- Fixed BC break in mime_content_type(), removes the content encoding. (Scott)
- Fixed bug #49193 (gdJpegGetVersionString() inside gd_compact identifies
wrong type in declaration). (Ilia)
Modified: php/php-src/branches/PHP_5_3/ext/fileinfo/fileinfo.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/fileinfo/fileinfo.c 2009-08-11 22:55:19 UTC (rev 287124)
+++ php/php-src/branches/PHP_5_3/ext/fileinfo/fileinfo.c 2009-08-11 23:05:13 UTC (rev 287125)
@@ -414,7 +414,7 @@
RETURN_FALSE;
}
- magic = magic_open(MAGIC_MIME);
+ magic = magic_open(MAGIC_MIME_TYPE);
if (magic_load(magic, NULL) == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to load magic database.");
goto common;
Modified: php/php-src/trunk/ext/fileinfo/fileinfo.c
===================================================================
--- php/php-src/trunk/ext/fileinfo/fileinfo.c 2009-08-11 22:55:19 UTC (rev 287124)
+++ php/php-src/trunk/ext/fileinfo/fileinfo.c 2009-08-11 23:05:13 UTC (rev 287125)
@@ -419,7 +419,7 @@
RETURN_FALSE;
}
- magic = magic_open(MAGIC_MIME);
+ magic = magic_open(MAGIC_MIME_TYPE);
if (magic_load(magic, NULL) == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to load magic database.");
goto common;