]> granicus.if.org Git - php/log
php
4 years agoReturn void from php_jpeg_emit_message()
Nikita Popov [Fri, 19 Jun 2020 14:07:14 +0000 (16:07 +0200)]
Return void from php_jpeg_emit_message()

Instead of returning long and then casting to void.

This fixes a build warning on Ubuntu 20.04.

Closes GH-5742.

4 years agoJIT for FETCH_OBJ_W
Dmitry Stogov [Fri, 19 Jun 2020 11:36:38 +0000 (14:36 +0300)]
JIT for FETCH_OBJ_W

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 19 Jun 2020 08:48:34 +0000 (10:48 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79710

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 19 Jun 2020 08:47:01 +0000 (10:47 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

4 years agoFixed bug #79710
Nikita Popov [Fri, 19 Jun 2020 08:46:02 +0000 (10:46 +0200)]
Fixed bug #79710

Make sure we don't use zresource after the stream has been destroyed.

4 years agoRemoving HTML Functionality from run-tests.php
Paul Dragoonis [Thu, 18 Jun 2020 09:40:40 +0000 (10:40 +0100)]
Removing HTML Functionality from run-tests.php

As discussed on GH-5632, the HTML functionality does not appear
to be in active use. For HTML rendering of test results, it is
suggested to instead use the JUnit integration, in combination
with your favorite JUnit viewer.

Closes GH-5705.

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 19 Jun 2020 07:44:56 +0000 (09:44 +0200)]
Merge branch 'PHP-7.4'

4 years agoGenerate temporary config file when generating certificates
Nikita Popov [Fri, 19 Jun 2020 07:43:56 +0000 (09:43 +0200)]
Generate temporary config file when generating certificates

The putenv trick doesn't work on ZTS Windows, so generate a new
openssl config every time.

4 years agoForbid use of <?= as a semi-reserved identifier
Nikita Popov [Fri, 19 Jun 2020 07:27:19 +0000 (09:27 +0200)]
Forbid use of <?= as a semi-reserved identifier

One of the weirdest pieces of PHP code I've ever seen. In terms
of tokens, this gets internally translated to

    use x as y; echo as my_echo;

On master it crashes because this "echo" does not have attached
identifier metadata. Make sure it is added and then reject the
use of "<?=" as an identifier inside zend_lex_tstring.

Fixes oss-fuzz #23547.

4 years agoMAY_BE_INDIRECT inference
Dmitry Stogov [Thu, 18 Jun 2020 15:54:32 +0000 (18:54 +0300)]
MAY_BE_INDIRECT inference

4 years agoFix CLI test if linked against libedit
Nikita Popov [Thu, 18 Jun 2020 15:30:03 +0000 (17:30 +0200)]
Fix CLI test if linked against libedit

The error message changed here.

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 18 Jun 2020 15:14:03 +0000 (17:14 +0200)]
Merge branch 'PHP-7.4'

4 years agocheck for broken libzip versions
Remi Collet [Thu, 18 Jun 2020 14:45:39 +0000 (16:45 +0200)]
check for broken libzip versions

Closes GH-5738.

4 years agoUpdate libzip on macos
Nikita Popov [Thu, 18 Jun 2020 14:25:16 +0000 (16:25 +0200)]
Update libzip on macos

We need libzip 1.7.1, because libzip 1.7.0 is broken.

Closes GH-5737.

4 years agoCall zpp in enchant_broker_*_dict_path with libenchant-2
Nikita Popov [Thu, 18 Jun 2020 15:10:22 +0000 (17:10 +0200)]
Call zpp in enchant_broker_*_dict_path with libenchant-2

Even if the function is a dummy, we still need to call zpp to
comply with arginfo.

4 years agoUse ZEND_TOSTRING_FUNC_NAME
moliata [Thu, 18 Jun 2020 12:24:27 +0000 (15:24 +0300)]
Use ZEND_TOSTRING_FUNC_NAME

Closes GH-5736.

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 18 Jun 2020 15:02:24 +0000 (17:02 +0200)]
Merge branch 'PHP-7.4'

4 years agoFix race condition in FPM tests
Nikita Popov [Thu, 18 Jun 2020 15:01:29 +0000 (17:01 +0200)]
Fix race condition in FPM tests

