]> granicus.if.org Git - php/log
php
5 years agoAllow array_merge() / array_merge_recursive() without arguments
Dik Takken [Thu, 16 May 2019 20:08:08 +0000 (22:08 +0200)]
Allow array_merge() / array_merge_recursive() without arguments

This allows writing

    array_merge(...$arrays)

instead of

    array_merge([], ...$arrays)

and is in line with similar changes to array_push() and array_unshift()
in PHP 7.3.

Closes GH-4175.

5 years agoPut phpinfo() related code into cold code segment
Dmitry Stogov [Tue, 28 May 2019 08:04:13 +0000 (11:04 +0300)]
Put phpinfo() related code into cold code segment

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Joe Watkins [Tue, 28 May 2019 07:54:47 +0000 (09:54 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  bump version after release

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Joe Watkins [Tue, 28 May 2019 07:54:15 +0000 (09:54 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  bump version after release

5 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Tue, 28 May 2019 07:53:32 +0000 (09:53 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  bump version after release

5 years agobump version after release
Joe Watkins [Tue, 28 May 2019 07:52:52 +0000 (09:52 +0200)]
bump version after release

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Stanislav Malyshev [Tue, 28 May 2019 04:36:10 +0000 (21:36 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix bug #77967 - Bypassing open_basedir restrictions via file uris

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Stanislav Malyshev [Tue, 28 May 2019 04:36:05 +0000 (21:36 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix bug #77967 - Bypassing open_basedir restrictions via file uris

5 years agoMerge branch 'PHP-7.1' into PHP-7.2
Stanislav Malyshev [Tue, 28 May 2019 04:36:00 +0000 (21:36 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix bug #77967 - Bypassing open_basedir restrictions via file uris

5 years agoFix bug #77967 - Bypassing open_basedir restrictions via file uris
Stanislav Malyshev [Tue, 28 May 2019 01:04:00 +0000 (18:04 -0700)]
Fix bug #77967 - Bypassing open_basedir restrictions via file uris

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Stanislav Malyshev [Tue, 28 May 2019 00:28:29 +0000 (17:28 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix bug #77988 - heap-buffer-overflow on php_jpg_get16

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Stanislav Malyshev [Tue, 28 May 2019 00:28:25 +0000 (17:28 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix bug #77988 - heap-buffer-overflow on php_jpg_get16

5 years agoMerge branch 'PHP-7.1' into PHP-7.2
Stanislav Malyshev [Tue, 28 May 2019 00:28:20 +0000 (17:28 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix bug #77988 - heap-buffer-overflow on php_jpg_get16

5 years agoFix bug #77988 - heap-buffer-overflow on php_jpg_get16
Stanislav Malyshev [Tue, 28 May 2019 00:16:29 +0000 (17:16 -0700)]
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Stanislav Malyshev [Tue, 28 May 2019 00:21:28 +0000 (17:21 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix function name

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Stanislav Malyshev [Tue, 28 May 2019 00:21:23 +0000 (17:21 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix function name

5 years agoFix function name
Stanislav Malyshev [Tue, 28 May 2019 00:20:56 +0000 (17:20 -0700)]
Fix function name

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Stanislav Malyshev [Mon, 27 May 2019 23:49:31 +0000 (16:49 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Update NEWS
  Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
  Fix #77973: Uninitialized read in gdImageCreateFromXbm

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Stanislav Malyshev [Mon, 27 May 2019 23:49:25 +0000 (16:49 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Update NEWS
  Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
  Fix #77973: Uninitialized read in gdImageCreateFromXbm

5 years agoMerge branch 'PHP-7.1' into PHP-7.2
Stanislav Malyshev [Mon, 27 May 2019 23:49:19 +0000 (16:49 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Update NEWS
  Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
  Fix #77973: Uninitialized read in gdImageCreateFromXbm

5 years agoUpdate NEWS
Stanislav Malyshev [Mon, 27 May 2019 23:48:32 +0000 (16:48 -0700)]
Update NEWS

5 years agoFix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to intege...
Stanislav Malyshev [Mon, 27 May 2019 23:32:42 +0000 (16:32 -0700)]
Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow

5 years agoFix #77973: Uninitialized read in gdImageCreateFromXbm
Christoph M. Becker [Mon, 6 May 2019 08:18:51 +0000 (10:18 +0200)]
Fix #77973: Uninitialized read in gdImageCreateFromXbm

We have to ensure that `sscanf()` does indeed read a hex value here,
and bail out otherwise.

5 years agoPrevent parallel test conflicts
Christoph M. Becker [Mon, 27 May 2019 14:20:50 +0000 (16:20 +0200)]
Prevent parallel test conflicts

These ports are already used by another test, so we change them.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 27 May 2019 15:44:11 +0000 (17:44 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 27 May 2019 15:42:50 +0000 (17:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFixed bug #76345
Michael Maroszek [Mon, 27 May 2019 15:42:20 +0000 (17:42 +0200)]
Fixed bug #76345

5 years agoBIND_STATIC of implicit binding may be undef
Nikita Popov [Mon, 27 May 2019 15:11:44 +0000 (17:11 +0200)]
BIND_STATIC of implicit binding may be undef

Even though we don't need it at runtime, add the BIND_IMPLICIT
flag to BIND_STATIC as well, so we can distinguish this case in
type inference.

This fixes a JIT miscompile in arrow_functions/002.phpt.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 27 May 2019 14:15:03 +0000 (16:15 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoFunc info: Fix calls to zero-arg varargs
Nikita Popov [Mon, 27 May 2019 14:09:58 +0000 (16:09 +0200)]
Func info: Fix calls to zero-arg varargs

The num_args does not include variadics, so a "zero-arg" function
may accept additional arguments through that. No functions seem
to be affected right now, but they will be after #4175.

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

5 years agoFunc info: Fix calls to zero-arg varargs
Nikita Popov [Mon, 27 May 2019 14:09:58 +0000 (16:09 +0200)]
Func info: Fix calls to zero-arg varargs

The num_args does not include variadics, so a "zero-arg" function
may accept additional arguments through that. No functions seem
to be affected right now, but they will be after #4175.

5 years agoEnable pcre valgrind support only in DEBUG build (it affects performance)
Dmitry Stogov [Mon, 27 May 2019 13:20:20 +0000 (16:20 +0300)]
Enable pcre valgrind support only in DEBUG build (it affects performance)

5 years agoext/xml: Use PKG_CHECK_MODULES to detect the Expat library
Hugh McMaster [Sun, 26 May 2019 09:30:54 +0000 (19:30 +1000)]
ext/xml: Use PKG_CHECK_MODULES to detect the Expat library

5 years agoAlign .text segment for better huge pages usage
Dmitry Stogov [Mon, 27 May 2019 10:37:19 +0000 (13:37 +0300)]
Align .text segment for better huge pages usage

5 years agoMake more tests run on Windows
Gabriel Caruso [Mon, 27 May 2019 01:30:05 +0000 (22:30 -0300)]
Make more tests run on Windows

5 years agoAccept flags argument in zend_lookup_class_ex()
Nikita Popov [Fri, 24 May 2019 12:41:38 +0000 (14:41 +0200)]
Accept flags argument in zend_lookup_class_ex()

Instead of a single boolean, so we have space for extension here.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Jakub Zelenka [Sun, 26 May 2019 17:51:10 +0000 (18:51 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 26 May 2019 17:49:52 +0000 (18:49 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoAdd fpmi to the opcache supported sapis
Jakub Zelenka [Sun, 26 May 2019 17:47:22 +0000 (18:47 +0100)]
Add fpmi to the opcache supported sapis

5 years agoUpgrade bundled PCRE2 to 10.33
Anatol Belski [Sat, 25 May 2019 09:33:39 +0000 (11:33 +0200)]
Upgrade bundled PCRE2 to 10.33

5 years agoUse PKG_CHECK_MODULES to detect valgrind, and share build config with pcre
Hugh McMaster [Thu, 23 May 2019 13:01:04 +0000 (23:01 +1000)]
Use PKG_CHECK_MODULES to detect valgrind, and share build config with pcre

5 years agoDefine minimum required libffi version
Peter Kokot [Wed, 8 May 2019 21:32:20 +0000 (23:32 +0200)]
Define minimum required libffi version

5 years agoAdd UPGRADING/NEWS entries
Nikita Popov [Fri, 24 May 2019 08:58:33 +0000 (10:58 +0200)]
Add UPGRADING/NEWS entries

5 years agoDeprecate use of parent where no parent exists
Nikita Popov [Fri, 24 May 2019 07:49:44 +0000 (09:49 +0200)]
Deprecate use of parent where no parent exists

This deprecation is part of the covariance RFC.

5 years agolist net/interfaces, trying to get the error on windows when possible
David Carlier [Wed, 22 May 2019 22:04:56 +0000 (00:04 +0200)]
list net/interfaces, trying to get the error on windows when possible

5 years agoImplement basic variance support
Nikita Popov [Wed, 8 May 2019 10:30:16 +0000 (12:30 +0200)]
Implement basic variance support

This is a minimal variance implementation: It does not support any
cyclic type dependencies. Additionally the preloading requirements
are much more restrictive than necessary. Hopefully we can relax
these in the future.

5 years agoAvoid early-binding on unresolved types
Nikita Popov [Thu, 9 May 2019 08:41:06 +0000 (10:41 +0200)]
Avoid early-binding on unresolved types

Fixes bug #76451, and more importantly lays necessary groundwork for
covariant/contravariant types. Bug #76451 is just an edge case, but
once covariance is introduced this will become a common problem instead.

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

5 years agoFix bug #77955
Nikita Popov [Thu, 23 May 2019 10:29:08 +0000 (12:29 +0200)]
Fix bug #77955

Free metadata before freeing the arena. I don't have a repro script,
but the added assertion fails for many existing tests prior to this
change.

5 years agoPrevent further potential test conflicts
Christoph M. Becker [Thu, 23 May 2019 11:09:14 +0000 (13:09 +0200)]
Prevent further potential test conflicts

These tests partially use the same resource names; as a quick-fix we're
marking them all as conflicting.

5 years agofix notice in run-tests
Joe Watkins [Thu, 23 May 2019 11:09:18 +0000 (13:09 +0200)]
fix notice in run-tests

5 years agoPrevent potential test conflict
Christoph M. Becker [Thu, 23 May 2019 09:40:39 +0000 (11:40 +0200)]
Prevent potential test conflict

bug48746_tmp.lnk is also created by bug48746_2.phpt which might clash,
if both are run simultaneouly.

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

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 23 May 2019 09:12:34 +0000 (11:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFixed bug #78038 socket_select with references
Nikita Popov [Thu, 23 May 2019 09:11:54 +0000 (11:11 +0200)]
Fixed bug #78038 socket_select with references

5 years agorun-tests improvements:
Joe Watkins [Thu, 23 May 2019 08:55:25 +0000 (10:55 +0200)]
run-tests improvements:
  Add XLEAK section, this is made necessary by the support
  for valgrind tools other than memcheck.
  XLEAK is to a leaking test what XFAIL is to a failing test.
  Tidy up summary a little to exclude Expected Fail and Expected Leak
  when there are no expected fail/leaks

5 years agoForbid use of not fully linked classes
Nikita Popov [Wed, 22 May 2019 09:13:28 +0000 (11:13 +0200)]
Forbid use of not fully linked classes

5 years agoFixed double mutex unlock
Dmitry Stogov [Thu, 23 May 2019 08:20:46 +0000 (11:20 +0300)]
Fixed double mutex unlock

5 years agoDon't require NO_ESCAPE for partial arrays in SCCP
Nikita Popov [Wed, 15 May 2019 13:27:17 +0000 (15:27 +0200)]
Don't require NO_ESCAPE for partial arrays in SCCP

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Dmitry Stogov [Wed, 22 May 2019 21:21:15 +0000 (00:21 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed race condition in opcache restart

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Wed, 22 May 2019 21:21:04 +0000 (00:21 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed race condition in opcache restart

5 years agoFixed race condition in opcache restart
Dmitry Stogov [Wed, 22 May 2019 21:20:35 +0000 (00:20 +0300)]
Fixed race condition in opcache restart

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Dmitry Stogov [Wed, 22 May 2019 20:00:26 +0000 (23:00 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed dump of constant flags

5 years agoFixed dump of constant flags
Dmitry Stogov [Wed, 22 May 2019 19:59:40 +0000 (22:59 +0300)]
Fixed dump of constant flags

5 years agoadd support for valgrind tools to run-tests.php
Joe Watkins [Wed, 22 May 2019 18:20:13 +0000 (20:20 +0200)]
add support for valgrind tools to run-tests.php

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 22 May 2019 10:45:25 +0000 (12:45 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 22 May 2019 10:45:05 +0000 (12:45 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix #77956 - When mysqli.allow_local_infile = Off, return a client error
Sjon Hortensius [Sat, 18 May 2019 15:14:21 +0000 (17:14 +0200)]
Fix #77956 - When mysqli.allow_local_infile = Off, return a client error

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Wed, 22 May 2019 10:02:43 +0000 (12:02 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix test case for cURL 7.65.0

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Wed, 22 May 2019 10:02:03 +0000 (12:02 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix test case for cURL 7.65.0

5 years agoFix test case for cURL 7.65.0
Christoph M. Becker [Wed, 22 May 2019 10:00:06 +0000 (12:00 +0200)]
Fix test case for cURL 7.65.0

Reported and patch provided by @Jan-E.

5 years agoMark bug44811.phpt as an online test
Nikita Popov [Wed, 22 May 2019 09:43:56 +0000 (11:43 +0200)]
Mark bug44811.phpt as an online test

For some reason this was checked on PHP-7.2 and PHP-7.3, but not
on PHP-7.4. Bad merge?

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 22 May 2019 09:43:40 +0000 (11:43 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 22 May 2019 09:43:26 +0000 (11:43 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoUse a different URL in bug44811.phpt
Nikita Popov [Wed, 22 May 2019 09:41:51 +0000 (11:41 +0200)]
Use a different URL in bug44811.phpt

5 years ago.text segment may be not the first one
Dmitry Stogov [Wed, 22 May 2019 09:20:34 +0000 (12:20 +0300)]
.text segment may be not the first one

5 years agoFix bug #78034
Nikita Popov [Wed, 22 May 2019 07:34:35 +0000 (09:34 +0200)]
Fix bug #78034

Don't def non-cv variables in assign_obj_ref data operand.

5 years agoFixed some arg infos to match documentation
Jaroslav Hanslík [Thu, 9 May 2019 19:58:46 +0000 (21:58 +0200)]
Fixed some arg infos to match documentation

5 years agoUse PKG_CHECK_MODULES to detect unixODBC
Hugh McMaster [Mon, 20 May 2019 12:48:14 +0000 (22:48 +1000)]
Use PKG_CHECK_MODULES to detect unixODBC

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Rasmus Lerdorf [Tue, 21 May 2019 21:46:44 +0000 (14:46 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Rasmus Lerdorf [Tue, 21 May 2019 21:46:24 +0000 (14:46 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select

5 years agoFix precedence issue causing sub-second timeouts to be 0 in
Rasmus Lerdorf [Tue, 21 May 2019 21:44:11 +0000 (14:44 -0700)]
Fix precedence issue causing sub-second timeouts to be 0 in
curl_multi_select

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

5 years agoDon't evaluate functions with partial array arguments
Nikita Popov [Tue, 21 May 2019 15:35:03 +0000 (17:35 +0200)]
Don't evaluate functions with partial array arguments

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

5 years agoFix null check in sccp add_array_elem chain handling
Nikita Popov [Tue, 21 May 2019 15:15:07 +0000 (17:15 +0200)]
Fix null check in sccp add_array_elem chain handling

We need to check result_use rather than result_def for a null zval.
Previously we were later assuming that the null zval is really a
partial array, which does not go well.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 21 May 2019 15:03:52 +0000 (17:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoFix partial array handling in FE_RESET edge feasibility
Nikita Popov [Tue, 21 May 2019 14:59:27 +0000 (16:59 +0200)]
Fix partial array handling in FE_RESET edge feasibility

5 years agoHandle partial arrays in zend_is_true() checks
Nikita Popov [Tue, 21 May 2019 14:51:35 +0000 (16:51 +0200)]
Handle partial arrays in zend_is_true() checks

5 years agoExtract ct_eval_binary_op()
Nikita Popov [Tue, 21 May 2019 14:43:41 +0000 (16:43 +0200)]
Extract ct_eval_binary_op()

And use it in more places, though some of them are currently not
reachable by partial arrays to the best of my knowledge.

5 years agoImprove SCCP debug code
Nikita Popov [Tue, 21 May 2019 14:40:18 +0000 (16:40 +0200)]
Improve SCCP debug code

In particular properly dump partial arrays when tracing execution.

5 years agosodium: fix shared build
Remi Collet [Tue, 21 May 2019 14:14:42 +0000 (16:14 +0200)]
sodium: fix shared build

5 years agoenchant: fix shared build
Remi Collet [Tue, 21 May 2019 14:14:12 +0000 (16:14 +0200)]
enchant: fix shared build

5 years agoFix ASLR related invalid opline handler issues
Christoph M. Becker [Mon, 20 May 2019 13:59:54 +0000 (15:59 +0200)]
Fix ASLR related invalid opline handler issues

Opcache stores `opline->handler`s in shared memory.  These pointers are
invalid, if the main PHP DLL is loaded at another base address due to
ASLR.  We therefore store the address of `execute_ex` in the mmap base
file, and check on startup whether it matches its current address.  If
not, we fall back on the file cache if enabled, and bail out otherwise.

This still does not address cases where the opline handler is located
inside of another DLL (e.g. for some profilers, debuggers), but there
seems to be no general solution for now.

5 years agofix typo breaking shared build
Remi Collet [Tue, 21 May 2019 12:25:55 +0000 (14:25 +0200)]
fix typo breaking shared build

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Tue, 21 May 2019 09:19:05 +0000 (11:19 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Prevent test case failure

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Tue, 21 May 2019 09:18:32 +0000 (11:18 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Prevent test case failure

5 years agoPrevent test case failure
Christoph M. Becker [Tue, 21 May 2019 09:17:28 +0000 (11:17 +0200)]
Prevent test case failure

If opcache.log_verbosity_level is greater than 1, opcache will raise
warnings, which will be written to stderr in the default case.  These
warnings are actually to be expected, but would break the test, so we
make sure that the log_verbosity_level is 1 when running this test.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 21 May 2019 08:05:03 +0000 (10:05 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4