summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Partial fixed bug #79649 (Altering disable_functions from module ↵PHP-7.4.8Derick Rethans2020-07-091-11/+9
| | | | | | init corrupts memory)" This reverts commit a297c09da5ad355d53a8e8ea72655a06d15b7bc7.
* Update NEWS for PHP 7.4.8Derick Rethans2020-07-071-1/+1
|
* Turn into markerDerick Rethans2020-07-071-1/+1
|
* Update NEWS for PHP 7.4.8RC1Derick Rethans2020-06-231-1/+1
|
* SplHeap: Avoid memcpy on overlapping pointerAnatol Belski2020-06-211-1/+5
| | | | | | | | Check if data would overlap and also add an assert. Previous implementations didn't have this issue, as the direct assignment was used. Signed-off-by: Anatol Belski <ab@php.net>
* Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-06-192-0/+20
|\ | | | | | | | | * PHP-7.3: Fixed bug #79570
| * Fixed bug #79570Böszörményi Zoltán2020-06-192-0/+20
| | | | | | | | | | | | | | Use the same logic for getgrgid_r, getpwnam_r and getpwuid_r as for getgrnam_r in #75696 Closes GH-5740.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-06-193-2/+51
|\ \ | |/
| * Fixed bug #79710Nikita Popov2020-06-193-2/+51
| | | | | | | | Make sure we don't use zresource after the stream has been destroyed.
* | Generate temporary config file when generating certificatesNikita Popov2020-06-192-37/+47
| | | | | | | | | | The putenv trick doesn't work on ZTS Windows, so generate a new openssl config every time.
* | check for broken libzip versionsRemi Collet2020-06-181-1/+1
| | | | | | | | Closes GH-5738.
* | Update libzip on macosNikita Popov2020-06-181-1/+4
| | | | | | | | | | | | We need libzip 1.7.1, because libzip 1.7.0 is broken. Closes GH-5737.
* | Fix race condition in FPM testsNikita Popov2020-06-182-2/+2
| | | | | | | | | | The newly de-XFAILed tests have a race condition. Make sure we terminate only after expecting all the log lines.
* | Un-XFAIL FPM testsNikita Popov2020-06-182-4/+0
| | | | | | | | | | | | 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.
* | Downgrade server security level in security level testNikita Popov2020-06-181-1/+4
| | | | | | | | | | We want to test the client side error here, so make sure the server side can start up successfully.
* | Add SubjectAltName support to certificate generatorNikita Popov2020-06-187-77/+71
| | | | | | | | | | | | | | 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.
* | Add missing NEWS entryChristoph M. Becker2020-06-181-0/+3
| | | | | | | | I forgot to update NEWS after merging back then.
* | Generate certificates for bug69215.phptNikita Popov2020-06-184-86/+22
| |
* | Generate certificate for bug68920.phptNikita Popov2020-06-181-1/+12
| | | | | | | | | | The certificate really doesn't matter here, but it still needs to comply with security level...
* | Generate certificate for bug65729.pemNikita Popov2020-06-182-35/+18
| | | | | | | | Make this test pass under security level 2.
* | Revert "Fix tests regarding OpenSSL security_level"Nikita Popov2020-06-183-36/+18
| | | | | | | | This reverts commit b281493503401a2b5c45c11fcd0498d8448998c2.
* | Don't generate spurious warning is security_level not supportedNikita Popov2020-06-181-5/+1
| | | | | | | | | | People should not have to worry about the used openssl version when downgrading security_level.
* | Fix tests regarding OpenSSL security_levelChristoph M. Becker2020-06-183-18/+36
| | | | | | | | | | | | 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.
* | Migrate some tests to certificate generatorNikita Popov2020-06-189-41/+106
| | | | | | | | | | | | | | | | | | 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.
* | Don't use ternary in ini defaultNikita Popov2020-06-181-1/+7
| | | | | | | | | | 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.
* | Remove bug48187.phptNikita Popov2020-06-181-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Use sha256 as digest algorithm in certificate generatorNikita Popov2020-06-171-1/+2
| | | | | | | | | | | | | | | | 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.
* | Suppress zend signals check in two readline testsNikita Popov2020-06-174-2/+5
| | | | | | | | | | Installing a callback handler may cause libedit to register new signals during the request.
* | Add mbregex skipifNikita Popov2020-06-171-0/+5
| |
* | Fix non-default syntax in mb_ereg_search()Nikita Popov2020-06-162-5/+16
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-06-134-3/+36
|\ \ | |/ | | | | | | * PHP-7.3: Fix #79687: Sony picture - PHP Warning - Make, Model, MakerNotes
| * Fix #79687: Sony picture - PHP Warning - Make, Model, MakerNotesChristoph M. Becker2020-06-134-3/+36
| | | | | | | | | | | | | | 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.
* | Drop freetype from i386Nikita Popov2020-06-122-2/+0
| | | | | | | | | | For some reason this seems to pick up the amd64 library (though we do install the i386 one).
* | Use shared setup.yml on azureNikita Popov2020-06-123-13/+11
| | | | | | | | Make sure things stay synchronized between different x64 jobs.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-06-123-4/+38
|\ \ | |/ | | | | | | * PHP-7.3: Fix #79676: imagescale adds black border with IMG_BICUBIC
| * Fix #79676: imagescale adds black border with IMG_BICUBICChristoph M. Becker2020-06-123-4/+38
| | | | | | | | | | We have to loop over all image pixels to avoid the black border. This is also done in external libgd in `_gdScaleOneAxis` and `_gdScalePass`.
* | Suppress deprecation warning in sockets.cNikita Popov2020-06-121-0/+8
| | | | | | | | This one was quite a journey...
* | sqlite3: Fix possible use after freeAnatol Belski2020-06-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exception should be thrown before the db handle is destroyed. The backtrace excerpt ==26628== Invalid read of size 4 ==26628== at 0x53C49E3: sqlite3_errmsg (in /usr/lib64/libsqlite3.so.0.8.6) ==26628== by 0x38C4E9: zim_sqlite3_open (sqlite3.c:142) ==26628== by 0x8977BF: ZEND_DO_FCALL_SPEC_RETVAL_UNUSED_HANDLER (zend_vm_execute.h:1618) ==26628== by 0x8F801E: execute_ex (zend_vm_execute.h:53824) ==26628== by 0x8FC0BB: zend_execute (zend_vm_execute.h:57920) ==26628== by 0x828F54: zend_execute_scripts (zend.c:1672) ==26628== by 0x793C2C: php_execute_script (main.c:2621) ==26628== by 0x8FEA44: do_cli (php_cli.c:964) ==26628== by 0x8FF9DC: main (php_cli.c:1359) Signed-off-by: Anatol Belski <ab@php.net>
* | Update NEWS wrt. bug 79681Christoph M. Becker2020-06-101-0/+4
| |
* | Fix #79681: mime_content_type/finfo returning incorrect mimetypeChristoph M. Becker2020-06-102-772/+888
| | | | | | | | | | | | We backport the respective fix for MP3s[1]. [1] <https://github.com/file/file/commit/5a55569a35eff686d4b7400b219d380f7c622890>
* | Explicitly start postgres on azureNikita Popov2020-06-101-0/+1
| | | | | | | | Seems to be necessary now...
* | Also support absolute Windows filenamesChristoph M. Becker2020-06-101-3/+3
| | | | | | | | | | | | | | The output normalization of bless_tests.php only detected absolute Unix filenames; we extend this for absolute Windows filenames, regardless of the platform we're running on (tests may have been run on Windows, but bless_tests.php may be run from WSL or a Linux VM, for instance).
* | Partial fixed bug #79649 (Altering disable_functions from module init ↵Xinchen Hui2020-06-102-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | corrupts memory) In module startup stage, we should not initiliaze EG(modified_ini_directives) as it use zend MM, the zend MM will be restart at the end of modules startup stage, by say "partial", because this issue still exists if altering ZEND_USER inis, we should add a zend_ini_deactive at the end of modules startup stage, but it brings some new cost, and I think no one would do things like that
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-06-092-1/+2
|\ \ | |/ | | | | | | * PHP-7.3: Fix possibly unsupported timercmp() usage
| * Fix possibly unsupported timercmp() usageChristoph M. Becker2020-06-092-1/+2
| | | | | | | | | | | | | | | | The `timercmp()` manpage[1] points out that some systems have a broken implementation which does not support `>=`. This is definitely the case for the Windows SDK, which only supports `<` and `>`. [1] <https://linux.die.net/man/3/timercmp>
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-06-093-2/+21
|\ \ | |/ | | | | | | * PHP-7.3: Fix #62890: default_socket_timeout=-1 causes connection to timeout
| * Fix #62890: default_socket_timeout=-1 causes connection to timeoutChristoph M. Becker2020-06-093-2/+21
| | | | | | | | | | | | While unencrypted connections ignore negative timeouts, SSL/TLS connections did not special case that, and so always failed due to timeout.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-06-090-0/+0
|\ \ | |/ | | | | | | * PHP-7.3: [ci skip] Update NEWS
| * [ci skip] Update NEWSChristoph M. Becker2020-06-091-1/+1
| |
* | Fixed bug #79683Nikita Popov2020-06-093-0/+39
| | | | | | | | | | | | | | Reset fake_scope during __toString() call. I'll check if we can solve this more globally in master, by resetting fake_scope in zend_call_function.
View Lorry Controller Status