]> granicus.if.org Git - php/log
php
5 years agoPerform map ptr base arithmetic through uintptr_t
Nikita Popov [Tue, 28 Jan 2020 10:23:16 +0000 (11:23 +0100)]
Perform map ptr base arithmetic through uintptr_t

Adding an offset to the NULL pointer is undefined behavior.
Avoid this by performing arithmetic on uintptr_t instead.

5 years agoDon't index NULL pointer when fetching non-existent constant
Nikita Popov [Tue, 28 Jan 2020 10:16:53 +0000 (11:16 +0100)]
Don't index NULL pointer when fetching non-existent constant

5 years ago- bump zip extension version to 1.16.0 - add ZipArchive::setMtimeName and ZipArchive...
Remi Collet [Tue, 28 Jan 2020 09:52:09 +0000 (10:52 +0100)]
- bump zip extension version to 1.16.0 - add ZipArchive::setMtimeName and ZipArchive::setMtimeIndex methods

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Tue, 28 Jan 2020 09:44:37 +0000 (10:44 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #78989

5 years agoFixed bug #78989
Nikita Popov [Tue, 28 Jan 2020 09:41:11 +0000 (10:41 +0100)]
Fixed bug #78989

Always operate on copies of the functions, so we don't reference
temporary trait methods that have gone out of scope.

This could be more efficient, but doing an allocated copy only when
strictly necessary turned out to be somewhat tricky.

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

* PHP-7.4:
  Fix #76584: PharFileInfo::decompress not working

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

* PHP-7.3:
  Fix #76584: PharFileInfo::decompress not working

5 years agoFix #76584: PharFileInfo::decompress not working
Christoph M. Becker [Sun, 26 Jan 2020 12:33:07 +0000 (13:33 +0100)]
Fix #76584: PharFileInfo::decompress not working

We actually have to decompress, when told to do so.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Tue, 28 Jan 2020 08:19:45 +0000 (09:19 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79172: STRUCT_OFFSET() relies on undefined behavior

5 years agoFix #79172: STRUCT_OFFSET() relies on undefined behavior
Christoph M. Becker [Tue, 28 Jan 2020 08:15:23 +0000 (09:15 +0100)]
Fix #79172: STRUCT_OFFSET() relies on undefined behavior

Since this pattern is understood by compilers, not a real issue, but
certainly cleaner this way.

5 years agoConvert ZEND_ECHO operand to string after sccp
Tyson Andre [Sun, 26 Jan 2020 18:05:34 +0000 (13:05 -0500)]
Convert ZEND_ECHO operand to string after sccp

And filter out echoes of the empty string (e.g. false/null)

Split out of #5097 (on GitHub)

Closes GH-5118

5 years agoConvert some warnings into ValueErrors in the standard file extension
George Peter Banyard [Wed, 11 Dec 2019 20:57:57 +0000 (21:57 +0100)]
Convert some warnings into ValueErrors in the standard file extension

Closes GH-5007

5 years agoMerge branch 'PHP-7.4'
Remi Collet [Mon, 27 Jan 2020 15:48:54 +0000 (16:48 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  - bump zip extension version to 1.15.6 - add ZipArchive::LIBZIP_VERSION - skip bug53885.phpt with libzip 1.6.0 (empty file is no more valid archive)

5 years ago- bump zip extension version to 1.15.6
Remi Collet [Mon, 27 Jan 2020 15:47:28 +0000 (16:47 +0100)]
- bump zip extension version to 1.15.6
- add ZipArchive::LIBZIP_VERSION
- skip bug53885.phpt with libzip 1.6.0 (empty file is no more valid archive)

5 years agoRemove state pointer argument from php_strip_tags
Nikita Popov [Mon, 27 Jan 2020 15:13:36 +0000 (16:13 +0100)]
Remove state pointer argument from php_strip_tags

5 years agoMerge branch 'PHP-7.4'
Máté Kocsis [Mon, 27 Jan 2020 13:04:19 +0000 (14:04 +0100)]
Merge branch 'PHP-7.4'

5 years agoFix #78969 Make PASSWORD_DEFAULT match PASSWORD_BCRYPT instead of being null
Máté Kocsis [Wed, 22 Jan 2020 12:33:11 +0000 (13:33 +0100)]
Fix #78969 Make PASSWORD_DEFAULT match PASSWORD_BCRYPT instead of being null

It was an unintentional BC break.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 27 Jan 2020 12:32:51 +0000 (13:32 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix bug #78323: Code 0 is returned on invalid options

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 27 Jan 2020 12:32:29 +0000 (13:32 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix bug #78323: Code 0 is returned on invalid options

5 years agoFix bug #78323: Code 0 is returned on invalid options
Ivan Mikheykin [Fri, 17 Jan 2020 19:26:35 +0000 (22:26 +0300)]
Fix bug #78323: Code 0 is returned on invalid options

Set CLI exit code to 1 when invalid parameters are passed,
and print error to stderr.

5 years ago[skip ci] Fix typos in NEWS
Tyson Andre [Sun, 26 Jan 2020 16:53:42 +0000 (11:53 -0500)]
[skip ci] Fix typos in NEWS

5 years agoFix typo [ci skip]
Markus Staab [Sat, 25 Jan 2020 11:40:22 +0000 (12:40 +0100)]
Fix typo [ci skip]

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Sun, 26 Jan 2020 13:14:52 +0000 (14:14 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Add CURLOPT CURLOPT_HTTP09_ALLOWED available since 7.64.0

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Sun, 26 Jan 2020 13:13:52 +0000 (14:13 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Add CURLOPT CURLOPT_HTTP09_ALLOWED available since 7.64.0

5 years agoAdd CURLOPT CURLOPT_HTTP09_ALLOWED available since 7.64.0
Florian Smeets [Sun, 26 Jan 2020 04:18:57 +0000 (05:18 +0100)]
Add CURLOPT CURLOPT_HTTP09_ALLOWED available since 7.64.0

5 years agoFix bundled PCRE2 compilation on ARM64
Anatol Belski [Sat, 25 Jan 2020 16:44:18 +0000 (17:44 +0100)]
Fix bundled PCRE2 compilation on ARM64

5 years agoUpgrade bundled PCRE2 to 10.34
Anatol Belski [Tue, 21 Jan 2020 19:22:40 +0000 (20:22 +0100)]
Upgrade bundled PCRE2 to 10.34

5 years agoMerge branch 'PHP-7.4'
George Peter Banyard [Sat, 25 Jan 2020 12:31:43 +0000 (13:31 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79080 [ci skip]

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
George Peter Banyard [Sat, 25 Jan 2020 12:31:10 +0000 (13:31 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed bug #79080 [ci skip]

5 years agoFixed bug #79080 [ci skip]
George Peter Banyard [Sat, 25 Jan 2020 12:23:51 +0000 (13:23 +0100)]
Fixed bug #79080 [ci skip]

Rewrote session.gc_probability and session.gc_divisor INI setting
description to be more succint.

5 years agoAdd mention about empty needles for strrch() functions in UPGRADING [ci skip]
George Peter Banyard [Sat, 25 Jan 2020 11:32:55 +0000 (12:32 +0100)]
Add mention about empty needles for strrch() functions in UPGRADING [ci skip]

5 years agoAllow empty needle in mb_strrchr()
George Peter Banyard [Sat, 25 Jan 2020 11:22:01 +0000 (12:22 +0100)]
Allow empty needle in mb_strrchr()

5 years agoConvert warnings to ValueError in mb_strpos function family.
George Peter Banyard [Tue, 7 Jan 2020 23:11:37 +0000 (00:11 +0100)]
Convert warnings to ValueError in mb_strpos function family.

Closes GH-5109

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 24 Jan 2020 15:20:30 +0000 (16:20 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79128

5 years agoFixed bug #79128
Nikita Popov [Fri, 24 Jan 2020 15:18:28 +0000 (16:18 +0100)]
Fixed bug #79128

We need to extend the hash table before performing raw append
operations.

This doesn't matter if preloading happens in the same process,
as the tables will be large enough to hold all entries as a
side-effect of the preloading process. However, if preloading
happens in a different process, we need to reserve space here.

5 years agoFix bug #64865: Use CONTEXT_DOCUMENT_ROOT for scanning dir tree
wbender [Fri, 3 Jan 2020 15:29:12 +0000 (09:29 -0600)]
Fix bug #64865: Use CONTEXT_DOCUMENT_ROOT for scanning dir tree

If CONTEXT_DOCUMENT_ROOT is set use that rather than DOCUMENT_ROOT to
scan up the dir tree looking for .user.ini files.

Closes GH-5051.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 24 Jan 2020 14:15:36 +0000 (15:15 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix mysqli ssl test for tls1.3

5 years agoFix mysqli ssl test for tls1.3
Nikita Popov [Fri, 24 Jan 2020 14:14:52 +0000 (15:14 +0100)]
Fix mysqli ssl test for tls1.3

Specifying AES256-SHA results in TLS_AES_256_GCM_SHA384 if the
connection uses TLS v1.3.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 24 Jan 2020 13:55:00 +0000 (14:55 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79011
  Fix memory leaks in mysqlnd debug functionality

5 years agoFixed bug #79011
Nikita Popov [Fri, 24 Jan 2020 13:52:28 +0000 (14:52 +0100)]
Fixed bug #79011

auth_plugin_data_len here is 21, including the trailing null byte.
Directly use SCRAMBLE_LENGTH instead. Also add a sanity check that
the provided scramble is long enough.

5 years agoFix memory leaks in mysqlnd debug functionality
Nikita Popov [Fri, 24 Jan 2020 12:12:11 +0000 (13:12 +0100)]
Fix memory leaks in mysqlnd debug functionality

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 24 Jan 2020 13:20:59 +0000 (14:20 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Make test independent of online XSD schema
  Yet another check for php_strip_tags_ex()

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Fri, 24 Jan 2020 13:19:17 +0000 (14:19 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Make test independent of online XSD schema
  Yet another check for php_strip_tags_ex()

5 years agoMake test independent of online XSD schema
Christoph M. Becker [Fri, 24 Jan 2020 09:18:01 +0000 (10:18 +0100)]
Make test independent of online XSD schema

The test still needs to access <http://www.w3.org/2009/01/xml.xsd>, but
at least we no longer depend on <http://x-road.eu/xsd/x-road.xsd>,
which may be moved again.

5 years agoMerge branch 'PHP-7.4'
Remi Collet [Fri, 24 Jan 2020 13:06:38 +0000 (14:06 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Add ZipArchive::CM_LZMA2 constant (since libzip 1.6.0)

5 years agoAdd ZipArchive::CM_LZMA2 constant (since libzip 1.6.0)
Remi Collet [Fri, 24 Jan 2020 13:06:19 +0000 (14:06 +0100)]
Add ZipArchive::CM_LZMA2 constant (since libzip 1.6.0)

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 24 Jan 2020 12:04:26 +0000 (13:04 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Yet another check for php_strip_tags_ex()

5 years agoYet another check for php_strip_tags_ex()
Christoph M. Becker [Fri, 24 Jan 2020 11:45:04 +0000 (12:45 +0100)]
Yet another check for php_strip_tags_ex()

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Fri, 24 Jan 2020 11:51:02 +0000 (12:51 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Yet another check for php_strip_tags_ex()

5 years agoYet another check for php_strip_tags_ex()
Christoph M. Becker [Fri, 24 Jan 2020 11:45:04 +0000 (12:45 +0100)]
Yet another check for php_strip_tags_ex()

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 24 Jan 2020 11:28:54 +0000 (12:28 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Don't use CRLF when generating diffs

5 years agoDon't use CRLF when generating diffs
Nikita Popov [Fri, 24 Jan 2020 11:28:37 +0000 (12:28 +0100)]
Don't use CRLF when generating diffs

5 years agoAlso use zend_memnrstr in mbfl_strpos
Nikita Popov [Fri, 24 Jan 2020 10:41:35 +0000 (11:41 +0100)]
Also use zend_memnrstr in mbfl_strpos

5 years agoBase mbfl_strpos on zend_memnstr
Nikita Popov [Fri, 24 Jan 2020 10:29:34 +0000 (11:29 +0100)]
Base mbfl_strpos on zend_memnstr

The same algorithm is also used by zend_memnstr, but it also has
a fast-path for short strings / needles, where a more naive
search performs better.

5 years agoExtract calculation of offset from pointer
Nikita Popov [Fri, 24 Jan 2020 10:15:58 +0000 (11:15 +0100)]
Extract calculation of offset from pointer

5 years agoHandle mb_str(r)ipos offset consistently as well
Nikita Popov [Fri, 24 Jan 2020 09:54:20 +0000 (10:54 +0100)]
Handle mb_str(r)ipos offset consistently as well

5 years agoMove offset error checking into mbfl_strpos
Nikita Popov [Fri, 24 Jan 2020 09:29:34 +0000 (10:29 +0100)]
Move offset error checking into mbfl_strpos

This avoids calculating the full length only in order to validate
the offset, as mbfl_strpos needs to find the offset internally
anyway.

5 years agoAdd #defines for mbfl_strpos error conditions
Nikita Popov [Fri, 24 Jan 2020 09:02:41 +0000 (10:02 +0100)]
Add #defines for mbfl_strpos error conditions

5 years agoAllow variadic arguments to replace non-variadic ones
Nikita Popov [Mon, 6 Jan 2020 11:06:51 +0000 (12:06 +0100)]
Allow variadic arguments to replace non-variadic ones

Any number of arguments can be replaced by a variadic one, so
long as the variadic argument is compatible (in the sense of
contravariance) with the subsumed arguments.

In particular this means that function(...$args) becomes a
near-universal signature: It is compatible with any function
signature that does not accept parameters by-reference.

This also fixes bug #70839, which describes a special case.

Closes GH-5059.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 23 Jan 2020 14:09:59 +0000 (15:09 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix bug76348.phpt

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 23 Jan 2020 14:09:54 +0000 (15:09 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix bug76348.phpt

5 years agoFix bug76348.phpt
Nikita Popov [Thu, 23 Jan 2020 14:08:20 +0000 (15:08 +0100)]
Fix bug76348.phpt

Adjust for URL change in XSD file and mark as online test.

Is it possible for use to store http://x-road.eu/xsd/xroad.xsd
locally instead? Do relative file system paths work here?
I'm not familiar with this.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 23 Jan 2020 13:58:15 +0000 (14:58 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #78902
  Add unit test for bug #78902

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 23 Jan 2020 13:58:01 +0000 (14:58 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed bug #78902
  Add unit test for bug #78902

5 years agoFixed bug #78902
liudaixiao [Mon, 16 Dec 2019 01:10:28 +0000 (09:10 +0800)]
Fixed bug #78902

5 years agoAdd unit test for bug #78902
Léopold Jacquot [Wed, 4 Dec 2019 14:14:50 +0000 (15:14 +0100)]
Add unit test for bug #78902

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 23 Jan 2020 13:21:21 +0000 (14:21 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79151

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 23 Jan 2020 13:21:14 +0000 (14:21 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed bug #79151

5 years agoFixed bug #79151
Nikita Popov [Thu, 23 Jan 2020 13:19:20 +0000 (14:19 +0100)]
Fixed bug #79151

Make sure we also NULL out next/prev of the removed element on
pop/shift. This only matter is that element is still being referenced
by an iterator.

5 years agoApply custom format/length modifier removal to spprintf
George Peter Banyard [Thu, 23 Jan 2020 11:57:48 +0000 (12:57 +0100)]
Apply custom format/length modifier removal to spprintf

This mimicks the changes made to the custom snprintf implementation
by removing the custom 'v' format and custom 'I' length modifier
from the spprintf implementation.

Closes GH-5108

5 years agoRevert "Merge branch 'PHP-7.4'"
Christoph M. Becker [Thu, 23 Jan 2020 12:12:16 +0000 (13:12 +0100)]
Revert "Merge branch 'PHP-7.4'"

This reverts commit 046dcfb531e242d36a7af2942b9b148290c3c7fe, due to
segfaults on Travis.  This needs to be investigated.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 23 Jan 2020 11:55:28 +0000 (12:55 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79155

5 years agoFixed bug #79155
Nikita Popov [Thu, 23 Jan 2020 11:48:45 +0000 (12:48 +0100)]
Fixed bug #79155

Make sure we only unset the NULLABLE flag temporarily for class
resolution, as the same type may be compiled multiple types.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 23 Jan 2020 11:00:50 +0000 (12:00 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Enable UBSan in addition to ASan

5 years agoEnable UBSan in addition to ASan
Christoph M. Becker [Tue, 31 Dec 2019 10:46:04 +0000 (11:46 +0100)]
Enable UBSan in addition to ASan

UBSan is a useful tool, so we enable it for `--enable-sanitizer` in
addition to ASan.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 23 Jan 2020 10:48:20 +0000 (11:48 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Make MSVCRT memory leak checking usable for the test suite

5 years agoMake MSVCRT memory leak checking usable for the test suite
Christoph M. Becker [Wed, 15 Jan 2020 22:04:03 +0000 (23:04 +0100)]
Make MSVCRT memory leak checking usable for the test suite

While basic support for MSVCRT debugging has been added long
ago[1], the leak checking is not usable for the test suite, because we
are no longer calling `xmlCleanupParser()` on RSHUTDOWN of
ext/libxml[2], and therefore a few bogus leaks are reported whenever
ext/libxml is unloaded.

We therefore ignore memory leaks for this case.  We introduce
`ZEND_IGNORE_LEAKS_BEGIN()` and `ZEND_IGNORE_LEAKS_END()` to keep
those ignores better readable, and also because these *might* be
useful for other leak checkers as well.

We also explicitly free the `zend_handlers_table` and the `p5s` to
avoid spurious leak reports.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=d756e1db2324c1f4ab6f9b52e329959ce6a02bc3>
[2] <http://git.php.net/?p=php-src.git;a=commit;h=8742276eb3905eb97a585417000c7b8df85006d4>

5 years agoMerge branch 'PHP-7.4'
Stanislav Malyshev [Thu, 23 Jan 2020 07:06:35 +0000 (23:06 -0800)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  More checks for php_strip_tags_ex

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Stanislav Malyshev [Thu, 23 Jan 2020 07:06:28 +0000 (23:06 -0800)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  More checks for php_strip_tags_ex

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Stanislav Malyshev [Thu, 23 Jan 2020 06:41:56 +0000 (22:41 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  More checks for php_strip_tags_ex

5 years agoMore checks for php_strip_tags_ex
Stanislav Malyshev [Thu, 23 Jan 2020 06:36:53 +0000 (22:36 -0800)]
More checks for php_strip_tags_ex

5 years agoAdd ValueError for invalid mode in count()
George Peter Banyard [Wed, 22 Jan 2020 00:55:12 +0000 (01:55 +0100)]
Add ValueError for invalid mode in count()

Closes GH-5106

5 years agoAdd UPGRADING notes [skip ci]
Máté Kocsis [Wed, 22 Jan 2020 22:24:28 +0000 (23:24 +0100)]
Add UPGRADING notes [skip ci]

5 years agoAdd ReflectionProperty::getDefaultValue and ReflectionProperty::hasDefaultValue
Benjamin Eberlei [Thu, 9 Jan 2020 21:51:15 +0000 (22:51 +0100)]
Add ReflectionProperty::getDefaultValue and ReflectionProperty::hasDefaultValue

5 years agoFix #78649 Provide ICU RELATIVE_ constants
Máté Kocsis [Tue, 21 Jan 2020 23:13:29 +0000 (00:13 +0100)]
Fix #78649 Provide ICU RELATIVE_ constants

Closes GH-5105

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Wed, 22 Jan 2020 10:17:20 +0000 (11:17 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Don't leak encoding_str

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

* PHP-7.3:
  Don't leak encoding_str

5 years agoDon't leak encoding_str
Christoph M. Becker [Wed, 22 Jan 2020 10:13:12 +0000 (11:13 +0100)]
Don't leak encoding_str

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Wed, 22 Jan 2020 09:32:06 +0000 (10:32 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79154: mb_convert_encoding() can modify $from_encoding

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Wed, 22 Jan 2020 09:30:25 +0000 (10:30 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79154: mb_convert_encoding() can modify $from_encoding

5 years agoFix #79154: mb_convert_encoding() can modify $from_encoding
Christoph M. Becker [Wed, 22 Jan 2020 09:25:37 +0000 (10:25 +0100)]
Fix #79154: mb_convert_encoding() can modify $from_encoding

We must not modify arrays passed by value.

5 years agoFix test expectation
Christoph M. Becker [Wed, 22 Jan 2020 09:21:55 +0000 (10:21 +0100)]
Fix test expectation

As of PHP 8.0.0, array to string conversion raises a warning.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Wed, 22 Jan 2020 08:45:37 +0000 (09:45 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79149: SEGV in mb_convert_encoding with non-string encodings

5 years agoFix #79149: SEGV in mb_convert_encoding with non-string encodings
Christoph M. Becker [Wed, 22 Jan 2020 08:43:51 +0000 (09:43 +0100)]
Fix #79149: SEGV in mb_convert_encoding with non-string encodings

We must not assume that `hash_entry` `IS_STRING`, but rather use
`encoding_str` which is guaranteed to be.

5 years agoMerge branch 'PHP-7.4'
Remi Collet [Wed, 22 Jan 2020 08:18:13 +0000 (09:18 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  next will be 7.2.28

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Remi Collet [Wed, 22 Jan 2020 08:17:56 +0000 (09:17 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  next will be 7.2.28

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Remi Collet [Wed, 22 Jan 2020 08:17:33 +0000 (09:17 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  next will be 7.2.28

5 years agonext will be 7.2.28
Remi Collet [Wed, 22 Jan 2020 08:17:00 +0000 (09:17 +0100)]
next will be 7.2.28

5 years agoUse smaller batch size in run-tests.php when appropriate
Tyson Andre [Mon, 20 Jan 2020 21:53:37 +0000 (16:53 -0500)]
Use smaller batch size in run-tests.php when appropriate

- When valgrind is used, communication overhead is relatively small,
  so just use a batch size of 1.
- If this is running a small enough number of tests,
  reduce the batch size to give batches to more workers.
  (Previously, if there were 90 tests and -j8,
  only 3 of 8 workers would get a batch of size 32 or less.
  After this change, the batch size is 12 or less)

Closes GH-5098

5 years agoDon't start unnecessary processes with run-tests.php -j
Tyson Andre [Mon, 20 Jan 2020 22:00:56 +0000 (17:00 -0500)]
Don't start unnecessary processes with run-tests.php -j

If there's only 2 files to test, then only start 2 workers instead of N.

If there's only 1 file, then avoid parallelism entirely.
A separate option such as `--force-parallel` could be added
if this turns out to be something developers would want to do
when debugging test failures.