From: Anatol Belski <ab@php.net>
Date: Wed, 19 Feb 2014 09:48:52 +0000 (+0100)
Subject: expose correct libmagic version
X-Git-Tag: php-5.6.0alpha3~1^2~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d2cf0f2a4afcd1f392aadc6178318dacef05c82;p=php

expose correct libmagic version
---

diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
index 99c3945204..2f61944ad7 100644
--- a/ext/fileinfo/fileinfo.c
+++ b/ext/fileinfo/fileinfo.c
@@ -269,9 +269,15 @@ ZEND_GET_MODULE(fileinfo)
  */
 PHP_MINFO_FUNCTION(fileinfo)
 {
+	char magic_ver[5];
+
+	(void)snprintf(magic_ver, 4, "%d", magic_version());
+	magic_ver[4] = '\0';
+
 	php_info_print_table_start();
 	php_info_print_table_row(2, "fileinfo support", "enabled");
 	php_info_print_table_row(2, "version", PHP_FILEINFO_VERSION);
+	php_info_print_table_row(2, "libmagic", magic_ver);
 	php_info_print_table_end();
 }
 /* }}} */
diff --git a/ext/fileinfo/libmagic/magic.h b/ext/fileinfo/libmagic/magic.h
index 737ec1be1a..0f06814a42 100644
--- a/ext/fileinfo/libmagic/magic.h
+++ b/ext/fileinfo/libmagic/magic.h
@@ -75,7 +75,7 @@
 #define	MAGIC_NO_CHECK_FORTRAN	0x000000 /* Don't check ascii/fortran */
 #define	MAGIC_NO_CHECK_TROFF	0x000000 /* Don't check ascii/troff */
 
-#define MAGIC_VERSION		516	/* This implementation */
+#define MAGIC_VERSION		517	/* This implementation */
 
 
 #ifdef __cplusplus
diff --git a/ext/fileinfo/libmagic/patchlevel.h b/ext/fileinfo/libmagic/patchlevel.h
index 2aea7010cf..a53c6830d8 100644
--- a/ext/fileinfo/libmagic/patchlevel.h
+++ b/ext/fileinfo/libmagic/patchlevel.h
@@ -6,7 +6,7 @@
  * $File: patchlevel.h,v 1.68 2008/03/22 21:39:43 christos Exp $
  *
  * $Log$
- * Revision 1.7  2014/02/18 22:27:12 ab
+ * Revision 1.8  2014/02/18 22:27:12 ab
  * Update libmagic to 5.17
  *
  * $Log$