delta/php-git.git - git.php.net: repository/php-src.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	PHP-5.6.0beta4php-5.6.0beta4	Ferenc Kovacs	2014-06-04	2	-3/+3
\|
*	Merge branch 'PHP-5.6' into PHP-5.6.0	Ferenc Kovacs	2014-06-04	80	-534/+881
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: (51 commits) Fix tests Fix possible segfault depending on memory location... fix gcov data with some locales (again) Update NEWS Fixed startup segfault in non-debug builds Fixes issue #87 Fixed regression introduced by patch for bug #67072 Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files (re)add cve number in NEWS, from 5.4.29 NEWS NEWS NEWS Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check add NEWS block for 5.6.0RC1 Update NEWs Update NEWs Fixed bug #67359 (Segfault in recursiveDirectoryIterator) Check for zero-length keys in spl_array_skip_protected and don't skip them. added CVEs in NEWS updated libmagic.patch for 5.6+ updated libmagic.patch for 5.4+ ... Conflicts: NEWS
\| *	Merge sapi/phpdbg into PHP-5.6	Bob Weinand	2014-06-04	5	-19/+28
\| \|\
\| \| *	Fix tests	Bob Weinand	2014-06-04	4	-16/+25
\| \| \|
\| \| *	Fix possible segfault depending on memory location...	Bob Weinand	2014-06-04	1	-3/+3
\| \| \|
\| * \|	fix gcov data with some locales (again)	Nuno Lopes	2014-06-03	1	-1/+1
\| \| \|
\| * \|	Update NEWS	Bob Weinand	2014-06-03	1	-0/+4
\| \| \|
\| * \|	Merge sapi/phpdbg into PHP-5.6	Bob Weinand	2014-06-03	2	-13/+36
\| \|\ \ \| \| \|/
\| \| *	Fixed startup segfault in non-debug builds	Bob Weinand	2014-06-03	1	-12/+35
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue #87
\| \| *	PHP 5.4/5.5 compability in phpdbg_watch.c	Bob Weinand	2014-05-18	1	-1/+1
\| \| \|
\| * \|	Merge branch 'PHP-5.5' into PHP-5.6	Anatol Belski	2014-06-03	0	-0/+0
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Fixed regression introduced by patch for bug #67072
\| \| * \	Merge branch 'PHP-5.4' into PHP-5.5	Anatol Belski	2014-06-03	3	-38/+44
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fixed regression introduced by patch for bug #67072
\| \| \| * \|	Fixed regression introduced by patch for bug #67072	Anatol Belski	2014-06-03	3	-38/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This applies to 5.4 and 5.5 only as a legacy fix.
\| * \| \| \|	Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain ↵	Anatol Belski	2014-06-03	4	-19/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CDF files
\| * \| \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Remi Collet	2014-06-03	0	-0/+0
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: (re)add cve number in NEWS, from 5.4.29
\| \| * \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Remi Collet	2014-06-03	0	-0/+0
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: (re)add cve number in NEWS, from 5.4.29
\| \| \| * \|	(re)add cve number in NEWS, from 5.4.29	Remi Collet	2014-06-03	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	NEWS	Remi Collet	2014-06-03	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Remi Collet	2014-06-03	1	-2/+2
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: NEWS NEWS Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
\| \| * \| \|	NEWS	Remi Collet	2014-06-03	1	-0/+3
\| \| \| \| \|
\| \| * \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Remi Collet	2014-06-03	1	-2/+2
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: NEWS Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
\| \| \| * \|	NEWS	Remi Collet	2014-06-03	1	-0/+3
\| \| \| \| \|
\| \| \| * \|	Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check	Remi Collet	2014-06-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upstream fix https://github.com/file/file/commit/6d209c1c489457397a5763bca4b28e43aac90391.patch Only revelant part applied
\| * \| \| \|	add NEWS block for 5.6.0RC1	Ferenc Kovacs	2014-06-03	1	-1/+3
\| \| \| \| \|
\| * \| \| \|	Update NEWs	Xinchen Hui	2014-06-01	1	-0/+3
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Xinchen Hui	2014-06-01	3	-0/+32
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Update NEWs	Xinchen Hui	2014-06-01	1	-0/+1
\| \| \| \| \|
\| \| * \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Xinchen Hui	2014-06-01	3	-0/+32
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Fixed bug #67359 (Segfault in recursiveDirectoryIterator)	Xinchen Hui	2014-06-01	4	-0/+33
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Adam Harvey	2014-05-29	2	-1/+42
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Check for zero-length keys in spl_array_skip_protected and don't skip them. added CVEs in NEWS
\| \| * \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Adam Harvey	2014-05-29	3	-1/+45
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Check for zero-length keys in spl_array_skip_protected and don't skip them.
\| \| \| * \|	Check for zero-length keys in spl_array_skip_protected and don't skip them.	Adam Harvey	2014-05-29	3	-1/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes bug #67360 (Missing element after ArrayObject::getIterator).
\| \| * \| \|	added CVEs in NEWS	Julien Pauli	2014-05-28	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	updated libmagic.patch for 5.6+	Anatol Belski	2014-05-27	1	-6/+62
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Anatol Belski	2014-05-27	0	-0/+0
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: updated libmagic.patch for 5.4+
\| \| * \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Anatol Belski	2014-05-27	1	-4/+60
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: updated libmagic.patch for 5.4+ Conflicts: ext/fileinfo/libmagic.patch
\| \| \| * \|	updated libmagic.patch for 5.4+	Anatol Belski	2014-05-27	1	-66/+138
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Stanislav Malyshev	2014-05-27	3	-2/+15
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: update NEWS Fix bug #67249: printf out-of-bounds read 5.5.13 release date
\| \| * \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2014-05-27	3	-2/+13
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: update NEWS Fix bug #67249: printf out-of-bounds read
\| \| \| * \|	update NEWS	Stanislav Malyshev	2014-05-27	1	-0/+2
\| \| \| \| \|
\| \| \| * \|	Fix bug #67249: printf out-of-bounds read	Stanislav Malyshev	2014-05-27	2	-2/+12
\| \| \| \| \|
\| \| * \| \|	5.5.13 release date	Julien Pauli	2014-05-27	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Matteo Beccati	2014-05-27	1	-0/+3
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Escape non-printable characters in the junit XML output
\| \| * \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Matteo Beccati	2014-05-27	1	-0/+3
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Escape non-printable characters in the junit XML output
\| \| \| * \|	Escape non-printable characters in the junit XML output	Matteo Beccati	2014-05-27	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Matteo Beccati	2014-05-27	1	-7/+8
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Fixed broken XML junit output due to escaping of CDATA sections
\| \| * \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Matteo Beccati	2014-05-27	1	-7/+8
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fixed broken XML junit output due to escaping of CDATA sections
\| \| \| * \|	Fixed broken XML junit output due to escaping of CDATA sections	Matteo Beccati	2014-05-27	1	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I've removed CDATA and used htmlspecialchars as the output might not be UTF-8 safe, as pointed out by ircmaxell in 26b37f1792dfaf9b0b30f81e492c8f68b9ece571
\| * \| \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Stanislav Malyshev	2014-05-26	0	-0/+0
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Fix #50444: PDO-ODBC changes for 64-bit
\| \| * \| \|	Fix #50444: PDO-ODBC changes for 64-bit	Andrew Kehrig	2014-05-26	3	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.