40220 Commits

Author	SHA1	Message	Date
Xinchen Hui	cb5af748b1	Merge branch 'PHP-7.0'	2015-11-27 19:12:37 -08:00
Xinchen Hui	5af61aa1cc	Space	2015-11-27 19:12:26 -08:00
Xinchen Hui	f9a56e00f6	Merge branch 'PHP-7.0'	2015-11-27 07:31:19 -08:00
Xinchen Hui	e9a8d7ff1d	Fixed bug #70977, #70973 (Segmentation fault with opcache.huge_code_pages=1)	2015-11-27 07:30:37 -08:00
Xinchen Hui	3aa2182db6	Merge branch 'PHP-7.0'	2015-11-27 15:53:19 +08:00
Xinchen Hui	a347b0be48	Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors)	2015-11-27 15:52:55 +08:00
Xinchen Hui	d3e6a9ce39	Merge branch 'PHP-7.0'	2015-11-27 11:42:39 +08:00
Xinchen Hui	b0f472b3b2	Fixed test	2015-11-27 11:42:30 +08:00
Xinchen Hui	541b11b5f6	Merge branch 'PHP-7.0'	2015-11-27 11:33:05 +08:00
Xinchen Hui	6cb6c04499	Fixed bug #70982 (setStaticPropertyValue behaviors inconsistently with 5.6)	2015-11-27 11:32:38 +08:00
Dmitry Stogov	2e6cf2710a	Fixed compilation warning	2015-11-26 11:27:24 +03:00
Christopher Jones	eaa94390b3	Merge branch 'PHP-7.0'	2015-11-26 06:53:54 +11:00
Christopher Jones	071247713f	Change line endings: Windows to Unix	2015-11-26 06:51:46 +11:00
Xinchen Hui	07a05836de	Merge branch 'PHP-7.0'	2015-11-25 20:20:51 +08:00
Xinchen Hui	9376e8213c	ZEND_SPACESHIP supports	2015-11-25 20:20:05 +08:00
Christopher Jones	850ef17c5d	Merge branch 'PHP-7.0'	2015-11-25 12:44:10 +11:00
Christopher Jones	7be30eb78c	Improve test portability	2015-11-25 12:43:05 +11:00
Christopher Jones	d10ee1eef1	Fix remaining gcov valgrind issues	2015-11-25 12:42:27 +11:00
Andrey Hristov	85e4fcf647	Give the possibility of the client to pass a factory	2015-11-24 10:23:44 +01:00
Xinchen Hui	7e7c2c062f	Merge branch 'PHP-7.0'	2015-11-24 13:46:04 +08:00
Xinchen Hui	e637ead6ed	Merge branch 'PHP-5.6' into PHP-7.0	2015-11-24 13:45:32 +08:00
Xinchen Hui	e6b46dc2ff	Fixed bug #70960 (ReflectionFunction for array_unique returns wrong number of parameters)	2015-11-24 13:45:16 +08:00
Xinchen Hui	8d4fc591ef	Merge branch 'PHP-7.0'	2015-11-24 11:48:14 +08:00
Xinchen Hui	fd545f4f44	Also fixed 'r'	2015-11-24 11:48:03 +08:00
Xinchen Hui	59933934be	Merge branch 'PHP-7.0'	2015-11-24 11:08:53 +08:00
Xinchen Hui	3e0b2ba5d8	Indent (not sure why it was messed)	2015-11-24 11:08:30 +08:00
Xinchen Hui	31b4581c45	Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0	2015-11-24 11:05:56 +08:00
Xinchen Hui	26a526fb4a	Merge branch 'PHP-7.0'	2015-11-24 11:05:13 +08:00
Xinchen Hui	91fb1edbbf	Fixed bug #70963 (Unserialize shows UNKNOW in result) ... Thanks to ryat for reportinig	2015-11-24 11:04:42 +08:00
Côme Bernigaud	e6759644ec	Revert "Added back support for undocummented host:port syntax" ... This reverts commit 15876e85e5.	2015-11-24 03:45:21 +01:00
Côme Bernigaud	5a8bcf73ba	Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)" ... This reverts commit 391087ed28.	2015-11-24 03:45:17 +01:00
Xinchen Hui	34bff5b91c	Merge branch 'PHP-7.0'	2015-11-23 23:16:11 +08:00
Xinchen Hui	7e9f416218	Fixed bug #70959 (ArrayObject unserialize does not restore protected fields)	2015-11-23 23:15:33 +08:00
Xinchen Hui	26f3710ae8	Merge branch 'PHP-7.0'	2015-11-23 06:22:11 -08:00
Xinchen Hui	801e46d8c0	Add test for bug (count on symbol table) ... I should have do this ....	2015-11-23 06:21:30 -08:00
Xinchen Hui	8c22edc546	Merge branch 'PHP-7.0'	2015-11-23 06:12:46 -08:00
Xinchen Hui	6313e16a04	Improved fix for bug (count on symbol table)	2015-11-23 06:12:03 -08:00
Xinchen Hui	2ae9a6fca6	Merge branch 'master' of git.php.net:/php-src	2015-11-23 18:49:25 +08:00
Xinchen Hui	6dbf8d142f	Merge branch 'PHP-7.0'	2015-11-23 18:48:59 +08:00
Xinchen Hui	8c51578c81	Merge branch 'PHP-5.6' into PHP-7.0	2015-11-23 18:48:51 +08:00
Xinchen Hui	b9845e5006	Add bug #70957 and #70958 releated test in refection	2015-11-23 18:48:21 +08:00
Andrey Hristov	6b0d026c76	Remove unused variable	2015-11-23 11:36:25 +01:00
Côme Bernigaud	56b584491b	Merge branch 'php-7.0' ... * php-7.0: Revert "Added back support for undocummented host:port syntax" Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)"	2015-11-23 03:15:46 +01:00
Côme Bernigaud	ab39f981f8	Revert "Added back support for undocummented host:port syntax" ... This reverts commit 15876e85e5.	2015-11-23 03:08:25 +01:00
Côme Bernigaud	a9bfdcb82c	Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)" ... This reverts commit 391087ed28.	2015-11-23 03:08:02 +01:00
Xinchen Hui	3178242cda	Merge branch 'PHP-7.0'	2015-11-21 20:58:34 -08:00
Xinchen Hui	eada2aa91a	Fixed bug (count on symbol tables)	2015-11-21 20:58:29 -08:00
Xinchen Hui	1e9fcb49ac	conflicts variable name	2015-11-20 19:03:18 -08:00
Dmitry Stogov	4d49736155	cleanup	2015-11-21 01:19:45 +03:00
Dmitry Stogov	02fad0414b	Fixed wrong BB.flags initialization	2015-11-20 23:32:27 +03:00