]>
granicus.if.org Git - php/log
Christopher Jones [Wed, 25 Nov 2015 19:53:54 +0000 (06:53 +1100)]
Merge branch 'PHP-7.0'
Christopher Jones [Wed, 25 Nov 2015 19:51:46 +0000 (06:51 +1100)]
Change line endings: Windows to Unix
Xinchen Hui [Wed, 25 Nov 2015 16:04:59 +0000 (08:04 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Wed, 25 Nov 2015 16:04:36 +0000 (08:04 -0800)]
Fixed NEWs again (not sure why this is messd up twice today)
Xinchen Hui [Wed, 25 Nov 2015 16:00:50 +0000 (08:00 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Wed, 25 Nov 2015 15:57:01 +0000 (07:57 -0800)]
Fixed bug #70970 (Segfault when combining error handler with output buffering)
of course we can try to refactor the current flow to make this error can
be catched safly.
but as 7.0.0 is releasing, I don't think a refactor is safe now. and
actually I don't see any gain to make this catchable.
so let's keep this be consistent with 5.6 and safe for now
Xinchen Hui [Wed, 25 Nov 2015 14:34:40 +0000 (06:34 -0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Wed, 25 Nov 2015 12:20:51 +0000 (20:20 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Wed, 25 Nov 2015 12:20:05 +0000 (20:20 +0800)]
ZEND_SPACESHIP supports
Xinchen Hui [Wed, 25 Nov 2015 11:15:41 +0000 (19:15 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Wed, 25 Nov 2015 11:15:33 +0000 (19:15 +0800)]
Fixed NEWS
Xinchen Hui [Wed, 25 Nov 2015 11:12:40 +0000 (19:12 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Wed, 25 Nov 2015 11:12:04 +0000 (19:12 +0800)]
Merge branch 'master' of git.php.net:/php-src
Xinchen Hui [Wed, 25 Nov 2015 11:11:40 +0000 (19:11 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Wed, 25 Nov 2015 11:11:22 +0000 (19:11 +0800)]
Always lower name
Xinchen Hui [Wed, 25 Nov 2015 11:06:42 +0000 (19:06 +0800)]
Revert "Improved fix for Fully qualified (leading backslash) type names must fail"
This reverts commit
00865ae22f2c5fdee9e500ce79d442467e0a0899 .
Bob Weinand [Wed, 25 Nov 2015 08:55:59 +0000 (09:55 +0100)]
Merge branch 'PHP-7.0'
Bob Weinand [Wed, 25 Nov 2015 08:49:39 +0000 (09:49 +0100)]
Fixed bug #70965 (yield from with a common iterator primes too much)
Anatol Belski [Wed, 25 Nov 2015 04:04:29 +0000 (05:04 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix NEWS
Anatol Belski [Wed, 25 Nov 2015 04:03:15 +0000 (05:03 +0100)]
fix NEWS
Xinchen Hui [Wed, 25 Nov 2015 03:46:14 +0000 (11:46 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Wed, 25 Nov 2015 03:41:26 +0000 (11:41 +0800)]
Merge branch 'master' of git.php.net:/php-src
Xinchen Hui [Wed, 25 Nov 2015 03:41:01 +0000 (11:41 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Wed, 25 Nov 2015 03:27:32 +0000 (11:27 +0800)]
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
Anatol Belski [Wed, 25 Nov 2015 02:40:55 +0000 (03:40 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
rearrange NEWS for RC8
Anatol Belski [Wed, 25 Nov 2015 02:39:28 +0000 (03:39 +0100)]
rearrange NEWS for RC8
Christopher Jones [Wed, 25 Nov 2015 01:44:10 +0000 (12:44 +1100)]
Merge branch 'PHP-7.0'
Christopher Jones [Wed, 25 Nov 2015 01:43:05 +0000 (12:43 +1100)]
Improve test portability
Christopher Jones [Wed, 25 Nov 2015 01:42:27 +0000 (12:42 +1100)]
Fix remaining gcov valgrind issues
Bob Weinand [Tue, 24 Nov 2015 22:44:17 +0000 (23:44 +0100)]
Merge branch 'PHP-7.0'
Bob Weinand [Tue, 24 Nov 2015 22:43:34 +0000 (23:43 +0100)]
Fixed bug #70904 (yield from incorrectly marks valid generator as finished)
Bob Weinand [Tue, 24 Nov 2015 20:39:30 +0000 (21:39 +0100)]
Merge branch 'PHP-7.0'
Bob Weinand [Tue, 24 Nov 2015 20:39:06 +0000 (21:39 +0100)]
Fix scalar type names with leading backslash
Andrey Hristov [Tue, 24 Nov 2015 09:23:22 +0000 (10:23 +0100)]
Give the possibility of the client to pass a factory
Xinchen Hui [Tue, 24 Nov 2015 05:46:04 +0000 (13:46 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Tue, 24 Nov 2015 05:45:56 +0000 (13:45 +0800)]
Update NEWS
Xinchen Hui [Tue, 24 Nov 2015 05:45:32 +0000 (13:45 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Tue, 24 Nov 2015 05:45:16 +0000 (13:45 +0800)]
Fixed bug #70960 (ReflectionFunction for array_unique returns wrong number of parameters)
Xinchen Hui [Tue, 24 Nov 2015 03:48:14 +0000 (11:48 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Tue, 24 Nov 2015 03:42:43 +0000 (11:42 +0800)]
Also fixed 'r'
Xinchen Hui [Tue, 24 Nov 2015 03:08:53 +0000 (11:08 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Tue, 24 Nov 2015 03:08:30 +0000 (11:08 +0800)]
Indent (not sure why it was messed)
Xinchen Hui [Tue, 24 Nov 2015 03:06:18 +0000 (11:06 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Tue, 24 Nov 2015 03:05:56 +0000 (11:05 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Tue, 24 Nov 2015 03:05:13 +0000 (11:05 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Tue, 24 Nov 2015 03:02:24 +0000 (11:02 +0800)]
Fixed bug #70963 (Unserialize shows UNKNOW in result)
Thanks to ryat for reportinig
Côme Bernigaud [Mon, 23 Nov 2015 02:08:25 +0000 (03:08 +0100)]
Revert "Added back support for undocummented host:port syntax"
This reverts commit
15876e85e59658bfbda3bf0b0c34d56ca503fd2f .
Côme Bernigaud [Mon, 23 Nov 2015 02:08:02 +0000 (03:08 +0100)]
Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)"
This reverts commit
391087ed280f86f144ffa5a2b72eeeda3c271743 .
Lior Kaplan [Mon, 23 Nov 2015 17:02:41 +0000 (19:02 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)
Lior Kaplan [Mon, 23 Nov 2015 17:00:42 +0000 (19:00 +0200)]
Align NEWS entries format
Lior Kaplan [Mon, 23 Nov 2015 16:58:03 +0000 (18:58 +0200)]
Add NEWS entry for #61751
Lior Kaplan [Mon, 23 Nov 2015 16:56:13 +0000 (18:56 +0200)]
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
Bob Weinand [Mon, 23 Nov 2015 16:46:39 +0000 (17:46 +0100)]
Merge branch 'PHP-7.0'
Lior Kaplan [Mon, 23 Nov 2015 16:46:19 +0000 (18:46 +0200)]
Align NEWS entries format
Bob Weinand [Mon, 23 Nov 2015 16:41:01 +0000 (17:41 +0100)]
Output stderr on real stderr in phpdbg
Lior Kaplan [Mon, 23 Nov 2015 16:42:21 +0000 (18:42 +0200)]
Add NEWS entry for #61751
Lior Kaplan [Mon, 23 Nov 2015 16:40:47 +0000 (18:40 +0200)]
Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)
Xinchen Hui [Mon, 23 Nov 2015 15:16:11 +0000 (23:16 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Mon, 23 Nov 2015 15:15:33 +0000 (23:15 +0800)]
Fixed bug #70959 (ArrayObject unserialize does not restore protected fields)
Xinchen Hui [Mon, 23 Nov 2015 15:08:47 +0000 (07:08 -0800)]
Fixed bug #70959 (ArrayObject unserialize does not restore protected fields)
Xinchen Hui [Mon, 23 Nov 2015 14:22:11 +0000 (06:22 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Mon, 23 Nov 2015 14:21:30 +0000 (06:21 -0800)]
Add test for bug (count on symbol table)
I should have do this ....
Xinchen Hui [Mon, 23 Nov 2015 14:12:46 +0000 (06:12 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Mon, 23 Nov 2015 14:12:03 +0000 (06:12 -0800)]
Improved fix for bug (count on symbol table)
Xinchen Hui [Mon, 23 Nov 2015 10:49:25 +0000 (18:49 +0800)]
Merge branch 'master' of git.php.net:/php-src
Xinchen Hui [Mon, 23 Nov 2015 10:48:59 +0000 (18:48 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Mon, 23 Nov 2015 10:48:51 +0000 (18:48 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Mon, 23 Nov 2015 10:48:21 +0000 (18:48 +0800)]
Add bug #70957 and #70958 releated test in refection
Andrey Hristov [Mon, 23 Nov 2015 10:36:05 +0000 (11:36 +0100)]
Remove unused variable
Xinchen Hui [Mon, 23 Nov 2015 10:33:21 +0000 (18:33 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Mon, 23 Nov 2015 10:33:14 +0000 (18:33 +0800)]
Fixed test
Xinchen Hui [Mon, 23 Nov 2015 10:31:56 +0000 (18:31 +0800)]
Port fix to 7.0
Xinchen Hui [Mon, 23 Nov 2015 10:30:41 +0000 (18:30 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_compile.c
Xinchen Hui [Mon, 23 Nov 2015 10:29:59 +0000 (18:29 +0800)]
Fixed bug #70958 (Invalid opcode while using ::class as trait method paramater default value)
Xinchen Hui [Mon, 23 Nov 2015 04:41:15 +0000 (12:41 +0800)]
Merge branch 'master' of git.php.net:/php-src
Xinchen Hui [Mon, 23 Nov 2015 04:40:54 +0000 (12:40 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Mon, 23 Nov 2015 04:22:17 +0000 (12:22 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_compile.c
Xinchen Hui [Mon, 23 Nov 2015 04:20:44 +0000 (12:20 +0800)]
Fixed bug #70957 (self::class can not be resolved with reflection for abstract class)
Côme Bernigaud [Mon, 23 Nov 2015 02:15:46 +0000 (03:15 +0100)]
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)"
Côme Bernigaud [Mon, 23 Nov 2015 02:08:25 +0000 (03:08 +0100)]
Revert "Added back support for undocummented host:port syntax"
This reverts commit
15876e85e59658bfbda3bf0b0c34d56ca503fd2f .
Côme Bernigaud [Mon, 23 Nov 2015 02:08:02 +0000 (03:08 +0100)]
Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)"
This reverts commit
391087ed280f86f144ffa5a2b72eeeda3c271743 .
Xinchen Hui [Sun, 22 Nov 2015 14:46:56 +0000 (06:46 -0800)]
Fixed tests (new opcache will optimize serias echo IS_CONST into one)
Xinchen Hui [Sun, 22 Nov 2015 04:58:34 +0000 (20:58 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sun, 22 Nov 2015 04:57:10 +0000 (20:57 -0800)]
Fixed bug (count on symbol tables)
Xinchen Hui [Sat, 21 Nov 2015 15:14:12 +0000 (07:14 -0800)]
cleanup
Xinchen Hui [Sat, 21 Nov 2015 14:11:02 +0000 (06:11 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sat, 21 Nov 2015 13:16:11 +0000 (05:16 -0800)]
Port the fix of 5.6 to 7.0
Xinchen Hui [Sat, 21 Nov 2015 13:03:20 +0000 (05:03 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/tests/bug70944.phpt
Zend/zend_exceptions.c
Xinchen Hui [Sat, 21 Nov 2015 13:01:51 +0000 (05:01 -0800)]
Update test script
Xinchen Hui [Sat, 21 Nov 2015 12:54:21 +0000 (04:54 -0800)]
Unused var
Xinchen Hui [Sat, 21 Nov 2015 08:27:56 +0000 (00:27 -0800)]
Improved fix for bug #70944
Xinchen Hui [Fri, 20 Nov 2015 17:10:20 +0000 (09:10 -0800)]
conflicts variable name
Dmitry Stogov [Fri, 20 Nov 2015 22:19:45 +0000 (01:19 +0300)]
cleanup
Dmitry Stogov [Fri, 20 Nov 2015 20:32:27 +0000 (23:32 +0300)]
Fixed wrong BB.flags initialization
Dmitry Stogov [Fri, 20 Nov 2015 19:06:36 +0000 (22:06 +0300)]
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)
Xinchen Hui [Fri, 20 Nov 2015 14:57:14 +0000 (06:57 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Fri, 20 Nov 2015 14:54:57 +0000 (06:54 -0800)]
Improved previously fix a little
Xinchen Hui [Fri, 20 Nov 2015 14:37:54 +0000 (06:37 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Fri, 20 Nov 2015 14:37:38 +0000 (06:37 -0800)]
Fixed bug #70947 (INI parser segfault with INI_SCANNER_TYPED)
Xinchen Hui [Fri, 20 Nov 2015 08:38:36 +0000 (16:38 +0800)]
Merge branch 'PHP-7.0'