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
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
1fa5d306d8
Merge branch 'PHP-8.2'
2023-06-15 17:37:35 +01:00
6877b4f110
Merge branch 'PHP-8.1' into PHP-8.2
2023-06-15 17:37:09 +01:00
9b18466396
FPM: Add "pcntl" when running another test depending on pcntl
2023-06-15 17:36:00 +01:00
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
d5ad75108e
More usage of known zend_str instead of C string ( #11381 )
2023-06-08 13:03:29 +01:00
548e0615cd
FPM: refactor fpm_php_get_string_from_table() to better match usage ( #11051 )
...
Pass the key length to improve the existence check for the key
2023-05-20 22:49:41 +01:00
e5d46b31a1
Merge branch 'PHP-8.2'
2023-05-19 16:31:00 +01:00
3769505c87
Merge branch 'PHP-8.1' into PHP-8.2
2023-05-19 16:30:36 +01:00
aa061cd40b
Fix FPM status json encoded value test
...
Closes GH-11276
2023-05-19 16:20:21 +01:00
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
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
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
03f64b7853
Merge branch 'PHP-8.2'
2023-05-14 12:29:19 +01:00
1129046482
Merge branch 'PHP-8.1' into PHP-8.2
2023-05-14 12:28:52 +01:00
4294e8d448
FPM: Fix memory leak for invalid primary script file handle
...
Closes GH-11088
2023-05-14 12:27:38 +01:00
a225f6ab6b
Merge branch 'PHP-8.2'
2023-05-13 18:54:16 +01:00
90553af15c
Merge branch 'PHP-8.1' into PHP-8.2
2023-05-13 18:53:35 +01:00
5e64ead64a
Fix bug #64539 : FPM status - query_string not properly JSON encoded
...
Closes GH-11050
2023-05-13 18:43:30 +01:00
7034263f6e
Merge branch 'PHP-8.2'
2023-05-13 14:15:17 +01:00
bda28eb649
Merge branch 'PHP-8.1' into PHP-8.2
2023-05-13 14:14:23 +01:00
102953735c
Fix GH-10461: Postpone FPM child freeing in event loop
...
This is to prevent after free accessing of the child event that might
happen when child is killed and the message is delivered at that same
time.
Also fixes GH-10889 and properly fixes GH-8517 that was not previously
fixed correctly.
2023-05-13 14:11:42 +01:00
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
f89fe830f2
Minor conditions simplify ( #10397 )
2023-04-26 15:12:01 +02:00
581e729e8d
fpm: remove 2 unneeded newlines from zlog call
2023-04-16 11:39:00 +01:00
7de83e2736
Merge branch 'PHP-8.2'
2023-04-07 12:29:46 +01:00
0b4f2fc9e8
Merge branch 'PHP-8.1' into PHP-8.2
2023-04-07 12:29:23 +01:00
ebb3213f79
Add FPM FCGI env Apache handler UDS test
2023-04-07 12:28:42 +01:00
f17cf2ed63
Merge branch 'PHP-8.2'
2023-04-06 16:01:13 +01:00
1ca1858f31
Merge branch 'PHP-8.1' into PHP-8.2
2023-04-06 16:00:48 +01:00
15802dfc62
Add FPM FastCGI env var test for Apache without path info fix
2023-04-06 15:59:34 +01:00
c9d728cbd6
Revert "Zend/zend_types.h: move zend_rc_debug to zend_rc_debug.h"
...
This reverts commit d6e95041e2
2023-04-04 22:48:26 +03:00
9d5f2f1343
Use new ZSTR_INIT_LITERAL macro ( #10879 )
2023-03-20 16:19:05 +01:00
5efd60ea90
Merge branch 'PHP-8.2'
2023-03-19 13:17:56 +00:00
2b0d29bf17
Merge branch 'PHP-8.1' into PHP-8.2
2023-03-19 13:17:09 +00:00
0d4d471847
Fix bug #74129 : Incorrect SCRIPT_NAME with apache ProxyPassMatch
...
This happens when there are spaces are in the path info. The reason is
that Apache decodes the path info part in the SCRIPT_NAME as per CGI
RFC. FPM tries to strip path info from the SCRIPT_NAME but the
comparison is done against SCRIPT_FILENAME which is not decoded. For
that to work we have to decode it before comparison if there is any
encoded character.
Closes GH-10869
2023-03-19 13:11:14 +00:00
674bcca513
Merge branch 'PHP-8.2'
...
* PHP-8.2:
Destroy file_handle in fpm_main
2023-03-18 21:05:44 +01:00
e44b1a916d
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Destroy file_handle in fpm_main
2023-03-18 21:00:21 +01:00
f30e71cbde
Destroy file_handle in fpm_main
...
If it's not in the CG(open_files) list, we need to destroy the file
handle ourselves.
Co-authored-by: Jakub Zelenka <bukka@php.net >
Closes GH-10707.
2023-03-18 20:54:46 +01:00
31ccfbd6f6
Merge branch 'PHP-8.2'
2023-03-17 14:57:14 +00:00
4ac12006ae
Merge branch 'PHP-8.1' into PHP-8.2
2023-03-17 14:56:45 +00:00
7d987ebbbf
Fix FPM tester $scriptName logic
2023-03-17 14:55:51 +00:00
856925ccb4
Merge branch 'PHP-8.2'
2023-03-17 10:45:49 +00:00
e9bbddcdaf
Merge branch 'PHP-8.1' into PHP-8.2
2023-03-17 10:45:14 +00:00
38d2e7ea9a
Test FPM FCGI envs with path info fix for Apache proxy pass
2023-03-17 10:42:16 +00:00
8cf621e0e4
Test FPM FCGI envs with path info fix for Apache proxy handler
2023-03-17 10:42:16 +00:00
b53b0ac2ea
Test FPM FCGI envs with path info fix for Apache proxy balancer
2023-03-17 10:42:15 +00:00
92d2cd5cb8
Test FPM FCGI envs without path info fix for custom source
2023-03-17 10:42:15 +00:00
3125155b5d
Add extra option to FPM tester for handling script filename
2023-03-17 10:42:14 +00:00
Joshua Behrens