summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update versions for PHP 7.4.0RC3php-7.4.0RC3Derick Rethans2019-10-012-3/+3
|
* Update NEWS for PHP 7.4.0RC3Derick Rethans2019-10-011-1/+1
|
* Fix AppVeyor setup wrt. changed OpenSSL default config pathChristoph M. Becker2019-10-011-3/+8
|
* Update regarding changed OpenSSL default config pathChristoph M. Becker2019-10-013-3/+10
|
* Fix borked SKIPIFsFabien Villepinte2019-09-3042-57/+74
|
* Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-09-302-0/+19
|\
| * Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-09-303-0/+21
| |\
| | * Fixed bug #78612Nikita Popov2019-09-303-0/+21
| | |
* | | Skip tests for old versions instead of marking them XFAILChristoph M. Becker2019-09-302-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | According to commit 0eea9a6[1], these tests fail with old Oniguruma versions; we are not sure which version of Oniguruma is required to let them pass, but at least 6.9.3 is sufficient. [1] <http://git.php.net/?p=php-src.git;a=commit;h=0eea9a642941ab5d4c612f8092f186977afbb73e>
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2019-09-303-20/+32
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #78609: mb_check_encoding() no longer supports stringable objects
| * | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-09-303-20/+30
| |\ \ | | |/ | | | | | | | | | * PHP-7.2: Fix #78609: mb_check_encoding() no longer supports stringable objects
| | * Fix #78609: mb_check_encoding() no longer supports stringable objectsChristoph M. Becker2019-09-303-20/+30
| | | | | | | | | | | | We apply type juggling for other types than array.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-09-306-4/+16
|\ \ \ | |/ /
| * | Fix #78413: php-fpm request_terminate_timeout does not take effect after ↵Sergei Turchanov2019-09-308-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fastcgi_finish_request To retain legacy behavior I decided to add an option to control request termination logic. If request_terminate_timeout_track_finished is set, then request will be tracked for time limits even after fastcgi_finish_request was called. This patch depends on the fix provided in BUG 78469 (otherwise php-fpm workers listening on named pipes on Windows will be erroneously terminated) (PR #4636)
* | | Fixed bug #78604Nikita Popov2019-09-304-1/+31
| | | | | | | | | | | | <?php followed by EOF is valid since PHP 7.4.
* | | Add max_depth option to unserialize()Nikita Popov2019-09-3010-16/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a max_depth option to unserialize and an unserialize_max_depth ini setting, which can be used to control the depth limit. The default value is 4096. This option is intended to prevent stack overflows during the unserialization of deeply nested structures. This fixes bug #78549 and addresses oss-fuzz #17581, #17589, #17664, and #17788.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2019-09-291-0/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix build for libzip < 0.11.2
| * | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-09-291-0/+2
| |\ \ | | |/ | | | | | | | | | * PHP-7.2: Fix build for libzip < 0.11.2
| | * Fix build for libzip < 0.11.2Christoph M. Becker2019-09-291-0/+2
| | | | | | | | | | | | | | | We must not define method entries, if the actual method definitions or the arginfo structures are not defined.
* | | Reduce memory used by token_get_all()Tyson Andre2019-09-281-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Around a quarter of all strings in array tokens would have a string that's one character long (e.g. ` `, `\`, `1`) For parsing a large number of php files, The memory increase dropped from 378374248 to 369535688 (2.5%) Closes GH-4753.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-09-282-2/+24
|\ \ \ | |/ /
| * | Don't throw warnings during heredoc scan-aheadNikita Popov2019-09-284-181/+207
| | | | | | | | | | | | Otherwise these warnings will turn up twice (or more...)
* | | Fix wrong function name in SKIPIFFabien Villepinte2019-09-273-3/+3
| | |
* | | Fix test regarding Reflection::export() deprecationChristoph M. Becker2019-09-271-18/+9
| | |
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2019-09-2711-20/+20
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix SKIPIF in ext/mysqli
| * | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-09-2711-20/+20
| |\ \ | | |/ | | | | | | | | | * PHP-7.2: Fix SKIPIF in ext/mysqli
| | * Fix SKIPIF in ext/mysqliFabien Villepinte2019-09-2711-20/+20
| | |
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2019-09-271-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix skipif.inc
| * | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-09-271-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-7.2: Fix skipif.inc
| | * Fix skipif.incChristoph M. Becker2019-09-271-1/+1
| | |
* | | XFAIL sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phptNikita Popov2019-09-271-0/+2
| | | | | | | | | | | | | | | This is supposed to be addressed by GH-4007, but that seems stalled for now.
* | | Enable ubsan stack trace printing on community jobNikita Popov2019-09-271-0/+2
| | | | | | | | | | | | | | | Try to do this using "variables" -- apparently these get uppercased and are made available as environment variables.
* | | Fix file clash in rename_variation.phptNikita Popov2019-09-271-2/+2
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Handle resources used as array keys consistentlyNikita Popov2019-09-2710-41/+147
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-09-262-0/+26
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-09-262-0/+26
| |\ \ | | |/
| | * Fix memory leak with ** on array operandsNikita Popov2019-09-262-0/+26
| | |
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-09-262-1/+5
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-09-262-1/+5
| |\ \ | | |/
| | * Fix null-pointer deref in if stmt printingNikita Popov2019-09-262-1/+5
| | | | | | | | | | | | Fixes OSS-Fuzz #17721.
* | | Fixed GOTO VMDmitry Stogov2019-09-262-9/+9
| | |
* | | Increase serialize_lock while decoding sessionNikita Popov2019-09-252-7/+13
| | | | | | | | | | | | | | | Avoid leaking state between Serializable::unserialize() and session_decode().
* | | Remove xfail on bug70219.phptNikita Popov2019-09-251-14/+3
| | | | | | | | | | | | | | | Looks like this is working as it's supposed to, the test expectation just needs to be adjusted.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-09-251-3/+3
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-09-251-3/+3
| |\ \ | | |/
| | * Fix hash key length in umsg_parse_format()Jinesh Patel2019-09-251-3/+3
| | | | | | | | | | | | | | | Fix array length passed to zend_hash_str_find_ptr() casting from UChar array to char array requires mul by sizeof(UChar).
* | | Fix GCOV not working for PHP-7.4 and master branchesGerard Roche2019-09-252-59/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Use nproc instead of hardcoded numberGabriel Caruso2019-09-252-2/+2
| | |
* | | Fixed bug #78589Nikita Popov2019-09-242-2/+19
| | | | | | | | | | | | | | | Don't protect GC while destroying zvals. We may need to add GC roots during this phase.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2019-09-240-0/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Update NEWS