The newly de-XFAILed tests have a race condition. Make sure we
terminate only after expecting all the log lines.

4 years agoAdd reference to phpweb/bin/createReleaseEntry
Sara Golemon [Thu, 18 Jun 2020 14:03:44 +0000 (14:03 +0000)]
Add reference to phpweb/bin/createReleaseEntry

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 18 Jun 2020 14:00:30 +0000 (16:00 +0200)]
Merge branch 'PHP-7.4'

4 years agoUn-XFAIL FPM tests
Nikita Popov [Thu, 18 Jun 2020 13:59:32 +0000 (15:59 +0200)]
Un-XFAIL FPM tests

These were XFAILed due to a bug in the log implementation that
caused intermittent failures. However, this issue is supposed to
be resolved in the meantime, so try dropping the XFAIL marker.

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 18 Jun 2020 13:55:23 +0000 (15:55 +0200)]
Merge branch 'PHP-7.4'

4 years agoDowngrade server security level in security level test
Nikita Popov [Thu, 18 Jun 2020 13:54:02 +0000 (15:54 +0200)]
Downgrade server security level in security level test

We want to test the client side error here, so make sure the
server side can start up successfully.

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 18 Jun 2020 13:49:43 +0000 (15:49 +0200)]
Merge branch 'PHP-7.4'

4 years agoAdd SubjectAltName support to certificate generator
Nikita Popov [Thu, 18 Jun 2020 13:34:33 +0000 (15:34 +0200)]
Add SubjectAltName support to certificate generator

And switch tests using SAN certificates to the generator.

This is ugly, but there doesn't seem to be a more direct way
to privide SAN in PHP.

4 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 18 Jun 2020 13:29:50 +0000 (15:29 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Add missing NEWS entry

4 years agoAdd missing NEWS entry
Christoph M. Becker [Thu, 18 Jun 2020 13:28:19 +0000 (15:28 +0200)]
Add missing NEWS entry

I forgot to update NEWS after merging back then.

4 years agoDowngrade security level in tests using TLS < 1.2
Nikita Popov [Thu, 18 Jun 2020 13:08:24 +0000 (15:08 +0200)]
Downgrade security level in tests using TLS < 1.2

A few additional tests have been added on master that require
lower security level.

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 18 Jun 2020 13:02:02 +0000 (15:02 +0200)]
Merge branch 'PHP-7.4'

4 years agoGenerate certificates for bug69215.phpt
Nikita Popov [Thu, 18 Jun 2020 12:58:48 +0000 (14:58 +0200)]
Generate certificates for bug69215.phpt

4 years agoGenerate certificate for bug68920.phpt
Nikita Popov [Thu, 18 Jun 2020 12:49:15 +0000 (14:49 +0200)]
Generate certificate for bug68920.phpt

The certificate really doesn't matter here, but it still needs to
comply with security level...

4 years agoGenerate certificate for bug65729.pem
Nikita Popov [Thu, 18 Jun 2020 12:43:19 +0000 (14:43 +0200)]
Generate certificate for bug65729.pem

Make this test pass under security level 2.

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 18 Jun 2020 12:22:29 +0000 (14:22 +0200)]
Merge branch 'PHP-7.4'

4 years agoRevert "Fix tests regarding OpenSSL security_level"
Nikita Popov [Thu, 18 Jun 2020 12:21:04 +0000 (14:21 +0200)]
Revert "Fix tests regarding OpenSSL security_level"

This reverts commit b281493503401a2b5c45c11fcd0498d8448998c2.

4 years agoDon't generate spurious warning is security_level not supported
Nikita Popov [Thu, 18 Jun 2020 12:20:23 +0000 (14:20 +0200)]
Don't generate spurious warning is security_level not supported

People should not have to worry about the used openssl version
when downgrading security_level.

