php-src/ext/fileinfo/libmagic
Stanislav Malyshev b3709bfc52 Merge branch 'PHP-5.6'
* PHP-5.6: (27 commits)
  fix non-standard C
  update NEWS
  5.4.41 next
  fix CVE num
  update NEWS
  Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
  fix test
  fix type in fix for #69085
  fix memory leak & add test
  Fix tests
  fix CVE num
  Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
  Fix test
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  ...

Conflicts:
	Zend/zend_exceptions.c
	ext/curl/interface.c
	ext/dom/document.c
	ext/fileinfo/libmagic/softmagic.c
	ext/gd/gd.c
	ext/hash/hash.c
	ext/pgsql/pgsql.c
	ext/phar/phar.c
	ext/phar/phar_internal.h
	ext/standard/http_fopen_wrapper.c
	ext/standard/link.c
	ext/standard/streamsfuncs.c
	ext/xmlwriter/php_xmlwriter.c
	ext/zlib/zlib.c
2015-04-14 01:28:06 -07:00
..
apprentice.c Drop old VC support for ext/fileinfo. 2015-03-29 07:48:48 +02:00
apptype.c started to patch for libmagic.next 2015-03-08 19:47:06 +01:00
ascmagic.c started to patch for libmagic.next 2015-03-08 19:47:06 +01:00
cdf_time.c started to patch for libmagic.next 2015-03-08 19:47:06 +01:00
cdf.c Drop old VC support for ext/fileinfo. 2015-03-29 07:48:48 +02:00
cdf.h catch up with libmagic.orig 2015-03-29 18:11:11 +02:00
compress.c further sync with libmagic.orig 2015-03-29 18:17:02 +02:00
config.h MFB: 2008-08-26 12:24:12 +00:00
elfclass.h started to patch for libmagic.next 2015-03-08 19:47:06 +01:00
encoding.c started to patch for libmagic.next 2015-03-08 19:47:06 +01:00
file.h missing prototype 2015-03-08 19:47:17 +01:00
fsmagic.c partially revert wrong merge 2015-03-08 20:05:34 +01:00
funcs.c use right memory api 2015-03-08 19:47:12 +01:00
is_tar.c started to patch for libmagic.next 2015-03-08 19:47:06 +01:00
LICENSE - add license 2009-06-26 07:25:38 +00:00
magic.c catching up 2015-03-08 19:48:01 +01:00
magic.h started to patch for libmagic.next 2015-03-08 19:47:06 +01:00
patchlevel.h add patchlevel info 2015-03-08 19:47:25 +01:00
print.c fix possible unititialized pointer usage 2015-03-12 13:00:36 +01:00
readcdf.c catch up with libmagic.orig 2015-03-29 18:11:11 +02:00
softmagic.c Merge branch 'PHP-5.6' 2015-04-14 01:28:06 -07:00
strcasestr.c started to patch for libmagic.next 2015-03-08 19:47:06 +01:00
tar.h started to patch for libmagic.next 2015-03-08 19:47:06 +01:00