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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of git.php.net:php-src	Anatol Belski	2014-08-25	1	-0/+11
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# By Daniel Lowrey # Via Daniel Lowrey * 'master' of git.php.net:php-src: Update NEWS Bug #67850: Build when OpenSSL compiled without SSLv3 support
\| *	Merge branch 'PHP-5.6'	Daniel Lowrey	2014-08-25	0	-0/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Update NEWS
\| \| *	Merge branch 'PHP-5.5' into PHP-5.6	Daniel Lowrey	2014-08-25	1	-0/+4
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Update NEWS
\| \| \| *	Update NEWS	Daniel Lowrey	2014-08-25	1	-0/+2
\| \| \| \|
\| * \| \|	Merge branch 'PHP-5.6'	Daniel Lowrey	2014-08-25	1	-0/+11
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Bug #67850: Build when OpenSSL compiled without SSLv3 support
\| \| * \|	Merge branch 'PHP-5.5' into PHP-5.6	Daniel Lowrey	2014-08-25	1	-0/+11
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Bug #67850: Build when OpenSSL compiled without SSLv3 support Conflicts: ext/openssl/xp_ssl.c
\| \| \| *	Bug #67850: Build when OpenSSL compiled without SSLv3 support	Daniel Lowrey	2014-08-25	1	-0/+10
\| \| \| \|
* \| \| \|	master renames phase 3	Anatol Belski	2014-08-25	131	-643/+635
\| \| \| \|
* \| \| \|	master renames phase 2	Anatol Belski	2014-08-25	64	-463/+461
\| \| \| \|
* \| \| \|	master renames phase 1	Anatol Belski	2014-08-25	486	-11616/+11534
\|/ / /
* \| \|	Merge branch 'PHP-5.6'	Lior Kaplan	2014-08-25	7	-0/+252
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* PHP-5.6: Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
\| * \|	Merge branch 'PHP-5.5' into PHP-5.6	Lior Kaplan	2014-08-25	7	-0/+252
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \|	* PHP-5.5: Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
\| \| *	Merge branch 'PHP-5.4' into PHP-5.5	Lior Kaplan	2014-08-25	7	-0/+252
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
\| \| \| *	Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>	Lior Kaplan	2014-08-25	7	-0/+252
\| \| \| \|
* \| \| \|	bring back the logic to parse 64 bit props also in 32 bit build	Anatol Belski	2014-08-24	1	-1/+19
\| \| \| \|
* \| \| \|	fix a phrase	Anatol Belski	2014-08-24	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'master' of git.php.net:php-src	Anatol Belski	2014-08-24	1	-5/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# By Ferenc Kovacs # Via Ferenc Kovacs * 'master' of git.php.net:php-src: this test depends on the simplexml ext, not just on xml
\| * \ \ \	Merge branch 'PHP-5.6'	Ferenc Kovacs	2014-08-24	1	-5/+1
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: this test depends on the simplexml ext, not just on xml Conflicts: ext/simplexml/tests/bug62328.phpt
\| \| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Ferenc Kovacs	2014-08-24	1	-3/+1
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: this test depends on the simplexml ext, not just on xml
\| \| \| * \|	Merge branch 'PHP-5.4' into PHP-5.5	Ferenc Kovacs	2014-08-24	1	-3/+1
\| \| \| \|\ \ \| \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: this test depends on the simplexml ext, not just on xml
\| \| \| \| *	this test depends on the simplexml ext, not just on xml	Ferenc Kovacs	2014-08-24	1	-3/+1
\| \| \| \| \|
* \| \| \| \|	note on %pd format	Anatol Belski	2014-08-24	1	-0/+4
\| \| \| \| \|
* \| \| \| \|	fixes to %pd format usage	Anatol Belski	2014-08-24	53	-114/+202
\|/ / / /
* \| \| \|	Merge branch 'PHP-5.6'	Tjerk Meesters	2014-08-23	3	-1/+45
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Fixed #67694: Regression in session_regenerate_id() Conflicts: ext/session/session.c
\| * \| \|	Fixed #67694: Regression in session_regenerate_id()	Tjerk Meesters	2014-08-23	3	-1/+45
\| \| \| \|
* \| \| \|	Use %d instead of object id	Tjerk Meesters	2014-08-23	1	-2/+2
\| \| \| \|
* \| \| \|	Fixed test case based on var_dump() changes made in ↵	Tjerk Meesters	2014-08-23	1	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	c1965f58d4dd3970912dcd6a63ccd5860bae1a97
* \| \| \|	fix wrong type causing build error	krakjoe	2014-08-22	1	-1/+1
\| \| \| \|
* \| \| \|	adedd note on portable numeric macros	Anatol Belski	2014-08-22	1	-1/+16
\| \| \| \|
* \| \| \|	note on LFS macros	Anatol Belski	2014-08-22	1	-0/+10
\| \| \| \|
* \| \| \|	updated UPGRADING so far	Anatol Belski	2014-08-22	1	-2/+13
\| \| \| \|
* \| \| \|	note on hash table and sprintf	Anatol Belski	2014-08-22	1	-2/+17
\| \| \| \|
* \| \| \|	note on zpp specs	Anatol Belski	2014-08-22	1	-0/+5
\| \| \| \|
* \| \| \|	updated UPGRADING.INTERNALS with new data types	Anatol Belski	2014-08-22	1	-0/+39
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'weltling/master'POST_64BIT_BRANCH_MERGE	Anatol Belski	2014-08-22	511	-11534/+11763
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* weltling/master: (725 commits) fix zpp fixed array_pad() fix zpp fix zpp fix zpp fix zpp and a bit more fix zpp fix zpp fix zpp fix zpp fix zpp fix zpp fix zpp fix zpp fix zpp fix zpp fix zpp fix zpp fix zpp fixed the test ...
\| * \| \| \|	fix zpp	Anatol Belski	2014-08-21	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	fixed array_pad()	Anatol Belski	2014-08-21	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	fix zpp	Anatol Belski	2014-08-21	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	fix zpp	Anatol Belski	2014-08-21	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	fix zpp	Anatol Belski	2014-08-21	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	fix zpp and a bit more	Anatol Belski	2014-08-21	1	-20/+20
\| \| \| \| \|
\| * \| \| \|	fix zpp	Anatol Belski	2014-08-21	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	fix zpp	Anatol Belski	2014-08-21	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'php/master'	Anatol Belski	2014-08-21	1	-1/+1
\| \|\ \ \ \
\| * \| \| \| \|	fix zpp	Anatol Belski	2014-08-21	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	fix zpp	Anatol Belski	2014-08-21	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	fix zpp	Anatol Belski	2014-08-21	1	-8/+8
\| \| \| \| \| \|
\| * \| \| \| \|	fix zpp	Anatol Belski	2014-08-21	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	fix zpp	Anatol Belski	2014-08-21	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	fix zpp	Anatol Belski	2014-08-21	1	-2/+2
\| \| \| \| \| \|