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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use reference counting instead of zval duplication	Dmitry Stogov	2014-06-05	47	-878/+915
\|
*	Reference counters in PHPNG may have different values	Dmitry Stogov	2014-06-04	1	-9/+9
\|
*	Avoid useless merge	Dmitry Stogov	2014-06-04	5	-13/+26
\|
*	Simplified and optimized ZEND_HANDLE_NUMERIC()	Dmitry Stogov	2014-06-03	7	-127/+299
\|
*	Optimized conditions order	Dmitry Stogov	2014-06-03	3	-68/+169
\|
*	Optimized conditions order	Dmitry Stogov	2014-06-03	4	-100/+105
\|
*	Avoid copying of immutable arrays	Dmitry Stogov	2014-06-03	3	-68/+141
\|
*	cleanup	Dmitry Stogov	2014-06-03	1	-9/+3
\|
*	cleanup	Dmitry Stogov	2014-06-03	9	-229/+253
\|
*	Fixed merge	Xinchen Hui	2014-06-01	1	-0/+1
\|
*	Merge branch 'master' into phpng	Xinchen Hui	2014-06-01	8	-21/+148
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ext/spl/spl_array.c ext/spl/spl_directory.c ext/standard/formatted_print.c
\| *	Merge branch 'PHP-5.6'	Xinchen Hui	2014-06-01	3	-0/+32
\| \|\
\| \| *	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.6'	Adam Harvey	2014-05-29	2	-1/+42
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Check for zero-length keys in spl_array_skip_protected and don't skip them. added CVEs in NEWS
\| \| * \| \|	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
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-5.6'	Anatol Belski	2014-05-27	1	-6/+62
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: updated libmagic.patch for 5.6+ updated libmagic.patch for 5.4+
\| \| * \| \|	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.6'	Stanislav Malyshev	2014-05-27	2	-2/+12
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: update NEWS Fix bug #67249: printf out-of-bounds read 5.5.13 release date
\| \| * \| \|	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.6'	Matteo Beccati	2014-05-27	1	-0/+3
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Escape non-printable characters in the junit XML output
\| \| * \| \|	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.6'	Matteo Beccati	2014-05-27	1	-7/+8
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Fixed broken XML junit output due to escaping of CDATA sections
\| \| * \| \|	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.6'	Stanislav Malyshev	2014-05-26	0	-0/+0
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Fix #50444: PDO-ODBC changes for 64-bit
\| \| * \| \|	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.
\| * \| \| \|	Merge branch 'PHP-5.6'	Stanislav Malyshev	2014-05-26	1	-13/+11
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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
\| \| * \| \|	update NEWS	Stanislav Malyshev	2014-05-26	1	-0/+5
\| \| \| \| \|
\| \| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Stanislav Malyshev	2014-05-26	1	-13/+11
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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
\| \| \| * \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2014-05-26	1	-0/+3
\| \| \| \|\ \ \| \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: backport this piece from 5.6, related to the #66307 fix Fixed bug #66307 Fileinfo crashes with powerpoint files
\| \| \| \| *	backport this piece from 5.6, related to the #66307 fix	Anatol Belski	2014-05-26	1	-1/+2
\| \| \| \| \|
\| \| \| \| *	Fixed bug #66307 Fileinfo crashes with powerpoint files	Anatol Belski	2014-05-26	3	-2/+7
\| \| \| \| \|