]> granicus.if.org Git - php/log
php
4 years ago[ci skip] Tweeks to release-process.md
Christoph M. Becker [Thu, 5 Mar 2020 17:06:10 +0000 (18:06 +0100)]
[ci skip] Tweeks to release-process.md

As discussed with Derick and Remi.

4 years agoupgrade information about changs in Zip
Remi Collet [Thu, 5 Mar 2020 13:03:20 +0000 (14:03 +0100)]
upgrade information about changs in Zip

4 years agodrop old constant with bad name, kept until now for BC
Remi Collet [Thu, 5 Mar 2020 12:46:34 +0000 (13:46 +0100)]
drop old constant with bad name, kept until now for BC

4 years ago- make status, statusSys properties and
Remi Collet [Thu, 5 Mar 2020 09:57:26 +0000 (10:57 +0100)]
- make status, statusSys properties and
  ZipArchive::getStatusString() method   available after archive is closed

4 years agoNEWS
Remi Collet [Wed, 4 Mar 2020 14:31:38 +0000 (15:31 +0100)]
NEWS

4 years agoadd lastId property to ZipArchive
Remi Collet [Wed, 4 Mar 2020 14:29:59 +0000 (15:29 +0100)]
add lastId property to ZipArchive

4 years agoUse separate typedef for bucket comparison function
Nikita Popov [Wed, 4 Mar 2020 11:35:49 +0000 (12:35 +0100)]
Use separate typedef for bucket comparison function

Avoid performing the same casting dance inside each sort compare
function.

