php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 09:28:21 +02:00
Code Issues Packages Projects Releases Wiki Activity
79,344 Commits 549 Branches 1,485 Tags
f3f22ff5c697aef854ffc1918bce708b37481b0f
Commit Graph

79344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski f3f22ff5c6 Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files 2014-06-03 11:37:20 +02:00
Remi Collet 9e16493e72 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  (re)add cve number in NEWS, from 5.4.29
 2014-06-03 11:28:43 +02:00
Remi Collet 97b86c3c4a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  (re)add cve number in NEWS, from 5.4.29
 2014-06-03 11:28:21 +02:00
Remi Collet 0817a2c767 (re)add cve number in NEWS, from 5.4.29 2014-06-03 11:28:07 +02:00
Remi Collet 0e25448e6b NEWS 2014-06-03 11:09:52 +02:00
Remi Collet e61f7727d4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fix bug #67326	fileinfo: cdf_read_short_sector insufficient boundary check
 2014-06-03 11:09:29 +02:00
Remi Collet f5333418d7 NEWS 2014-06-03 11:09:18 +02:00
Remi Collet 2d59b87527 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fix bug #67326	fileinfo: cdf_read_short_sector insufficient boundary check
 2014-06-03 11:09:04 +02:00
Remi Collet 21986f98db NEWS 2014-06-03 11:08:46 +02:00
Remi Collet 4fcb9a9d1b Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check 
Upstream fix https://github.com/file/file/commit/6d209c1c489457397a5763bca4b28e43aac90391.patch
Only revelant part applied
 2014-06-03 11:05:00 +02:00
Ferenc Kovacs 6538dab85f add NEWS block for 5.6.0RC1 2014-06-03 10:27:42 +02:00
Xinchen Hui f41ab36e5c Update NEWs 2014-06-01 19:42:39 +08:00
Xinchen Hui c4e7c7d50e Merge branch 'PHP-5.5' into PHP-5.6 2014-06-01 19:42:20 +08:00
Xinchen Hui 0218e4eb19 Update NEWs 2014-06-01 19:42:01 +08:00
Xinchen Hui 9bb5867fad Merge branch 'PHP-5.4' into PHP-5.5 2014-06-01 19:41:35 +08:00
Xinchen Hui 38be99b739 Fixed bug #67359 (Segfault in recursiveDirectoryIterator) 2014-06-01 19:41:01 +08:00
Adam Harvey b8042acdde Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
  added CVEs in NEWS
 2014-05-29 17:56:32 +00:00
Adam Harvey 43e3a83d51 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
 2014-05-29 17:53:28 +00:00
Adam Harvey b5d9983ff4 Check for zero-length keys in spl_array_skip_protected and don't skip them. 
Fixes bug #67360 (Missing element after ArrayObject::getIterator).
 2014-05-29 17:49:32 +00:00
Julien Pauli 4ef561c7ba added CVEs in NEWS 2014-05-28 10:59:57 +02:00
Anatol Belski fb991bd7fd updated libmagic.patch for 5.6+ 2014-05-27 22:39:54 +02:00
Anatol Belski e844055761 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated libmagic.patch for 5.4+
 2014-05-27 22:38:30 +02:00
Anatol Belski 546797f329 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated libmagic.patch for 5.4+

Conflicts:
	ext/fileinfo/libmagic.patch
 2014-05-27 22:38:02 +02:00
Anatol Belski d2765e4b8c updated libmagic.patch for 5.4+ 2014-05-27 22:36:12 +02:00
Stanislav Malyshev 13a3826687 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  Fix bug #67249: printf out-of-bounds read
  5.5.13 release date
 2014-05-27 12:11:59 -07:00
Stanislav Malyshev a2f8c9c1ae Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
  Fix bug #67249: printf out-of-bounds read
 2014-05-27 12:10:41 -07:00
