]> granicus.if.org Git - php/log
php
4 years agoAdd identify filter for UTF-16, UTF-16LE, UTF-16BE
Alex Dowad [Sun, 6 Sep 2020 08:32:58 +0000 (10:32 +0200)]
Add identify filter for UTF-16, UTF-16LE, UTF-16BE

There was one faulty test in the suite which only passed before because UTF-16 had no
identify filter. After this was fixed, it exposed the problem with the test.

4 years agoMerge branch 'PHP-8.0' into master
Christoph M. Becker [Tue, 13 Oct 2020 17:41:54 +0000 (19:41 +0200)]
Merge branch 'PHP-8.0' into master

* PHP-8.0:
  Fix #64076: imap_sort() does not return FALSE on failure

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Christoph M. Becker [Tue, 13 Oct 2020 17:40:49 +0000 (19:40 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #64076: imap_sort() does not return FALSE on failure

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Tue, 13 Oct 2020 17:38:10 +0000 (19:38 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #64076: imap_sort() does not return FALSE on failure

4 years agoFix #64076: imap_sort() does not return FALSE on failure
Christoph M. Becker [Tue, 13 Oct 2020 14:20:55 +0000 (16:20 +0200)]
Fix #64076: imap_sort() does not return FALSE on failure

If unsupported `$search_criteria` are passed to `imap_sort()`, the
function returns an empty array, but there is also an error on the
libc-client error stack ("Unknown search criterion: UNSUPPORTED
(errflg=2)").  If, on the other hand, unsupported `$criteria` or
unsupported `$flags` are passed, the function returns `false`.  We
solve this inconsistency by returning `false` for unsupported
`$search_criteria` as well.

Closes GH-6332.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 13 Oct 2020 15:47:11 +0000 (17:47 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix incorrect zpp parameter count in mb_substr() / mb_strcut()

4 years agoFix incorrect zpp parameter count in mb_substr() / mb_strcut()
Nikita Popov [Tue, 13 Oct 2020 15:44:56 +0000 (17:44 +0200)]
Fix incorrect zpp parameter count in mb_substr() / mb_strcut()

These functions only accept 4 params.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 13 Oct 2020 15:29:16 +0000 (17:29 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix default value for some pgsql functions

4 years agoFix default value for some pgsql functions
Nikita Popov [Tue, 13 Oct 2020 15:28:38 +0000 (17:28 +0200)]
Fix default value for some pgsql functions

These set the PGSQL_DML_EXEC flag by default.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 13 Oct 2020 15:13:14 +0000 (17:13 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix null handling in mysqli_begin_transaction()

4 years agoFix null handling in mysqli_begin_transaction()
Nikita Popov [Tue, 13 Oct 2020 15:10:41 +0000 (17:10 +0200)]
Fix null handling in mysqli_begin_transaction()

We don't want an explicit null name hit the !name_len check.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 13 Oct 2020 14:03:29 +0000 (16:03 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix argument nullability in mbstring

4 years agoFix argument nullability in mbstring
Nikita Popov [Tue, 13 Oct 2020 14:02:29 +0000 (16:02 +0200)]
Fix argument nullability in mbstring

These arguments were declared nullable in stubs (and should be
nullable), but didn't accept null in zpp.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 13 Oct 2020 13:37:23 +0000 (15:37 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Don't accept null in pg_unescape_bytea()

4 years agoDon't accept null in pg_unescape_bytea()
Nikita Popov [Tue, 13 Oct 2020 13:36:09 +0000 (15:36 +0200)]
Don't accept null in pg_unescape_bytea()

This is an error that slipped in via 8d37c37bcdbf6fa99cd275413342457eeb2c664e.
pg_unescape_bytea() did not accept null in PHP 7.4, and it is not
meaningful for it to accept null now -- it will always fail, and now
with a misleading OOM message.

4 years agoMerge branch 'PHP-8.0' into master
Christoph M. Becker [Tue, 13 Oct 2020 13:34:48 +0000 (15:34 +0200)]
Merge branch 'PHP-8.0' into master

* PHP-8.0:
  Update ext/odbc parameter names

4 years agoUpdate ext/odbc parameter names
Christoph M. Becker [Tue, 13 Oct 2020 12:57:17 +0000 (14:57 +0200)]
Update ext/odbc parameter names

Closes GH-6303.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 13 Oct 2020 12:20:13 +0000 (14:20 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Use $statement in mysqli

4 years agoUse $statement in mysqli
Nikita Popov [Tue, 13 Oct 2020 10:38:39 +0000 (12:38 +0200)]
Use $statement in mysqli

As we went with $statement rather than $stmts in other places,
let's also use it in mysqli. The discrepancy with mysqli_stmt
is a bit unfortunate, but we can't be consistent with *both*.

Closes GH-6330.

4 years agoMerge branch 'PHP-8.0' into master
Derick Rethans [Tue, 13 Oct 2020 11:29:28 +0000 (12:29 +0100)]
Merge branch 'PHP-8.0' into master

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Derick Rethans [Tue, 13 Oct 2020 11:29:14 +0000 (12:29 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

4 years agoPrepare for 7.4.13
Derick Rethans [Tue, 13 Oct 2020 11:28:58 +0000 (12:28 +0100)]
Prepare for 7.4.13

4 years agoMerge branch 'PHP-8.0' into master
Christoph M. Becker [Tue, 13 Oct 2020 11:13:26 +0000 (13:13 +0200)]
Merge branch 'PHP-8.0' into master

* PHP-8.0:
  Ignore memory leaks reported for some libc-client functions

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Christoph M. Becker [Tue, 13 Oct 2020 11:12:39 +0000 (13:12 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Ignore memory leaks reported for some libc-client functions

4 years agoIgnore memory leaks reported for some libc-client functions
Christoph M. Becker [Mon, 12 Oct 2020 15:28:24 +0000 (17:28 +0200)]
Ignore memory leaks reported for some libc-client functions

At least on Windows, some static variables are lazily initialized
during `mail_open()` and `mail_lsub()`, which are reported as memory
leaks.  We suppress these false positives.

Closes GH-6326.

4 years agoMerge branch 'PHP-8.0'
Dmitry Stogov [Tue, 13 Oct 2020 11:00:57 +0000 (14:00 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Give preference to live-ranges with register hints to improve register reuse.

4 years agoGive preference to live-ranges with register hints to improve register reuse.
Dmitry Stogov [Tue, 13 Oct 2020 10:59:53 +0000 (13:59 +0300)]
Give preference to live-ranges with register hints to improve register reuse.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 13 Oct 2020 10:32:08 +0000 (12:32 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Update ext/pdo_pgsql parameter names

4 years agoUpdate ext/pdo_pgsql parameter names
Nikita Popov [Tue, 13 Oct 2020 09:11:13 +0000 (11:11 +0200)]
Update ext/pdo_pgsql parameter names

Closes GH-6329.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 13 Oct 2020 10:30:59 +0000 (12:30 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Update ext/pgsql parameter names

4 years agoUpdate ext/pgsql parameter names
Nikita Popov [Wed, 7 Oct 2020 14:07:03 +0000 (16:07 +0200)]
Update ext/pgsql parameter names

Closes GH-6294.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 13 Oct 2020 09:45:43 +0000 (11:45 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix handling of throwing undef var in verify return

4 years agoFix handling of throwing undef var in verify return
Nikita Popov [Tue, 13 Oct 2020 09:38:30 +0000 (11:38 +0200)]
Fix handling of throwing undef var in verify return

If we have an undefined variable and null is not accepted by the
return type, we want to throw just the undef var error.

In this case this lead to an infinite loop, because we overwrite
the exception opline in SAVE_OPLINE and it does not get reset
when chaining into a previous exception. Add an assertiong to
catch this case earlier.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 13 Oct 2020 08:41:43 +0000 (10:41 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Update ext/sodium parameter names

4 years agoUpdate ext/sodium parameter names
Nikita Popov [Tue, 6 Oct 2020 10:02:11 +0000 (12:02 +0200)]
Update ext/sodium parameter names

Closes GH-6279.

4 years agoMerge branch 'PHP-8.0'
Dmitry Stogov [Tue, 13 Oct 2020 08:37:51 +0000 (11:37 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Avoid useless register allocation

4 years agoAvoid useless register allocation
Dmitry Stogov [Tue, 13 Oct 2020 08:37:33 +0000 (11:37 +0300)]
Avoid useless register allocation

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 13 Oct 2020 08:21:41 +0000 (10:21 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Update ext/phar parameter names

4 years agoUpdate ext/phar parameter names
Nikita Popov [Wed, 7 Oct 2020 15:33:22 +0000 (17:33 +0200)]
Update ext/phar parameter names

Closes GH-6307.

4 years agoMerge branch 'PHP-8.0' into master
Christoph M. Becker [Tue, 13 Oct 2020 07:56:32 +0000 (09:56 +0200)]
Merge branch 'PHP-8.0' into master

* PHP-8.0:
  7.3.25 is next

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Christoph M. Becker [Tue, 13 Oct 2020 07:55:33 +0000 (09:55 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  7.3.25 is next

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Tue, 13 Oct 2020 07:53:52 +0000 (09:53 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  7.3.25 is next

4 years ago7.3.25 is next
Christoph M. Becker [Tue, 13 Oct 2020 07:52:46 +0000 (09:52 +0200)]
7.3.25 is next

4 years agoHandle illegal bytes properly when converting to '7bit' encoding
Alex Dowad [Mon, 12 Oct 2020 18:52:52 +0000 (20:52 +0200)]
Handle illegal bytes properly when converting to '7bit' encoding

Previously, mbstring would silently drop illegal bytes when converting a
string to '7bit' encoding.

4 years agoAdd mbstring identify filter for '7bit' encoding
Alex Dowad [Sun, 6 Sep 2020 11:08:47 +0000 (13:08 +0200)]
Add mbstring identify filter for '7bit' encoding

4 years agoRefactor mbfl_ident.c, mbfl_encoding.c, mbfl_memory_device.c, mbfl_string.c
Alex Dowad [Thu, 16 Jul 2020 08:59:39 +0000 (10:59 +0200)]
Refactor mbfl_ident.c, mbfl_encoding.c, mbfl_memory_device.c, mbfl_string.c

- Make everything less gratuitously verbose
- Don't litter the code with lots of unneeded NULL checks (for things which
  will never be NULL)
- Don't return success/failure code from functions which can never fail
- For encoding structs, don't use pointers to pointers to pointers for the
  list of alias strings. Pointers to pointers (2 levels of indirection)
  is what actually makes sense. This gets rid of some extraneous
  dereference operations.

4 years agoRemove useless constants MBFL_CHP_{CTL,DIGIT,UALPHA,LALPHA,MSPECIAL}
Alex Dowad [Tue, 21 Jul 2020 14:09:12 +0000 (16:09 +0200)]
Remove useless constants MBFL_CHP_{CTL,DIGIT,UALPHA,LALPHA,MSPECIAL}

4 years agoRemove useless validity check when converting UTF-16LE -> wchar
Alex Dowad [Sun, 6 Sep 2020 10:09:02 +0000 (12:09 +0200)]
Remove useless validity check when converting UTF-16LE -> wchar

The check ensures that the decoded codepoint is between 0x10000-0x10FFFF,
which is the valid range which can be encoded in a UTF-16 surrogate pair.
However, just looking at the code, it's obvious that this will be true.
First of all, 0x10000 is added to the decoded codepoint on the previous
line, so how could it be less than 0x10000?

Further, even if the 20 data bits already decoded were 0xFFFFF (all ones),
when you add 0x10000, it comes to 0x10FFFF, which is the very top of the
valid range. So how could the decoded codepoint be more than 0x10FFFF?
It can't.

4 years agoRefactor UTF-16LE -> wchar conversion code
Alex Dowad [Mon, 10 Aug 2020 19:40:43 +0000 (21:40 +0200)]
Refactor UTF-16LE -> wchar conversion code

4 years agoAvoid compiler warnings related to mbstring flush functions
Alex Dowad [Sat, 19 Sep 2020 15:54:25 +0000 (17:54 +0200)]
Avoid compiler warnings related to mbstring flush functions

4 years agoMerge branch 'PHP-8.0' into master
Christoph M. Becker [Mon, 12 Oct 2020 21:22:19 +0000 (23:22 +0200)]
Merge branch 'PHP-8.0' into master

* PHP-8.0:
  Fix #80226: imap_sort() leaks sortpgm memory

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Christoph M. Becker [Mon, 12 Oct 2020 21:21:35 +0000 (23:21 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #80226: imap_sort() leaks sortpgm memory

4 years agoMerge branch 'PHP-8.0'
Dmitry Stogov [Mon, 12 Oct 2020 21:19:02 +0000 (00:19 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Perform trace range propagation

4 years agoPerform trace range propagation
Dmitry Stogov [Mon, 12 Oct 2020 21:18:17 +0000 (00:18 +0300)]
Perform trace range propagation

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 12 Oct 2020 21:17:42 +0000 (23:17 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #80226: imap_sort() leaks sortpgm memory

4 years agoFix #80226: imap_sort() leaks sortpgm memory
Christoph M. Becker [Mon, 12 Oct 2020 16:06:53 +0000 (18:06 +0200)]
Fix #80226: imap_sort() leaks sortpgm memory

We need to free what we have allocated.

Closes GH-6327.

4 years agoMerge branch 'PHP-8.0' into master
Christoph M. Becker [Mon, 12 Oct 2020 21:10:41 +0000 (23:10 +0200)]
Merge branch 'PHP-8.0' into master

* PHP-8.0:
  Change parameters types from int to bool

4 years agoChange parameters types from int to bool
Christoph M. Becker [Mon, 12 Oct 2020 17:18:03 +0000 (19:18 +0200)]
Change parameters types from int to bool

These are typical boolean parameters, so we shouldn't advertize them as
integers.  For the `$reverse` parameter that even fixes expectations,
because the `reverse` member is a bitfield of 1 bit, so assigning any
even integer would not set it.

Closes GH-6328.

4 years agoMerge branch 'PHP-8.0'
Dmitry Stogov [Mon, 12 Oct 2020 19:59:48 +0000 (22:59 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Eliminate dead stores

4 years agoEliminate dead stores
Dmitry Stogov [Mon, 12 Oct 2020 19:59:30 +0000 (22:59 +0300)]
Eliminate dead stores

4 years agoMerge branch 'PHP-8.0'
Máté Kocsis [Mon, 12 Oct 2020 16:09:08 +0000 (18:09 +0200)]
Merge branch 'PHP-8.0'

4 years agoImprove parameter names in ext/intl
Máté Kocsis [Fri, 9 Oct 2020 11:14:41 +0000 (13:14 +0200)]
Improve parameter names in ext/intl

Closes GH-6309

4 years agoImprove parameter names in ext/pdo_sqlite
Máté Kocsis [Fri, 9 Oct 2020 21:02:14 +0000 (23:02 +0200)]
Improve parameter names in ext/pdo_sqlite

Closes GH-6310

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 12 Oct 2020 14:44:46 +0000 (16:44 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  intl: report more information about message pattern parse errors

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Mon, 12 Oct 2020 14:44:18 +0000 (16:44 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  intl: report more information about message pattern parse errors

4 years agointl: report more information about message pattern parse errors
Philip Hofstetter [Fri, 9 Oct 2020 09:55:33 +0000 (11:55 +0200)]
intl: report more information about message pattern parse errors

The message patterns can be pretty complex, so reporting a generic
U_PARSE_ERROR without any additional information makes it needlessly
hard to fix erroneous patterns.

This commit makes use of the additional UParseError* parameter to
umsg_open to retrieve more details about the parse error to report that
to the user via intl_get_error_message()

Additional improve error reporting from the IntlMessage constructor.
Previously, all possible failures when calling IntlMessage::__construct()
would be masked away with a generic "Constructor failed" message.
This would include invalid patterns.

This commit makes sure that the underlying error that caused the
constructor failure is reported as part of the IntlException error
message.

Closes GH-6325.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 12 Oct 2020 14:35:20 +0000 (16:35 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #80225

4 years agoFixed bug #80225
Nikita Popov [Mon, 12 Oct 2020 14:34:19 +0000 (16:34 +0200)]
Fixed bug #80225

Namespaced and declares have a different interpretation of what
"first statement" means.

4 years agoMerge branch 'PHP-8.0' into master
Christoph M. Becker [Mon, 12 Oct 2020 14:31:03 +0000 (16:31 +0200)]
Merge branch 'PHP-8.0' into master

* PHP-8.0:
  Fix #80216: imap_mail_compose() does not validate types/encodings

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Christoph M. Becker [Mon, 12 Oct 2020 14:30:34 +0000 (16:30 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #80216: imap_mail_compose() does not validate types/encodings

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 12 Oct 2020 14:28:36 +0000 (16:28 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #80216: imap_mail_compose() does not validate types/encodings

4 years agoFix #80216: imap_mail_compose() does not validate types/encodings
Christoph M. Becker [Mon, 12 Oct 2020 12:04:18 +0000 (14:04 +0200)]
Fix #80216: imap_mail_compose() does not validate types/encodings

We need to check whether the given `type`s and `encoding`s are within
bounds to avoid segfaults and out-of-bound reads.

Closes GH-6323.

4 years agoMerge branch 'PHP-8.0' into master
Christoph M. Becker [Mon, 12 Oct 2020 13:10:55 +0000 (15:10 +0200)]
Merge branch 'PHP-8.0' into master

* PHP-8.0:
  Fix #80223: imap_mail_compose() leaks envelope on malformed bodies

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Christoph M. Becker [Mon, 12 Oct 2020 13:10:27 +0000 (15:10 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #80223: imap_mail_compose() leaks envelope on malformed bodies

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 12 Oct 2020 13:09:15 +0000 (15:09 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #80223: imap_mail_compose() leaks envelope on malformed bodies

4 years agoFix #80223: imap_mail_compose() leaks envelope on malformed bodies
Christoph M. Becker [Mon, 12 Oct 2020 11:26:38 +0000 (13:26 +0200)]
Fix #80223: imap_mail_compose() leaks envelope on malformed bodies

We have to clean up even on failure.

Closes GH-6322.

4 years agoMerge branch 'PHP-8.0' into master
Christoph M. Becker [Mon, 12 Oct 2020 11:34:42 +0000 (13:34 +0200)]
Merge branch 'PHP-8.0' into master

* PHP-8.0:
  Fix #80220: imap_mail_compose() may leak memory

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Christoph M. Becker [Mon, 12 Oct 2020 11:34:07 +0000 (13:34 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #80220: imap_mail_compose() may leak memory

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 12 Oct 2020 11:32:28 +0000 (13:32 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #80220: imap_mail_compose() may leak memory

4 years agoFix #80220: imap_mail_compose() may leak memory
Christoph M. Becker [Mon, 12 Oct 2020 08:36:18 +0000 (10:36 +0200)]
Fix #80220: imap_mail_compose() may leak memory

Unless `topbod` is of `TYPEMULTIPART`, `mail_free_body()` does not free
the `nested.part`; while we could do this ourselves, instead we just
ignore additional bodies in this case, i.e. we don't attach them in the
first place.

Closes GH-6321.

4 years agoAdd GC support for PDO driver data
Nikita Popov [Fri, 2 Oct 2020 08:53:21 +0000 (10:53 +0200)]
Add GC support for PDO driver data

Add a get_gc method that can be implemented by drivers, which can
be used to add additional zvals to the GC buffer.

Implement GC support for PDO SQLite callbacks in particular.

Closes GH-6262.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 12 Oct 2020 10:56:30 +0000 (12:56 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Revert "Add missing X509 purpose constants"

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Mon, 12 Oct 2020 10:56:21 +0000 (12:56 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Revert "Add missing X509 purpose constants"

4 years agoRevert "Add missing X509 purpose constants"
Nikita Popov [Mon, 12 Oct 2020 10:56:07 +0000 (12:56 +0200)]
Revert "Add missing X509 purpose constants"

This reverts commit 1e53e14bc31aec98a408e517c7c8493ef4bf80cd.

This fails on Travis.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 12 Oct 2020 09:53:59 +0000 (11:53 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Add missing X509 purpose constants

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Mon, 12 Oct 2020 09:53:22 +0000 (11:53 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Add missing X509 purpose constants

4 years agoAdd missing X509 purpose constants
Vincent JARDIN [Fri, 9 Oct 2020 22:14:06 +0000 (22:14 +0000)]
Add missing X509 purpose constants

X509_PURPOSE_OCSP_HELPER, X509_PURPOSE_TIMESTAMP_SIGN are available
from OpenSSL for many years:

  - X509_PURPOSE_OCSP_HELPER, since 2001
  - X509_PURPOSE_TIMESTAMP_SIGN, since 2006

Also drop the ifdef check for X509_PURPOSE_ANY, as it is always
available in supported OpenSSL versions.

Closes GH-6312.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 12 Oct 2020 09:25:36 +0000 (11:25 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Detect self-addition of array more accurately
  Deindirect source elements in zend_hash_merge

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Mon, 12 Oct 2020 09:25:27 +0000 (11:25 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Detect self-addition of array more accurately
  Deindirect source elements in zend_hash_merge

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 12 Oct 2020 09:24:59 +0000 (11:24 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Detect self-addition of array more accurately
  Deindirect source elements in zend_hash_merge

4 years agoDetect self-addition of array more accurately
Nikita Popov [Mon, 12 Oct 2020 09:22:39 +0000 (11:22 +0200)]
Detect self-addition of array more accurately

While the zvals may be different, they may still point to the
same array.

Fixes oss-fuzz #26245.

4 years agoDeindirect source elements in zend_hash_merge
Nikita Popov [Mon, 12 Oct 2020 09:03:39 +0000 (11:03 +0200)]
Deindirect source elements in zend_hash_merge

If the RHS has INDIRECT elements, we do not those to be added to
the LHS verbatim. As we're using UPDATE_INDIRECT, we might even
create a nested INDIRECT that way.

This is a side-quest of oss-fuzz #26245.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 12 Oct 2020 08:07:01 +0000 (10:07 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Backport schedule in yaml

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Mon, 12 Oct 2020 08:06:30 +0000 (10:06 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Backport schedule in yaml

4 years agoBackport schedule in yaml
Nikita Popov [Mon, 12 Oct 2020 08:05:37 +0000 (10:05 +0200)]
Backport schedule in yaml

I'm not sure it's needed, but let's try it: Add the scheduled
builds on PHP-7.4 and PHP-8.0 as well, rather than just master.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 12 Oct 2020 07:47:22 +0000 (09:47 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Avoid non-object in FE_FREE

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Mon, 12 Oct 2020 07:46:38 +0000 (09:46 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Avoid non-object in FE_FREE

4 years agoAvoid non-object in FE_FREE
Nikita Popov [Mon, 12 Oct 2020 07:38:59 +0000 (09:38 +0200)]
Avoid non-object in FE_FREE

Even if the properties HT is empty, make sure we still leave an
object in the FE_RESET result, so our type inference results
stay correct.

4 years agoMerge branch 'PHP-8.0' into master
Christoph M. Becker [Sun, 11 Oct 2020 16:50:49 +0000 (18:50 +0200)]
Merge branch 'PHP-8.0' into master

* PHP-8.0:
  XMLReader::open() and XMLReader::xml() are now static

4 years agoXMLReader::open() and XMLReader::xml() are now static
Christoph M. Becker [Sun, 11 Oct 2020 16:50:35 +0000 (18:50 +0200)]
XMLReader::open() and XMLReader::xml() are now static