clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 20:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,102 Commits 493 Branches 1,366 Tags 850 MiB
d196ac6a48
Commit Graph

80102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
d196ac6a48 Merge branch 'PHP-5.6' 2014-06-01 19:42:53 +08: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
f4a235c541 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
  added CVEs in NEWS
 2014-05-29 17:57:54 +00: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
412feff4be Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated libmagic.patch for 5.6+
  updated libmagic.patch for 5.4+
 2014-05-27 22:40:17 +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
cca9f376f4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
  Fix bug #67249: printf out-of-bounds read
  5.5.13 release date
 2014-05-27 12:12:22 -07: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
b85990fd8f Merge branch 'PHP-5.6' 
* PHP-5.6:
  Escape non-printable characters in the junit XML output
 2014-05-27 12:04:32 +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
40fd85821b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed broken XML junit output due to escaping of CDATA sections
 2014-05-27 11:07:52 +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
1887f9cce4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #50444: PDO-ODBC changes for 64-bit
 2014-05-26 22:18:32 -07: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
43faeaa621 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
  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
  fix my last commit with some locales
 2014-05-26 18:11:38 -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: b8acc83781
 2014-05-26 18:01:17 -07:00
Stanislav Malyshev
57225f09ed Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS 
Upstream fix: f97486ef5d
 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
bdae3d2548 fix my last commit with some locales 2014-05-26 15:08:28 -04:00
Nuno Lopes
f105e1589d fix my last commit with some locales 2014-05-26 15:08:00 -04:00
Xinchen Hui
cdacf4c90a Merge branch 'PHP-5.6' 2014-05-26 15:40:57 +08: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
347b430a03 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed issue #183 (TMP_VAR is not only used once)
 2014-05-26 10:12:36 +04: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