]> granicus.if.org Git - php/log
php
5 years agoPromote warning to exception in file_get_contents() function
Máté Kocsis [Wed, 20 Nov 2019 01:29:18 +0000 (02:29 +0100)]
Promote warning to exception in file_get_contents() function

5 years agoPromote warnings to exceptions in settype() function
Máté Kocsis [Wed, 20 Nov 2019 01:26:39 +0000 (02:26 +0100)]
Promote warnings to exceptions in settype() function

5 years agoPromote warning to exception in log() function
Máté Kocsis [Wed, 20 Nov 2019 01:14:20 +0000 (02:14 +0100)]
Promote warning to exception in log() function

5 years agoUpdate/fix remaining opcache zend_func_info.c signatures
Tyson Andre [Thu, 5 Dec 2019 00:24:34 +0000 (19:24 -0500)]
Update/fix remaining opcache zend_func_info.c signatures

See UPGRADING:

> . The GD extension now uses objects as the underlying data structure for
>   images, rather than resources. These objects are completely opaque, i.e.
>   they don't have any methods.

Remove types which are no longer in Reflection due to throwing instead of
emitting warnings.
Remove entries where reference counts are 0 and types are duplicated.

Closes GH-4967.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 5 Dec 2019 06:25:26 +0000 (07:25 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix bug #78823: add zlib library to mysqlnd

5 years agoFix bug #78823: add zlib library to mysqlnd
Arjen de Korte [Mon, 25 Nov 2019 22:54:49 +0000 (23:54 +0100)]
Fix bug #78823: add zlib library to mysqlnd

The problem is newer binutils will no longer default to --copy-dt-needed-entries but use --no-copy-dt-needed-entries instead. So all libraries needed *must* be provided.

Workarounds (either one works)
1) Add "-Wl,--copy-dt-needed-entries" to LDFLAGS to bring back the old behavior of the linker
2) Add "-lz" to list of libraries to be added

In "ext/mysqlnd/mysqlnd_protocol_frame_codec.c" when the "zlib.h" header is included should also trigger adding '-lz' to the list of libraries.

5 years agoMerge branch 'reflection-fixes' into HEAD
Tyson Andre [Thu, 5 Dec 2019 00:12:28 +0000 (19:12 -0500)]
Merge branch 'reflection-fixes' into HEAD

5 years agoRemove opcache signatures duplicating reflection
Tyson Andre [Wed, 4 Dec 2019 14:50:24 +0000 (09:50 -0500)]
Remove opcache signatures duplicating reflection

None of these are refcounted.

5 years agoMake more opcache signatures consistent with reflection
Tyson Andre [Wed, 4 Dec 2019 14:40:42 +0000 (09:40 -0500)]
Make more opcache signatures consistent with reflection

5 years agoRemove obsolete configure checks for isinf, isnan, and isfinite
George Peter Banyard [Wed, 4 Dec 2019 14:17:57 +0000 (15:17 +0100)]
Remove obsolete configure checks for isinf, isnan, and isfinite

5 years agoRemove configure checks for asinh, acosh, atanh, log1p, hypot
George Peter Banyard [Wed, 4 Dec 2019 13:57:11 +0000 (14:57 +0100)]
Remove configure checks for asinh, acosh, atanh, log1p, hypot

5 years agoRemove now obsolete configure checks for INFINITY and NAN.
George Peter Banyard [Wed, 4 Dec 2019 12:39:52 +0000 (13:39 +0100)]
Remove now obsolete configure checks for INFINITY and NAN.

5 years agoRemove custom implementation for inifinity and NAN as we can now rely on C99
George Peter Banyard [Wed, 4 Dec 2019 12:13:06 +0000 (13:13 +0100)]
Remove custom implementation for inifinity and NAN as we can now rely on C99

Those ZEND_* constant variant are now identical to their C counterpart, we may considering removing them in the future.

