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

	Commit message (Collapse)	Author	Age	Files	Lines
*	PHP 5.5.0php-5.5.0	David Soria Parra	2013-06-19	2	-3/+3
\|
*	Update credits	David Soria Parra	2013-06-19	1	-2/+2
\|
*	Merge NEWS from PHP 5.4 branch	David Soria Parra	2013-06-19	1	-1/+7975
\|
*	Reorder NEWS for PHP 5.5.0 final	David Soria Parra	2013-06-19	1	-401/+246
\|
*	add notes about opcache windows issue and migration from APC	Pierre Joye	2013-06-19	1	-0/+16
\|
*	added some tests based on bug #64395	Anatol Belski	2013-06-19	3	-7/+80
\|
*	Merge branch 'PHP-5.4' into PHP-5.5	Johannes Schlüter	2013-06-19	0	-0/+0
\|\
\| *	Merge branch 'PHP-5.3' into PHP-5.4	Johannes Schlüter	2013-06-19	0	-0/+0
\| \|\
\| \| *	This will be PHP 5.3.28	Johannes Schlüter	2013-06-19	3	-4/+11
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Remi Collet	2013-06-19	3	-4/+4
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* PHP-5.4: Related to bug #65047 (Test skip on client / server version)
\| * \|	Related to bug #65047 (Test skip on client / server version)	Remi Collet	2013-06-19	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bug46274.phpt and bug46274_2.phpt Make query silent (when server don't know bytea_output option) bug_49985.phpt Make result "locale" independent
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Matteo Beccati	2013-06-19	17	-30/+131
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fixed bug #65047 (Test skip on client / server version) Remove broken client version checking Clean up leftover file after the test
\| * \|	Fixed bug #65047 (Test skip on client / server version)	Matteo Beccati	2013-06-19	16	-24/+127
\| \| \|
\| * \|	Remove broken client version checking	Matteo Beccati	2013-06-19	1	-7/+3
\| \| \|
\| * \|	Clean up leftover file after the test	Matteo Beccati	2013-06-19	1	-0/+2
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2013-06-18	0	-0/+0
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* PHP-5.4: sync NEWS
\| * \|	sync NEWS	Stanislav Malyshev	2013-06-18	1	-0/+9
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2013-06-18	0	-0/+0
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: 5.4.18 next Conflicts: configure.in main/php_version.h
\| * \|	5.4.18 next	Stanislav Malyshev	2013-06-18	3	-4/+6
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Xinchen Hui	2013-06-19	1	-2/+2
\|\ \ \ \| \|/ /
\| * \|	Fix test typo	Xinchen Hui	2013-06-19	1	-2/+2
\| \| \|
* \| \|	Fix bug #65051: count() off by one inside unset()	Nikita Popov	2013-06-17	3	-3/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nNumOfElements was incremented after the pDestructor code, so any code in the dtor would get a wrong number of elements. Right now the bucket deletion code is replicated in four places, it should probably be moved off into one function (or rather, zend_hash_apply_deleter should be used everywhere). The codes are subtly different though in that the HANDLE_UNBLOCK_INTERRUPTIONS() happens in different places. In particular it seems odd that in some cases interruptions stay blocked during the destructor call.
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2013-06-17	0	-0/+0
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* PHP-5.4: Merge branch 'pull-request/320'
\| * \|	Merge branch 'pull-request/320'	Stanislav Malyshev	2013-06-17	18	-66/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* pull-request/320: this is test 5 not 6 fix race condition more shared names that create race conditions change to a unique filename more shared filenames yet another shared filename don't share a filename to stop race conditions fix race condition for 2-4 and normalize names for others fix race condition when running tests in parallel clean up after test Fix #64572: Clean up after the test Fix #64572: Clean up after the test
* \| \|	Merge branch 'pull-request/320'	Stanislav Malyshev	2013-06-17	18	-66/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* pull-request/320: this is test 5 not 6 fix race condition more shared names that create race conditions change to a unique filename more shared filenames yet another shared filename don't share a filename to stop race conditions fix race condition for 2-4 and normalize names for others fix race condition when running tests in parallel clean up after test Fix #64572: Clean up after the test Fix #64572: Clean up after the test
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2013-06-17	3	-7/+14
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Tests: PDO Mysql - update for fixed getColumnMeta() fix bug #48724
\| * \|	Tests: PDO Mysql - update for fixed getColumnMeta()	Daniel Beardsley	2013-06-17	2	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \|	The test has always been disabled... so it's never run anyway. Oh well.
\| * \|	fix bug #48724	Antony Dovgal	2013-06-17	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \|	PDO's getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2013-06-17	5	-5/+23
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: readline can output control codes Bug #55694: Update readline test to support attempted_completion_over variable Bug #55694: Expose attempted_completion_over variable from readline library
\| * \|	readline can output control codes	Stanislav Malyshev	2013-06-17	2	-3/+3
\| \| \|
\| * \|	Bug #55694: Update readline test to support attempted_completion_over variable	Hartmel	2013-06-16	2	-1/+11
\| \| \|
\| * \|	Bug #55694: Expose attempted_completion_over variable from readline library	Hartmel	2013-06-16	1	-1/+9
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Xinchen Hui	2013-06-17	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	Fix typo in test	Xinchen Hui	2013-06-17	1	-1/+1
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2013-06-16	1	-1/+1
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* PHP-5.4: Identation Fixed
\| * \|	Identation Fixed	Jefersson Nathan	2013-06-16	1	-7/+7
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2013-06-16	1	-6/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Identation Fixed
\| * \| \|	Identation Fixed	Jefersson Nathan	2013-06-16	1	-6/+6
\| \|/ /
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2013-06-16	2	-1/+18
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fix bug #64764: Add status option to fpm init.d script
\| * \|	Fix bug #64764: Add status option to fpm init.d script	Lior Kaplan	2013-06-16	2	-1/+16
\| \| \|
* \| \|	update NEWS	Stanislav Malyshev	2013-06-16	1	-0/+4
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2013-06-16	0	-0/+0
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* PHP-5.4: news for #64166
\| * \|	news for #64166	Stanislav Malyshev	2013-06-16	1	-0/+2
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2013-06-16	4	-10/+191
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: add more tests for bug #64166 Move unsigned char declaration to top of block trailing ws Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
\| * \|	add more tests for bug #64166	Stanislav Malyshev	2013-06-16	2	-0/+98
\| \| \|
\| * \|	Move unsigned char declaration to top of block	Michael M Slusarz	2013-06-16	1	-1/+2
\| \| \|
\| * \|	trailing ws	Michael M Slusarz	2013-06-16	1	-5/+5
\| \| \|
\| * \|	Fix #64166: quoted-printable-encode stream filter incorrectly discarding ↵	Michael M Slusarz	2013-06-16	2	-36/+74
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	whitespace Second attempt: need to use lookaheadto determine whether to encode ws
\| * \|	Fix #64166: quoted-printable-encode stream filter incorrectly discarding ↵	Michael M Slusarz	2013-06-16	2	-0/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	whitespace If trailing whitespace on a line is detected, mark the linebreak as a soft linebreak.
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2013-06-16	4	-344/+391
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fix bug #64936 - clean doc comment state at the beginning and end of the scan ws fix Conflicts: Zend/zend_language_scanner.c Zend/zend_language_scanner.l Zend/zend_language_scanner_defs.h