1
0
mirror of https://github.com/php/php-src.git synced 2026-04-22 07:28:09 +02:00
Commit Graph

127476 Commits

Author SHA1 Message Date
Remi Collet f597e4c3cc Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  add missing CVEs
2022-09-30 09:18:24 +02:00
Remi Collet b0cc5ed91f add missing CVEs 2022-09-30 09:18:03 +02:00
David Carlier 2440d29efd Merge branch 'PHP-8.0' into PHP-8.1 2022-09-29 20:40:33 +01:00
David Carlier 257f108924 fix php_init_crypt_r/php_shutdown_crypt_r signatures warning. 2022-09-29 20:40:16 +01:00
Jakub Zelenka 6d005c2cec Merge branch 'PHP-8.0' into PHP-8.1 2022-09-29 15:30:27 +01:00
Jakub Zelenka 8e1cef4341 Do not check X-Powered-By header in FPM tester if expose_php off
Closes GH-9508
2022-09-29 15:27:33 +01:00
Jakub Zelenka 1ed4303957 Improve CS in FPM Tester Response 2022-09-29 15:24:00 +01:00
Ilija Tovilo d85bdfd108 [skip ci] Don't generate junit.xml in libmysqlclient for now
We're not uploading it anyway, and it makes the verify generated files
step fail.
2022-09-29 15:02:25 +02:00
Dmitry Stogov aa179bf3dd Force exit to VM 2022-09-29 15:27:38 +03:00
Dmitry Stogov f7d0a3e0e0 Keep original EG(jit_trace_num) value around __autoload() 2022-09-29 15:00:52 +03:00
Ilija Tovilo 2b8ac216b0 [skip ci] Fix libmysqlclient build for >=PHP-8.2
Inputs are implicitly coerced to strings...
2022-09-29 13:50:28 +02:00
Ilija Tovilo a3b5861ccc Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  [skip ci ] Rename matrix-include output on old branches
2022-09-29 13:08:01 +02:00
Ilija Tovilo f3dba7e642 [skip ci ] Rename matrix-include output on old branches
Otherwise we have a discrepancy of the output name between
master:nightly.yml and branch:nightly_matrix.php.
2022-09-29 13:06:43 +02:00
Derick Rethans 0360e62cae Updated to version 2022.4 (2022d) 2022-09-29 11:52:08 +01:00
Derick Rethans 0841b5af33 Empty merge 2022-09-29 11:52:08 +01:00
Derick Rethans d16b5d3803 Updated to version 2022.4 (2022d) 2022-09-29 11:52:06 +01:00
Ilija Tovilo 98f7126cc3 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Skip Symfony preloading for PHP-8.0
2022-09-29 12:22:19 +02:00
Ilija Tovilo f49709a544 Skip Symfony preloading for PHP-8.0 2022-09-29 12:20:53 +02:00
Christoph M. Becker 9caa71f94f Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Revert unintended test expectation change
2022-09-28 12:13:39 +02:00
Athos Ribeiro e6a822d437 Revert unintended test expectation change
Commit fbe3059 included an unintended change to the test which checks if
dns_get_record populates its additional parameter. This patch reverts
such change.

The issue was not detected by the CIs because their tests run in
the --offline mode, and the test in question needs internet connection.