5 years agoRemove unnecessary C99 checks for maths functions
George Peter Banyard [Wed, 20 Nov 2019 01:22:38 +0000 (02:22 +0100)]
Remove unnecessary C99 checks for maths functions

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 4 Dec 2019 10:21:34 +0000 (11:21 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix AST printing of nullable builtin types

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 4 Dec 2019 10:21:28 +0000 (11:21 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix AST printing of nullable builtin types

5 years agoFix AST printing of nullable builtin types
Nikita Popov [Wed, 4 Dec 2019 10:20:52 +0000 (11:20 +0100)]
Fix AST printing of nullable builtin types

Fixes oss-fuzz #19109.

5 years agoFix incorrect assertion in property type variance check
Nikita Popov [Wed, 4 Dec 2019 10:07:22 +0000 (11:07 +0100)]
Fix incorrect assertion in property type variance check

Only one of the status has to be UNRESOLVED, the other could also
be SUCCESS.

Fixes oss-fuzz #19108 and oss-fuzz #19111.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 4 Dec 2019 08:53:08 +0000 (09:53 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Preload: Better reason message for internal parents on windows

5 years agoPreload: Better reason message for internal parents on windows
Nikita Popov [Wed, 4 Dec 2019 08:52:40 +0000 (09:52 +0100)]
Preload: Better reason message for internal parents on windows

Related to bug #78881.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 4 Dec 2019 08:41:51 +0000 (09:41 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #78898

5 years agoFixed bug #78898
Nikita Popov [Wed, 4 Dec 2019 08:40:48 +0000 (09:40 +0100)]
Fixed bug #78898

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 4 Dec 2019 07:08:40 +0000 (08:08 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Add ReflectionMethod::getClosure() change to UPGRADING

[ci skip]

5 years agoAdd ReflectionMethod::getClosure() change to UPGRADING
Nikita Popov [Wed, 4 Dec 2019 07:07:59 +0000 (08:07 +0100)]
Add ReflectionMethod::getClosure() change to UPGRADING

Fixes bug #78897.

[ci skip]

5 years agoFix other incorrect opcache types
Tyson Andre [Sun, 1 Dec 2019 15:51:57 +0000 (10:51 -0500)]
Fix other incorrect opcache types

Closes GH-4959.

5 years agoMake some opcache types consistent with reflection information
Tyson Andre [Sun, 1 Dec 2019 15:37:39 +0000 (10:37 -0500)]
Make some opcache types consistent with reflection information

Remove functions such as filter_id() where reference counts and types are
identical to what's in opcache.

Remove null types from zend_func_info.c that aren't in Reflection
(php would throw now)

Fix the Reflection type information for assert_options()

    php > assert_options(ASSERT_CALLBACK, static function() {});
    php > var_export(assert_options(ASSERT_CALLBACK));
    Closure::__set_state(array(
    ))

Closes GH-4958.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 4 Dec 2019 06:17:18 +0000 (07:17 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix print_r return types in opcache

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 4 Dec 2019 06:16:56 +0000 (07:16 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix print_r return types in opcache

5 years agoFix print_r return types in opcache
Tyson Andre [Sat, 30 Nov 2019 19:14:06 +0000 (14:14 -0500)]
Fix print_r return types in opcache

https://www.php.net/print_r

> When the return parameter is TRUE, this function will return a string.
> Otherwise, the return value is TRUE.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Tue, 3 Dec 2019 11:09:47 +0000 (12:09 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Next is 7.3.14

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Tue, 3 Dec 2019 11:07:57 +0000 (12:07 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Next is 7.3.14

5 years agoNext is 7.3.14
Christoph M. Becker [Tue, 3 Dec 2019 11:04:17 +0000 (12:04 +0100)]
Next is 7.3.14

5 years agoMerge branch 'PHP-7.4'
Remi Collet [Tue, 3 Dec 2019 10:26:36 +0000 (11:26 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  next is 7.2.27

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Remi Collet [Tue, 3 Dec 2019 10:26:20 +0000 (11:26 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  next is 7.2.27

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Remi Collet [Tue, 3 Dec 2019 10:26:05 +0000 (11:26 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  next is 7.2.27

5 years agonext is 7.2.27
Remi Collet [Tue, 3 Dec 2019 10:25:37 +0000 (11:25 +0100)]
next is 7.2.27

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Mon, 2 Dec 2019 15:53:35 +0000 (16:53 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78883: fgets(STDIN) fails on Windows

5 years agoFix #78883: fgets(STDIN) fails on Windows
Christoph M. Becker [Mon, 2 Dec 2019 14:14:57 +0000 (15:14 +0100)]
Fix #78883: fgets(STDIN) fails on Windows

We add the `is_seekable` member to `php_stdio_stream_data`, and prefer
that over `is_pipe`, since the latter is simply a misnomer.  We keep
`is_pipe` for now for Windows only, though, because we need special
support for pipes there.  We also fix the misaligned bitfield which
formerly took 33 bit.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Mon, 2 Dec 2019 10:39:58 +0000 (11:39 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78814: strip_tags allows / in tag name => whitelist bypass

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 2 Dec 2019 10:39:10 +0000 (11:39 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78814: strip_tags allows / in tag name => whitelist bypass

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Mon, 2 Dec 2019 10:38:11 +0000 (11:38 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #78814: strip_tags allows / in tag name => whitelist bypass

5 years agoFix #78814: strip_tags allows / in tag name => whitelist bypass
Christoph M. Becker [Sun, 17 Nov 2019 13:14:59 +0000 (14:14 +0100)]
Fix #78814: strip_tags allows / in tag name => whitelist bypass

When normalizing tags to check whether they are contained in the set
of allowable tags, we must not strip slashes, unless they come
immediately after the opening `<`, or immediately before the closing
`>`.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Mon, 2 Dec 2019 10:30:23 +0000 (11:30 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78296: is_file fails to detect file

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 2 Dec 2019 10:29:32 +0000 (11:29 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78296: is_file fails to detect file

5 years agoFix #78296: is_file fails to detect file
Christoph M. Becker [Mon, 25 Nov 2019 11:16:54 +0000 (12:16 +0100)]
Fix #78296: is_file fails to detect file

If we're constructing extended-length paths (i.e. paths prefixed with
`\\?\`), we have to replace all forward slashes with backward slashes,
because the former are not supported by Windows for extended-length
paths.

The more efficient and likely cleaner alternative solution would be to
cater to this in `php_win32_ioutil_normalize_path_w()` by always
replacing forward slashes, but that might break existing code.  It
might be sensible to change that for `master`, though.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Mon, 2 Dec 2019 10:21:37 +0000 (11:21 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78833: Integer overflow in pack causes out-of-bound access

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 2 Dec 2019 10:20:53 +0000 (11:20 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78833: Integer overflow in pack causes out-of-bound access

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Mon, 2 Dec 2019 10:18:58 +0000 (11:18 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #78833: Integer overflow in pack causes out-of-bound access

5 years agoFix #78833: Integer overflow in pack causes out-of-bound access
Christoph M. Becker [Tue, 19 Nov 2019 13:22:26 +0000 (14:22 +0100)]
Fix #78833: Integer overflow in pack causes out-of-bound access

We check for potential signed integer overflow, and bail out
gracefully, in that case.

5 years agoFix misleading error message in `ZendAccelerator.c`.
Adam Saponara [Tue, 26 Nov 2019 22:21:16 +0000 (17:21 -0500)]
Fix misleading error message in `ZendAccelerator.c`.

Currently this error emits something like...

`Error Cannot kill process 12345: Success!`

...due to calling `time` before `strerror` which clears `errno`. This
patch adds an error log immediately after both `kill` calls which gives
us better indication of what exactly failed.

5 years agoMerge branch 'PHP-7.4'
Jakub Zelenka [Sun, 1 Dec 2019 17:17:30 +0000 (17:17 +0000)]
Merge branch 'PHP-7.4'

5 years agoFix bug #78889 (php-fpm service fails to start)
Jakub Zelenka [Sun, 1 Dec 2019 17:13:20 +0000 (17:13 +0000)]
Fix bug #78889 (php-fpm service fails to start)

5 years agoFix typo in xmm15 register
Lucas Martín [Sat, 30 Nov 2019 19:05:24 +0000 (20:05 +0100)]
Fix typo in xmm15 register

5 years agoAdd fuzzing badge to README
Stanislav Malyshev [Fri, 22 Nov 2019 06:03:01 +0000 (22:03 -0800)]
Add fuzzing badge to README

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Sat, 30 Nov 2019 13:02:14 +0000 (14:02 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Upgrade to Oniguruma 6.9.4

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Sat, 30 Nov 2019 13:01:25 +0000 (14:01 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Upgrade to Oniguruma 6.9.4

5 years agoUpgrade to Oniguruma 6.9.4
Christoph M. Becker [Sat, 30 Nov 2019 08:38:46 +0000 (09:38 +0100)]
Upgrade to Oniguruma 6.9.4

Oniguruma 6.9.4 fixes several CVEs.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 29 Nov 2019 22:52:52 +0000 (23:52 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Add missing skip checks

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Fri, 29 Nov 2019 22:51:12 +0000 (23:51 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Add missing skip checks

5 years agoAdd missing skip checks
Christoph M. Becker [Fri, 29 Nov 2019 22:50:05 +0000 (23:50 +0100)]
Add missing skip checks

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 29 Nov 2019 22:42:48 +0000 (23:42 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Partially revert "Adapt test cases for Oniguruma 6.9.4"

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Fri, 29 Nov 2019 22:41:39 +0000 (23:41 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Partially revert "Adapt test cases for Oniguruma 6.9.4"

5 years agoPartially revert "Adapt test cases for Oniguruma 6.9.4"
Christoph M. Becker [Fri, 29 Nov 2019 22:28:28 +0000 (23:28 +0100)]
Partially revert "Adapt test cases for Oniguruma 6.9.4"

This partially reverts commit c55d09c2f547634b577aa5aeaa1438d772bc29d1,
because `MB_ONIGURUMA_VERSION` is only available as of PHP 7.4.0, so
that change made no sense for PHP-7.3; we keep it for PHP-7.4, though.
We also stick with the modification to bug78633.phpt.

5 years agoRefactor JIT to reduce back-end dependency from SSA representation.
Dmitry Stogov [Fri, 29 Nov 2019 16:07:17 +0000 (19:07 +0300)]
Refactor JIT to reduce back-end dependency from SSA representation.

This commit shouldn't change JIT behavior, but it adds asserts, that may catch wrong-cases occasionally passed before.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 29 Nov 2019 16:01:11 +0000 (17:01 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Adapt test cases for Oniguruma 6.9.4

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Fri, 29 Nov 2019 16:00:11 +0000 (17:00 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Adapt test cases for Oniguruma 6.9.4

5 years agoAdapt test cases for Oniguruma 6.9.4
Christoph M. Becker [Fri, 29 Nov 2019 15:47:10 +0000 (16:47 +0100)]
Adapt test cases for Oniguruma 6.9.4

Apparently, bug 78633 has now really been fixed; the former fix only
catered to the buffer overflow, but yielded a wrong result.  Also,
the order of the named captures has been fixed.

5 years agoDon't keep QM_ASSIGN with IS_UNUSED result
Dmitry Stogov [Fri, 29 Nov 2019 14:43:36 +0000 (17:43 +0300)]
Don't keep QM_ASSIGN with IS_UNUSED result

5 years agoRemove no-op check for 'use strict;'
Tyson Andre [Thu, 28 Nov 2019 14:14:06 +0000 (09:14 -0500)]
Remove no-op check for 'use strict;'

This should be checking for ZEND_SYMBOL_CLASS, not T_CLASS.

This was first added in 37ac1b96ed1

5 years agotypos
Dmitry Stogov [Thu, 28 Nov 2019 10:23:17 +0000 (13:23 +0300)]
typos

5 years agoFixed wrong parameteris order
Dmitry Stogov [Wed, 27 Nov 2019 13:48:01 +0000 (16:48 +0300)]
Fixed wrong parameteris order

5 years agoFixed register allocation
Dmitry Stogov [Wed, 27 Nov 2019 13:26:43 +0000 (16:26 +0300)]
Fixed register allocation

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Wed, 27 Nov 2019 13:05:47 +0000 (14:05 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Prevent parallel test conflicts

5 years agoPrevent parallel test conflicts
Christoph M. Becker [Wed, 27 Nov 2019 13:02:44 +0000 (14:02 +0100)]
Prevent parallel test conflicts

The better solution would be to actually use different directory names,
but adding respective CONFLICTS sections solves the issue for now.

5 years agoFixed JIT for LONG->DOUBLE conversion when optimizer disabled
Dmitry Stogov [Wed, 27 Nov 2019 11:31:24 +0000 (14:31 +0300)]
Fixed JIT for LONG->DOUBLE conversion when optimizer disabled

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Wed, 27 Nov 2019 08:34:57 +0000 (09:34 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78840: imploding $GLOBALS crashes

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Wed, 27 Nov 2019 08:33:36 +0000 (09:33 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78840: imploding $GLOBALS crashes

5 years agoFix #78840: imploding $GLOBALS crashes
Christoph M. Becker [Tue, 26 Nov 2019 09:19:27 +0000 (10:19 +0100)]
Fix #78840: imploding $GLOBALS crashes

We add support for IS_INDIRECT zvals to implode().

5 years agoFixed incorrect JIT compilation
Dmitry Stogov [Tue, 26 Nov 2019 13:45:19 +0000 (16:45 +0300)]
Fixed incorrect JIT compilation

5 years agoOpen opcache.error_log with 'a' flag
avkarenow [Tue, 26 Nov 2019 04:35:32 +0000 (05:35 +0100)]
Open opcache.error_log with 'a' flag

When opcache.error_log is set to log to file the read flag is not needed and used.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Mon, 25 Nov 2019 14:58:45 +0000 (15:58 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #77638: var_export'ing certain class instances segfaults

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 25 Nov 2019 14:57:13 +0000 (15:57 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #77638: var_export'ing certain class instances segfaults

5 years agoFix #77638: var_export'ing certain class instances segfaults
Christoph M. Becker [Mon, 25 Nov 2019 14:44:15 +0000 (15:44 +0100)]
Fix #77638: var_export'ing certain class instances segfaults

If objects return immutable property hash tables (typically,
`zend_empty_array`), we must not try to apply recursion protection on
those.

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Mon, 25 Nov 2019 11:10:53 +0000 (14:10 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #78868 (Calling __autoload() with incorrect EG(fake_scope) value)
  Consolidate NEWS for 7.4.0 release
  WIP: Merge NEWS

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Dmitry Stogov [Mon, 25 Nov 2019 11:09:18 +0000 (14:09 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed bug #78868 (Calling __autoload() with incorrect EG(fake_scope) value)

5 years agoFixed bug #78868 (Calling __autoload() with incorrect EG(fake_scope) value)
Dmitry Stogov [Mon, 25 Nov 2019 11:05:43 +0000 (14:05 +0300)]
Fixed bug #78868 (Calling __autoload() with incorrect EG(fake_scope) value)

5 years agoDocument the need for merging NEWS sections before x.y.0
Christoph M. Becker [Sun, 24 Nov 2019 11:19:49 +0000 (12:19 +0100)]
Document the need for merging NEWS sections before x.y.0

5 years agoConsolidate NEWS for 7.4.0 release
Derick Rethans [Sun, 24 Nov 2019 09:23:33 +0000 (10:23 +0100)]
Consolidate NEWS for 7.4.0 release

5 years agoWIP: Merge NEWS
Derick Rethans [Sat, 23 Nov 2019 19:00:51 +0000 (20:00 +0100)]
WIP: Merge NEWS

5 years agoMerge branch 'PHP-7.4'
Tyson Andre [Sat, 23 Nov 2019 15:46:28 +0000 (10:46 -0500)]
Merge branch 'PHP-7.4'

5 years agoHandle reallocated root buffer during GC destroy phase (v2)
Tyson Andre [Wed, 20 Nov 2019 00:12:56 +0000 (19:12 -0500)]
Handle reallocated root buffer during GC destroy phase (v2)

We no longer protect GC during the destroy phase, so we need to
deal with buffer reallocation.

Note that the implementation of spl_SplObjectStorage_free_storage
will call the destructor of SplObjectStorage, and free the instance properties,
which I think is what caused the root buffer to be reallocated.
(`current` is a pointer for an index within the root buffer?)

This fixes bug #78811 for me.

Closes GH-4935

5 years agoHandle reallocated root buffer during GC destroy phase (v2)
Tyson Andre [Wed, 20 Nov 2019 00:12:56 +0000 (19:12 -0500)]
Handle reallocated root buffer during GC destroy phase (v2)

We no longer protect GC during the destroy phase, so we need to
deal with buffer reallocation.

Note that the implementation of spl_SplObjectStorage_free_storage
will call the destructor of SplObjectStorage, and free the instance properties,
which I think is what caused the root buffer to be reallocated.
(`current` is a pointer for an index within the root buffer?)

This fixes bug #78811 for me.

Closes GH-4935

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 22 Nov 2019 18:30:43 +0000 (19:30 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78853: preg_match() may return integer > 1

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Fri, 22 Nov 2019 18:28:49 +0000 (19:28 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78853: preg_match() may return integer > 1

5 years agoFix #78853: preg_match() may return integer > 1
Christoph M. Becker [Fri, 22 Nov 2019 18:21:43 +0000 (19:21 +0100)]
Fix #78853: preg_match() may return integer > 1

Commit 54ebebd[1] optimized the match loop, but for this case it has
been overlooked, that we must only loop if we're doing global matching.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=54ebebd686255c5f124af718c966edb392782d4a>

5 years agoPromote warning to value error in strpbrk()
George Peter Banyard [Wed, 20 Nov 2019 22:35:03 +0000 (23:35 +0100)]
Promote warning to value error in strpbrk()

Closes GH-4598

5 years agoMerge branch 'PHP-7.4'
George Wang [Thu, 21 Nov 2019 22:59:05 +0000 (17:59 -0500)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
George Wang [Thu, 21 Nov 2019 22:58:44 +0000 (17:58 -0500)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
George Wang [Thu, 21 Nov 2019 22:58:16 +0000 (17:58 -0500)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoAdded environment LSAPI_CLEAN_SHUTDOWN to control clean shutdown. Update SAPI version...
George Wang [Thu, 21 Nov 2019 22:57:50 +0000 (17:57 -0500)]
Added environment LSAPI_CLEAN_SHUTDOWN to control clean shutdown. Update SAPI version to LiteSpeed v7.6 .