php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-01 21:22:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
134,685 Commits 547 Branches 1,481 Tags
php-8.3.12
Commit Graph

323 Commits

Author SHA1 Message Date
Jakub Zelenka
0accd7240c Fix GHSA-865w-9rf3-2wh5: FPM: Logs from childrens may be altered 2024-09-23 11:46:07 +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
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
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
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
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
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
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
Niels Dossche
1fb73463d3 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-12621: browscap segmentation fault when configured in the vhost
 2023-11-11 18:36:32 +01:00
Niels Dossche
7353c7ce17 Fix GH-12621: browscap segmentation fault when configured in the vhost 
The temporary HashTable has a destructor that releases the string held
by the entry's value. However, browscap_intern_str(_ci) only incremented
the refcount for the reference created by the return value. As the
HashTable is only used during parsing, we don't need to manage the
reference count of the value anyway, so get rid of the destructor.

This is triggerable in two cases:
 - When using php_admin_value to set the ini at the activation stage
 - When running out of space for the opcache-interned strings

Closes GH-12634.
 2023-11-11 18:35:57 +01:00
Jakub Zelenka
d02a8f4e87 Separate setting of SO_KEEPALIVE in FPM tests 
Closes GH-12640
 2023-11-10 09:45:19 +00:00
Jakub Zelenka
52b13f6ddb Merge branch 'PHP-8.2' into PHP-8.3 2023-11-03 17:17:52 +00:00
Jakub Zelenka
882cc4f804 Merge branch 'PHP-8.1' into PHP-8.2 2023-11-03 17:17:23 +00:00
Jakub Zelenka
a8c6c6165b Fix GH-9921: Loading ext in FPM config does not register module handlers 
Closes GH-12377
 2023-11-03 16:53:09 +00:00
Jakub Zelenka
e43438544e Merge branch 'PHP-8.2' into PHP-8.3 2023-11-03 14:07:36 +00:00
Jakub Zelenka
e3d1beb0f1 Fix bug #76922: FastCGI terminates conn after FCGI_GET_VALUES 
Closes GH-12387
 2023-11-03 14:06:36 +00:00
Jakub Zelenka
2913447653 Merge branch 'PHP-8.2' into PHP-8.3 2023-10-14 18:44:26 +01:00
Jakub Zelenka
c776f79578 Merge branch 'PHP-8.1' into PHP-8.2 2023-10-14 18:41:48 +01:00
Jakub Zelenka
0217be4d5b Fix GH-12232: FPM: segfault dynamically loading extension without opcache 
Also fixes incorrect assertion in ini init that php_dl is always
temporary.

Closes GH-12277
 2023-10-14 18:38:21 +01:00
Jakub Zelenka
fe30c5098f Fix GH-12077: Check lsof functionality in socket on close test 
Closes GH-12084
 2023-08-30 14:28:17 +01:00
Jakub Zelenka
ea87501aee Fix FPM UDS test for very long name check by extending its length 
It did not correctly produce error message if run in in a short src path
 2023-08-30 12:57:15 +01:00
Jakub Zelenka
99a222cd80 FPM tester FastCGI client transport (#11764) 
This improves FastCGI client by separating transport functions and adding support for more low level socket transport that is useful for debugging in some cases.

In addition to that it introduces an option for delaying of fcgi request writing.
 2023-08-26 19:03:59 +01:00
Mikhail Galanin
418cdc0bea Set CLOEXEC on listened/accepted sockets in the FPM children 
Closes GH-11708

Co-authored-by: Jakub Zelenka <bukka@php.net>
 2023-08-26 15:19:03 +01:00
Joshua Behrens
08b57772b0 Warn when fpm socket was not registered on the expected path 
This might happen if the UDS length limit is exceeded.

Co-authored-by: Jakub Zelenka <bukka@php.net>

Closes GH-11066
 2023-07-15 14:21:58 +01:00
Tim Starling
ea2ee60552 When running FPM tests, pass -n option to php-fpm 
"make test" was failing for me, because I was running it prior to
install, and there was an old installed version which was incompatible.
The FPM tests were using the installed php.ini which referenced
installed dynamically linked extensions.

So, pass -n to php-fpm.

FPM\Tester::start() has $extensions, $iniEntries and
TEST_FPM_EXTENSION_DIR but they are not actually set by anything. Rather
than rely on the installed php.ini to be correct, it seems safer to pass
-n, and any tests that need specific config can pass $iniEntries.

Closes GH-11373
 2023-06-15 18:00:50 +01:00
Jakub Zelenka
1fa5d306d8 Merge branch 'PHP-8.2' 2023-06-15 17:37:35 +01:00
Jakub Zelenka
6877b4f110 Merge branch 'PHP-8.1' into PHP-8.2 2023-06-15 17:37:09 +01:00
Jakub Zelenka
9b18466396 FPM: Add "pcntl" when running another test depending on pcntl 2023-06-15 17:36:00 +01:00
Mikhail Galanin
7ade242e28 sapi/fpm: add "pcntl" when running test depending pcntl_sigprocmask() 
If "pcntl" is built as a shared module, the extension will not
load automatically when we spawn the FPM
 2023-06-15 17:32:02 +01:00
Jakub Zelenka
e5d46b31a1 Merge branch 'PHP-8.2' 2023-05-19 16:31:00 +01:00
Jakub Zelenka
3769505c87 Merge branch 'PHP-8.1' into PHP-8.2 2023-05-19 16:30:36 +01:00
Jakub Zelenka
aa061cd40b Fix FPM status json encoded value test 
Closes GH-11276
 2023-05-19 16:20:21 +01:00
Ilija Tovilo
8d0345d94e Merge branch 'PHP-8.2' 
* PHP-8.2:
  [skip ci] Mark frequently failing fpm test as XFAIL
 2023-05-17 17:42:46 +02:00
Ilija Tovilo
69d41cc7fc Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Mark frequently failing fpm test as XFAIL
 2023-05-17 17:42:39 +02:00
Ilija Tovilo
e31fe111a5 [skip ci] Mark frequently failing fpm test as XFAIL 
Reported here: https://github.com/php/php-src/pull/11050#issuecomment-1546990346
 2023-05-17 17:42:05 +02:00
Jakub Zelenka
a225f6ab6b Merge branch 'PHP-8.2' 2023-05-13 18:54:16 +01:00
Jakub Zelenka
90553af15c Merge branch 'PHP-8.1' into PHP-8.2 2023-05-13 18:53:35 +01:00
Jakub Zelenka
5e64ead64a Fix bug #64539: FPM status - query_string not properly JSON encoded 
Closes GH-11050
 2023-05-13 18:43:30 +01:00
Calvin Buckley
3af5f47ce6 http_response_code should warn if headers were already sent 
This would previously fail silently. We also return false to indicate the error.

Fixes GH-10742
Closes GH-10744
 2023-05-05 15:24:56 +02:00
Jakub Zelenka
7de83e2736 Merge branch 'PHP-8.2' 2023-04-07 12:29:46 +01:00
Jakub Zelenka
0b4f2fc9e8 Merge branch 'PHP-8.1' into PHP-8.2 2023-04-07 12:29:23 +01:00
Jakub Zelenka
ebb3213f79 Add FPM FCGI env Apache handler UDS test 2023-04-07 12:28:42 +01:00
Jakub Zelenka
f17cf2ed63 Merge branch 'PHP-8.2' 2023-04-06 16:01:13 +01:00
Jakub Zelenka
1ca1858f31 Merge branch 'PHP-8.1' into PHP-8.2 2023-04-06 16:00:48 +01:00