Closes GH-9625.
2022-09-28 12:12:21 +02:00
Derick Rethans 551a0e1e51 Merge branch 'PHP-8.0' into PHP-8.1 2022-09-28 10:15:11 +01:00
Derick Rethans 856a7ac4b7 Merge branch 'PHP-7.4' into PHP-8.0 2022-09-28 10:15:04 +01:00
Derick Rethans ad8d00b47b Prepare for next release 2022-09-28 10:14:50 +01:00
Derick Rethans 42fea44c13 Merge branch 'PHP-8.0' into PHP-8.1 2022-09-28 10:08:00 +01:00
Derick Rethans 7ca5d91b70 Merge branch 'PHP-7.4' into PHP-8.0 2022-09-28 10:07:51 +01:00
Derick Rethans 0b4e153394 Prepare for 7.4.32 2022-09-28 10:07:43 +01:00
Ilija Tovilo a79e0ee57c [skip ci] Attempt to fix libmysqlclient build for >=PHP-8.2 2022-09-27 23:54:36 +02:00
Ilija Tovilo 85641ae05a Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  And also update the branch ref...
2022-09-27 23:39:08 +02:00
Ilija Tovilo f518ae50aa And also update the branch ref... 2022-09-27 23:38:22 +02:00
Ilija Tovilo 1d4620a6fb Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix PHP-8.0 skipping for community steps
2022-09-27 23:36:35 +02:00
Ilija Tovilo 03a48b1209 Fix PHP-8.0 skipping for community steps
github.ref refers to master here, even for other branches.
2022-09-27 23:36:09 +02:00
Ilija Tovilo 93e509fd8c Skip some OCI tests with repeat 2022-09-27 23:32:15 +02:00
Ilija Tovilo 958955e62a Fix PHP-8.0 skipping for some jobs 2022-09-27 23:28:59 +02:00
Ilija Tovilo 0aa5adb143 Fix invalid label before }
Will be fixed in C23 :)

Closes GH-9624
2022-09-27 23:27:17 +02:00
Dmitry Stogov 2568db287d Wrap JIT compiler with zend_try to recover in case of memory overflow 2022-09-27 22:28:16 +03:00
Christoph M. Becker d981def074 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix new bug81726.phpt for PHP 8.0
2022-09-27 18:45:54 +02:00
Christoph M. Becker 809176dab0 Fix new bug81726.phpt for PHP 8.0
The error message has slightly changed, so we adapt our expectations.
2022-09-27 18:40:02 +02:00
Jakub Zelenka 54cb2cdcd3 Merge branch 'PHP-8.0' into PHP-8.1 2022-09-27 17:31:08 +01:00
Jakub Zelenka 1e8fa6607d Rework FPM tests logging for better debugging 2022-09-27 17:27:43 +01:00
Christoph M. Becker 4552f62911 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix regression introduced by fixing bug 81726
2022-09-27 18:24:07 +02:00
Christoph M. Becker 3477499d26 Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Fix regression introduced by fixing bug 81726
2022-09-27 18:22:57 +02:00
Christoph M. Becker 432bf196d5 Fix regression introduced by fixing bug 81726
When a tar phar is created, `phar_open_from_fp()` is also called, but
since the file has just been created, none of the format checks can
succeed, so we continue to loop, but must not check again for the
format.  Therefore, we bring back the old `test` variable.

Closes GH-9620.
2022-09-27 18:21:32 +02:00
George Peter Banyard 72cb47338e Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix GH-9583: session_create_id() fails with user defined save handler that doesn't have a validateId() method
2022-09-27 15:54:37 +01:00
George Peter Banyard 8b115254c0 Fix GH-9583: session_create_id() fails with user defined save handler that doesn't have a validateId() method 2022-09-27 15:52:21 +01:00
Derick Rethans cfee252a95 Merge branch 'PHP-8.0' into PHP-8.1 2022-09-27 14:11:31 +01:00
Derick Rethans def8c8d174 Merge branch 'PHP-7.4' into PHP-8.0 2022-09-27 14:11:14 +01:00
Derick Rethans 6f586ef90f Add CVEs 2022-09-27 14:10:02 +01:00
Ilija Tovilo ebe4467a42 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Switch to sanitize CFLAGS for community build
2022-09-26 23:39:25 +02:00
Ilija Tovilo 12afd0cba8 Switch to sanitize CFLAGS for community build
PHP-8.0 doesn't support those flags, we can switch once we drop that
build.
2022-09-26 23:39:03 +02:00
Dmitry Stogov a4a9a69edb Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix memory leak
2022-09-26 12:02:31 +03:00