clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,379 Commits 491 Branches 1,363 Tags 841 MiB
9bbdb86ed7
Commit Graph

93379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Weinand
9bbdb86ed7 Merge branch 'PHP-7.0' 2015-11-23 17:46:39 +01:00
Bob Weinand
c1189eccae Output stderr on real stderr in phpdbg 2015-11-23 17:46:07 +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
Xinchen Hui
42252f409b Merge branch 'PHP-7.0' 2015-11-23 18:33:21 +08:00
Xinchen Hui
45c5e27183 Fixed test 2015-11-23 18:33:14 +08:00
Xinchen Hui
51ccc88b87 Port fix to 7.0 2015-11-23 18:31:56 +08:00
Xinchen Hui
397be4ff54 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	Zend/zend_compile.c
 2015-11-23 18:30:41 +08:00
Xinchen Hui
a2b85ddecf Fixed bug #70958 (Invalid opcode while using ::class as trait method paramater default value) 2015-11-23 18:29:59 +08:00
Xinchen Hui
f49078fd76 Merge branch 'master' of git.php.net:/php-src 2015-11-23 12:41:15 +08:00
Xinchen Hui
3bd231c0a0 Merge branch 'PHP-7.0' 2015-11-23 12:40:54 +08:00
Xinchen Hui
1b16c2f41c Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	Zend/zend_compile.c
 2015-11-23 12:22:17 +08:00
Xinchen Hui
ab17840d33 Fixed bug #70957 (self::class can not be resolved with reflection for abstract class) 2015-11-23 12:20:44 +08: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
58168b48e2 Fixed tests (new opcache will optimize serias echo IS_CONST into one) 2015-11-22 06:49:28 -08: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
7bfc4fca60 cleanup 2015-11-21 07:14:12 -08:00
Xinchen Hui
fb7564d457 Merge branch 'PHP-7.0' 2015-11-21 06:11:02 -08:00
Xinchen Hui
31d93fcf4b Port the fix of 5.6 to 7.0 2015-11-21 05:41:53 -08:00
Xinchen Hui
c6961cb41b Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	Zend/tests/bug70944.phpt
	Zend/zend_exceptions.c
 2015-11-21 05:03:20 -08:00
Xinchen Hui
205e0ba81d Update test script 2015-11-21 05:01:51 -08:00
Xinchen Hui
cbc71995a8 Unused var 2015-11-21 04:54:48 -08:00
Xinchen Hui
7b195c9875 Improved fix for bug #70944 2015-11-21 00:27:56 -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
Dmitry Stogov
b3393baa5d Refactored CFG based optimization using new CFG representation. 
Squashed commit of the following:

commit 907533390678f58eac738040ef62a40788048bef
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Nov 20 21:25:28 2015 +0300

    cleanup

commit 82f7e6f5bb434f12e9fdf45f597be351527f383c
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Nov 20 21:22:01 2015 +0300

    Update build system

commit 8fd83d843fde3f486692de4e2c6b7d64d4192704
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Nov 20 20:50:32 2015 +0300

    Reachable blocks can't be empty

commit 5822a36269833930a35cb3547222357118b11310
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Nov 20 19:11:02 2015 +0300

    added missing constraints

commit 2d0c00b243479924de0260ae8d80d624c36994a3
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Nov 20 19:03:12 2015 +0300

    optimization

commit 29d1e5eb210c51b052cac4d6c232aaa2c724dbbb
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Nov 20 18:34:11 2015 +0300

    Added missing optimization patterns

commit 38dd3b3f2459f5193c742633213f41d78326ea28
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Nov 20 17:47:06 2015 +0300

    zend_optimize_block() refactoring

commit 3dc97bd1f6d433dff0617338382347b6d0c08f84
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Nov 20 14:30:32 2015 +0300

    We don't use CFG back-references anymore

commit 2242c9e0aa741d287146ad43179650796f199f2d
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Nov 20 14:16:03 2015 +0300

    Consistent naming

commit 64f2856716069390ed7703ac88905cebf5e04023
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Nov 20 13:29:32 2015 +0300

    Optimization and separate building of direct CFG from predecessrs calculation

commit 9389be4869b13ec45df5dbd443015d2ac539a347
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Nov 20 10:44:19 2015 +0300

    Use CFG without back references (incomplete, but works)

commit 3d3ecd4b883959cf7b86c33622183295f913924e
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Nov 20 00:50:09 2015 +0300

    Fixed iteration in reverse order

commit 52f7fde0c3dfa4b4591519828ebdb238c2377936
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Nov 19 18:35:09 2015 +0300

    Separate debugging code into zend_dump.c

commit 4193a039ea96bae41baf97c6e458f419e8dbf9c5
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Nov 19 17:22:04 2015 +0300

    Remove unused code

commit 4228fdc57d8d120e1dad4e4d44045fa1a6f06fe0
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Nov 19 17:21:20 2015 +0300

    Remove dead live-ranges only on assembling basic blocks

commit 9a4a7966edf19b92678876f85565700694205598
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Nov 19 15:26:29 2015 +0300

    New CFG representation (incomplete)
 2015-11-20 22:06:36 +03:00
Xinchen Hui
4e94fa09e6 Merge branch 'PHP-7.0' 2015-11-20 06:57:14 -08:00
Xinchen Hui
4674f18a4b Improved previously fix a little 2015-11-20 06:54:57 -08:00
Xinchen Hui
cc98663fcd Merge branch 'PHP-7.0' 2015-11-20 06:37:54 -08:00
Xinchen Hui
519f9bc675 Fixed bug #70947 (INI parser segfault with INI_SCANNER_TYPED) 2015-11-20 06:37:38 -08:00
Xinchen Hui
61d5ac2d7e Merge branch 'PHP-7.0' 2015-11-20 16:38:36 +08:00
Xinchen Hui
2a9fc35e51 Update NEWS 2015-11-20 16:38:24 +08:00
Xinchen Hui
a2e4e64682 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	Zend/zend_exceptions.c
 2015-11-20 16:38:00 +08:00
Xinchen Hui
a1c887964e Fixed bug #70944 (try{ } finally{} can create infinite chains of exceptions) 2015-11-20 16:24:53 +08:00
Xinchen Hui
1065feba7d Merge branch 'PHP-7.0' 
Conflicts:
	ext/gd/gd_compat.c
 2015-11-20 15:37:43 +08:00
Xinchen Hui
64a90a6b98 Merge branch 'PHP-5.6' into PHP-7.0 2015-11-20 15:36:26 +08:00
Xinchen Hui
b42eb16cf4 This seems better 2015-11-20 15:36:13 +08:00