4 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Wed, 4 Mar 2020 11:16:13 +0000 (12:16 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix intermittent test failures of windows_mb_path tests

4 years agoFix intermittent test failures of windows_mb_path tests
Christoph M. Becker [Wed, 4 Mar 2020 11:11:44 +0000 (12:11 +0100)]
Fix intermittent test failures of windows_mb_path tests

Some of these tests create, use and later remove the same folder, so if
these are run in parallel, they may fail due to race conditions[1].  As
quick fix we add appropriate CONFLICTS clauses to prevent parallel
execution of the respective test groups.

[1] <https://ci.appveyor.com/project/php/php-src/builds/31213037/job/48rp13i0frf5t9hl#L5480>

4 years agoImplement interfaces after all methods available
Nikita Popov [Wed, 4 Mar 2020 09:10:36 +0000 (10:10 +0100)]
Implement interfaces after all methods available

The place where interface implementation handlers is called is
currently ill-defined: If the class implements interfaces itself,
the handlers for both the parent interfaces and the new interfaces
will be called after all methods are registered (post trait use).
If the class does not implement interfaces, then the parent
interface handlers are called early during inheritance (before
methods are inherited).

This commit moves the calls to always occur after all methods are
available. For userland classes this will be post trait import,
at the time where interfaces get implemented (whether the class
itself defines additional interfaces or not). For internal classes
it will be at the end of inheritance, as internal class declarations
do not have proper finalization.

This allows us to simplify the logic for implementing the magic
Iterator / IteratorAggregate interfaces. In particularly we can
now also automatically detect whether an extension of
IteratorAggregate can safely reuse a custom get_iterator handler,
or whether it needs to switch to the userland mechanism. The
Iterator case continues to rely on ZEND_ACC_REUSE_GET_ITERATOR
for this purpose, as a wholesale replacement is not possible there.

4 years agoPDO_OCI: Add test of the phpinfo output
Cameron Porter [Tue, 3 Mar 2020 02:35:28 +0000 (20:35 -0600)]
PDO_OCI: Add test of the phpinfo output

4 years agozip_file_replace don't need ZIP_FL_OVERWRITE
Remi Collet [Wed, 4 Mar 2020 08:22:24 +0000 (09:22 +0100)]
zip_file_replace don't need ZIP_FL_OVERWRITE

4 years agoRemove empty "interface gets implemented" handlers
Nikita Popov [Tue, 3 Mar 2020 16:06:15 +0000 (17:06 +0100)]
Remove empty "interface gets implemented" handlers

4 years agoSmall code cleanup
Nikita Popov [Tue, 3 Mar 2020 14:00:15 +0000 (15:00 +0100)]
Small code cleanup

I found what the modifier code does with XOR pretty confusing.
It's just removing the PPP bits...

Also remove an outdated reference to OVERLOADED_FUNCTION.

4 years agoResolve trait alias refers to earlier
Nikita Popov [Tue, 3 Mar 2020 13:21:33 +0000 (14:21 +0100)]
Resolve trait alias refers to earlier

Make sure all trait method references are converted to absolute
method references in advance. This regresses one error message
that I don't think is particularly valuable.

4 years agoMerge branch 'PHP-7.4'
Remi Collet [Tue, 3 Mar 2020 12:06:46 +0000 (13:06 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  this test needs json

4 years agothis test needs json
Remi Collet [Tue, 3 Mar 2020 12:06:31 +0000 (13:06 +0100)]
this test needs json

4 years agoMerge branch 'PHP-7.4'
Derick Rethans [Tue, 3 Mar 2020 11:29:48 +0000 (11:29 +0000)]
Merge branch 'PHP-7.4'

4 years agoPHP-7.4 is now 7.4.5-dev
Derick Rethans [Tue, 3 Mar 2020 11:29:10 +0000 (11:29 +0000)]
PHP-7.4 is now 7.4.5-dev

4 years agooci8: Fix two tests that fail with stricter internal checks
Cameron Porter [Tue, 3 Mar 2020 04:11:55 +0000 (22:11 -0600)]
oci8: Fix two tests that fail with stricter internal checks

Closes GH-5230

4 years agoAdd test for bug #69084
Nikita Popov [Tue, 3 Mar 2020 11:10:18 +0000 (12:10 +0100)]
Add test for bug #69084

This is another bug fixed by the precending commit.

4 years agoStore aliased name of trait method
Nikita Popov [Mon, 2 Mar 2020 10:07:57 +0000 (11:07 +0100)]
Store aliased name of trait method

Currently, trait methods are aliased will continue to use the
original function name. In a few places in the codebase, we will
try to look up the actual method name instead. However, this does
not work if an aliased method is used indirectly
(https://bugs.php.net/bug.php?id=69180).

I think it would be better to instead actually change the method
name to the alias. This is in principle easy: We have to allow
function_name to be changed even if op array is otherwise shared
(similar to static_variables). This means we need to addref/release
the function_name separately, but I don't think there is a
performance concern here (especially as everything is usually
interned).

There is a bit of complication in opcache, where we need to make
sure that the function name is released the correct number of times
(interning may overwrite the name in the original op_array, but we
need to release it as many times as the op_array is shared).

Fixes bug #69180.
Fixes bug #74939.
Closes GH-5226.

4 years agoFix memory leak in dom_zvals_to_fragment
Nikita Popov [Tue, 3 Mar 2020 09:35:42 +0000 (10:35 +0100)]
Fix memory leak in dom_zvals_to_fragment

4 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Tue, 3 Mar 2020 09:22:52 +0000 (10:22 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Next is 7.3.17

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

* PHP-7.3:
  Next is 7.3.17

4 years agoNext is 7.3.17
Christoph M. Becker [Tue, 3 Mar 2020 09:19:31 +0000 (10:19 +0100)]
Next is 7.3.17

4 years agoUpdated maintainer ranges
Xinchen Hui [Tue, 3 Mar 2020 06:26:42 +0000 (14:26 +0800)]
Updated maintainer ranges

4 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Mon, 2 Mar 2020 18:12:49 +0000 (19:12 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79013: Content-Length missing when posting a curlFile with curl

4 years agoFix #79013: Content-Length missing when posting a curlFile with curl
Christoph M. Becker [Mon, 2 Mar 2020 17:45:12 +0000 (18:45 +0100)]
Fix #79013: Content-Length missing when posting a curlFile with curl

Unfortunately, some Webservers (e.g. IIS) do not implement the (F)CGI
specifications correctly wrt. chunked uploads (i.e. Transfer-encoding:
chunked), but instead pass -1 as CONTENT_LENGTH to the CGI
application. However, our (F)CFI SAPIs (i.e. cgi and cgi-fcgi) do not
support this.

Therefore we try to retrieve the stream size in advance and pass it to
`curl_mime_data_cb()` to prevent libcurl from doing chunked uploads.
This is basically the same approach that `curl_mime_filedata()`
implements, except that we are keeping already opened streams open for
the `read_cb()`.

4 years agobump zip version + NEWS
Remi Collet [Mon, 2 Mar 2020 15:51:55 +0000 (16:51 +0100)]
bump zip version + NEWS

4 years ago- add ZipArchive::FL_RECOMPRESS, FL_ENCRYPTED, FL_OVERWRITE, FL_LOCAL, FL_CENTRAL...
Remi Collet [Fri, 28 Feb 2020 14:51:33 +0000 (15:51 +0100)]
- add ZipArchive::FL_RECOMPRESS, FL_ENCRYPTED, FL_OVERWRITE, FL_LOCAL, FL_CENTRAL constants
- add optional "flags" parameter to ZipArchive::addEmptyDir, addFile and addFromString methods
- add "flags" options to ZipArchive::addGlob and addPattern methods
  keeping previous behavior having FL_OVERWRITE by default
- add ZipArchive::replaceFile() method

4 years agoadd myself as zip maintainer
Remi Collet [Mon, 2 Mar 2020 15:47:47 +0000 (16:47 +0100)]
add myself as zip maintainer

4 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Mon, 2 Mar 2020 15:33:40 +0000 (16:33 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Native Windows support for mysqlnd sha256 authentification
  Abstract over crypto operations

4 years agoNative Windows support for mysqlnd sha256 authentification
Christoph M. Becker [Wed, 26 Feb 2020 16:01:37 +0000 (17:01 +0100)]
Native Windows support for mysqlnd sha256 authentification

We implement that on top of Cryptography API: Next Generation (CNG).

4 years agoAbstract over crypto operations
Christoph M. Becker [Wed, 26 Feb 2020 15:56:57 +0000 (16:56 +0100)]
Abstract over crypto operations

4 years agoAutomatically implement Stringable interface
Nikita Popov [Thu, 6 Feb 2020 09:27:30 +0000 (10:27 +0100)]
Automatically implement Stringable interface

4 years agoDefine Stringable with __toString():string method
Nicolas Grekas [Mon, 13 Jan 2020 16:06:26 +0000 (17:06 +0100)]
Define Stringable with __toString():string method

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

* PHP-7.4:
  Update libmagic.patch

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 2 Mar 2020 14:06:14 +0000 (15:06 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Update libmagic.patch

4 years agoUpdate libmagic.patch
Christoph M. Becker [Wed, 26 Feb 2020 08:59:44 +0000 (09:59 +0100)]
Update libmagic.patch

Some commits missed to update the patch file, so we're catching up on
this.

To generally make this easier, we back-port generate_patch.sh from
PHP-7.4, where we now also generate magic.h from magic.h.in.

4 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Mon, 2 Mar 2020 10:38:50 +0000 (11:38 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79333: com_print_typeinfo() leaks memory

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 2 Mar 2020 10:37:14 +0000 (11:37 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79333: com_print_typeinfo() leaks memory

4 years agoFix #79333: com_print_typeinfo() leaks memory
Christoph M. Becker [Mon, 2 Mar 2020 10:36:30 +0000 (11:36 +0100)]
Fix #79333: com_print_typeinfo() leaks memory

We have to free the `ansiname`s, regardless of whether they have been
put into the hashtable or not.

Since bug79299.phpt already shows the leak when run with a leak
checker, there is no need for another regression test.

4 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Mon, 2 Mar 2020 09:48:14 +0000 (10:48 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79332: php_istreams are never freed

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 2 Mar 2020 09:46:31 +0000 (10:46 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79332: php_istreams are never freed

4 years agoFix #79332: php_istreams are never freed
Christoph M. Becker [Mon, 2 Mar 2020 09:45:37 +0000 (10:45 +0100)]
Fix #79332: php_istreams are never freed

Releasing the `com_dotnet_istream_wrapper` in `istream_destructor()` is
pointless, since `istream_destructor()` is only called when the
resource is going to be released.  This recursion is not a real issue,
though, since the resource is never exposed to userland, and has at
most refcount 1, so due to well defined unsigned integer underflow, it
never is released twice.  However, returning early in this case causes
a memory leak which needs to be fixed.

4 years agoAdd stubs for IntlChar
Máté Kocsis [Fri, 28 Feb 2020 17:10:48 +0000 (18:10 +0100)]
Add stubs for IntlChar

Closes GH-5217

4 years agoImprove argument error messages in ext/sodium
Máté Kocsis [Sat, 22 Feb 2020 10:06:17 +0000 (11:06 +0100)]
Improve argument error messages in ext/sodium

Closes GH-5197

4 years agoAdd upgrading note regarding merge of RFC for new DOMParentNode/DOMChildNode APIs.
Benjamin Eberlei [Fri, 28 Feb 2020 16:35:54 +0000 (17:35 +0100)]
Add upgrading note regarding merge of RFC for new DOMParentNode/DOMChildNode APIs.

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 28 Feb 2020 16:26:06 +0000 (17:26 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove generated lexer

4 years agoRemove generated lexer
Nikita Popov [Fri, 28 Feb 2020 16:25:47 +0000 (17:25 +0100)]
Remove generated lexer

Accidentially committed this when merging from 7.3.

4 years agoFixed bug #77325
Nikita Popov [Fri, 28 Feb 2020 16:19:37 +0000 (17:19 +0100)]
Fixed bug #77325

Make ReflectionClassConstant->class the declaring class, not the
class on which the constant was fetched. This matches the behavior
for properties and methods.

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 28 Feb 2020 16:08:15 +0000 (17:08 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79062

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 28 Feb 2020 16:07:36 +0000 (17:07 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed bug #79062

4 years agoFixed bug #79062
Nikita Popov [Fri, 28 Feb 2020 16:06:05 +0000 (17:06 +0100)]
Fixed bug #79062

Back up the doc comment when performing heredoc scanahead.

4 years ago[RFC] Implement new DOM Living Standard APIs in ext/dom
Benjamin Eberlei [Fri, 28 Feb 2020 15:13:39 +0000 (16:13 +0100)]
[RFC] Implement new DOM Living Standard APIs in ext/dom

4 years agoFixed bug #64592
Nikita Popov [Fri, 28 Feb 2020 14:53:04 +0000 (15:53 +0100)]
Fixed bug #64592

Make ReflectionClass::getMethods() behave the same ways as
ReflectionClass::getProperties() by not including private methods
from parent classes.

4 years agoUpdate ext maintenance ranges
Nikita Popov [Fri, 28 Feb 2020 14:49:00 +0000 (15:49 +0100)]
Update ext maintenance ranges

Also add myself as reflection maintainer.

4 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 28 Feb 2020 14:46:17 +0000 (15:46 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79311: enchant_dict_suggest() fails on big endian architecture

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Fri, 28 Feb 2020 14:44:34 +0000 (15:44 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79311: enchant_dict_suggest() fails on big endian architecture

4 years agoFix #79311: enchant_dict_suggest() fails on big endian architecture
Christoph M. Becker [Fri, 28 Feb 2020 12:18:00 +0000 (13:18 +0100)]
Fix #79311: enchant_dict_suggest() fails on big endian architecture

For obvious reasons, we must not assign a `size_t` value to an `int`
variable using memcpy().  However, there is actually no need for the
intermediate `n_sugg_st` here, if we use the proper types in the first
place.

A regression test is not necessary, because dict_suggest.phpt already
exhibits the erroneous behavior on big endian architectures.

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 28 Feb 2020 13:49:03 +0000 (14:49 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Try to fix msvc build

4 years agoTry to fix msvc build
Nikita Popov [Fri, 28 Feb 2020 13:48:02 +0000 (14:48 +0100)]
Try to fix msvc build

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 28 Feb 2020 13:41:32 +0000 (14:41 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix another flaky FPM test

4 years agoFix another flaky FPM test
Nikita Popov [Fri, 28 Feb 2020 13:40:21 +0000 (14:40 +0100)]
Fix another flaky FPM test

4 years agoAdd stubs for UConverter
Máté Kocsis [Thu, 27 Feb 2020 18:59:32 +0000 (19:59 +0100)]
Add stubs for UConverter

Closes GH-5218

4 years agoUpdate MySQLi function info
Máté Kocsis [Wed, 26 Feb 2020 19:30:40 +0000 (20:30 +0100)]
Update MySQLi function info

Closes GH-5214

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 28 Feb 2020 12:19:53 +0000 (13:19 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Try to fix intermittent FPM failures

4 years agoTry to fix intermittent FPM failures
Nikita Popov [Fri, 28 Feb 2020 12:19:10 +0000 (13:19 +0100)]
Try to fix intermittent FPM failures

Terminate only after expecting the log lines to avoid race
condition.

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 28 Feb 2020 11:49:45 +0000 (12:49 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79252

4 years agoFixed bug #79252
Nikita Popov [Fri, 28 Feb 2020 11:47:56 +0000 (12:47 +0100)]
Fixed bug #79252

4 years agoAvoid duplicate calls to interface implementation handler
Nikita Popov [Fri, 28 Feb 2020 11:16:41 +0000 (12:16 +0100)]
Avoid duplicate calls to interface implementation handler

4 years agoMerge branch 'PHP-7.4'
Remi Collet [Fri, 28 Feb 2020 09:39:43 +0000 (10:39 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  fix test

4 years agofix test
Remi Collet [Fri, 28 Feb 2020 09:39:08 +0000 (10:39 +0100)]
fix test

4 years agoMerge branch 'PHP-7.4'
Remi Collet [Fri, 28 Feb 2020 09:36:34 +0000 (10:36 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  NEWS
  Fix #79315 ZipArchive::addFile doesn't honor start/length parameters

4 years agoNEWS
Remi Collet [Fri, 28 Feb 2020 09:36:12 +0000 (10:36 +0100)]
NEWS

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Remi Collet [Fri, 28 Feb 2020 09:35:39 +0000 (10:35 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79315 ZipArchive::addFile doesn't honor start/length parameters

4 years agoFix #79315 ZipArchive::addFile doesn't honor start/length parameters
Remi Collet [Fri, 28 Feb 2020 09:21:19 +0000 (10:21 +0100)]
Fix #79315 ZipArchive::addFile doesn't honor start/length parameters

4 years agoMerge branch 'PHP-7.4'
Remi Collet [Fri, 28 Feb 2020 09:29:30 +0000 (10:29 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  NEWS
  Fix #79315 ZipArchive::addFile doesn't honor start/length parameters

4 years agoNEWS
Remi Collet [Fri, 28 Feb 2020 09:24:52 +0000 (10:24 +0100)]
NEWS

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Remi Collet [Fri, 28 Feb 2020 09:23:19 +0000 (10:23 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79315 ZipArchive::addFile doesn't honor start/length parameters

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 28 Feb 2020 09:22:11 +0000 (10:22 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Use type-checked ref assignment in UConverter

4 years agoUse type-checked ref assignment in UConverter
Nikita Popov [Fri, 28 Feb 2020 09:21:50 +0000 (10:21 +0100)]
Use type-checked ref assignment in UConverter

4 years agoFix #79315 ZipArchive::addFile doesn't honor start/length parameters
Remi Collet [Fri, 28 Feb 2020 09:21:19 +0000 (10:21 +0100)]
Fix #79315 ZipArchive::addFile doesn't honor start/length parameters

4 years agoUse {0} to initialize instead of {NULL}
George Peter Banyard [Thu, 27 Feb 2020 22:32:36 +0000 (23:32 +0100)]
Use {0} to initialize instead of {NULL}

Clang emits a [-Wmissing-field-initializers] when using {NULL} instead of {0}

4 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Thu, 27 Feb 2020 20:38:19 +0000 (23:38 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed incorrect overflow detection

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Dmitry Stogov [Thu, 27 Feb 2020 20:38:09 +0000 (23:38 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed incorrect overflow detection

4 years agoFixed incorrect overflow detection
Dmitry Stogov [Thu, 27 Feb 2020 20:37:41 +0000 (23:37 +0300)]
Fixed incorrect overflow detection

4 years agoAvoid more null arithmetic
Nikita Popov [Thu, 27 Feb 2020 13:48:43 +0000 (14:48 +0100)]
Avoid more null arithmetic

4 years agoUse EX_NUM_TO_VAR() in more places
Nikita Popov [Thu, 27 Feb 2020 12:13:01 +0000 (13:13 +0100)]
Use EX_NUM_TO_VAR() in more places

Not sure why I missed these before.

4 years agoRemove more null arithmetic UB
Nikita Popov [Thu, 27 Feb 2020 11:53:55 +0000 (12:53 +0100)]
Remove more null arithmetic UB

Introduce an EX_NUM_TO_VAR macro to mirror EX_VAR_TO_NUM and
replace usages of the ZEND_CALL_VAR_NUM(NULL) pattern.

4 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 27 Feb 2020 09:39:07 +0000 (10:39 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Add upgrading node regarding fix for bug #79271

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Thu, 27 Feb 2020 09:36:59 +0000 (10:36 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Add upgrading node regarding fix for bug #79271

4 years agoRemove mergesort implementation
Nikita Popov [Thu, 27 Feb 2020 09:33:35 +0000 (10:33 +0100)]
Remove mergesort implementation

php_mergesort() isn't being used for anything, and hasn't been for
a long time. Even if we wanted to use a stable sort, this isn't
the implementation we'd use...

4 years agoAdd upgrading node regarding fix for bug #79271
Christoph M. Becker [Thu, 27 Feb 2020 09:32:24 +0000 (10:32 +0100)]
Add upgrading node regarding fix for bug #79271

Cf. <https://github.com/php/php-src/pull/5180#issuecomment-590259750>ff.

4 years agoAvoid null arithmetic UB in EX_VAR_TO_NUM
Nikita Popov [Thu, 27 Feb 2020 09:29:44 +0000 (10:29 +0100)]
Avoid null arithmetic UB in EX_VAR_TO_NUM

4 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Thu, 27 Feb 2020 09:28:09 +0000 (12:28 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed incorrect behavior of internal memory debugger

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Dmitry Stogov [Thu, 27 Feb 2020 09:27:58 +0000 (12:27 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed incorrect behavior of internal memory debugger

4 years agoFixed incorrect behavior of internal memory debugger
Dmitry Stogov [Thu, 27 Feb 2020 09:27:22 +0000 (12:27 +0300)]
Fixed incorrect behavior of internal memory debugger

4 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 27 Feb 2020 08:40:31 +0000 (09:40 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #64032: mysqli reports different client_version