1
0
mirror of https://github.com/php/php-src.git synced 2026-04-10 01:23:53 +02:00
Commit Graph

130567 Commits

Author SHA1 Message Date
Derick Rethans
d6ac533f4f Merge branch 'PHP-8.2' 2022-11-30 15:58:12 +00:00
Derick Rethans
41fef8b849 Import timelib 2022.03 2022-11-30 15:58:02 +00:00
Derick Rethans
f9ef2db550 Merge branch 'PHP-8.2' 2022-11-30 15:56:01 +00:00
Derick Rethans
83b714d788 Merge branch 'PHP-8.1' into PHP-8.2 2022-11-30 15:55:46 +00:00
Derick Rethans
64f5f5333e Merge remote-tracking branch 'derickr/timelib-2021.18' into PHP-8.1 2022-11-30 15:53:52 +00:00
Derick Rethans
d021851171 Fixed GH-9699, GH-9866, and GH-9880 (problems with diff); and GH-9700 (greedy tzid parsing) 2022-11-30 15:47:43 +00:00
Derick Rethans
818b46acb0 Import timelib 2021.18 2022-11-30 15:42:11 +00:00
Christoph M. Becker
7402d90902 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix GH-9971: Incorrect NUMERIC value returned from PDO_Firebird
2022-11-30 12:13:36 +01:00
Christoph M. Becker
e29ca3688b Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix GH-9971: Incorrect NUMERIC value returned from PDO_Firebird
2022-11-30 12:13:11 +01:00
Christoph M. Becker
44377c3c70 Fix GH-9971: Incorrect NUMERIC value returned from PDO_Firebird
Dialect 1 databases store and transfer `NUMERIC(15,2)` values as
doubles, which we need to cater to in `firebird_stmt_get_col()` to
avoid `ZEND_ASSUME(0)` to ever be triggered, since that may result
in undefined behavior.

Since adding a regression test would require to create a dialect 1
database, we go without it.

Closes GH-10021.
2022-11-30 12:11:42 +01:00
Derick Rethans
ebde5d3c79 Updated to version 2022.7 (2022g) 2022-11-29 18:25:17 +00:00
Derick Rethans
ac1b232c02 Empty merge 2022-11-29 18:25:17 +00:00
Derick Rethans
e568f93422 Updated to version 2022.7 (2022g) 2022-11-29 18:25:16 +00:00
Derick Rethans
6f71697e65 Empty merge 2022-11-29 18:25:16 +00:00
Derick Rethans
bcc00304c7 Updated to version 2022.7 (2022g) 2022-11-29 18:25:15 +00:00
Jorg Adam Sowa
77ee92a50c Remove unnecessary usage of CONST_CS
Closes GH-9685.
2022-11-28 17:12:07 +01:00
Thomas PIRAS
289822d3ad Add a proper error message for ffi load
We call dlerror when a library failed to load properly.

