]> granicus.if.org Git - php/log
php
5 years agoEliminate run-time check
Dmitry Stogov [Wed, 18 Mar 2020 18:19:31 +0000 (21:19 +0300)]
Eliminate run-time check

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Wed, 18 Mar 2020 16:01:30 +0000 (17:01 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Improve FFI test suite for Windows

5 years agoImprove FFI test suite for Windows
Christoph M. Becker [Fri, 13 Mar 2020 13:09:53 +0000 (14:09 +0100)]
Improve FFI test suite for Windows

We add Windows support to four existing test cases, extract some useful
utility functions, and use them to simplify further test cases.

We also remove the Windows specific code from preload.inc, since
preloading isn't supported on Windows anyway.

5 years agoImprove build instructions in README
Nikita Popov [Wed, 18 Mar 2020 15:29:09 +0000 (16:29 +0100)]
Improve build instructions in README

Provide enough information to get a build going without hunting
down packages.

If someone wants to add info for macos or other distros, that
would probably be nice as well.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 18 Mar 2020 15:00:23 +0000 (16:00 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Clarify session.cookie_samesite="None"

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 18 Mar 2020 15:00:05 +0000 (16:00 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Clarify session.cookie_samesite="None"

5 years agoClarify session.cookie_samesite="None"
Nikita Popov [Wed, 18 Mar 2020 14:59:30 +0000 (15:59 +0100)]
Clarify session.cookie_samesite="None"

5 years agoImproved JIT for BIND_GLOBAL
Dmitry Stogov [Wed, 18 Mar 2020 14:20:40 +0000 (17:20 +0300)]
Improved JIT for BIND_GLOBAL

5 years agoRevert "Fetch for read in nested property assignments"
Nikita Popov [Wed, 18 Mar 2020 13:52:22 +0000 (14:52 +0100)]
Revert "Fetch for read in nested property assignments"

This reverts commit bb43a3822e42dbd15b1d416a166549d3980b379a.

After thinking about this a bit more, this is now going to be
a complete solution for the "readonly properties" case, for example:

    unset($foo->readOnly->bar);

should also be legal and

    $foo->readOnly['bar'] = 42;

should also be legal if $foo->readOnly is not an array but an
ArrayAccess object.

I think it may be better to distinguish better on the BP_VAR flag
level. Reverting for now.

5 years agobump zp to 1.18.1 + doc
Remi Collet [Wed, 18 Mar 2020 13:09:50 +0000 (14:09 +0100)]
bump zp to 1.18.1 + doc

5 years agoFix bug #77960 add compr. /encr. options for ZipArchive::addGlob and ZipArchive:...
Remi Collet [Wed, 18 Mar 2020 10:55:16 +0000 (11:55 +0100)]
Fix bug #77960 add compr. /encr. options for ZipArchive::addGlob and ZipArchive::addPattern

options parameter now accepts:
- comp_method
- comp_flags
- enc_method
- enc_password

5 years agoFetch for read in nested property assignments
Nikita Popov [Tue, 10 Mar 2020 09:50:17 +0000 (10:50 +0100)]
Fetch for read in nested property assignments

    $a->b->c = 'd';

is now compiled the same way as

    $b = $a->b;
    $b->c = 'd';

That is, we perform a read fetch on $a->b, rather than a write
fetch.

This is possible, because PHP 8 removed auto-vivification support
for objects, so $a->b->c = 'd' may no longer modify $a->b proper
(i.e. not counting interior mutability of the object).

Closes GH-5250.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 18 Mar 2020 10:46:37 +0000 (11:46 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Make bug52820.phpt more robust
  Explicitly start mysql
  Use "set -e" in some pipeline steps

5 years agoMake bug52820.phpt more robust
Nikita Popov [Wed, 18 Mar 2020 09:25:38 +0000 (10:25 +0100)]
Make bug52820.phpt more robust

Use a more robust error condition...

5 years agoExplicitly start mysql
Nikita Popov [Wed, 18 Mar 2020 09:15:05 +0000 (10:15 +0100)]
Explicitly start mysql

5 years agoUse "set -e" in some pipeline steps
Nikita Popov [Wed, 18 Mar 2020 09:11:15 +0000 (10:11 +0100)]
Use "set -e" in some pipeline steps

5 years agoUse different scratch register in read_obj
Nikita Popov [Wed, 18 Mar 2020 08:56:23 +0000 (09:56 +0100)]
Use different scratch register in read_obj

We already use r0 to hold the zval.

5 years agoExplicitly pass scratch register to SAVE_VALID_OPLINE
Nikita Popov [Wed, 18 Mar 2020 08:56:07 +0000 (09:56 +0100)]
Explicitly pass scratch register to SAVE_VALID_OPLINE

5 years agoResult of ASSIGN may be different from the assigned value when LHS is a typed reference
Dmitry Stogov [Tue, 17 Mar 2020 22:40:41 +0000 (01:40 +0300)]
Result of ASSIGN may be different from the assigned value when LHS is a typed reference

5 years agoUse zend_fetch_arg_info_type()
Dmitry Stogov [Tue, 17 Mar 2020 15:10:27 +0000 (18:10 +0300)]
Use zend_fetch_arg_info_type()

5 years agoUse _const_op_type() for converting constant into type info
Dmitry Stogov [Tue, 17 Mar 2020 14:55:34 +0000 (17:55 +0300)]
Use _const_op_type() for converting constant into type info

5 years agoImprove type inference
Nikita Popov [Tue, 17 Mar 2020 14:41:47 +0000 (15:41 +0100)]
Improve type inference

After thinking about this a bit more, the code here was too
conservative. We know that everything but an object is going to
throw, so it's sufficient to restrict the type to MAY_BE_OBJECT.

The change in the test is weird but not incorrect, because it
operates on empty inferred types, in which case the code must be
dead (which it is). We should probably add a more explicit removal
of code working on empty types.

5 years agoClean up a few more places
Nikita Popov [Tue, 17 Mar 2020 14:23:52 +0000 (15:23 +0100)]
Clean up a few more places

5 years agoRemove object auto-vivification leftovers in type-inference
Nikita Popov [Tue, 17 Mar 2020 13:53:13 +0000 (14:53 +0100)]
Remove object auto-vivification leftovers in type-inference

undef/null/false no longer get promoted to object in PHP 8.

In fact, we may drop the SSA var defs outside RC inference mode now.

5 years agoDrop support for iconv without proper errno setting
Christoph M. Becker [Tue, 17 Mar 2020 12:58:17 +0000 (13:58 +0100)]
Drop support for iconv without proper errno setting

It is hard to impossible to work around iconv() implementations which
do not properly set errno according to POSIX.  We therefore do no
longer allow to build against such iconv() implementations.

Co-Authored-By: Nikita Popov <nikita.ppv@googlemail.com>
5 years agoImproved JIT for ZEND_ASSIGN
Dmitry Stogov [Tue, 17 Mar 2020 12:45:54 +0000 (15:45 +0300)]
Improved JIT for ZEND_ASSIGN

5 years agoFix typos
Nikita Popov [Tue, 17 Mar 2020 11:08:46 +0000 (12:08 +0100)]
Fix typos

5 years agoMerge branch 'PHP-7.4'
Remi Collet [Tue, 17 Mar 2020 10:29:20 +0000 (11:29 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  bump verison to 7.2.30-dev

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Remi Collet [Tue, 17 Mar 2020 10:29:03 +0000 (11:29 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  bump verison to 7.2.30-dev

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Remi Collet [Tue, 17 Mar 2020 10:28:47 +0000 (11:28 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  bump verison to 7.2.30-dev

5 years agobump verison to 7.2.30-dev
Remi Collet [Tue, 17 Mar 2020 10:28:34 +0000 (11:28 +0100)]
bump verison to 7.2.30-dev

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Tue, 17 Mar 2020 10:15:48 +0000 (11:15 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix NEWS

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Tue, 17 Mar 2020 10:11:15 +0000 (11:11 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix NEWS

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Tue, 17 Mar 2020 10:08:45 +0000 (11:08 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix NEWS

5 years agoFix NEWS
Christoph M. Becker [Tue, 17 Mar 2020 10:04:24 +0000 (11:04 +0100)]
Fix NEWS

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Tue, 17 Mar 2020 10:00:48 +0000 (11:00 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  [ci skip] Update NEWS
  Fix test
  Fix bug #79329 - get_headers should not accept \0
  Fixed bug #79282

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Tue, 17 Mar 2020 09:58:58 +0000 (10:58 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  [ci skip] Update NEWS
  Fix test
  Fix bug #79329 - get_headers should not accept \0
  Fixed bug #79282

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Tue, 17 Mar 2020 09:56:47 +0000 (10:56 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  [ci skip] Update NEWS
  Fix test
  Fix bug #79329 - get_headers should not accept \0
  Fixed bug #79282

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Tue, 17 Mar 2020 09:33:28 +0000 (10:33 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  [ci skip] Update NEWS
  Fix test
  Fix bug #79329 - get_headers should not accept \0
  Fixed bug #79282
  Fix #79283: Segfault in libmagic patch contains a buffer overflow
  Fix #79371: mb_strtolower (UTF-32LE): stack-buffer-overflow
  [ci skip] Update NEWS
  Fix test
  Fix bug #79329 - get_headers should not accept \0
  Fixed bug #79282
  Fix #79371: mb_strtolower (UTF-32LE): stack-buffer-overflow

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Tue, 17 Mar 2020 09:30:57 +0000 (10:30 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  [ci skip] Update NEWS
  Fix test
  Fix bug #79329 - get_headers should not accept \0
  Fixed bug #79282
  Fix #79371: mb_strtolower (UTF-32LE): stack-buffer-overflow

5 years agoFix test
Stanislav Malyshev [Mon, 16 Mar 2020 00:55:28 +0000 (17:55 -0700)]
Fix test

5 years agoFix bug #79329 - get_headers should not accept \0
Stanislav Malyshev [Mon, 16 Mar 2020 00:30:44 +0000 (17:30 -0700)]
Fix bug #79329 - get_headers should not accept \0

5 years agoFixed bug #79282
Stanislav Malyshev [Mon, 16 Mar 2020 00:26:00 +0000 (17:26 -0700)]
Fixed bug #79282

5 years agoFix #79283: Segfault in libmagic patch contains a buffer overflow
Christoph M. Becker [Mon, 2 Mar 2020 14:26:59 +0000 (15:26 +0100)]
Fix #79283: Segfault in libmagic patch contains a buffer overflow

To solve this, we properly calculate the required string length upfront
instead of allocating an oversized string (`len * 4 + 4`).

5 years agoFix #79371: mb_strtolower (UTF-32LE): stack-buffer-overflow
Christoph M. Becker [Thu, 12 Mar 2020 12:04:04 +0000 (13:04 +0100)]
Fix #79371: mb_strtolower (UTF-32LE): stack-buffer-overflow

We make sure that negative values are properly compared.

5 years ago[ci skip] Update NEWS
Stanislav Malyshev [Mon, 16 Mar 2020 02:35:01 +0000 (19:35 -0700)]
[ci skip] Update NEWS

5 years agoFix test
Stanislav Malyshev [Mon, 16 Mar 2020 00:55:28 +0000 (17:55 -0700)]
Fix test

5 years agoFix bug #79329 - get_headers should not accept \0
Stanislav Malyshev [Mon, 16 Mar 2020 00:30:44 +0000 (17:30 -0700)]
Fix bug #79329 - get_headers should not accept \0

5 years agoFixed bug #79282
Stanislav Malyshev [Mon, 16 Mar 2020 00:26:00 +0000 (17:26 -0700)]
Fixed bug #79282

5 years agoFix #79283: Segfault in libmagic patch contains a buffer overflow
Christoph M. Becker [Mon, 2 Mar 2020 14:26:59 +0000 (15:26 +0100)]
Fix #79283: Segfault in libmagic patch contains a buffer overflow

To solve this, we properly calculate the required string length upfront
instead of allocating an oversized string (`len * 4 + 4`).

5 years agoFix #79371: mb_strtolower (UTF-32LE): stack-buffer-overflow
Christoph M. Becker [Thu, 12 Mar 2020 12:04:04 +0000 (13:04 +0100)]
Fix #79371: mb_strtolower (UTF-32LE): stack-buffer-overflow

We make sure that negative values are properly compared.

5 years ago[ci skip] Update NEWS
Stanislav Malyshev [Mon, 16 Mar 2020 02:35:35 +0000 (19:35 -0700)]
[ci skip] Update NEWS

5 years agoFix test
Stanislav Malyshev [Mon, 16 Mar 2020 00:55:28 +0000 (17:55 -0700)]
Fix test

5 years agoFix bug #79329 - get_headers should not accept \0
Stanislav Malyshev [Mon, 16 Mar 2020 00:30:44 +0000 (17:30 -0700)]
Fix bug #79329 - get_headers should not accept \0

5 years agoFixed bug #79282
Stanislav Malyshev [Mon, 16 Mar 2020 00:26:00 +0000 (17:26 -0700)]
Fixed bug #79282

5 years agoFix #79371: mb_strtolower (UTF-32LE): stack-buffer-overflow
Christoph M. Becker [Thu, 12 Mar 2020 12:04:04 +0000 (13:04 +0100)]
Fix #79371: mb_strtolower (UTF-32LE): stack-buffer-overflow

We make sure that negative values are properly compared.

5 years agoStore informaton about class
Dmitry Stogov [Mon, 16 Mar 2020 21:25:47 +0000 (00:25 +0300)]
Store informaton about class

5 years agoFixed recording classes of object references
Dmitry Stogov [Mon, 16 Mar 2020 20:08:07 +0000 (23:08 +0300)]
Fixed recording classes of object references

5 years agoFix assertion when (real) is used
Nikita Popov [Mon, 16 Mar 2020 17:37:01 +0000 (18:37 +0100)]
Fix assertion when (real) is used

And bring back a test for it...

5 years agoSlightly deduplicate code
Nikita Popov [Mon, 16 Mar 2020 14:39:02 +0000 (15:39 +0100)]
Slightly deduplicate code

This code is the same in both branches, extract it.

5 years agoRemove "safe" argument from ZVAL_PTR_DTOR
Nikita Popov [Mon, 16 Mar 2020 14:07:59 +0000 (15:07 +0100)]
Remove "safe" argument from ZVAL_PTR_DTOR

This is no longer used

5 years agoFix typos
Nikita Popov [Mon, 16 Mar 2020 14:04:50 +0000 (15:04 +0100)]
Fix typos

5 years agoMerge EX variants of INFO macros
Nikita Popov [Mon, 16 Mar 2020 12:02:16 +0000 (13:02 +0100)]
Merge EX variants of INFO macros

5 years agoMerge EX variants of RANGE macros
Nikita Popov [Mon, 16 Mar 2020 11:32:40 +0000 (12:32 +0100)]
Merge EX variants of RANGE macros

Only need to create the ssa_op variable in range inference...

5 years agoMerge zend_may_throw(_ex)
Nikita Popov [Mon, 16 Mar 2020 11:23:55 +0000 (12:23 +0100)]
Merge zend_may_throw(_ex)

Explicitly pass ssa_op in the places that don't do so yet.

5 years agoRemove unnecessary cast
Nikita Popov [Mon, 16 Mar 2020 11:01:50 +0000 (12:01 +0100)]
Remove unnecessary cast

5 years agoFix ZPP of MultipleIterator::detachIterator() and MultipleIterator::containsIterator()
Máté Kocsis [Mon, 16 Mar 2020 09:27:48 +0000 (10:27 +0100)]
Fix ZPP of MultipleIterator::detachIterator() and MultipleIterator::containsIterator()

5 years agoAdd stubs for SplObjectStorage and MultipleIterator
Máté Kocsis [Sat, 14 Mar 2020 19:16:19 +0000 (20:16 +0100)]
Add stubs for SplObjectStorage and MultipleIterator

Closes GH-5267

5 years agoAdd stubs for SplHeap and SplPriorityQueue
Máté Kocsis [Sat, 14 Mar 2020 18:26:20 +0000 (19:26 +0100)]
Add stubs for SplHeap and SplPriorityQueue

Closes GH-5266

5 years agoAdd str_contains() function
Philipp Tanlak [Thu, 13 Feb 2020 15:23:01 +0000 (16:23 +0100)]
Add str_contains() function

RFC: https://wiki.php.net/rfc/str_contains

Closes GH-5179.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 16 Mar 2020 09:32:39 +0000 (10:32 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Don't specify ports in socket_export_stream-4.phpt

5 years agoDon't specify ports in socket_export_stream-4.phpt
Nikita Popov [Mon, 16 Mar 2020 09:32:04 +0000 (10:32 +0100)]
Don't specify ports in socket_export_stream-4.phpt

Let the system pick a free port instead...

5 years ago[ci skip] Update NEWS
Stanislav Malyshev [Mon, 16 Mar 2020 02:35:26 +0000 (19:35 -0700)]
[ci skip] Update NEWS

5 years agoFix test
Stanislav Malyshev [Mon, 16 Mar 2020 00:55:28 +0000 (17:55 -0700)]
Fix test

5 years agoFix bug #79329 - get_headers should not accept \0
Stanislav Malyshev [Mon, 16 Mar 2020 00:30:44 +0000 (17:30 -0700)]
Fix bug #79329 - get_headers should not accept \0

5 years agoFixed bug #79282
Stanislav Malyshev [Mon, 16 Mar 2020 00:26:00 +0000 (17:26 -0700)]
Fixed bug #79282

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Sun, 15 Mar 2020 14:02:10 +0000 (15:02 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix typo in php.ini comment

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Sun, 15 Mar 2020 14:01:23 +0000 (15:01 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix typo in php.ini comment

5 years agoFix typo in php.ini comment
Jacob Dreesen [Sun, 15 Mar 2020 13:11:40 +0000 (14:11 +0100)]
Fix typo in php.ini comment

5 years agoEmit warning about type narrowing for tracing JIT as well
Dmitry Stogov [Fri, 13 Mar 2020 22:29:46 +0000 (01:29 +0300)]
Emit warning about type narrowing for tracing JIT as well

5 years agoFixed RC inference for ZEND_ASSIGN_STATIC_PROP and removed useless checks during...
Dmitry Stogov [Fri, 13 Mar 2020 22:17:45 +0000 (01:17 +0300)]
Fixed RC inference for ZEND_ASSIGN_STATIC_PROP and removed useless checks during RC inference

5 years agoTracing JIT (it doesn't support register allocation yet)
Dmitry Stogov [Fri, 13 Mar 2020 19:11:07 +0000 (22:11 +0300)]
Tracing JIT (it doesn't support register allocation yet)

Use opcache.jit=1255 to swith it on (the third digit 5 really matters)
Use opcache.jit_debug=0xff001 to see how it works and what code it generates

5 years agoAccept const op_array in zend_build_call_map
Nikita Popov [Fri, 13 Mar 2020 15:25:28 +0000 (16:25 +0100)]
Accept const op_array in zend_build_call_map

5 years agoAdd assertions for DIM_W/RW uses
Nikita Popov [Fri, 13 Mar 2020 12:11:42 +0000 (13:11 +0100)]
Add assertions for DIM_W/RW uses

The result should be used only once and on the directly next opline,
otherwise it may not be safe. Add some assertions to that effect.

5 years agoAlso remove dead arguments
Nikita Popov [Fri, 13 Mar 2020 11:45:02 +0000 (12:45 +0100)]
Also remove dead arguments

5 years agoRemove dead type narrowing code
Nikita Popov [Fri, 13 Mar 2020 11:26:18 +0000 (12:26 +0100)]
Remove dead type narrowing code

Rename handle_type_narrowing() to clarify what it does, and
remove dead code for resetting dependent vars.

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Fri, 13 Mar 2020 08:42:07 +0000 (11:42 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Check asserts early
  identation fix
  Call global code of preloaded script in global context
  Avoid "Anonymous class wasn't preloaded" error by lazely loading of not preloaded part of a preloaded script

5 years agoCheck asserts early
Dmitry Stogov [Thu, 12 Mar 2020 19:26:30 +0000 (22:26 +0300)]
Check asserts early

5 years agoidentation fix
Dmitry Stogov [Thu, 12 Mar 2020 19:26:16 +0000 (22:26 +0300)]
identation fix

5 years agoCall global code of preloaded script in global context
Dmitry Stogov [Thu, 12 Mar 2020 19:19:47 +0000 (22:19 +0300)]
Call global code of preloaded script in global context

5 years agoRemove deprecated (real) cast
George Peter Banyard [Fri, 28 Feb 2020 11:13:03 +0000 (12:13 +0100)]
Remove deprecated (real) cast

Closes GH-5220

5 years agoAvoid "Anonymous class wasn't preloaded" error by lazely loading of not preloaded...
Dmitry Stogov [Thu, 12 Mar 2020 13:31:24 +0000 (16:31 +0300)]
Avoid "Anonymous class wasn't preloaded" error by lazely loading of not preloaded part of a preloaded script

5 years agoUpdate Unicode tables to 13.0.0
Nikita Popov [Wed, 11 Mar 2020 20:15:28 +0000 (21:15 +0100)]
Update Unicode tables to 13.0.0

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 12 Mar 2020 10:28:39 +0000 (11:28 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79199: curl_copy_handle() memory leak

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Thu, 12 Mar 2020 10:27:30 +0000 (11:27 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79199: curl_copy_handle() memory leak

5 years agoFix #79199: curl_copy_handle() memory leak
Christoph M. Becker [Wed, 11 Mar 2020 17:29:40 +0000 (18:29 +0100)]
Fix #79199: curl_copy_handle() memory leak

`curl_copy_handle()` already registers a new resource, so we must not
increase the refcount of the original resource.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 12 Mar 2020 09:57:14 +0000 (10:57 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #61597: SXE properties may lack attributes and content

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Thu, 12 Mar 2020 09:53:22 +0000 (10:53 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #61597: SXE properties may lack attributes and content

5 years agoFix #61597: SXE properties may lack attributes and content
Christoph M. Becker [Sat, 7 Mar 2020 10:20:06 +0000 (11:20 +0100)]
Fix #61597: SXE properties may lack attributes and content

We must not treat a node as string if it has attributes, unless it is
an entity declaration which is always treated as string by simplexml.

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Thu, 12 Mar 2020 08:45:05 +0000 (11:45 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Export FFI::__BIGGEST_ALIGNMENT__