Niels Dossche
228c27112a
Merge branch 'PHP-8.4'
...
* PHP-8.4:
Fix test with shared zend_test (#16705 )
2024-11-05 21:36:54 +01:00
Niels Dossche
2f5021b6bd
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Fix test with shared zend_test (#16705 )
2024-11-05 21:36:48 +01:00
Niels Dossche
9a255b384f
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix test with shared zend_test (#16705 )
2024-11-05 21:36:41 +01:00
Niels Dossche
3f1ea1b663
Fix test with shared zend_test ( #16705 )
2024-11-05 21:35:47 +01:00
Ilija Tovilo
0ad6e4efb0
[skip ci] Document --repeat flag as internal (GH-16698)
...
Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>
2024-11-04 17:40:08 +01:00
Niels Dossche
64f2d11e38
Merge branch 'PHP-8.4'
...
* PHP-8.4:
Fix GH-16628: FPM logs are getting corrupted with this log statement
Fix GH-16601: Memory leak in Reflection constructors
2024-11-02 19:39:00 +01:00
Niels Dossche
bfd9e0cca3
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Fix GH-16628: FPM logs are getting corrupted with this log statement
Fix GH-16601: Memory leak in Reflection constructors
2024-11-02 19:38:54 +01:00
Niels Dossche
16cda10650
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-16628: FPM logs are getting corrupted with this log statement
Fix GH-16601: Memory leak in Reflection constructors
2024-11-02 19:37:28 +01:00
Niels Dossche
e643129bbb
Fix GH-16628: FPM logs are getting corrupted with this log statement
...
zlog_buf_prefix() can return a larger length than what actually was
written due to its use of snprintf(). The code in
zlog_stream_prefix_ex() does not take this into account, other callers
do. What ends up happening then is that stream->length is set to the
length as if snprintf() was able to write all bytes, causing
stream->length to become larger than stream->buf.size, causing a
segfault.
In case the buffer was too small we try with a larger buffer up to a
limit of zlog_limit. This makes sure that the stream length will remain
bounded by the buffer size.
This also adds assertions to make the programmer intent clear and catch
this more easily in debug builds.
Closes GH-16680.
2024-11-02 19:36:20 +01:00
Gina Peter Banyard
6ddab74d55
sapi: Fix some variable shadowing ( #16485 )
...
sapi_module, mime_type_map, zend_extensions, php_cgi_globals, and phpdbg_globals are true globals which are being shadowed
2024-10-17 22:46:23 +01:00
Ilija Tovilo
0f172715b0
Merge branch 'PHP-8.4'
...
* PHP-8.4:
Skip shebang in cli-server router script
2024-10-14 13:35:48 +02:00
Ilija Tovilo
3074cbf5b6
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Skip shebang in cli-server router script
2024-10-14 13:35:41 +02:00
Ilija Tovilo
77f770871b
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Skip shebang in cli-server router script
2024-10-14 13:34:21 +02:00
Ilija Tovilo
06efe44c2e
Skip shebang in cli-server router script
...
Fixes GH-16373
Closes GH-16403
2024-10-14 13:33:16 +02:00
Christoph M. Becker
4d3240261d
Merge branch 'PHP-8.4'
...
* PHP-8.4:
Fix GH-16174: Empty string is an invalid expression for phpdbg-ev
2024-10-10 01:47:52 +02:00
Christoph M. Becker
980d41cb3a
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Fix GH-16174: Empty string is an invalid expression for phpdbg-ev
2024-10-10 01:47:23 +02:00
Christoph M. Becker
5c6fc09e45
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-16174: Empty string is an invalid expression for phpdbg-ev
2024-10-10 01:46:30 +02:00
Christoph M. Becker
6bcba24eb0
Fix GH-16174: Empty string is an invalid expression for phpdbg-ev
...
Strings may be empty, so we must not assume they are not.
Closes GH-16177.
2024-10-10 01:45:37 +02:00
Gina Peter Banyard
2d217f08b8
sapi/phpdbg: Use HASH_FOREACH macro ( #16211 )
2024-10-07 00:17:30 +01:00
Jakub Zelenka
00cdbcf110
Merge branch 'PHP-8.4'
2024-10-06 21:27:06 +01:00
Jakub Zelenka
ee7e21020e
Fix FPM tester params type
2024-10-06 21:26:42 +01:00
Jakub Zelenka
ba0336c5b9
Merge branch 'PHP-8.4'
2024-10-06 19:43:44 +01:00
Jakub Zelenka
10d2d862a6
Merge branch 'PHP-8.3' into PHP-8.4
2024-10-06 19:43:19 +01:00
Jakub Zelenka
59816b9a73
Merge branch 'PHP-8.2' into PHP-8.3
2024-10-06 19:40:24 +01:00
Jakub Zelenka
5a47f27021
Fix GH-15395: php-fpm: zend_mm_heap corrupted with cgi-fcgi request
...
Closes GH-16227
Co-authored-by: David Carlier <devnexen@gmail.com>
2024-10-06 19:37:55 +01:00
David Carlier
c8791e5581
Merge branch 'PHP-8.4'
2024-10-03 22:46:50 +01:00
David Carlier
139accecb4
Merge branch 'PHP-8.3' into PHP-8.4
2024-10-03 22:46:02 +01:00
David Carlier
4b7a906d57
Merge branch 'PHP-8.2' into PHP-8.3
2024-10-03 22:45:51 +01:00
David Carlier
3d80d98a10
Fix GH-16137: "Deduplicate" http headers values but Set-Cookie.
...
Those are meant to have 1 or plus values separated by a comma even
if the client set them separately.
close GH-16154
2024-10-03 22:45:31 +01:00
Arnaud Le Blanc
2d8a93cbb6
Merge branch 'PHP-8.4'
...
* PHP-8.4:
[ci skip] NEWS for GH-16055
Support stack limit in phpdbg SAPI
2024-10-03 15:25:57 +02:00
Arnaud Le Blanc
443aa29dbe
Support stack limit in phpdbg SAPI
...
Fixes GH-16041
Closes GH-16055
2024-10-03 15:22:51 +02:00
Christoph M. Becker
2f09c0ed0f
Merge branch 'PHP-8.4'
...
* PHP-8.4:
Fix GH-16181: phpdbg: exit in exception handler reports fatal error
2024-10-03 11:39:34 +02:00
Christoph M. Becker
3c1af3febb
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Fix GH-16181: phpdbg: exit in exception handler reports fatal error
2024-10-03 11:39:03 +02:00
Christoph M. Becker
95c97c81b7
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-16181: phpdbg: exit in exception handler reports fatal error
2024-10-03 11:37:15 +02:00
Christoph M. Becker
f14e5cfaaa
Fix GH-16181: phpdbg: exit in exception handler reports fatal error
...
When running PHP code, we must not handle `UnwindExit` exceptions, but
rather have to ignore them.
Closes GH-16182.
2024-10-03 11:36:13 +02:00
Gina Peter Banyard
98a4c53ad5
sapi/apache2handler/php_functions.c: No need to rely on argnum ( #16143 )
2024-09-30 22:09:17 +01:00
Niels Dossche
6674213a88
Remove dead code in fpm of redirect_status ( #16090 )
...
This is a feature copied from the CGI SAPI, but since cgi is always 0 in
fpm, this code is dead. Similarly, the INI settings related to this are
no longer used after removing this dead code.
2024-09-28 17:50:53 +02:00
Ilija Tovilo
a58df54bc4
Merge branch 'PHP-8.4'
...
* PHP-8.4:
Fix printing backtrace of fake generator frame
2024-09-27 17:37:14 +02:00
Ilija Tovilo
bc07a8a28a
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Fix printing backtrace of fake generator frame
2024-09-27 17:37:07 +02:00
Ilija Tovilo
8c556b211d
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix printing backtrace of fake generator frame
2024-09-27 17:35:55 +02:00
Ilija Tovilo
706bcdbc1a
Fix printing backtrace of fake generator frame
...
Fixes GH-15851
Closes GH-15952
2024-09-27 17:34:51 +02:00
Arnaud Le Blanc
4252545064
Remove phpdbg binary during make clean ( #16085 )
2024-09-27 16:24:17 +02:00
Ben Ramsey
91a07e7b75
Merge branch 'PHP-8.4'
2024-09-26 14:25:41 -05:00
Ben Ramsey
d854a54b5f
Merge branch 'PHP-8.3' into PHP-8.4
2024-09-26 14:24:13 -05:00
Ben Ramsey
6d99ccc268
Merge branch 'PHP-8.2' into PHP-8.3
2024-09-26 14:13:00 -05:00
Ben Ramsey
c259c9f3f6
Merge branch 'PHP-8.1' into PHP-8.2
2024-09-26 13:13:46 -05:00
Niels Dossche
d5f6e56610
[ci skip] Clarify intention in phpdbg, removing one TODO comment ( #16014 )
...
The point of WATCH_ON_BUCKET is to watch for all 3 fields of the bucket,
so the fallthrough is intended.
2024-09-24 19:32:11 +02:00
Jakub Zelenka
4580b8b3e1
Fix GHSA-865w-9rf3-2wh5: FPM: Logs from childrens may be altered
2024-09-23 11:24:35 +01:00
Niels Dossche
c1c14c8a0f
Fix GHSA-94p6-54jq-9mwp
...
Apache only generates REDIRECT_STATUS, so explicitly check for that
if the server name is Apache, don't allow other variable names.
Furthermore, redirect.so and Netscape no longer exist, so
remove those entries as we can't check their server name anymore.
We now also check for the configuration override *first* such that it
always take precedence. This would allow for a mitigation path if
something like this happens in the future.
2024-09-23 11:24:26 +01:00
Niels Dossche
4b9cd27ff5
Fix GHSA-p99j-rfp4-xqvq
...
It's no use trying to work around whatever the operating system and Apache
do because we'll be fighting that until eternity.
Change the skip_getopt condition such that when we're running in
CGI or FastCGI mode we always skip the argument parsing.
This is a BC break, but this seems to be the only way to get rid of this
class of issues.
2024-09-23 11:24:19 +01:00
