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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed warning message	Xinchen Hui	2014-06-18	1	-1/+1
\|
*	Fixed memory leak while doing fetch	Xinchen Hui	2014-06-18	2	-48/+6
\|
*	Fixed segfaults	Xinchen Hui	2014-06-18	2	-16/+11
\|
*	copy_data seems useless now	Xinchen Hui	2014-06-18	1	-1/+6
\|
*	Fixed typo	Xinchen Hui	2014-06-18	1	-2/+2
\|
*	Fixed segfault of stream handling	Xinchen Hui	2014-06-18	4	-5/+9
\|
*	Fixed plugin fetching	Xinchen Hui	2014-06-18	1	-1/+1
\|
*	Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng	Xinchen Hui	2014-06-18	9	-51/+170
\|\
\| *	Use arena allocator for zend_class_entry, zend_op_array and ↵	Dmitry Stogov	2014-06-18	9	-49/+167
\| \| \| \| \| \| \| \|	zend_property_info that live till the end of request
\| *	Fixed HASH_FLAG_APPLY_PROTECTION flag usage	Dmitry Stogov	2014-06-17	1	-2/+3
\| \|
* \|	Refactoring mysqlnd (incompleted, only mysqlnd ext compilable)	Xinchen Hui	2014-06-18	11	-323/+285
\|/
*	Don't include trailing zero into hash function	Dmitry Stogov	2014-06-17	2	-25/+25
\|
*	Fixed support for constants inherited from interfaces	Dmitry Stogov	2014-06-17	1	-0/+3
\|
*	Avoid useles constants update	Dmitry Stogov	2014-06-16	5	-53/+101
\|
*	Optimize out useles paths	Dmitry Stogov	2014-06-16	1	-81/+56
\|
*	Use new zend_hash iteration API	Dmitry Stogov	2014-06-16	3	-90/+66
\|
*	Small call/return improvement	Dmitry Stogov	2014-06-16	2	-10/+15
\|
*	Fixed support for references	Dmitry Stogov	2014-06-16	2	-3/+3
\|
*	Refactoring imap (in progress)	Xinchen Hui	2014-06-16	1	-383/+346
\|
*	Fixed reference counting	Dmitry Stogov	2014-06-12	2	-78/+26
\|
*	Merge branch 'master' into phpng	Dmitry Stogov	2014-06-12	74	-3570/+3197
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (77 commits) NEWS entry for Fix potential segfault in dns_get_record() NEWS entry for "Fix potential segfault in dns_get_record()" NEWS entry for Fix potential segfault in dns_get_record( Fix potential segfault in dns_get_record() Revert "Add optional second arg to unserialize()" 5.5.15 now update NEWS Fix bug #66127 (Segmentation fault with ArrayObject unset) 5.4.31 next Add NEWS. This doesn't need UPGRADING (or an RFC), IMO. Fix broken test. Add a mime type map generation script and update the header. Move the mime type map out of php_cli_server.c for easier generation. Replace the CLI server's linear search for extensions with a hash table. fix test Remove unused included file NEWS NEWS NEWS Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec ... Conflicts: Zend/zend_closures.c Zend/zend_execute.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/spl/spl_array.c ext/standard/basic_functions.c ext/standard/dns.c ext/standard/var.c
\| *	Merge branch 'PHP-5.6'	Adam Harvey	2014-06-11	0	-0/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: NEWS entry for Fix potential segfault in dns_get_record() NEWS entry for "Fix potential segfault in dns_get_record()" NEWS entry for Fix potential segfault in dns_get_record( 5.5.15 now
\| \| *	Merge branch 'PHP-5.5' into PHP-5.6	Adam Harvey	2014-06-11	0	-0/+0
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: NEWS entry for "Fix potential segfault in dns_get_record()" NEWS entry for Fix potential segfault in dns_get_record( 5.5.15 now Conflicts: configure.in main/php_version.h
\| \| \| *	Merge branch 'PHP-5.4' into PHP-5.5	Adam Harvey	2014-06-11	0	-0/+0
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: NEWS entry for "Fix potential segfault in dns_get_record()"
\| \| \| \| *	NEWS entry for "Fix potential segfault in dns_get_record()"	Sara Golemon	2014-06-11	1	-0/+3
\| \| \| \| \|
\| \| \| * \|	NEWS entry for Fix potential segfault in dns_get_record(	Sara Golemon	2014-06-11	1	-0/+3
\| \| \| \| \|
\| \| \| * \|	Merge branch 'PHP-5.4' into PHP-5.5	Sara Golemon	2014-06-11	1	-0/+4
\| \| \| \|\ \ \| \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fix potential segfault in dns_get_record()
\| \| \| * \|	5.5.15 now	Julien Pauli	2014-06-11	3	-4/+6
\| \| \| \| \|
\| \| * \| \|	NEWS entry for Fix potential segfault in dns_get_record()	Sara Golemon	2014-06-11	1	-0/+3
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-5.6'	Sara Golemon	2014-06-11	1	-0/+4
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Fix potential segfault in dns_get_record()
\| \| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Sara Golemon	2014-06-11	1	-0/+4
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Fix potential segfault in dns_get_record()
\| \| \| * \|	Fix potential segfault in dns_get_record()	Sara Golemon	2014-06-11	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the remote sends us a packet with a malformed TXT record, we could end up trying to over-consume the packet and wander off into overruns.
\| * \| \| \|	Merge branch 'PHP-5.6'	Ferenc Kovacs	2014-06-11	4	-39/+5
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Revert "Add optional second arg to unserialize()"
\| \| * \| \|	Revert "Add optional second arg to unserialize()"	Ferenc Kovacs	2014-06-11	4	-39/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit cfd104582220d578ab1b78a5991065d038e1f931.
\| * \| \| \|	Merge branch 'PHP-5.6'	Stanislav Malyshev	2014-06-10	0	-0/+0
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: update NEWS
\| \| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Stanislav Malyshev	2014-06-10	1	-0/+3
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: update NEWS
\| \| \| * \|	update NEWS	Stanislav Malyshev	2014-06-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-5.6'	Stanislav Malyshev	2014-06-10	3	-1/+28
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Fix bug #66127 (Segmentation fault with ArrayObject unset) 5.4.31 next
\| \| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Stanislav Malyshev	2014-06-10	3	-1/+28
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Fix bug #66127 (Segmentation fault with ArrayObject unset) 5.4.31 next
\| \| \| * \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2014-06-10	3	-1/+28
\| \| \| \|\ \ \| \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fix bug #66127 (Segmentation fault with ArrayObject unset) 5.4.31 next Conflicts: configure.in main/php_version.h
\| \| \| \| *	Fix bug #66127 (Segmentation fault with ArrayObject unset)	Stanislav Malyshev	2014-06-10	4	-1/+29
\| \| \| \| \|
\| \| \| \| *	5.4.31 next	Stanislav Malyshev	2014-06-10	3	-4/+6
\| \| \| \| \|
\| * \| \| \|	Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.	Adam Harvey	2014-06-11	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	Fix broken test.	Adam Harvey	2014-06-11	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add a mime type map generation script and update the header.	Adam Harvey	2014-06-11	2	-43/+1046
\| \| \| \| \|
\| * \| \| \|	Move the mime type map out of php_cli_server.c for easier generation.	Adam Harvey	2014-06-11	2	-63/+98
\| \| \| \| \|
\| * \| \| \|	Replace the CLI server's linear search for extensions with a hash table.	Adam Harvey	2014-06-10	1	-8/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This doesn't make a statistically significant performance impact either way today, but gives us more scope to grow the MIME type list.
\| * \| \| \|	fix test	Stanislav Malyshev	2014-06-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-5.6'	Xinchen Hui	2014-06-10	1	-2/+0
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Xinchen Hui	2014-06-10	1	-2/+0
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Zend/zend_execute_API.c