Stanislav Malyshev 76b06780d5 update NEWS 2014-05-27 11:28:53 -07:00
Stanislav Malyshev 091b7642c2 Fix bug #67249: printf out-of-bounds read 2014-05-27 11:28:22 -07:00
Julien Pauli 3b8bdb7164 5.5.13 release date 2014-05-27 14:21:16 +02:00
Matteo Beccati eb2bd85004 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Escape non-printable characters in the junit XML output
 2014-05-27 12:04:26 +02:00
Matteo Beccati abfd977410 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Escape non-printable characters in the junit XML output
 2014-05-27 12:04:17 +02:00
Matteo Beccati 92d54f81d6 Escape non-printable characters in the junit XML output 
XML doesn't allow most of the characters < 0x20 and binary output
breaks XML parsers. Such characters are not allowed as entities
either, so the generated entities are escaped in order to be printed
as text.
 2014-05-27 12:03:38 +02:00
Matteo Beccati cc3a1af62a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed broken XML junit output due to escaping of CDATA sections
 2014-05-27 11:07:32 +02:00
Matteo Beccati 56bcb22afb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed broken XML junit output due to escaping of CDATA sections
 2014-05-27 11:07:19 +02:00
Matteo Beccati 1696166466 Fixed broken XML junit output due to escaping of CDATA sections 
I've removed CDATA and used htmlspecialchars as the output might not be UTF-8 safe, as pointed out by ircmaxell in 26b37f1792
 2014-05-27 11:04:48 +02:00
Stanislav Malyshev 49662be30b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #50444: PDO-ODBC changes for 64-bit
 2014-05-26 22:18:08 -07:00
Andrew Kehrig 91e7b3b84f Fix #50444: PDO-ODBC changes for 64-bit 
This bug is also referenced in
[#61777](https://bugs.php.net/bug.php?id=61777) and is still present in
the latest stable release of the 5.5 branch. I see two tickets exist for
this problem already, and I'm just submitting these changes via github
as a reminder that this is a serious problem for anyone using PDO_ODBC
on the x64 builds.
 2014-05-26 22:17:29 -07:00
Stanislav Malyshev 4c64bb27b1 update NEWS 2014-05-26 18:11:07 -07:00
Stanislav Malyshev bc87ba8ee6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  backport this piece from 5.6, related to the #66307 fix
  Fixed bug #66307 Fileinfo crashes with powerpoint files
  Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
  Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS
  fix my last commit with some locales
 2014-05-26 18:06:58 -07:00
Stanislav Malyshev 076c25bfec Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  backport this piece from 5.6, related to the #66307 fix
  Fixed bug #66307 Fileinfo crashes with powerpoint files
 2014-05-26 18:06:15 -07:00
Anatol Belski d184f07b3c backport this piece from 5.6, related to the #66307 fix 2014-05-26 18:05:13 -07:00
Anatol Belski 15ee33eb21 Fixed bug #66307 Fileinfo crashes with powerpoint files 2014-05-26 18:04:27 -07:00
Stanislav Malyshev 5ce11c2698 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
  Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS
 2014-05-26 18:03:01 -07:00
Stanislav Malyshev 4005f06df6 Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation) 
Upstream patch: https://github.com/file/file/commit/b8acc83781d5a24cc5101e525d15efe0482c280d
 2014-05-26 18:01:17 -07:00
Stanislav Malyshev 57225f09ed Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS 
Upstream fix: https://github.com/file/file/commit/f97486ef5dc3e8735440edc4fc8808c63e1a3ef0
 2014-05-26 17:45:14 -07:00
Nuno Lopes 21f579b338 fix my last commit with some locales 2014-05-26 15:09:10 -04:00
Nuno Lopes f105e1589d fix my last commit with some locales 2014-05-26 15:08:00 -04:00
Xinchen Hui b0b0be176f Merge branch 'PHP-5.5' into PHP-5.6 2014-05-26 15:40:50 +08:00
Xinchen Hui 70699d7f68 Update NEWs and add a test 2014-05-26 15:40:26 +08:00
Dmitry Stogov 24a86dbb6f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed issue #183 (TMP_VAR is not only used once)
 2014-05-26 10:12:10 +04:00