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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'PHP-5.5'	Ferenc Kovacs	2013-11-06	0	-0/+0
\|\
\| *	Merge branch 'PHP-5.4' into PHP-5.5	Ferenc Kovacs	2013-11-06	84	-124/+227
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ext/spl/tests/SplFileObject_rewind_error001.phpt
\| \| *	Add a couple more test cases to parse_url() tests	Sara Golemon	2013-11-06	10	-10/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	http://::# (valid but silly) http://# (invalid)
\| \| *	fix missing change from 'tcp_socket' to the more common 'server'	ptarjan	2013-11-06	1	-3/+3
\| \| \|
\| \| *	fix many parallel test issues	ptarjan	2013-11-06	74	-109/+185
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While running these on HHVM I've run into a lot of parallelism issues. I'm backporting all the fixes I had to do in https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650 to php core. Most of these changes were just filenames that were shared between tests, but I did more surgery on the fixed ports. I can apreciate port 31337 as much as the next nerd, but random ports are better for tests.
\| \| *	Cleanup temp test file	Christopher Jones	2013-11-06	1	-0/+4
\| \| \|
* \| \|	Merge branch 'PHP-5.5'	Xinchen Hui	2013-11-06	1	-39/+5
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	Conflicts: ext/opcache/ZendAccelerator.c
\| * \|	Revert "Fixed issue #115 (path issue when using phar)."	Xinchen Hui	2013-11-06	2	-40/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need another better way to fix this This reverts commit 098855433dc5d609e3970f0bc9d6766c007273f3. Conflicts: ext/opcache/ZendAccelerator.c
* \| \|	Update LiteSpeed SAPI code to V6.4	George Wang	2013-11-05	4	-1226/+2764
\| \| \|
* \| \|	Fixed typo in Makefile.frag	George Wang	2013-11-05	1	-1/+1
\| \| \|
* \| \|	updated NEWS	Anatol Belski	2013-11-05	1	-0/+2
\| \| \|
* \| \|	Merge branch 'pull-request/500'	Anatol Belski	2013-11-05	29	-4792/+4836
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* pull-request/500: limit virtual_cwd_activate() duplicated call to ZTS only reverted the previous commit, both calls are needed in TS mode virtual_cwd_activate() should be called only in one place back to do_alloca() removed unnecessary call simplify the state free macros compact the code to preserve the error info after state freeing back to do_alloca(), reverted the wrong replacement enabled windows to use stack in both ts/nts mode, some more fixes moved to do_alloca() usage where appropriate fixed invalid free fixed virtual cwd header in phar updated NEWS fixed all the places where last error could be lost preserve the error code applied and fixed the original patch initial move on renaming files and fixing includes Conflicts: ext/opcache/ZendAccelerator.c
\| * \| \|	limit virtual_cwd_activate() duplicated call to ZTS only	Anatol Belski	2013-11-02	1	-0/+2
\| \| \| \|
\| * \| \|	reverted the previous commit, both calls are needed in TS mode	Anatol Belski	2013-11-01	1	-0/+1
\| \| \| \|
\| * \| \|	virtual_cwd_activate() should be called only in one place	Anatol Belski	2013-11-01	1	-1/+0
\| \| \| \|
\| * \| \|	back to do_alloca()	Anatol Belski	2013-10-31	1	-3/+4
\| \| \| \|
\| * \| \|	removed unnecessary call	Anatol Belski	2013-10-31	1	-1/+0
\| \| \| \|
\| * \| \|	simplify the state free macros	Anatol Belski	2013-10-31	1	-2/+2
\| \| \| \|
\| * \| \|	compact the code to preserve the error info after state freeing	Anatol Belski	2013-10-30	1	-242/+42
\| \| \| \|
\| * \| \|	back to do_alloca(), reverted the wrong replacement	Anatol Belski	2013-10-30	1	-2/+3
\| \| \| \|
\| * \| \|	Merge branch 'bug50333' of github.com:weltling/php-src into bug50333	Anatol Belski	2013-10-29	30	-4766/+5009
\| \|\ \ \
\| \| * \| \|	enabled windows to use stack in both ts/nts mode, some more fixes	Anatol Belski	2013-10-24	2	-4/+4
\| \| \| \| \|
\| \| * \| \|	moved to do_alloca() usage where appropriate	Anatol Belski	2013-10-24	1	-27/+31
\| \| \| \| \|
\| \| * \| \|	fixed invalid free	Anatol Belski	2013-10-21	1	-2/+2
\| \| \| \| \|
\| \| * \| \|	fixed virtual cwd header in phar	Anatol Belski	2013-10-18	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	updated NEWS	Anatol Belski	2013-10-18	1	-0/+2
\| \| \| \| \|
\| \| * \| \|	fixed all the places where last error could be lost	Anatol Belski	2013-10-18	1	-0/+201
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	whereby this commit should be applied to master anyway
\| \| * \| \|	preserve the error code	Anatol Belski	2013-10-18	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	otherwise it'd be cleared by a subsequent calls
\| \| * \| \|	applied and fixed the original patch	Anatol Belski	2013-10-17	9	-79/+106
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	initial work on the patch import done
\| \| * \| \|	initial move on renaming files and fixing includes	Anatol Belski	2013-10-17	19	-4683/+4684
\| \| \| \| \|
* \| \| \| \|	Merge branch 'PHP-5.5'	Xinchen Hui	2013-11-05	2	-9/+5
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ext/phar/phar_internal.h ext/phar/stream.c ext/phar/util.c
\| * \| \| \|	Remove outdate codes, make it clearer, although just a bit..	Xinchen Hui	2013-11-05	6	-546/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'PHP-5.5'	Xinchen Hui	2013-11-05	3	-4/+36
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Update NEWS	Xinchen Hui	2013-11-05	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Xinchen Hui	2013-11-05	3	-3/+35
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.in ext/mysqlnd/mysqlnd.c main/php_version.h
\| \| * \| \|	Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement ↵	Xinchen Hui	2013-11-05	3	-3/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	throws an exception) I know zend_call_function will initilize retval_ptr_ptr, but still set it to NULL explict is more readable
\| \| * \| \|	Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4	Xinchen Hui	2013-11-05	13	-701/+741
\| \| \|\ \ \
\| \| \| * \| \|	Typo fix: umknown -> unknown	Lior Kaplan	2013-10-31	1	-2/+2
\| \| \| \| \| \|
\| \| \| * \| \|	Fix bug #66008	Rasmus Lerdorf	2013-10-31	1	-0/+1
\| \| \| \| \| \|
\| \| \| * \| \|	5.4.23-dev	Stanislav Malyshev	2013-10-29	3	-4/+6
\| \| \| \| \| \|
\| \| \| * \| \|	Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4	Yasuo Ohgaki	2013-10-29	1	-0/+27
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'PHP-5.4' of git.php.net:php-src: add bundled libzip LICENSE, as required by BSD License terms
\| * \| \| \ \ \	Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5	Xinchen Hui	2013-11-04	21	-919/+964
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Typo fix: umknown -> unknown	Martin Hujer	2013-10-31	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	add news entry about FPM backlog change	Antony Dovgal	2013-10-31	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and move the other entry to its proper place
* \| \| \| \| \| \| \|	Merge branch 'master' of git.php.net:php-src	Pierre Joye	2013-11-04	103	-1875/+4827
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# By Remi Collet (2) and Xinchen Hui (2) # Via Xinchen Hui (5) and Remi Collet (1) * 'master' of git.php.net:php-src: NEWS + UPGRADING Sync ext/zip with pecl/zip version 1.3.2 - update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip Fixed coredump due to abnormal implemention of phar remove "PHP 6" staff
\| * \| \| \| \| \| \| \|	NEWS + UPGRADING	Remi Collet	2013-11-04	2	-0/+12
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Sync ext/zip with pecl/zip version 1.3.2	Remi Collet	2013-11-04	99	-1870/+4813
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip
\| * \| \| \| \| \| \| \|	Merge branch 'master' of git.php.net:php-src	Xinchen Hui	2013-11-04	35	-1480/+1770
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix English here	Rasmus Lerdorf	2013-11-02	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'PHP-5.5'	Rasmus Lerdorf	2013-10-31	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Fix bug #66008