4 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 18 Jun 2020 11:29:33 +0000 (13:29 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix tests regarding OpenSSL security_level

4 years agoFix tests regarding OpenSSL security_level
Christoph M. Becker [Thu, 18 Jun 2020 11:28:09 +0000 (13:28 +0200)]
Fix tests regarding OpenSSL security_level

The `security_level` stream option is only available as of OpenSSL
1.1.0, so we only set it for these versions.  Older OpenSSL versions
do not have security levels at all.

4 years agoFix UNKNOWN default values in ext/curl
Máté Kocsis [Thu, 18 Jun 2020 07:26:09 +0000 (09:26 +0200)]
Fix UNKNOWN default values in ext/curl

Closes GH-5734

4 years agoRemove the deprecated parameter of curl_version()
Máté Kocsis [Thu, 18 Jun 2020 07:26:58 +0000 (09:26 +0200)]
Remove the deprecated parameter of curl_version()

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 18 Jun 2020 08:49:56 +0000 (10:49 +0200)]
Merge branch 'PHP-7.4'

4 years agoMigrate some tests to certificate generator
Nikita Popov [Thu, 18 Jun 2020 08:32:33 +0000 (10:32 +0200)]
Migrate some tests to certificate generator

This migrates all the tests using ext/openssl/tests/streams_crypto_method.pem
to the certificate generator, so we can easily adjust needed parameters.
In particular, this makes the cert security level 2 compatible.

However, we still need to downgrade security_level to 1 in a number
of tests, because they are testing TLS < 1.2 connections.

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 18 Jun 2020 08:16:47 +0000 (10:16 +0200)]
Merge branch 'PHP-7.4'

4 years agoDon't use ternary in ini default
Nikita Popov [Thu, 18 Jun 2020 08:15:53 +0000 (10:15 +0200)]
Don't use ternary in ini default

We use sizeof() on ini defaults, so this isn't safe. I can't reproduce
the failures locally, but I expect this to fix the asan jobs.

4 years agoUse guards for ZEND_FETCH_OBJ_R/IS to eliminate repeatable checks
Dmitry Stogov [Thu, 18 Jun 2020 08:10:47 +0000 (11:10 +0300)]
Use guards for ZEND_FETCH_OBJ_R/IS to eliminate repeatable checks

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 18 Jun 2020 08:09:58 +0000 (10:09 +0200)]
Merge branch 'PHP-7.4'

4 years agoRemove bug48187.phpt
Nikita Popov [Thu, 18 Jun 2020 08:07:45 +0000 (10:07 +0200)]
Remove bug48187.phpt

Saw a spurious failure from this one on azure macos, presumably
the process got interrupted in the middle and waited for more than
one second to resume.

After looking a bit more closely, this test doesn't actually test
what bug #48187 reported, because there is no DateTime::diff()
anywhere to be found. This test was also added speculatively,
because the root cause was never diagnosed, and the problems seems
to have resolved itself at some point.

As such, I'm simply dropping this test, rather than figuring out
how to make it more robust.

4 years agoUpdate release-process.md wrt. new bin/createReleaseEntry
Christoph M. Becker [Thu, 18 Jun 2020 07:27:54 +0000 (09:27 +0200)]
Update release-process.md wrt. new bin/createReleaseEntry

4 years agoFixed multiple definition
Dmitry Stogov [Thu, 18 Jun 2020 06:34:21 +0000 (09:34 +0300)]
Fixed multiple definition

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 17 Jun 2020 20:16:11 +0000 (22:16 +0200)]
Merge branch 'PHP-7.4'

4 years agoUse sha256 as digest algorithm in certificate generator
Nikita Popov [Wed, 17 Jun 2020 20:08:54 +0000 (22:08 +0200)]
Use sha256 as digest algorithm in certificate generator

This makes the generated certificates compatible with security
level 2, which is apparently the default on Ubuntu 20.04.

Unfortunately this does not fix all tests, because some are using
pre-generated certificates.

4 years agoRemove unneeded --disable-inline-optimization build parameter
Alex Dowad [Wed, 27 May 2020 06:12:45 +0000 (08:12 +0200)]
Remove unneeded --disable-inline-optimization build parameter

In 1999, inline optimization was turned off by default. The commit log indicates this was
done because GCC was running out of memory on some hosts when building the Zend executor.
In 2003, inline optimization was re-enabled by default, but a build option was added to
turn it off if one runs out of memory when building.

