clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-26 20:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,422 Commits 494 Branches 1,367 Tags 881 MiB
554e4206ab
Commit Graph

93422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
554e4206ab Merge branch 'master' of git.php.net:/php-src 2015-11-25 19:12:04 +08:00
Xinchen Hui
06bcaf98c5 Merge branch 'PHP-7.0' 2015-11-25 19:11:40 +08:00
Xinchen Hui
3cdbe347ae Always lower name 2015-11-25 19:11:22 +08:00
Xinchen Hui
05738eb71a Revert "Improved fix for Fully qualified (leading backslash) type names must fail" 
This reverts commit 00865ae22f.
 2015-11-25 19:06:42 +08:00
Bob Weinand
0a512931c9 Merge branch 'PHP-7.0' 2015-11-25 09:55:59 +01:00
Bob Weinand
73a92964ff Fixed bug #70965 (yield from with a common iterator primes too much) 2015-11-25 09:54:24 +01:00
Anatol Belski
025417cf40 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix NEWS
 2015-11-25 05:04:29 +01:00
Anatol Belski
2bae178b35 fix NEWS 2015-11-25 05:03:15 +01:00
Xinchen Hui
0134de7cff Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-11-25 11:46:14 +08:00
Xinchen Hui
c1afaf65e3 Merge branch 'master' of git.php.net:/php-src 2015-11-25 11:41:26 +08:00
Xinchen Hui
c6b08e99fe Merge branch 'PHP-7.0' 2015-11-25 11:41:01 +08:00
Xinchen Hui
00865ae22f Improved fix for Fully qualified (leading backslash) type names must fail 
it now all fails with COMPILE_ERROR instead of syntax error for T_ARRAY
but COMPILE_ERROR for int
 2015-11-25 11:27:32 +08:00
Anatol Belski
283e9ea21b Merge branch 'PHP-7.0' 
* PHP-7.0:
  rearrange NEWS for RC8
 2015-11-25 03:40:55 +01:00
Anatol Belski
541631253a rearrange NEWS for RC8 2015-11-25 03:39:28 +01: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
Bob Weinand
be9e30000d Merge branch 'PHP-7.0' 2015-11-24 23:44:17 +01:00
Bob Weinand
80d9dcafe0 Fixed bug #70904 (yield from incorrectly marks valid generator as finished) 2015-11-24 23:43:34 +01:00
Bob Weinand
8e4a77ae73 Merge branch 'PHP-7.0' 2015-11-24 21:39:30 +01:00
Bob Weinand
569763cb1a Fix scalar type names with leading backslash 2015-11-24 21:39:06 +01: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
d978e92d3d Update NEWS 2015-11-24 13:45:56 +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
19adcf8cb9 Merge branch 'PHP-7.0' 2015-11-24 11:06:18 +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
Lior Kaplan
c1b374554c Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)
 2015-11-23 19:02:41 +02:00
Lior Kaplan
a8bd182ccd Align NEWS entries format 2015-11-23 19:00:42 +02:00
Lior Kaplan
818bffc534 Add NEWS entry for #61751 2015-11-23 18:58:03 +02:00
Lior Kaplan
9642710a09 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)

 Conflicts:
	sapi/cgi/config9.m4
	sapi/fpm/config.m4
 2015-11-23 18:56:13 +02:00
Bob Weinand
9bbdb86ed7 Merge branch 'PHP-7.0' 2015-11-23 17:46:39 +01:00
Lior Kaplan
1c72e5b299 Align NEWS entries format 2015-11-23 18:46:19 +02:00
Bob Weinand
c1189eccae Output stderr on real stderr in phpdbg 2015-11-23 17:46:07 +01:00
Lior Kaplan
532912d8ab Add NEWS entry for #61751 2015-11-23 18:42:21 +02:00
Lior Kaplan
d6b78a3511 Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions) 2015-11-23 18:40:47 +02: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