]>
granicus.if.org Git - php/log
Xinchen Hui [Tue, 1 Dec 2015 02:35:48 +0000 (10:35 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Tue, 1 Dec 2015 02:35:32 +0000 (10:35 +0800)]
Fixed bug #70991 (zend_file_cache.c:710: error: array type has incomplete element type)
Scott [Wed, 14 Oct 2015 19:16:59 +0000 (15:16 -0400)]
Update random.c
Ref: https://github.com/jedisct1/libsodium/commit/
beb826f6fd173cff4473c8b7614033dbd4803500
Anatol Belski [Tue, 1 Dec 2015 01:05:20 +0000 (02:05 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
arrange NEWS for final and fix one NEWS mistake
Anatol Belski [Tue, 1 Dec 2015 00:58:01 +0000 (01:58 +0100)]
arrange NEWS for final and fix one NEWS mistake
Dmitry Stogov [Mon, 30 Nov 2015 13:54:37 +0000 (16:54 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #70997 (When using parentClass:: instead of parent::, static context changed)
Dmitry Stogov [Mon, 30 Nov 2015 13:52:57 +0000 (16:52 +0300)]
Fixed bug #70997 (When using parentClass:: instead of parent::, static context changed)
Xinchen Hui [Mon, 30 Nov 2015 02:50:34 +0000 (10:50 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Mon, 30 Nov 2015 02:50:23 +0000 (10:50 +0800)]
Fixed bug #70993 (Array key references break argument processing)
Jakub Zelenka [Sun, 29 Nov 2015 19:31:04 +0000 (19:31 +0000)]
Merge branch 'PHP-7.0'
Jakub Zelenka [Sun, 29 Nov 2015 19:28:25 +0000 (19:28 +0000)]
Fix typo in php_stream_from_res_no_verify
This macro is not used but it's wrong as zend_fetch_resource
accepts only 3 args and just one res index. So obviously
we need to use zend_fetch_resource2 here.
Xinchen Hui [Sun, 29 Nov 2015 07:48:20 +0000 (23:48 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sun, 29 Nov 2015 07:48:12 +0000 (23:48 -0800)]
Order the NEWS
Xinchen Hui [Sun, 29 Nov 2015 07:44:06 +0000 (23:44 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sun, 29 Nov 2015 07:43:41 +0000 (23:43 -0800)]
Fixed bug #70931 (Two errors messages are in conflict)
Xinchen Hui [Sun, 29 Nov 2015 07:38:19 +0000 (23:38 -0800)]
Fixed Bug #70967 (Weird error handling for __toString when Error is thrown)
Xinchen Hui [Sat, 28 Nov 2015 03:12:37 +0000 (19:12 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sat, 28 Nov 2015 03:12:26 +0000 (19:12 -0800)]
Space
Xinchen Hui [Fri, 27 Nov 2015 15:32:21 +0000 (07:32 -0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Fri, 27 Nov 2015 15:31:53 +0000 (07:31 -0800)]
Merge branch 'master' of git.php.net:/php-src
Xinchen Hui [Fri, 27 Nov 2015 15:31:19 +0000 (07:31 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Fri, 27 Nov 2015 15:30:37 +0000 (07:30 -0800)]
Fixed bug #70977, #70973 (Segmentation fault with opcache.huge_code_pages=1)
Andrea Faulds [Fri, 27 Nov 2015 15:20:25 +0000 (15:20 +0000)]
Merge branch 'PHP-7.0'
Andrea Faulds [Fri, 27 Nov 2015 15:06:13 +0000 (15:06 +0000)]
Set called_scope in Closure::call (fixes bug #70987)
Xinchen Hui [Fri, 27 Nov 2015 07:53:19 +0000 (15:53 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Fri, 27 Nov 2015 07:52:55 +0000 (15:52 +0800)]
Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors)
Xinchen Hui [Fri, 27 Nov 2015 03:42:39 +0000 (11:42 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Fri, 27 Nov 2015 03:42:30 +0000 (11:42 +0800)]
Fixed test
Xinchen Hui [Fri, 27 Nov 2015 03:33:05 +0000 (11:33 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Fri, 27 Nov 2015 03:32:38 +0000 (11:32 +0800)]
Fixed bug #70982 (setStaticPropertyValue behaviors inconsistently with 5.6)
Nikita Popov [Thu, 26 Nov 2015 15:57:11 +0000 (16:57 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Thu, 26 Nov 2015 15:56:08 +0000 (16:56 +0100)]
Forbid namespace\int type hint as well
Dmitry Stogov [Thu, 26 Nov 2015 08:27:24 +0000 (11:27 +0300)]
Fixed compilation warning
Xinchen Hui [Thu, 26 Nov 2015 04:00:37 +0000 (12:00 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Thu, 26 Nov 2015 04:00:25 +0000 (12:00 +0800)]
Fixed test
Bob Weinand [Wed, 25 Nov 2015 22:10:06 +0000 (23:10 +0100)]
Merge branch 'PHP-7.0'
Bob Weinand [Wed, 25 Nov 2015 22:09:44 +0000 (23:09 +0100)]
Fixed bug causing exception not being thrown immediately into a generator yielding from an array
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'