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

	Commit message (Collapse)	Author	Age	Files	Lines
*	noted the TSRM changes to UPGRADING.INTERNALSnative-tls	Anatol Belski	2014-12-18	1	-0/+42
\|
*	Merge remote-tracking branch 'origin/master' into native-tls	Anatol Belski	2014-12-17	2	-1/+17
\|\ \| \| \| \| \| \| \| \| \| \|	* origin/master: fix integral constant overflow warning Use HUGE PAGES for opcahce SHM, if available.
\| *	fix integral constant overflow warningPRE_NATIVE_TLS_MERGE	Anatol Belski	2014-12-17	1	-1/+1
\| \| \| \| \| \| \| \|	as it's promoted to size_t when passed to ZEND_CALL_ARG
\| *	Use HUGE PAGES for opcahce SHM, if available.	Dmitry Stogov	2014-12-17	1	-0/+16
\| \|
* \|	integrated the static tsrmls cache into ext/skel	Anatol Belski	2014-12-17	3	-10/+14
\| \|
* \|	Merge remote-tracking branch 'origin/master' into native-tls	Anatol Belski	2014-12-17	2	-7/+7
\|\ \ \| \|/ \| \| \| \| \| \| \| \|	* origin/master: Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467 Added EXPECTED(). Most functions have arguments.
\| *	Merge branch 'PHP-5.6'	Remi Collet	2014-12-17	1	-6/+6
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
\| \| *	Merge branch 'PHP-5.5' into PHP-5.6	Remi Collet	2014-12-17	1	-6/+6
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
\| \| \| *	Better fix for #68601 for perf	Remi Collet	2014-12-17	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
\| * \| \|	Added EXPECTED(). Most functions have arguments.	Dmitry Stogov	2014-12-17	1	-1/+1
\| \| \| \|
* \| \| \|	remove the thread ctx from curl	Anatol Belski	2014-12-17	2	-9/+0
\| \| \| \|
* \| \| \|	remove unused ZTS macros	Anatol Belski	2014-12-17	1	-6/+0
\| \| \| \|
* \| \| \|	remove TSRMLS_* occurence	Anatol Belski	2014-12-17	1	-2/+2
\| \| \| \|
* \| \| \|	enable static tsrmls cache in the embed SAPI	Anatol Belski	2014-12-17	2	-2/+2
\| \| \| \|
* \| \| \|	get rid of TSRMLS_* in the embed SAPI	Anatol Belski	2014-12-17	2	-26/+12
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'origin/master' into native-tls	Anatol Belski	2014-12-17	24	-71/+109
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* origin/master: fix unserializer patch move this entry to the correct version add missing NEWS entry add missing NEWS entry Updated or skipped certain 32-bit tests add NEWS entry for #68594 5.4.37 add more BC breaks update news add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize() Fix typo Hash value must not zero?
\| * \| \|	Merge branch 'fix-typo' of https://github.com/gustavotemple/php-src	Xinchen Hui	2014-12-17	1	-0/+1
\| \|\ \ \
\| \| * \| \|	Fix typo	Gustavo Frederico Temple Pedrosa	2014-12-15	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of https://git.php.net/repository/php-src	Xinchen Hui	2014-12-17	143	-998/+1373
\| \|\ \ \ \
\| \| * \| \| \|	fix unserializer patch	Stanislav Malyshev	2014-12-16	2	-36/+32
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'PHP-5.6'	Ferenc Kovacs	2014-12-17	0	-0/+0
\| \| \|\ \ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: move this entry to the correct version
\| \| \| * \| \|	move this entry to the correct version	Ferenc Kovacs	2014-12-17	1	-3/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'PHP-5.6'	Ferenc Kovacs	2014-12-17	0	-0/+0
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: add missing NEWS entry add missing NEWS entry 5.4.37
\| \| \| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Ferenc Kovacs	2014-12-17	0	-0/+0
\| \| \| \|\ \ \ \| \| \| \| \| \|/ \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: add missing NEWS entry add missing NEWS entry 5.4.37
\| \| \| \| * \|	add missing NEWS entry	Ferenc Kovacs	2014-12-17	1	-0/+3
\| \| \| \| \| \|
\| \| \| \| * \|	Merge branch 'PHP-5.4' into PHP-5.5	Ferenc Kovacs	2014-12-17	0	-0/+0
\| \| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: add missing NEWS entry 5.4.37 Conflicts: configure.in main/php_version.h
\| \| \| \| \| * \|	add missing NEWS entry	Ferenc Kovacs	2014-12-17	1	-0/+3
\| \| \| \| \| \| \|
\| \| \| \| \| * \|	5.4.37	Stanislav Malyshev	2014-12-16	3	-5/+7
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'zppFailOnOverflow'	Andrea Faulds	2014-12-17	18	-11/+33
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* zppFailOnOverflow: Updated or skipped certain 32-bit tests
\| \| \| * \| \| \| \|	Updated or skipped certain 32-bit tests	Andrea Faulds	2014-12-17	18	-11/+33
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'PHP-5.6'	Ferenc Kovacs	2014-12-17	0	-0/+0
\| \| \|\ \ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: add NEWS entry for #68594
\| \| \| * \| \| \| \|	add NEWS entry for #68594	Ferenc Kovacs	2014-12-17	1	-0/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	add more BC breaks	Stanislav Malyshev	2014-12-16	1	-0/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'PHP-5.6'	Stanislav Malyshev	2014-12-16	3	-60/+72
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: update news add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize() Conflicts: ext/standard/var_unserializer.c ext/standard/var_unserializer.re
\| \| \| * \| \| \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Stanislav Malyshev	2014-12-16	3	-32/+62
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \|/ / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: update news add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize() Conflicts: ext/standard/var_unserializer.c
\| \| \| \| * \| \| \|	update news	Stanislav Malyshev	2014-12-16	1	-0/+2
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2014-12-16	3	-32/+62
\| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \|/ / \| \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize()
\| \| \| \| \| * \| \|	add CVE	Stanislav Malyshev	2014-12-16	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	add missing test file	Stanislav Malyshev	2014-12-16	1	-0/+7
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Fix bug #68594 - Use after free vulnerability in unserialize()	Stanislav Malyshev	2014-12-16	4	-32/+64
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Hash value must not zero?	Xinchen Hui	2014-12-13	1	-0/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into native-tls	Anatol Belski	2014-12-16	6	-65/+195
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* origin/master: Optimize argument passing handlers: Fix pcre non-FAST_ZPP build Conflicts: Zend/zend_compile.c Zend/zend_execute.h Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/pcre/php_pcre.c
\| * \| \| \| \| \| \|	Optimize argument passing handlers:	Dmitry Stogov	2014-12-16	5	-64/+194
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- predcalculate offsets of passed argument and store it in opline->result.var for ZEND_SEND_; - don't update "number of passed arguments" op each ZEND_SEND_ opcode, store it on call frame creation - Change ZEND_HANDLE_EXCEPTION to determine "number of passed arguments" in incomplete calls fefore freeing
\| * \| \| \| \| \|	Fix pcre non-FAST_ZPP build	Andrea Faulds	2014-12-16	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	don't need this in nts mode	Anatol Belski	2014-12-16	1	-1/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	various fixes for removing explicit tsrm_ls usage	Anatol Belski	2014-12-16	7	-558/+453
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into native-tls	Anatol Belski	2014-12-16	3	-5/+12
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* origin/master: C89 fixes use portable struct stat fixed macro va args expansion for vs
\| * \| \| \| \| \|	C89 fixes	Anatol Belski	2014-12-16	2	-3/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	use portable struct stat	Anatol Belski	2014-12-16	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fixed macro va args expansion for vs	Anatol Belski	2014-12-16	1	-0/+5
\| \| \| \| \| \| \|