Closes GH-9913.
2022-11-28 16:19:54 +01:00
Alex Dowad
0109aa62ec Simplify decoding filter for UTF-8
When decoding a 3-byte UTF-8 code unit, redundant checks for overlong
code unit and for illegal codepoints from U+D800-DFFF were included.
Both of these conditions are caught by the line which reads:

    if ((c2 & 0xC0) != 0x80 || (c == 0xF0 && c2 < 0x90) || (c == 0xF4 && c2 >= 0x90)) {

As such, there is no reason to check for the same error conditions again.

Likewise, when decoding a 4-byte UTF-8 code unit, there was a
redundant check for overlong code unit. That was already caught by the
line which reads:

    if ((c2 & 0xC0) != 0x80 || (c == 0xF0 && c2 < 0x90) || (c == 0xF4 && c2 >= 0x90)) {
2022-11-28 17:04:00 +02:00
Tim Düsterhus
50e32015ae Merge branch 'PHP-8.2'
* PHP-8.2:
  [ci skip] random: Trim trailing whitespace in randomizer.c
2022-11-27 19:11:32 +01:00
Tim Düsterhus
350883db06 [ci skip] random: Trim trailing whitespace in randomizer.c
To keep the diff cleaner for future changes, such as #9664.
2022-11-27 19:10:45 +01:00
Jakub Zelenka
eb83e0206c Merge branch 'PHP-8.2' 2022-11-25 14:08:17 +00:00
Jakub Zelenka
c8d8bf7c59 Merge branch 'PHP-8.1' into PHP-8.2 2022-11-25 14:07:41 +00:00
Jakub Zelenka
500b28ad04 Fix GH-10000: Test failures when OpenSSL compiled with no-dsa 2022-11-25 14:02:03 +00:00
Arnaud Le Blanc
1cba98ebe9 Merge branch 'PHP-8.2'
* PHP-8.2:
  [ci skip] NEWS
  [ci skip] NEWS
  Do not resolve constants on non-linked class during preloading (#9975)
2022-11-25 14:37:55 +01:00
Arnaud Le Blanc
772bb62526 [ci skip] NEWS 2022-11-25 14:37:43 +01:00
Arnaud Le Blanc
5563535e97 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [ci skip] NEWS
  Do not resolve constants on non-linked class during preloading (#9975)
2022-11-25 14:11:52 +01:00
Arnaud Le Blanc
4987e65a70 [ci skip] NEWS 2022-11-25 14:07:30 +01:00
Arnaud Le Blanc
91b3b58f71 Do not resolve constants on non-linked class during preloading (#9975)
Fixes GH-9968
2022-11-25 14:02:45 +01:00
Jakub Zelenka
d526773d20 Merge branch 'PHP-8.2' 2022-11-25 12:51:23 +00:00
Jakub Zelenka
c022ce92fb Merge branch 'PHP-8.1' into PHP-8.2 2022-11-25 12:50:38 +00:00
Jakub Zelenka
ce57221376 Fix GH-9064: PHP fails to build if openssl was built with no-ec 2022-11-25 12:49:12 +00:00
Jakub Zelenka
ce58ae5e79 Merge branch 'PHP-8.2' 2022-11-24 18:30:57 +00:00
Jakub Zelenka
3d90a24e93 Fix GH-9997: OpenSSL engine clean up segfault 2022-11-24 18:29:44 +00:00
Jakub Zelenka
b7c03d1bae Merge branch 'PHP-8.2' 2022-11-24 11:55:43 +00:00
Jakub Zelenka
3871ab2be6 Merge branch 'PHP-8.1' into PHP-8.2 2022-11-24 11:55:17 +00:00
Jakub Zelenka
9416186ff1 Add a note to php.ini-* regarding the required order for GH-8620 2022-11-24 11:54:15 +00:00
Jakub Zelenka
8f95dff4d3 Merge branch 'PHP-8.2' 2022-11-23 11:37:19 +00:00
Jakub Zelenka
642fcdb781 Merge branch 'PHP-8.1' into PHP-8.2 2022-11-23 11:36:24 +00:00
Jakub Zelenka
c9c1934ff0 Fix GH-8517: FPM child pointer can be potentially uninitialized
There might be a moment when the child log event is executed after
freeing a child. That could possibly happen if the child output is
triggered at the same as the terminating of the child. Then the output
event could be potentially processed after the terminating event which
would cause this kind of issue.

The issue might got more visible after introducing the log_stream on
a child because it is more likely that this cannot be dereferenced
after free. However it is very hard to reproduce this issue so there
is no test for this.

The fix basically prevents passing a child pointer and instead passes
the child PID and then looks the child up by the PID when it is being
processed. This is obviously slower but it is a safe way to do it and
the slow down should not be hopefully visible in a way that it would
overload a master process.
2022-11-23 11:25:51 +00:00
Jakub Zelenka
5a12ac88f3 Merge branch 'PHP-8.2' 2022-11-23 10:49:28 +00:00
Jakub Zelenka
f33b35c2ec [ci skip] Fix formatting in PHP 8.2 UPGRADING 2022-11-23 10:48:16 +00:00
Jakub Zelenka
2103e0921f Merge branch 'PHP-8.2' 2022-11-23 10:40:52 +00:00
Jakub Zelenka
94702c56e0 Fix bug #80669: FPM numeric user fails to set groups 2022-11-23 10:38:56 +00:00
Pierrick Charron
4a6f31b169 Merge branch 'PHP-8.2'
* PHP-8.2:
  [ci skip] Update PHP 8.2.0 new release date
2022-11-22 21:55:59 -05:00
Pierrick Charron
ecc126eba9 [ci skip] Update PHP 8.2.0 new release date 2022-11-22 21:55:35 -05:00
Pierrick Charron
ffc59f42a5 Merge branch 'PHP-8.2'
* PHP-8.2:
  [ci skip] Update PHP 8.2.0 new release date
2022-11-22 21:53:12 -05:00
Pierrick Charron
815d705aad [ci skip] Update PHP 8.2.0 new release date 2022-11-22 21:52:41 -05:00
Jakub Zelenka
599f6f1964 Merge branch 'PHP-8.2' 2022-11-22 18:53:08 +00:00
Jakub Zelenka
941e51a25a Merge branch 'PHP-8.1' into PHP-8.2 2022-11-22 18:52:15 +00:00
Jakub Zelenka
1767f32cb6 [ci skip] Fix NEWS FPM entries 2022-11-22 18:47:24 +00:00