]> granicus.if.org Git - php/log
php
5 years agoXFAIL sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt
Nikita Popov [Fri, 27 Sep 2019 09:18:50 +0000 (11:18 +0200)]
XFAIL sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt

This is supposed to be addressed by GH-4007, but that seems stalled
for now.

5 years agoEnable ubsan stack trace printing on community job
Nikita Popov [Fri, 27 Sep 2019 09:16:22 +0000 (11:16 +0200)]
Enable ubsan stack trace printing on community job

Try to do this using "variables" -- apparently these get uppercased
and are made available as environment variables.

5 years agoFix file clash in rename_variation.phpt
Nikita Popov [Fri, 27 Sep 2019 09:10:42 +0000 (11:10 +0200)]
Fix file clash in rename_variation.phpt

rename_variation2.tmp is ... unsurprisingly ... already used by
rename_variation2.phpt. Alternatively it could be placed in the
directory that the test creates, but maybe this is intended to
test cross-directory renames, so I'll leave it.

5 years agoHandle resources used as array keys consistently
Nikita Popov [Fri, 27 Sep 2019 08:39:21 +0000 (10:39 +0200)]
Handle resources used as array keys consistently

Resources used as array keys are generally handled by throwing a
notice and converting the resource to the resource handle. The only
exception is the [$resource => null] syntax, where this was treated
as an illegal offset type instead. However, this also only happened
for VM evaluations, the AST evaluator did handle resources correctly.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 26 Sep 2019 11:47:41 +0000 (13:47 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 26 Sep 2019 11:47:19 +0000 (13:47 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix memory leak with ** on array operands
Nikita Popov [Thu, 26 Sep 2019 11:45:45 +0000 (13:45 +0200)]
Fix memory leak with ** on array operands

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 26 Sep 2019 08:25:55 +0000 (10:25 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 26 Sep 2019 08:25:40 +0000 (10:25 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix null-pointer deref in if stmt printing
Nikita Popov [Thu, 26 Sep 2019 08:24:49 +0000 (10:24 +0200)]
Fix null-pointer deref in if stmt printing

Fixes OSS-Fuzz #17721.

5 years agoFixed GOTO VM
Dmitry Stogov [Wed, 25 Sep 2019 22:17:54 +0000 (01:17 +0300)]
Fixed GOTO VM

5 years agoIncrease serialize_lock while decoding session
Nikita Popov [Wed, 25 Sep 2019 09:02:23 +0000 (11:02 +0200)]
Increase serialize_lock while decoding session

Avoid leaking state between Serializable::unserialize() and
session_decode().

5 years agoRemove xfail on bug70219.phpt
Nikita Popov [Wed, 25 Sep 2019 08:56:27 +0000 (10:56 +0200)]
Remove xfail on bug70219.phpt

Looks like this is working as it's supposed to, the test expectation
just needs to be adjusted.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 25 Sep 2019 08:34:33 +0000 (10:34 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 25 Sep 2019 08:34:25 +0000 (10:34 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix hash key length in umsg_parse_format()
Jinesh Patel [Mon, 29 Jul 2019 18:19:52 +0000 (14:19 -0400)]
Fix hash key length in umsg_parse_format()

Fix array length passed to zend_hash_str_find_ptr() casting from
UChar array to char array requires mul by sizeof(UChar).

5 years agoFix GCOV not working for PHP-7.4 and master branches
Gerard Roche [Mon, 23 Sep 2019 16:09:00 +0000 (17:09 +0100)]
Fix GCOV not working for PHP-7.4 and master branches

Code coverage reports (`make lcov`), since commit eef8522 (7.4 branch),
generates incorrect coverage and emits warnings. Simplifying the
Makefile.gcov file has the side-effect of resolving the issue.

    Processing sapi/cli/php_http_parser.gcda
    php-src/lcov_data/sapi/cli/php_http_parser.gcda:stamp mismatch with notes file
    geninfo: WARNING: gcov did not create any files for php-src/lcov_data/sapi/cli/php_http_parser.gcda!
    ...
    Processing ext/mbstring/mb_gpc.gcda
    php-src/lcov_data/ext/mbstring/mb_gpc.gcda:stamp mismatch with notes file
    geninfo: WARNING: gcov did not create any files for php-src/lcov_data/ext/mbstring/mb_gpc.gcda!

Closes: https://bugs.php.net/bug.php?id=52718.
See also: https://bugs.php.net/bug.php?id=78288.

5 years agoUse nproc instead of hardcoded number
Gabriel Caruso [Sun, 15 Sep 2019 16:32:11 +0000 (18:32 +0200)]
Use nproc instead of hardcoded number

5 years agoFixed bug #78589
Nikita Popov [Mon, 23 Sep 2019 10:39:12 +0000 (12:39 +0200)]
Fixed bug #78589

Don't protect GC while destroying zvals. We may need to add GC
roots during this phase.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Tue, 24 Sep 2019 09:15:28 +0000 (11:15 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Update NEWS

5 years agoUpdate NEWS
Christoph M. Becker [Tue, 24 Sep 2019 09:13:55 +0000 (11:13 +0200)]
Update NEWS

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Stanislav Malyshev [Tue, 24 Sep 2019 04:51:12 +0000 (21:51 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78559: Heap buffer overflow in mb_eregi

5 years agoFix #78559: Heap buffer overflow in mb_eregi
Christoph M. Becker [Fri, 20 Sep 2019 17:02:22 +0000 (19:02 +0200)]
Fix #78559: Heap buffer overflow in mb_eregi

We backport kkos/oniguruma@d3e402928b6eb3327f8f7d59a9edfa622fec557b.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 23 Sep 2019 21:03:55 +0000 (23:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix NEWS entry

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Mon, 23 Sep 2019 21:01:38 +0000 (23:01 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix NEWS entry

5 years agoFix NEWS entry
Christoph M. Becker [Mon, 23 Sep 2019 20:59:55 +0000 (22:59 +0200)]
Fix NEWS entry

Cf. <https://bugs.php.net/78590>.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 15:18:39 +0000 (17:18 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 23 Sep 2019 15:18:33 +0000 (17:18 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix skipif condition
Nikita Popov [Mon, 23 Sep 2019 15:17:52 +0000 (17:17 +0200)]
Fix skipif condition

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 14:42:59 +0000 (16:42 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 23 Sep 2019 14:42:33 +0000 (16:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoSkip test on 32-bit
Nikita Popov [Mon, 23 Sep 2019 14:42:24 +0000 (16:42 +0200)]
Skip test on 32-bit

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 12:52:40 +0000 (14:52 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoSkip test on 32-bit
Nikita Popov [Mon, 23 Sep 2019 12:52:32 +0000 (14:52 +0200)]
Skip test on 32-bit

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 11:47:38 +0000 (13:47 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoCommit regenerated var_unserializer.c
Nikita Popov [Mon, 23 Sep 2019 11:47:05 +0000 (13:47 +0200)]
Commit regenerated var_unserializer.c

5 years agoRemove commented code
Nikita Popov [Mon, 23 Sep 2019 11:34:42 +0000 (13:34 +0200)]
Remove commented code

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 11:18:59 +0000 (13:18 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 23 Sep 2019 11:18:39 +0000 (13:18 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix signed integer overflow in SplObjectStorage unserialization
Nikita Popov [Mon, 23 Sep 2019 11:16:58 +0000 (13:16 +0200)]
Fix signed integer overflow in SplObjectStorage unserialization

If count is ZEND_LONG_MIN the count-- loop underflows. This is
ultimately harmless, but results in a ubsan warning.

Fix this by adding a sanity check that the count isn't negative,
because that doesn't make sense...

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 11:09:01 +0000 (13:09 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoFix ubsan violation in parse_iv2
Nikita Popov [Mon, 23 Sep 2019 11:06:55 +0000 (13:06 +0200)]
Fix ubsan violation in parse_iv2

This fixes two issues:
 * Negative the value in an unsigned type to avoid signed overflow.
 * Treat -0 as 0 rather than an invalid number that gets converted
   to ZEND_LONG_MIN.

5 years agoAllow lookup of distro-packaged QDBM headers on Debian
Stephen Reay [Sun, 22 Sep 2019 15:51:36 +0000 (22:51 +0700)]
Allow lookup of distro-packaged QDBM headers on Debian

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Sun, 22 Sep 2019 16:43:24 +0000 (18:43 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix test to be skipped if dom is not available

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sun, 22 Sep 2019 16:42:40 +0000 (18:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix test to be skipped if dom is not available

5 years agoFix test to be skipped if dom is not available
Christoph M. Becker [Sun, 22 Sep 2019 16:39:55 +0000 (18:39 +0200)]
Fix test to be skipped if dom is not available

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Sun, 22 Sep 2019 10:10:49 +0000 (12:10 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Sun, 22 Sep 2019 10:10:42 +0000 (12:10 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix leak of temporary buffer during exif tag reading
Nikita Popov [Sun, 22 Sep 2019 10:10:17 +0000 (12:10 +0200)]
Fix leak of temporary buffer during exif tag reading

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Sun, 22 Sep 2019 08:27:07 +0000 (10:27 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Sun, 22 Sep 2019 08:26:57 +0000 (10:26 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix multiple leaks in exif_read_data()
Nikita Popov [Sat, 21 Sep 2019 18:38:24 +0000 (20:38 +0200)]
Fix multiple leaks in exif_read_data()

This fixes two leaks related to duplicate tags, as well as a leak
of zero-length FMT_(S)BYTE with non-null value. This can show up
for MAKERNOTE values where the original length is non-zero, but
the first character is a null byte.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Sat, 21 Sep 2019 16:13:06 +0000 (18:13 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix length of key passed to zend_hash_str_find_ptr

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 21 Sep 2019 16:12:27 +0000 (18:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix length of key passed to zend_hash_str_find_ptr

5 years agoFix length of key passed to zend_hash_str_find_ptr
Jinesh Patel [Mon, 29 Jul 2019 18:21:25 +0000 (14:21 -0400)]
Fix length of key passed to zend_hash_str_find_ptr

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Sat, 21 Sep 2019 14:17:33 +0000 (16:17 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78579: mb_decode_numericentity: args number inconsistency

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 21 Sep 2019 14:16:09 +0000 (16:16 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #78579: mb_decode_numericentity: args number inconsistency

5 years agoFix #78579: mb_decode_numericentity: args number inconsistency
Christoph M. Becker [Sat, 21 Sep 2019 13:56:06 +0000 (15:56 +0200)]
Fix #78579: mb_decode_numericentity: args number inconsistency

mb_decode_numericentity() accepts a fourth optional parameter, which is
unused, however.  Since this parameter doesn't do any harm, and to avoid
the small BC break, we're keeping this parameter for PHP 7, but adjust
the arginfo.

For PHP 8, we will remove this parameter.

5 years agoFixed bug #78574 (broken shared build)
Remi Collet [Fri, 20 Sep 2019 11:30:13 +0000 (13:30 +0200)]
Fixed bug #78574 (broken shared build)

5 years agoDon't buid static libaraies when only DSO required
Dmitry Stogov [Thu, 19 Sep 2019 20:44:53 +0000 (23:44 +0300)]
Don't buid static libaraies when only DSO required

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 19 Sep 2019 19:14:46 +0000 (21:14 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 19 Sep 2019 19:14:40 +0000 (21:14 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix out-of-bounds read in exif tag reading
Nikita Popov [Thu, 19 Sep 2019 19:11:57 +0000 (21:11 +0200)]
Fix out-of-bounds read in exif tag reading

This issue was recently introduced in c739023a50876e2a90588f915803b0140a95638e,
when the restriction that components>0 has been relaxed. We now need
to make sure that any tags that expect at least one component check
that this is the case.

5 years agoClean up JSON parser
Nikita Popov [Thu, 19 Sep 2019 16:29:13 +0000 (18:29 +0200)]
Clean up JSON parser

Don't use <value> type for JSON tokens that don't have a value
and remove the errlex productions -- we're going to get an
unexpected token error anyway, there's no need to handle these
explicitly.

This also removes the awkward workarounds for the unused value
warnings.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 19 Sep 2019 15:22:28 +0000 (17:22 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 19 Sep 2019 15:21:45 +0000 (17:21 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix iterable return type optimization
Nikita Popov [Thu, 19 Sep 2019 15:20:10 +0000 (17:20 +0200)]
Fix iterable return type optimization

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 19 Sep 2019 12:20:13 +0000 (14:20 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 19 Sep 2019 12:20:04 +0000 (14:20 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix exif leak on duplicate copyright tags
Nikita Popov [Thu, 19 Sep 2019 12:16:36 +0000 (14:16 +0200)]
Fix exif leak on duplicate copyright tags

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 19 Sep 2019 09:36:19 +0000 (11:36 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 19 Sep 2019 09:36:09 +0000 (11:36 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix typo
CJDennis [Wed, 18 Sep 2019 10:03:24 +0000 (20:03 +1000)]
Fix typo

`sizeof("data")-1` and `sizeof("date")-1` are both 4, so no change in behaviour

5 years agoFix #78543: is_callable() on FFI\CData throws Exception
Christoph M. Becker [Wed, 18 Sep 2019 09:55:20 +0000 (11:55 +0200)]
Fix #78543: is_callable() on FFI\CData throws Exception

If `Z_OBJ_HANDLER_P(callable, get_closure)` throws, we must not let the
exeception pass to userland, if called through `is_callable()`.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 18 Sep 2019 14:37:14 +0000 (16:37 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoRemove unstable test output
Nikita Popov [Wed, 18 Sep 2019 14:36:29 +0000 (16:36 +0200)]
Remove unstable test output

This may be printed in a different order, and we don't care about
it anyway.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 18 Sep 2019 08:45:07 +0000 (10:45 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoFixed bug #78272
Nikita Popov [Wed, 18 Sep 2019 07:44:00 +0000 (09:44 +0200)]
Fixed bug #78272

Use MAP_JIT only when running under hardened runtime, because MAP_JIT
is incompatible with fork().

The check is based on
https://github.com/mono/mono/commit/f879e35e3ed7496d819bd766deb8be6992d068ed.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 18 Sep 2019 07:31:44 +0000 (09:31 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoBackport MAP_JIT fixes from PCRE2 10.33
Nikita Popov [Wed, 18 Sep 2019 07:28:54 +0000 (09:28 +0200)]
Backport MAP_JIT fixes from PCRE2 10.33

This is intended to fix the primary issue from bug #77260.

Prior to macOS 10.14 multiple MAP_JIT segments were not permitted,
leading to mmap failures and corresponding "no more memory" errors
on macOS 10.13.

5 years agoUpdate NEWS for 7.4.0RC3
Derick Rethans [Tue, 17 Sep 2019 16:39:07 +0000 (16:39 +0000)]
Update NEWS for 7.4.0RC3

5 years agoUpdate NEWS for PHP 7.4.0RC2
Derick Rethans [Tue, 17 Sep 2019 16:37:49 +0000 (16:37 +0000)]
Update NEWS for PHP 7.4.0RC2

5 years agoRevert "Update NEWS for PHP 7.4.0RC2"
Derick Rethans [Tue, 17 Sep 2019 16:32:33 +0000 (17:32 +0100)]
Revert "Update NEWS for PHP 7.4.0RC2"

This reverts commit 050059cb269f3581901d3ac4d155292fee95d4cf.

5 years agoRevert "Update NEWS for 7.4.0RC3"
Derick Rethans [Tue, 17 Sep 2019 16:32:31 +0000 (17:32 +0100)]
Revert "Update NEWS for 7.4.0RC3"

This reverts commit 803dc6b8f2ea1f9314d19eb242365f32a364437e.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 17 Sep 2019 15:34:24 +0000 (17:34 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 17 Sep 2019 15:34:08 +0000 (17:34 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoIncrease timeout in test
Nikita Popov [Tue, 17 Sep 2019 15:33:46 +0000 (17:33 +0200)]
Increase timeout in test

5 years agoEnable --with-mhash on CI
Nikita Popov [Tue, 17 Sep 2019 14:16:31 +0000 (16:16 +0200)]
Enable --with-mhash on CI

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 17 Sep 2019 13:43:35 +0000 (15:43 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 17 Sep 2019 13:42:42 +0000 (15:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix #76342: file_get_contents waits twice specified timeout
fancyweb [Mon, 29 Jul 2019 22:33:13 +0000 (00:33 +0200)]
Fix #76342: file_get_contents waits twice specified timeout

5 years agoFixed CLI/CGI/FPM build, when they are built together with Apache SAPI
Dmitry Stogov [Tue, 17 Sep 2019 12:43:00 +0000 (15:43 +0300)]
Fixed CLI/CGI/FPM build, when they are built together with Apache SAPI

5 years agoCheck for exception after calling count_values()
Nikita Popov [Tue, 17 Sep 2019 11:13:44 +0000 (13:13 +0200)]
Check for exception after calling count_values()

To avoid a duplicate error if count_values() throws.

5 years agoMonitoring anonymous pages on mac via vmmap tag
David Carlier [Sat, 27 Jul 2019 12:33:48 +0000 (13:33 +0100)]
Monitoring anonymous pages on mac via vmmap tag

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 17 Sep 2019 10:19:45 +0000 (12:19 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 17 Sep 2019 10:19:39 +0000 (12:19 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoAdd tilde to allowed status/ping path
Drakano [Thu, 12 Sep 2019 08:18:30 +0000 (10:18 +0200)]
Add tilde to allowed status/ping path

Because of user specific webdirs it should be possible to set a
status/ping path like "/~username/status".

Closes GH-4698.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 17 Sep 2019 10:09:06 +0000 (12:09 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 17 Sep 2019 10:08:57 +0000 (12:08 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix opcache return type for get_headers in zend_func_info
Tyson Andre [Fri, 13 Sep 2019 18:09:15 +0000 (14:09 -0400)]
Fix opcache return type for get_headers in zend_func_info

https://www.php.net/manual/en/function.get-headers.php#refsect1-function.get-headers-examples
shows that it will return string keys when the second argument is
non-zero. I've verified that this is the case.

This bug was there since the initial commit in c88ffa9a567.

Closes GH-4702.