Ilija Tovilo
6f17c693ef
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Fix RC assertion in fpm when php_admin_value setting fails
2025-09-03 14:50:15 +02:00
Ilija Tovilo
15beb140e5
Fix RC assertion in fpm when php_admin_value setting fails
...
The value is temporarily duplicated. While the value is allocated persistently,
it will be freed if the ini value can't be set. This is safe, given the value
has not actually been stored.
Exposed by GH-19619
Closes GH-19671
2025-09-03 14:49:06 +02:00
Jakub Zelenka
74d4e67236
Merge branch 'PHP-8.3' into PHP-8.4
2025-02-08 12:07:22 +01:00
Jakub Zelenka
e48ceb0026
Fix GH-17643: FPM with httpd ProxyPass encoded PATH_INFO env
...
Closes GH-17644
2025-02-08 12:05:25 +01:00
Jakub Zelenka
c4c536da4c
Merge branch 'PHP-8.3' into PHP-8.4
2024-12-22 14:58:08 +01:00
Jakub Zelenka
e0b79cdc5c
Introduce FPM_TEST_DEBUG_FILTER env var and extend multi request tracing
2024-12-22 14:15:03 +01:00
Jakub Zelenka
d165670d04
Fix GH-16932: wrong FPM status output
...
Closes GH-16974
Co-authored-by: James Lucas <james@lucas.net.au >
2024-11-28 08:59:55 +01:00
Jakub Zelenka
49bc011c9f
Merge branch 'PHP-8.3' into PHP-8.4
2024-11-08 16:50:41 +01:00
Jakub Zelenka
af8ebb12ca
Merge branch 'PHP-8.2' into PHP-8.3
2024-11-08 16:48:25 +01:00
Jakub Zelenka
065bde1e13
Fix GH-16432: PHP-FPM 8.2 SIGSEGV in fpm_get_status
2024-11-08 16:44:05 +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
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
Jakub Zelenka
ee7e21020e
Fix FPM tester params type
2024-10-06 21:26:42 +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
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
Jakub Zelenka
4580b8b3e1
Fix GHSA-865w-9rf3-2wh5: FPM: Logs from childrens may be altered
2024-09-23 11:24:35 +01:00
Michael Voříšek
d313ad6098
Deprecate E_STRICT constant and remove error level
...
RFC: https://wiki.php.net/rfc/deprecations_php_8_4#remove_e_strict_error_level_and_deprecate_e_strict_constant
Closes GH-13053
2024-09-18 14:33:14 +02:00
Peter Kokot
13f041163c
Remove Travis artefacts ( #15714 )
...
Travis was suspended https://github.com/php/php-src/pull/15314
This removes 404 errored Travis image in README, travis configuration
directory and YAML file and usages in tests.
[skip ci]
Co-authored-by: Gina Peter Banyard <girgias@php.net >
2024-09-04 01:15:10 +02:00
Flavio Heleno
67aac59cfc
Add PHP-FPM memory peak to the scoreboard
...
Closes #14153
2024-08-24 15:25:18 +01:00
Remi Collet
40d88cacc1
Fix test expectation for "Built by..." ( #15383 )
2024-08-13 21:58:44 +01:00
Jakub Zelenka
c33f58867e
Merge branch 'PHP-8.3'
2024-06-16 12:24:25 +01:00
Jakub Zelenka
ea79560190
Merge branch 'PHP-8.2' into PHP-8.3
2024-06-16 12:23:15 +01:00
Wilhansen Li
43bc53a730
Fix GH-14037: Make /ping of php-fpm work with pm.status_listen pool
...
The ping feature of php-fpm monitoring was previously not working
in pm.status_listen pool due to the configuration variables ping.path
and ping.response not being copied over to the worker when forked. This
results in the ping code path being disabled because the worker detects
that ping.path is not configured.
Closes GH-13980
Co-authored-by: Pierrick Charron <pierrick@php.net >
2024-06-16 12:22:21 +01:00
Jakub Zelenka
dbe35f6d2a
Merge branch 'PHP-8.3'
2024-03-30 14:38:41 +00:00
Jakub Zelenka
1b585d2620
Merge branch 'PHP-8.2' into PHP-8.3
2024-03-30 14:38:19 +00:00
Jakub Zelenka
9b1d2e93b8
Fix FPM tester default env vars change
...
This broke cloexec test
2024-03-30 14:37:54 +00:00
Jakub Zelenka
4bc7ea3437
Merge branch 'PHP-8.3'
2024-03-28 15:46:22 +00:00
Jakub Zelenka
8edd621501
Merge branch 'PHP-8.2' into PHP-8.3
2024-03-28 15:45:45 +00:00
Jakub Zelenka
d0a8d41eee
Fix GH-13563: Setting bool values via env in FPM config fails
...
Closes GH-13786
2024-03-28 15:43:50 +00:00
Máté Kocsis
330cc5cdb2
Deprecate implicit nullable parameter types ( #12959 )
...
RFC: https://wiki.php.net/rfc/deprecate-implicitly-nullable-types
Co-authored-by: Gina Peter Banyard <girgias@php.net >
2024-03-13 21:40:26 +01:00
Jakub Zelenka
f438b3bc69
Merge branch 'PHP-8.3'
2024-03-09 09:43:10 +00:00
Jakub Zelenka
a19267d488
Fix GH-11086: FPM: config test runs twice in daemonised mode
...
The previous check for STDERR did not work so this fixes it.
Closes GH-13357
2024-03-09 09:41:59 +00:00
Ilija Tovilo
cd66fcc68b
Add request_parse_body() function
...
RFC: https://wiki.php.net/rfc/rfc1867-non-post
This function allows populating the $_POST and $_FILES globals for non-post
requests. This avoids manual parsing of RFC1867 requests.
Fixes #55815
Closes GH-11472
2024-02-08 12:08:07 +01:00
Jakub Zelenka
da6a4e799a
Merge branch 'PHP-8.3'
2024-02-04 12:01:09 +00:00
Jakub Zelenka
ae44ab47a7
Merge branch 'PHP-8.2' into PHP-8.3
2024-02-04 12:00:36 +00:00
Jakub Zelenka
bc30ae4f04
Fix bug #75712 : getenv in php-fpm should not read $_ENV, $_SERVER
...
Closes GH-13195
2024-02-04 11:58:18 +00:00
Jakub Zelenka
08b9e8ae9c
Merge branch 'PHP-8.3'
2024-01-11 16:48:38 +00:00
Jakub Zelenka
1c7dc0f300
Merge branch 'PHP-8.2' into PHP-8.3
2024-01-11 16:48:03 +00:00
Jakub Zelenka
b04b09ef56
Fix GH-12996: Incorrect SCRIPT_NAME with Apache ProxyPassMatch when plus in path
...
Closes GH-13072
2024-01-11 16:47:08 +00:00
Jakub Zelenka
2ffd040ffd
Merge branch 'PHP-8.3'
2023-12-09 13:26:29 +00:00
Jakub Zelenka
43900bd568
Merge branch 'PHP-8.2' into PHP-8.3
2023-12-09 13:26:09 +00:00
Jakub Zelenka
62682cbd97
Add FPM tester logs printing for all errors
...
Closes GH-12902
2023-12-09 13:21:41 +00:00