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

	Commit message (Collapse)	Author	Age	Files	Lines
*	reworked ini dtor	Anatol Belski	2014-12-16	3	-4/+15
\|
*	free the right globals	Anatol Belski	2014-12-16	4	-8/+8
\| \| \| \| \| \|	That's the same as in the previous commit. In the TS mode the tsrm cache pointer might be unavailable or point to a wrong thread, so the exact globals passed should be freed.
*	Merge remote-tracking branch 'origin/master' into native-tls	Anatol Belski	2014-12-16	3	-0/+24
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	* origin/master: fix perms fix perms PowerPC64 support in safe_address function
\| *	fix perms	Remi Collet	2014-12-16	1	-0/+0
\| \|
\| *	Merge branch 'PHP-5.6'	Remi Collet	2014-12-16	1	-0/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: fix perms
\| \| *	Merge branch 'PHP-5.5' into PHP-5.6	Remi Collet	2014-12-16	1	-0/+0
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: fix perms
\| \| \| *	fix perms	Remi Collet	2014-12-16	1	-0/+0
\| \| \| \|
\| * \| \|	PowerPC64 support in safe_address function	Gustavo Frederico Temple Pedrosa	2014-12-16	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a ppc64-specific implementation of the safe_address function with overflow checking.
* \| \| \|	depending on declaration the tsrm cache pointer might be unavailable	Anatol Belski	2014-12-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	during shutdown when the main thread frees all the other threads resources. Even otherwise, exact resource passed to the dtor should be freed, not the one from the current thread.
* \| \| \|	Merge remote-tracking branch 'origin/master' into native-tls	Anatol Belski	2014-12-16	4	-7/+18
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* origin/master: Revert "Removed useless local variable" Fix the fix for bug #55415 add BC breaks from PHPNG RFC add include for definition of php_url_encode
\| * \| \|	Revert "Removed useless local variable"	Dmitry Stogov	2014-12-16	2	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 44ae32ad55b9ceee9eb980edefcc62df6cff3eef. It doesn't work properly. We can't access call->scope after free.
\| * \| \|	Fix the fix for bug #55415	Stanislav Malyshev	2014-12-15	1	-2/+2
\| \| \| \|
\| * \| \|	add BC breaks from PHPNG RFC	Stanislav Malyshev	2014-12-15	1	-0/+7
\| \| \| \|
\| * \| \|	add include for definition of php_url_encode	Stanislav Malyshev	2014-12-15	1	-1/+1
\| \| \| \|
* \| \| \|	removed the extra tsrm pointer passed to ctor/dtor	Anatol Belski	2014-12-16	2	-9/+9
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'origin/master' into native-tls	Anatol Belski	2014-12-15	1	-14/+4
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	* origin/master: Removed deprecated checks
\| * \| \|	Removed deprecated checks	Dmitry Stogov	2014-12-15	1	-14/+4
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'origin/master' into native-tls	Anatol Belski	2014-12-15	9	-30/+21
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* origin/master: made the apache ini holders to be zend_bool Removed useless local variable Use simpler functions Fixed test small fixes to UPGRADING Reorder to save alignment size (of course, only for common used structs)
\| * \| \|	made the apache ini holders to be zend_bool	Anatol Belski	2014-12-15	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	since they're documented to be so and we spare 16 byte
\| * \| \|	Removed useless local variable	Dmitry Stogov	2014-12-15	2	-8/+4
\| \| \| \|
\| * \| \|	Use simpler functions	Dmitry Stogov	2014-12-15	2	-8/+5
\| \| \| \|
\| * \| \|	Fixed test	Dmitry Stogov	2014-12-15	1	-1/+1
\| \| \| \|
\| * \| \|	small fixes to UPGRADING	Stanislav Malyshev	2014-12-14	1	-5/+3
\| \| \| \|
\| * \| \|	Reorder to save alignment size (of course, only for common used structs)	Xinchen Hui	2014-12-15	1	-2/+2
\| \| \| \|
* \| \| \|	in ext/soap globals are initialized also on minit	Anatol Belski	2014-12-15	1	-0/+3
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'origin/master' into native-tls	Anatol Belski	2014-12-15	2	-2/+1
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* origin/master: Save 8 bytes on 64 bits Conflicts: Zend/zend_API.c
\| * \| \|	Save 8 bytes on 64 bits	Xinchen Hui	2014-12-15	2	-2/+1
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'origin/master' into native-tls	Anatol Belski	2014-12-15	5	-12/+22
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* origin/master: Revert HTTP status codes merger fixed tests, bugs in status codes merger Fixed bug #55415 (php_info produces invalid anchor names) NEWS Implement feature request #55467 (phpinfo: PHP Variables with $ and single quotes) NEWS Change back to use is_int() as function instead of is_integer(), as per Jan Tvrdík's request @github NEWS Change is_long() to be an alias of is_integer() Fix indentation Share HTTP status codes map
\| * \| \|	Revert HTTP status codes merger	Andrea Faulds	2014-12-15	6	-96/+161
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commits 65768edcf3ef27a21a07e5e994bfd9ca1cabfa94, 627b350f31be83eb1d5ac5fad692256dcfaf1281 and 9c18ad3ac9103bc0a6c7b7ab8938fd7272095652.
\| * \| \|	fixed tests, bugs in status codes merger	Andrea Faulds	2014-12-14	4	-6/+6
\| \| \| \|
\| * \| \|	Fixed bug #55415 (php_info produces invalid anchor names)	Kalle Sommer Nielsen	2014-12-14	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	@@ Slightly based off Johannes' patch
\| * \| \|	NEWS	Kalle Sommer Nielsen	2014-12-14	1	-0/+1
\| \| \| \|
\| * \| \|	Implement feature request #55467 (phpinfo: PHP Variables with $ and single ↵	Kalle Sommer Nielsen	2014-12-14	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	quotes)
\| * \| \|	NEWS	Kalle Sommer Nielsen	2014-12-14	1	-1/+1
\| \| \| \|
\| * \| \|	Change back to use is_int() as function instead of is_integer(), as per Jan ↵	Kalle Sommer Nielsen	2014-12-14	3	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tvrdík's request @github
\| * \| \|	NEWS	Kalle Sommer Nielsen	2014-12-14	1	-1/+2
\| \| \| \|
\| * \| \|	Change is_long() to be an alias of is_integer()	Kalle Sommer Nielsen	2014-12-14	3	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	@@ See internals: news.php.net/php.internals/79639 @@ Manual will be updated so that is_int() will be an alias of is_integer() @@ I picked integer over int for consitentcy as we do not use str instead of string either
\| * \| \|	Fix indentation	Andrea Faulds	2014-12-14	1	-48/+48
\| \| \| \|
\| * \| \|	Merge branch 'unify_http'	Andrea Faulds	2014-12-14	4	-157/+92
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* unify_http: Share HTTP status codes map
\| \| * \| \|	Share HTTP status codes map	Andrea Faulds	2014-12-14	4	-157/+92
\| \| \| \| \|
* \| \| \| \|	Merge remote-tracking branch 'origin/master' into native-tls	Anatol Belski	2014-12-14	11	-425/+544
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* origin/master: Fix bug #67106 split main fpm config split fpm config to two parts. PR#903 fix typo Fix undefined behaviour in strnatcmp Fix undefined behaviour in strnatcmp Fixed memory leak introduced by 73458e8f update NEWS move the test to the right place Fixed bug #68545 NULL pointer dereference in unserialize.c
\| * \| \| \|	Fix bug #67106 split main fpm config	Remi Collet	2014-12-14	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	split fpm config to two parts. PR#903	Elan Ruusamäe	2014-12-14	4	-423/+423
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	main config = global options secondary config = pool options makes easier to add new pools: duplicate pool config in fpm.d dir https://bugs.php.net/bug.php?id=67106
\| * \| \| \|	Merge branch 'PHP-5.6'	Remi Collet	2014-12-14	1	-1/+1
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: fix typo
\| \| * \| \|	fix typo	Remi Collet	2014-12-14	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-5.6'	Andrea Faulds	2014-12-13	0	-0/+0
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Fix undefined behaviour in strnatcmp update NEWS move the test to the right place Fixed bug #68545 NULL pointer dereference in unserialize.c
\| \| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Andrea Faulds	2014-12-13	1	-2/+2
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Fix undefined behaviour in strnatcmp update NEWS move the test to the right place Fixed bug #68545 NULL pointer dereference in unserialize.c
\| \| \| * \|	Merge branch 'PHP-5.4' into PHP-5.5	Andrea Faulds	2014-12-13	1	-2/+2
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fix undefined behaviour in strnatcmp update NEWS move the test to the right place Fixed bug #68545 NULL pointer dereference in unserialize.c Conflicts: NEWS
\| \| \| \| * \|	Fix undefined behaviour in strnatcmp	Andrea Faulds	2014-12-13	1	-2/+2
\| \| \| \| \| \|
\| \| \| \| * \|	update NEWS	Stanislav Malyshev	2014-12-11	1	-0/+1
\| \| \| \| \| \|