Computing hardware has come a long way since 2003 and I doubt that anyone is running out
of memory when building PHP now.

Interestingly, this code set an unused variable called `INLINE_CFLAGS`. It actually
disabled inline optimization by adding -O0 to the build command, not using `INLINE_CFLAGS`.

Just to see how much memory GCC/Make are using when building PHP, I tried building with
successively higher values of `ulimit -v` until it succeeded. Interestingly, while most
of the codebase can be built with about 400MB of memory, ext/fileinfo/libmagic/apprentice.c
requires 1.2GB, doubtless because it includes ext/fileinfo/data_file.c, which is more
than 350,000 lines long. That is with GCC 7.5.0.

Most users get PHP as a binary package anyways, so the question is, are *packagers*
of PHP trying to build on machines with just 1GB RAM? And would they want to package
a PHP interpreter built with *no optimizations*? I can't imagine either being true.

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 17 Jun 2020 15:14:05 +0000 (17:14 +0200)]
Merge branch 'PHP-7.4'

4 years agoSuppress zend signals check in two readline tests
Nikita Popov [Wed, 17 Jun 2020 15:13:01 +0000 (17:13 +0200)]
Suppress zend signals check in two readline tests

Installing a callback handler may cause libedit to register new
signals during the request.

4 years agoConvert resources to objects in ext/zlib
Máté Kocsis [Wed, 17 Jun 2020 14:45:57 +0000 (16:45 +0200)]
Convert resources to objects in ext/zlib

Closes GH-5680

4 years agoImprove error messages of ext/zlib
Máté Kocsis [Wed, 17 Jun 2020 14:40:46 +0000 (16:40 +0200)]
Improve error messages of ext/zlib

4 years agoFix #63575: Root elements are not properly cloned
Christoph M. Becker [Thu, 23 Apr 2020 14:16:58 +0000 (16:16 +0200)]
Fix #63575: Root elements are not properly cloned

Cloning of root elements has to preserve that property, so they require
some special treatment.

4 years agoUse zend_is_constructor()
moliata [Wed, 17 Jun 2020 14:04:52 +0000 (17:04 +0300)]
Use zend_is_constructor()

4 years agoFix typos
Christoph M. Becker [Wed, 17 Jun 2020 14:45:12 +0000 (16:45 +0200)]
Fix typos

4 years agoAdd ZVAL_OBJ_COPY macro
Nikita Popov [Wed, 17 Jun 2020 10:34:04 +0000 (12:34 +0200)]
Add ZVAL_OBJ_COPY macro

For the common ZVAL_OBJ + GC_ADDREF pattern.
This mirrors the existing ZVAL_STR_COPY API.

4 years agoConvert CURL resources to objects
Máté Kocsis [Wed, 17 Jun 2020 14:05:55 +0000 (16:05 +0200)]
Convert CURL resources to objects

Closes GH-5402

Co-authored-by: Nikita Popov <nikita.ppv@gmail.com>
4 years agoUpdate CREDITS
Sara Golemon [Wed, 17 Jun 2020 13:03:52 +0000 (13:03 +0000)]
Update CREDITS

4 years agoImproved JIT for SEPARATE_ARRAY
Dmitry Stogov [Wed, 17 Jun 2020 11:45:25 +0000 (14:45 +0300)]
Improved JIT for SEPARATE_ARRAY

4 years agoTracing JIT support for PHP references in ASSIGN instruction
Dmitry Stogov [Wed, 17 Jun 2020 09:24:51 +0000 (12:24 +0300)]
Tracing JIT support for PHP references in ASSIGN instruction

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 17 Jun 2020 07:35:19 +0000 (09:35 +0200)]
Merge branch 'PHP-7.4'

4 years agoAdd mbregex skipif
Nikita Popov [Wed, 17 Jun 2020 07:35:02 +0000 (09:35 +0200)]
Add mbregex skipif

4 years agocleanup
Dmitry Stogov [Wed, 17 Jun 2020 07:32:53 +0000 (10:32 +0300)]
cleanup

4 years agoUse ZEND_UNREACHABLE() instead of ZEND_ASSERT(0)
Christoph M. Becker [Tue, 16 Jun 2020 14:29:05 +0000 (16:29 +0200)]
Use ZEND_UNREACHABLE() instead of ZEND_ASSERT(0)

