Xinchen Hui 2d21404e25 Merge branch 'PHP-7.1' ...

* PHP-7.1:
  Update NEWS
  Fixed bug #74379 (syntax error compile error in libmagic/apprentice.c)
  Missed NEWS

Conflicts:
	ext/fileinfo/libmagic.patch

2017-04-10 11:47:38 +08:00

..

apprentice.c

Merge branch 'PHP-7.1'

2017-04-10 11:47:38 +08:00

apptype.c

Upgraded libmagic to 5.29

2016-11-24 13:44:04 +01:00

ascmagic.c

Upgraded libmagic to 5.29

2016-11-24 13:44:04 +01:00

cdf_time.c

Upgraded libmagic to 5.29

2016-11-24 13:44:04 +01:00

cdf.c

Upgraded libmagic to 5.29

2016-11-24 13:44:04 +01:00

cdf.h

Upgraded libmagic to 5.29

2016-11-24 13:44:04 +01:00

compress.c

add missing condition

2017-01-05 23:16:09 +01:00

config.h

MFB:

2008-08-26 12:24:12 +00:00

der.c

revert year change on bundled lib files

2017-01-05 23:26:20 +01:00

der.h

revert year change on bundled lib files

2017-01-05 23:26:20 +01:00

elfclass.h

started to patch for libmagic.next

2015-03-08 19:47:06 +01:00

encoding.c

Upgraded libmagic to 5.29

2016-11-24 13:44:04 +01:00

file.h

Upgraded libmagic to 5.29

2016-11-24 13:44:04 +01:00

fsmagic.c

Upgraded libmagic to 5.29

2016-11-24 13:44:04 +01:00

funcs.c

Upgraded libmagic to 5.29

2016-11-24 13:44:04 +01:00

is_tar.c

Upgraded libmagic to 5.29

2016-11-24 13:44:04 +01:00

LICENSE

- add license

2009-06-26 07:25:38 +00:00

magic.c

Upgraded libmagic to 5.29

2016-11-24 13:44:04 +01:00

magic.h

Upgraded libmagic to 5.29

2016-11-24 13:44:04 +01:00

patchlevel.h

fix c/p mistake

2016-11-24 16:41:57 +01:00

print.c

Upgraded libmagic to 5.29

2016-11-24 13:44:04 +01:00

readcdf.c

Upgraded libmagic to 5.29

2016-11-24 13:44:04 +01:00

softmagic.c

Upgraded libmagic to 5.29

2016-11-24 13:44:04 +01:00

strcasestr.c

started to patch for libmagic.next

2015-03-08 19:47:06 +01:00

tar.h

Upgraded libmagic to 5.29

2016-11-24 13:44:04 +01:00