Derick Rethans
f3441c832f
Merge branch 'PHP-8.1'
2022-05-26 15:19:34 +01:00
Derick Rethans
a04eccb294
Merge branch 'PHP-8.0' into PHP-8.1
2022-05-26 15:19:27 +01:00
Derick Rethans
172b7345b1
Update NEWS
2022-05-26 15:18:33 +01:00
Derick Rethans
209ea3ffc7
Fixed tests
2022-05-26 14:30:22 +01:00
Derick Rethans
2dcd82162e
Fixed bug #72963 (Null-byte injection in CreateFromFormat and related functions)
2022-05-26 13:49:51 +01:00
Derick Rethans
dfd1d7a531
Fixed bug #76963 (Null-byte injection in createFromFormat)
2022-05-26 13:49:51 +01:00
Máté Kocsis
0acf77e21c
Properly fix tidy test failure on Windows
2022-05-26 12:54:01 +02:00
Máté Kocsis
eb0a3da219
Quick fix test failure on Windows
2022-05-26 10:52:40 +02:00
Máté Kocsis
df98edbf95
Test tidy::$value when not null
2022-05-26 09:48:07 +02:00
Máté Kocsis
df77fee28d
Add upgrading entry for ext/tidy property changes
...
[skip ci]
2022-05-26 08:32:06 +02:00
Máté Kocsis
aeb4acacec
Declare tidyNode properties as readonly
2022-05-26 08:26:16 +02:00
Máté Kocsis
768d00f83b
Declare tidy properties
2022-05-26 08:26:16 +02:00
Ben Ramsey
0f5d9302be
Merge branch 'PHP-8.1'
2022-05-25 15:30:24 -05:00
Chen
040a37d3f1
Add IBT support for fiber
...
Indirect Branch Tracking (IBT) is part of Intel's Control-Flow
Enforcement Technology (CET). IBT is hardware based, forward edge
Control-Flow-Integrity mechanism where any indirect CALL/JMP must target
an ENDBR instruction or suffer #CP.
This commit adds IBT support for fiber:
1. Add endbr32/64 in assembly
2. Inform compiler jump_fcontext may return via indirect branch
Furthermore:
gcc support CET since v8.1 and set it to default since gcc 11. That is,
the ELF header of sapi/cli/php has a property named IBT. However, such
property is lost since PHP8.1 because the assembly introduced by Fiber.
This commit also fixes this.
Closes GH-8339
Signed-off-by: Chen, Hu <hu1.chen@intel.com >
Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de >
2022-05-25 13:42:31 -05:00
Ben Ramsey
cdddf14ff7
Merge branch 'PHP-8.1'
2022-05-25 12:01:27 -05:00
Ben Ramsey
2236b2d211
[ci skip] Remove RC1 from 8.1.7 in the NEWS file
2022-05-25 12:00:01 -05:00
Ben Ramsey
9a6bf819ed
Merge branch 'PHP-8.1'
2022-05-25 11:54:38 -05:00
Ben Ramsey
cc599c299e
Update NEWS with mb_detect_encoding changes
2022-05-25 11:52:27 -05:00
Máté Kocsis
84cd2a9047
Add some stub related todo comments
2022-05-25 13:24:11 +02:00
Alex Dowad
8b70a7db4f
Merge branch 'PHP-8.1'
...
* PHP-8.1:
mb_detect_encoding recognizes all letters in Hungarian alphabet
2022-05-25 13:10:23 +02:00
Máté Kocsis
facddfdccb
Declare ext/calendar constants in stubs ( #8630 )
2022-05-25 12:11:15 +02:00
Bob Weinand
b4285e5546
Ensure vm_spec_handlers exists for all opcodes <= 255 so that user defined higher opcodes do not read outside buffer
...
This largely has no effect in practice, but ASAN will complain then.
2022-05-25 11:28:34 +02:00
Alex Dowad
58d0aad75c
mb_detect_encoding recognizes all letters in Hungarian alphabet
2022-05-25 08:22:07 +02:00
Alex Dowad
212b31b51c
Merge branch 'PHP-8.1'
...
* PHP-8.1:
mb_detect_encoding recognizes all letters in Czech alphabet
2022-05-25 07:53:39 +02:00
Alex Dowad
6a4b6d2344
mb_detect_encoding recognizes all letters in Czech alphabet
2022-05-25 07:52:39 +02:00
Jihwan Kim
af20923a0f
Fix datetime format string to follow POSIX spec in ftp_mdtm()
...
Closes GH-8259
2022-05-24 19:23:47 -05:00
Patrick Allaert
418ba5b3a7
Merge branch 'PHP-8.1'
2022-05-25 00:54:20 +02:00
Patrick Allaert
3b6ee1eb19
Bump for 8.1.8-dev
2022-05-25 00:54:00 +02:00
Sara Golemon
0c824992e1
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Bump for 8.0.21
2022-05-24 18:52:49 +00:00
Sara Golemon
95b23b796d
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Bump for 8.0.21
2022-05-24 18:52:28 +00:00
Sara Golemon
e05897fe5e
Bump for 8.0.21
2022-05-24 18:51:01 +00:00
Arnaud Le Blanc
e883407083
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Disable zend_rc_debug during dtor of dl()'ed module (#8606 )
2022-05-24 19:23:48 +02:00
Arnaud Le Blanc
6cda01a05c
Disable zend_rc_debug during dtor of dl()'ed module ( #8606 )
...
Newly added dl() tests trigger an assertion in ZEND_RC_DEBUG builds. This change
disables zend_rc_debug to allows these tests to pass until this issue is
resolved.
2022-05-24 19:22:55 +02:00
Levi Morrison
b63df3ce0e
Stop copying zend_module_entry ( #8551 )
...
I did some historical digging and could not figure out why a copy is
made. Additionally, the copy was not using the `.size` member, so it
was probably wrong, but it's been that way for quite some time.
2022-05-24 09:13:38 -06:00
Christoph M. Becker
cf971a1401
Fix potential parallel test conflict
...
Cf. <https://ci.appveyor.com/project/php/php-src/builds/43644961/job/xibhmsbs8panajy2?fullLog=true#L15770 >.
2022-05-24 16:49:19 +02:00
Alex Dowad
83db088fc2
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix mb_detect_encoding's recognition of Slavic names
2022-05-24 15:33:24 +02:00
Alex Dowad
9bb97ee8bc
Fix mb_detect_encoding's recognition of Slavic names
...
Thanks to Côme Chilliet for reporting that mb_detect_encoding was not
detecting the desired text encoding for strings containing š or Ž.
These characters are used in Czech, Serbian, Croatian, Bosnian,
Macedonian, etc. names.
2022-05-24 15:32:20 +02:00
Christoph M. Becker
6c1ea04b9a
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix pcntl Haiku build
2022-05-24 15:02:12 +02:00
Christoph M. Becker
5017240ccc
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix pcntl Haiku build
2022-05-24 15:00:47 +02:00
David Carlier
e33de9dda8
Fix pcntl Haiku build
...
guarding SIGIO constant.
Closes GH-8612.
2022-05-24 14:59:50 +02:00
Christoph M. Becker
06c3f9b043
Use proper cast
...
Casting to `void**` silences the compiler, but only works because that
is dereferenced to a generic `void*`.
2022-05-24 14:52:32 +02:00
Michael Voříšek
fb1c7eff04
Fix some level 1 MSVC compiler warnings on x86
...
See GH-8479.
2022-05-24 13:05:16 +02:00
George Peter Banyard
5ba6ecd523
Minor refactoring of main/main.c and TSRM ( #8608 )
2022-05-24 08:34:55 +01:00
George Peter Banyard
9f06bb3bb6
Drop remaining usage of u_char in favour of standard C99 uint8_t ( #8611 )
...
Plus minor drive-by fixes
2022-05-23 21:57:31 +01:00
George Peter Banyard
59b4fdbb2b
Use standard C99 uint8_t type instead of u_char type for crypt_freesec ( #8610 )
2022-05-23 19:06:41 +01:00
Christoph M. Becker
08d1593c7d
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix GH-8538: SoapClient may strip parts of nmtokens
2022-05-23 16:53:16 +02:00
Christoph M. Becker
ee9a3fa762
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix GH-8538: SoapClient may strip parts of nmtokens
2022-05-23 16:51:32 +02:00
Christoph M. Becker
2a13304b2e
Fix GH-8538: SoapClient may strip parts of nmtokens
...
When stripping the namespace prefix, we can assume that this does not
contain any colons, while the rest of the name may contain colons.
Hence we must not use `strrchr()` but rather `strchr()` instead.
Closes GH-8543.
2022-05-23 16:49:12 +02:00
Dmitry Stogov
f135ed9a8a
Fix memory leak
...
This fixes oss-fuzz #47527
2022-05-23 13:33:20 +03:00
David Carlier
45e623da26
libmagic: use php_memnstr instead of memmem
...
Closes GH-8391.
2022-05-23 10:57:44 +02:00