Instead of marking unreachable code with `ZEND_ASSERT(0)`, we introduce
`ZEND_UNREACHABLE()`, so that MSVC which does not consider `assert(0)`
to mark unreachable code does no longer trigger C4715[1] warnings in
debug builds.  This may be useful for other compilers as well.

[1] <https://docs.microsoft.com/de-de/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4715?view=vs-2019>

4 years agoMerge exit points
Dmitry Stogov [Tue, 16 Jun 2020 16:20:08 +0000 (19:20 +0300)]
Merge exit points

4 years agoEliminate a dead check
Dmitry Stogov [Tue, 16 Jun 2020 16:05:35 +0000 (19:05 +0300)]
Eliminate a dead check

4 years agoTracing JIT support for PHP references in array related instructions
Dmitry Stogov [Tue, 16 Jun 2020 14:59:04 +0000 (17:59 +0300)]
Tracing JIT support for PHP references in array related instructions

4 years agoConvert resource to object in Sysvshm extension
Máté Kocsis [Tue, 16 Jun 2020 14:36:11 +0000 (16:36 +0200)]
Convert resource to object in Sysvshm extension

Closes GH-5499

4 years agoFR #79344: xmlwriter_write_attribute_ns: $prefix should be nullable
Christoph M. Becker [Tue, 16 Jun 2020 12:08:55 +0000 (14:08 +0200)]
FR #79344: xmlwriter_write_attribute_ns: $prefix should be nullable

The `$prefix` parameter of `xmlwriter_write_element_ns()` and
`xmlwriter_start_element_ns()` is nullable, what allows these functions
to be used instead of their non NS variants.  Consequently, we make the
`$prefix` parameter of `xmlwriter_write_attribute_ns()` and
`xmlwriter_start_attribute_ns()` nullable as well.

4 years agoRemove debug code from usleep()
Nikita Popov [Tue, 16 Jun 2020 12:51:58 +0000 (14:51 +0200)]
Remove debug code from usleep()

This was added to debug CI failures, but ultimately didn't help
understand the macos timing issues. Drop it now so it's not
forgotten...

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Tue, 16 Jun 2020 12:32:33 +0000 (14:32 +0200)]
Merge branch 'PHP-7.4'

4 years agoFix non-default syntax in mb_ereg_search()
Nikita Popov [Tue, 16 Jun 2020 12:31:29 +0000 (14:31 +0200)]
Fix non-default syntax in mb_ereg_search()

4 years agoUse "lea" to add/sub register with constant
Dmitry Stogov [Tue, 16 Jun 2020 11:04:05 +0000 (14:04 +0300)]
Use "lea" to add/sub register with constant

4 years agoImproved JIT for ZVAL_COPY_DEREF
Dmitry Stogov [Tue, 16 Jun 2020 10:24:28 +0000 (13:24 +0300)]
Improved JIT for ZVAL_COPY_DEREF

4 years agoOptimize parallel test runner startup
Nikita Popov [Tue, 16 Jun 2020 09:39:03 +0000 (11:39 +0200)]
Optimize parallel test runner startup

Don't connect to each worker individually: First spawn all processes
and then establish connections in any order.

This avoids a ~1s wait when running on many cores.

4 years agoImplements an openpty wrapper for solaris based systems
David Carlier [Mon, 15 Jun 2020 08:53:30 +0000 (09:53 +0100)]
Implements an openpty wrapper for solaris based systems

This is only used by proc_open pty support, and as such declared
directly there.

4 years agoFix JIT build on solaris/illumos
David Carlier [Sat, 13 Jun 2020 22:18:54 +0000 (23:18 +0100)]
Fix JIT build on solaris/illumos

thr_self to detect the proper thread identifier but all
related typedef'd types conflict with the vtune part.

4 years agoFix printf type
Nikita Popov [Tue, 16 Jun 2020 08:57:29 +0000 (10:57 +0200)]
Fix printf type

