1
0
mirror of https://github.com/php/php-src.git synced 2026-04-19 22:11:12 +02:00
Commit Graph

129983 Commits

Author SHA1 Message Date
Remi Collet
5b1ba48065 Merge branch 'PHP-8.2'
* PHP-8.2:
  add missing CVEs
  add missing CVEs
2022-09-30 09:19:39 +02:00
Remi Collet
662c149b01 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  add missing CVEs
  add missing CVEs
2022-09-30 09:19:21 +02:00
Remi Collet
12c3636d01 add missing CVEs 2022-09-30 09:19:03 +02:00
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
615b8006c4 socket module add SO_ATTACH_REUSEPORT_CPBF for Linux.
to be used in conjunction with SO_REUSPORT, giving a greater control
over how we bind a socket instead of the round robin workflow, we do
 instead attach to the processor id as :
- we assign the processor_id to A in the BPF filter.
- then returns A.

in other words, a more modern version of SO_INCOMING_CPU (ie can have a per
 worker notion we do not use here).
Closes #8062
2022-09-29 23:32:39 +01:00
David Carlier
e23076f527 Merge branch 'PHP-8.2' 2022-09-29 20:40:57 +01:00
David Carlier
ed1d41465a Merge branch 'PHP-8.1' into PHP-8.2 2022-09-29 20:40:45 +01: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
caaa79cf72 Merge branch 'PHP-8.2' 2022-09-29 15:32:41 +01:00
Jakub Zelenka
da9e9d0004 Merge branch 'PHP-8.1' into PHP-8.2 2022-09-29 15:31:23 +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
twosee
fc37a8262b Fix debug backtrace frameno (#8761) 2022-09-29 16:17:17 +02:00
Ilija Tovilo
e619af45fa Merge branch 'PHP-8.2'
* PHP-8.2:
  Replace reallocarray with safe_perealloc
2022-09-29 15:16:42 +02:00
Ilija Tovilo
138fd5b3c8 Replace reallocarray with safe_perealloc
Fixes GH-9581
2022-09-29 15:15:40 +02:00
Ilija Tovilo
9901d74e47 Merge branch 'PHP-8.2'
* PHP-8.2:
  [skip ci] Don't generate junit.xml in libmysqlclient for now
2022-09-29 15:03:15 +02:00
Ilija Tovilo
acccb39607 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Don't generate junit.xml in libmysqlclient for now
2022-09-29 15:03:00 +02: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
e69a3c3e6b Merge branch 'PHP-8.2'
* PHP-8.2:
  Force exit to VM
2022-09-29 15:28:28 +03:00
Dmitry Stogov
efcffc9d5f Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Force exit to VM
2022-09-29 15:28:23 +03:00
Dmitry Stogov
aa179bf3dd Force exit to VM 2022-09-29 15:27:38 +03:00
Ilija Tovilo
95763005d5 [skip ci] Fix MSAN configure flags for PHP-8.0 2022-09-29 14:09:51 +02:00
Dmitry Stogov
6bb0b705fc Merge branch 'PHP-8.2'
* PHP-8.2:
  Keep original EG(jit_trace_num) value around __autoload()
2022-09-29 15:01:50 +03:00
Dmitry Stogov
57a01e3a4a Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Keep original EG(jit_trace_num) value around __autoload()
2022-09-29 15:01:39 +03:00
Dmitry Stogov
f7d0a3e0e0 Keep original EG(jit_trace_num) value around __autoload() 2022-09-29 15:00:52 +03:00
Ilija Tovilo
2733c2c254 Merge branch 'PHP-8.2'
* PHP-8.2:
  [skip ci] Pass --no-progress flag in libmysqlclient test
2022-09-29 13:55:09 +02:00
Ilija Tovilo
28a40b257a [skip ci] Pass --no-progress flag in libmysqlclient test 2022-09-29 13:54:25 +02:00
Ilija Tovilo
a6a45b6986 Merge branch 'PHP-8.2'
* PHP-8.2:
  [skip ci] Fix libmysqlclient build for >=PHP-8.2
2022-09-29 13:51:43 +02:00
Ilija Tovilo
d644600ddd Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Fix libmysqlclient build for >=PHP-8.2
2022-09-29 13:51:30 +02: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
b65784af89 Merge branch 'PHP-8.2'
* PHP-8.2:
  [skip ci ] Rename matrix-include output on old branches
2022-09-29 13:09:15 +02:00
Ilija Tovilo
a5fdfc4fc0 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci ] Rename matrix-include output on old branches
  Updated to version 2022.4 (2022d)
  Updated to version 2022.4 (2022d)
2022-09-29 13:08:45 +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
dc985723c8 Updated to version 2022.4 (2022d) 2022-09-29 11:52:09 +01:00
Derick Rethans
0360e62cae Updated to version 2022.4 (2022d) 2022-09-29 11:52:08 +01:00
Derick Rethans
6171164237 Empty merge 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
60887365db Merge branch 'PHP-8.2'
* PHP-8.2:
  Skip Symfony preloading for PHP-8.0
2022-09-29 12:22:52 +02:00
Ilija Tovilo
d156b317da Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Skip Symfony preloading for PHP-8.0
2022-09-29 12:22:36 +02: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
4a8e35ceed Merge branch 'PHP-8.2'
* PHP-8.2:
  Revert unintended test expectation change
2022-09-28 12:15:06 +02:00
Christoph M. Becker
3d2d7d1000 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Revert unintended test expectation change
2022-09-28 12:14:39 +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