]>
granicus.if.org Git - php/log
Bob Weinand [Thu, 21 Apr 2016 19:51:50 +0000 (21:51 +0200)]
Merge branch 'PHP-7.0'
Bob Weinand [Thu, 21 Apr 2016 19:51:00 +0000 (21:51 +0200)]
Fix constant expr coaleasce with protected mode opcache
Dmitry Stogov [Thu, 21 Apr 2016 19:37:13 +0000 (22:37 +0300)]
Added news entry
Dmitry Stogov [Thu, 21 Apr 2016 07:15:57 +0000 (10:15 +0300)]
Merge branch 'master' into safe_timeout
* master:
Fixed bug #72059 - Reference the bug id directly in NEWS
Fix magic constants (__LINE__) with ?? for constant scalar exprs
Add NEWS entry for ?? in constant scalar expressions
allow null coalescing (??) on constant expressions
Fix intl tests for ICU < 52
Fix ZTS builds by adding a missing TSRMLS_FETCH().
Fix bug #71737
Update NEWS
Fix RECV opcode to handle all kinds of exceptions
Fix RECV opcode to handle all kinds of exceptions
Bob Weinand [Thu, 21 Apr 2016 00:50:14 +0000 (02:50 +0200)]
Merge remote-tracking branch 'origin/PHP-7.0'
Bob Weinand [Thu, 21 Apr 2016 00:48:52 +0000 (02:48 +0200)]
Fixed bug #72059 - Reference the bug id directly in NEWS
Bob Weinand [Thu, 21 Apr 2016 00:45:09 +0000 (02:45 +0200)]
Fix magic constants (__LINE__) with ?? for constant scalar exprs
Also fix general memory leak when root ast gets replaced in compile time evaluation
Bob Weinand [Wed, 20 Apr 2016 23:26:48 +0000 (01:26 +0200)]
Merge remote-tracking branch 'origin/PHP-7.0'
Bob Weinand [Wed, 20 Apr 2016 23:24:56 +0000 (01:24 +0200)]
Add NEWS entry for ?? in constant scalar expressions
Márcio Almada [Sun, 17 Apr 2016 08:27:15 +0000 (04:27 -0400)]
allow null coalescing (??) on constant expressions
Nikita Popov [Wed, 20 Apr 2016 17:43:15 +0000 (19:43 +0200)]
Fix intl tests for ICU < 52
Nikita Popov [Wed, 20 Apr 2016 17:00:13 +0000 (19:00 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Wed, 20 Apr 2016 17:00:02 +0000 (19:00 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_compile.c
Adam Harvey [Tue, 19 Apr 2016 02:20:35 +0000 (19:20 -0700)]
Fix ZTS builds by adding a missing TSRMLS_FETCH().
Nikita Popov [Wed, 20 Apr 2016 16:43:43 +0000 (18:43 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Wed, 20 Apr 2016 16:37:23 +0000 (18:37 +0200)]
Fix bug #71737
Also improve the error message for $this used in parameters.
Xinchen Hui [Wed, 20 Apr 2016 15:43:54 +0000 (08:43 -0700)]
Merge branch 'PHP-7.0'
Xinchen Hui [Wed, 20 Apr 2016 15:42:06 +0000 (08:42 -0700)]
Update NEWS
Nikita Nefedov [Tue, 19 Apr 2016 16:26:08 +0000 (19:26 +0300)]
Fix RECV opcode to handle all kinds of exceptions
fix RECV opcode to handle exceptions thrown from user-defined error handler
as a result Notice error from failed type coercion
Xinchen Hui [Wed, 20 Apr 2016 15:40:11 +0000 (08:40 -0700)]
Merge branch 'fix-recv-opcode-handle-exception' of https://github.com/nikita2206/php-src
Dmitry Stogov [Wed, 20 Apr 2016 10:52:21 +0000 (13:52 +0300)]
Safe execution timeout handling.
Nikita Nefedov [Tue, 19 Apr 2016 16:26:08 +0000 (19:26 +0300)]
Fix RECV opcode to handle all kinds of exceptions
fix RECV opcode to handle exceptions thrown from user-defined error handler
as a result Notice error from failed type coercion
Dmitry Stogov [Wed, 20 Apr 2016 08:06:52 +0000 (11:06 +0300)]
Reduced amount of code generated for interrupt handling.
Improved ZEND_VM_INTERRUPT_CHECK() placement (always perform checks after opcode handler completion, when instruction pointer value is alredy changed to the next opcode).
Stanislav Malyshev [Wed, 20 Apr 2016 06:45:33 +0000 (23:45 -0700)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Better fix for #71952
Stanislav Malyshev [Wed, 20 Apr 2016 06:45:21 +0000 (23:45 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Better fix for #71952
Conflicts:
ext/gd/gd.c
Stanislav Malyshev [Wed, 20 Apr 2016 06:44:00 +0000 (23:44 -0700)]
Better fix for #71952
Stanislav Malyshev [Tue, 19 Apr 2016 06:34:44 +0000 (23:34 -0700)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fix bug #71952: Corruption inside imageaffinematrixget
Stanislav Malyshev [Tue, 19 Apr 2016 06:34:26 +0000 (23:34 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #71952: Corruption inside imageaffinematrixget
Conflicts:
ext/gd/gd.c
Stanislav Malyshev [Tue, 19 Apr 2016 06:31:03 +0000 (23:31 -0700)]
Fix bug #71952: Corruption inside imageaffinematrixget
Xinchen Hui [Tue, 19 Apr 2016 03:03:57 +0000 (11:03 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72051 (The reference in CallbackFilterIterator doesn't work as expected)
Xinchen Hui [Tue, 19 Apr 2016 02:59:35 +0000 (10:59 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
Prevent usage in GC after free.
Fix SEND_USER as well
Fix SEND_ARRAY+PREFER_REF SHM corruption
Xinchen Hui [Tue, 19 Apr 2016 02:59:10 +0000 (10:59 +0800)]
Fixed bug #72051 (The reference in CallbackFilterIterator doesn't work as expected)
Sara Golemon [Mon, 18 Apr 2016 23:14:08 +0000 (23:14 +0000)]
Add NEWS entry for rfc:intl.timezone.get-windows-id
Sara Golemon [Wed, 16 Mar 2016 00:32:36 +0000 (00:32 +0000)]
Update IntlTimeZone methods for ICU 52
Adds:
string IntlTimeZone::getWindowsID(string id)
string IntlTimeZone::getIDForWindowsID(string winID[, string region])
And matching procedural functions
Dmitry Stogov [Mon, 18 Apr 2016 22:37:45 +0000 (01:37 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Prevent usage in GC after free.
Dmitry Stogov [Mon, 18 Apr 2016 22:37:24 +0000 (01:37 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Prevent usage in GC after free.
Dmitry Stogov [Mon, 18 Apr 2016 22:31:49 +0000 (01:31 +0300)]
Prevent usage in GC after free.
Bob Weinand [Mon, 18 Apr 2016 21:54:41 +0000 (23:54 +0200)]
Fix generator being a cycle to itself
Nikita Popov [Sun, 17 Apr 2016 15:19:03 +0000 (17:19 +0200)]
Fully initialize DECLARE_CLASS/FUNCTION opcodes
Nikita Popov [Mon, 18 Apr 2016 20:46:36 +0000 (22:46 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Mon, 18 Apr 2016 20:45:38 +0000 (22:45 +0200)]
Fix SEND_USER as well
Missed copy&paste code here
Nikita Popov [Mon, 18 Apr 2016 16:26:30 +0000 (18:26 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Mon, 18 Apr 2016 16:24:45 +0000 (18:24 +0200)]
Fix SEND_ARRAY+PREFER_REF SHM corruption
Make the behavior consistent between namespaced and not and with
PHP 5.6.
Xinchen Hui [Mon, 18 Apr 2016 11:14:30 +0000 (19:14 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
combine conditions
Xinchen Hui [Mon, 18 Apr 2016 11:13:54 +0000 (19:13 +0800)]
combine conditions
Bob Weinand [Mon, 18 Apr 2016 10:14:47 +0000 (12:14 +0200)]
Merge branch 'PHP-7.0'
Bob Weinand [Mon, 18 Apr 2016 10:13:59 +0000 (12:13 +0200)]
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
Ferenc Kovacs [Mon, 18 Apr 2016 07:05:16 +0000 (09:05 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
mark frequent intermittent fpm test with XFAIL
Ferenc Kovacs [Mon, 18 Apr 2016 07:04:55 +0000 (09:04 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
mark frequent intermittent fpm test with XFAIL
Ferenc Kovacs [Mon, 18 Apr 2016 07:04:27 +0000 (09:04 +0200)]
mark frequent intermittent fpm test with XFAIL
Ferenc Kovacs [Mon, 18 Apr 2016 06:16:16 +0000 (08:16 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
prepare for 5.6.21RC1
Ferenc Kovacs [Mon, 18 Apr 2016 06:15:47 +0000 (08:15 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
prepare for 5.6.21RC1
Ferenc Kovacs [Mon, 18 Apr 2016 06:14:16 +0000 (08:14 +0200)]
prepare for 5.6.21RC1
Christopher Jones [Mon, 18 Apr 2016 01:16:35 +0000 (11:16 +1000)]
Merge branch 'PHP-7.0'
Christopher Jones [Mon, 18 Apr 2016 01:15:01 +0000 (11:15 +1000)]
Bump version in test
Nikita Popov [Sat, 16 Apr 2016 20:38:06 +0000 (22:38 +0200)]
Fix SSA for SEND_UNPACK
Nikita Popov [Sat, 16 Apr 2016 20:34:32 +0000 (22:34 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Sat, 16 Apr 2016 20:33:23 +0000 (22:33 +0200)]
Fix SEND_UNPACK array separation
Separating only immutable arrays is not enough.
Bob Weinand [Sat, 16 Apr 2016 18:57:45 +0000 (20:57 +0200)]
Merge branch 'PHP-7.0'
Bob Weinand [Sat, 16 Apr 2016 18:57:28 +0000 (20:57 +0200)]
Fix non-/Zend tests too
Bob Weinand [Sat, 16 Apr 2016 18:38:10 +0000 (20:38 +0200)]
Merge branch 'PHP-7.0'
Bob Weinand [Sat, 16 Apr 2016 18:27:53 +0000 (20:27 +0200)]
Fixed bug #72038 (Function calls with values to a by-ref parameter don't always throw a notice)
Nikita Popov [Sat, 16 Apr 2016 18:19:53 +0000 (20:19 +0200)]
Drop left-over debugging statement in block pass
Nikita Popov [Sat, 16 Apr 2016 13:15:44 +0000 (15:15 +0200)]
Drop unnecessary checks in get_closure
Anatol Belski [Sat, 16 Apr 2016 17:25:13 +0000 (19:25 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Adds new curl option CURLOPT_SSL_VERIFYSTATUS to enable OCSP verification
Add test for bug #72028
Dominic Luechinger [Wed, 13 Apr 2016 20:14:43 +0000 (22:14 +0200)]
Adds new curl option CURLOPT_SSL_VERIFYSTATUS to enable OCSP verification
Anatol Belski [Sat, 16 Apr 2016 14:11:22 +0000 (16:11 +0200)]
Add test for bug #72028
Nikita Popov [Sat, 16 Apr 2016 12:47:27 +0000 (14:47 +0200)]
Don't copy args in Closure::__invoke()
Nikita Popov [Sat, 16 Apr 2016 12:34:32 +0000 (14:34 +0200)]
Drop dead assignment
Nikita Popov [Sat, 16 Apr 2016 12:32:48 +0000 (14:32 +0200)]
Cleanup condition in SEND_VAR_NO_REF
Was overly convoluted after the IS_VAR_RET_REF removal.
Nikita Popov [Sat, 16 Apr 2016 07:59:35 +0000 (09:59 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Sat, 16 Apr 2016 07:56:08 +0000 (09:56 +0200)]
Use symtable lookup for arrays in array_column
Nikita Popov [Sat, 16 Apr 2016 07:52:22 +0000 (09:52 +0200)]
Respect property visibility in array_column
Nikita Popov [Fri, 15 Apr 2016 14:28:48 +0000 (16:28 +0200)]
Fixed bug #72031
Xinchen Hui [Sat, 16 Apr 2016 04:30:24 +0000 (21:30 -0700)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sat, 16 Apr 2016 04:29:27 +0000 (21:29 -0700)]
Fixed bug #72028 (pg_query_params(): NULL converts to empty string)
I don't have a pgsql server by hand, so no test script, but the fix must
be right.
Xinchen Hui [Sat, 16 Apr 2016 04:09:05 +0000 (21:09 -0700)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sat, 16 Apr 2016 04:08:51 +0000 (21:08 -0700)]
Fixed bug #71972 (Cyclic references causing session_start(): Failed to decode session object)
Lior Kaplan [Fri, 15 Apr 2016 19:17:37 +0000 (22:17 +0300)]
Align NEWS entry format
Lior Kaplan [Fri, 15 Apr 2016 19:09:05 +0000 (22:09 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Align NEWS entry format
Lior Kaplan [Fri, 15 Apr 2016 19:07:47 +0000 (22:07 +0300)]
Align NEWS entry format
Nikita Popov [Sun, 10 Apr 2016 11:01:54 +0000 (13:01 +0200)]
Remove IS_VAR_RET_REF flag
Instead decide whether a function returned by reference or by value
by checking whether the return value has REFERENCE type. This means
that functions returning by reference must always return a reference
and functions returning by value must not return a reference.
Anatol Belski [Fri, 15 Apr 2016 11:42:04 +0000 (13:42 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Fixed #71062 pg_convert() doesn't accept ISO 8601 for datatype timestamp
Anatol Belski [Fri, 15 Apr 2016 11:41:09 +0000 (13:41 +0200)]
update NEWS
Anatol Belski [Fri, 15 Apr 2016 11:38:49 +0000 (13:38 +0200)]
Fixed #71062 pg_convert() doesn't accept ISO 8601 for datatype timestamp
Xinchen Hui [Fri, 15 Apr 2016 03:58:13 +0000 (11:58 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed failed with libedit
Xinchen Hui [Fri, 15 Apr 2016 03:57:53 +0000 (11:57 +0800)]
Fixed failed with libedit
Dmitry Stogov [Thu, 14 Apr 2016 13:08:54 +0000 (16:08 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Fixed bug #72014 (Including a file with anonymous classes multiple times leads to fatal error)
Dmitry Stogov [Thu, 14 Apr 2016 13:07:28 +0000 (16:07 +0300)]
Use DO_FCALL_BY_NAME instead of DO_FCALL, if possible
Xinchen Hui [Thu, 14 Apr 2016 12:21:34 +0000 (20:21 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72014 (Including a file with anonymous classes multiple times leads to fatal error)
Xinchen Hui [Thu, 14 Apr 2016 12:21:19 +0000 (20:21 +0800)]
Fixed bug #72014 (Including a file with anonymous classes multiple times leads to fatal error)
Christopher Jones [Thu, 14 Apr 2016 05:49:52 +0000 (15:49 +1000)]
Merge branch 'PHP-7.0'
Christopher Jones [Thu, 14 Apr 2016 05:49:15 +0000 (15:49 +1000)]
On second thoughts, keep this in sync with 5.6 for 71422
Christopher Jones [Thu, 14 Apr 2016 05:09:25 +0000 (15:09 +1000)]
Merge branch 'PHP-7.0'
Christopher Jones [Thu, 14 Apr 2016 05:09:02 +0000 (15:09 +1000)]
Merge branch 'PHP-5.6' into PHP-7.0
Christopher Jones [Thu, 14 Apr 2016 05:08:42 +0000 (15:08 +1000)]
Fix old comment cut-n-paste error
Christopher Jones [Thu, 14 Apr 2016 04:09:34 +0000 (14:09 +1000)]
Merge branch 'PHP-7.0'
Christopher Jones [Thu, 14 Apr 2016 04:09:16 +0000 (14:09 +1000)]
Fixed bug #71600 (oci_fetch_all segfaults when selecting more than 8 columns) (Tian Yang)
Christopher Jones [Thu, 14 Apr 2016 03:55:40 +0000 (13:55 +1000)]
Merge branch 'PHP-7.0'
Christopher Jones [Thu, 14 Apr 2016 03:55:32 +0000 (13:55 +1000)]
Merge fix for bug #71422. No code changed needed in PHP 7