4 years agoMade sure zpp is always called and refactored some existing zpp calls.
Jens de Nies [Sat, 13 Jun 2020 15:35:19 +0000 (17:35 +0200)]
Made sure zpp is always called and refactored some existing zpp calls.

Closes GH-5714

4 years agoFixed some oci8 tests.
Jens de Nies [Sat, 13 Jun 2020 23:37:59 +0000 (01:37 +0200)]
Fixed some oci8 tests.

Closes GH-5716

4 years agoAdded JIT debug flag to dump the size of generated code (opcache.jit_debug=0x200)
Dmitry Stogov [Tue, 16 Jun 2020 08:27:34 +0000 (11:27 +0300)]
Added JIT debug flag to dump the size of generated code (opcache.jit_debug=0x200)

4 years agoFix typo
Fabien Villepinte [Mon, 15 Jun 2020 19:32:01 +0000 (21:32 +0200)]
Fix typo

4 years agoAdded note
Dmitry Stogov [Mon, 15 Jun 2020 14:21:32 +0000 (17:21 +0300)]
Added note

4 years agoFixed JIT
Dmitry Stogov [Mon, 15 Jun 2020 12:35:02 +0000 (15:35 +0300)]
Fixed JIT

4 years agoChange GC_COLLECTABLE flag into GC_NOT_COLLECTABLE to simplify GC_MAY_LEAK() check
Dmitry Stogov [Mon, 15 Jun 2020 11:26:22 +0000 (14:26 +0300)]
Change GC_COLLECTABLE flag into GC_NOT_COLLECTABLE to simplify GC_MAY_LEAK() check

4 years agoFETCH_FIM_R/IS JIT improvement
Dmitry Stogov [Mon, 15 Jun 2020 09:15:56 +0000 (12:15 +0300)]
FETCH_FIM_R/IS JIT improvement

4 years agoFix typo in file cache job
Nikita Popov [Mon, 15 Jun 2020 08:13:04 +0000 (10:13 +0200)]
Fix typo in file cache job

4 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Sat, 13 Jun 2020 16:33:17 +0000 (18:33 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79687: Sony picture - PHP Warning - Make, Model, MakerNotes

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Sat, 13 Jun 2020 16:32:01 +0000 (18:32 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79687: Sony picture - PHP Warning - Make, Model, MakerNotes

4 years agoFix #79687: Sony picture - PHP Warning - Make, Model, MakerNotes
Christoph M. Becker [Sat, 13 Jun 2020 12:09:28 +0000 (14:09 +0200)]
Fix #79687: Sony picture - PHP Warning - Make, Model, MakerNotes

Even if the length of a maker note does not match our expectations
(either because the maker note is corrupted, or because our
expectations do not quite match reality), there is no need to let
parsing fail; we can still go on parsing the other meta information.

4 years agoFix ZPP of OCI_Lob::free
Máté Kocsis [Sat, 13 Jun 2020 08:53:49 +0000 (10:53 +0200)]
Fix ZPP of OCI_Lob::free

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 12 Jun 2020 13:41:20 +0000 (15:41 +0200)]
Merge branch 'PHP-7.4'

4 years agoDrop freetype from i386
Nikita Popov [Fri, 12 Jun 2020 13:12:15 +0000 (15:12 +0200)]
Drop freetype from i386

For some reason this seems to pick up the amd64 library (though
we do install the i386 one).

4 years agoUse shared setup.yml on azure
Nikita Popov [Fri, 12 Jun 2020 13:09:43 +0000 (15:09 +0200)]
Use shared setup.yml on azure

Make sure things stay synchronized between different x64 jobs.

4 years agoUse GC stack in nested data removal
Nikita Popov [Fri, 12 Jun 2020 12:57:08 +0000 (14:57 +0200)]
Use GC stack in nested data removal

We should be doing this anyway to prevent stack overflow, but on
master this is important for an additional reason: The temporary
GC buffer provided for get_gc handlers may get reused if the scan
is performed recursively instead of indirected via the GC stack.

This fixes oss-fuzz #23350.

4 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 12 Jun 2020 12:09:16 +0000 (14:09 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79676: imagescale adds black border with IMG_BICUBIC

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

* PHP-7.3:
  Fix #79676: imagescale adds black border with IMG_BICUBIC