Máté Kocsis
9f4bd3040d
Revert "Remove name field from the zend_constant struct ( #10954 )"
...
This reverts commit f42992f580 .
Fix GH-11423
2023-07-03 15:16:24 +02:00
nielsdos
d8ee89d3fa
Merge branch 'PHP-8.2'
...
* PHP-8.2:
Fix interrupted CLI output causing the process to exit
2023-06-23 17:43:01 +02:00
nielsdos
b9bf9ee2cb
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fix interrupted CLI output causing the process to exit
2023-06-23 17:42:45 +02:00
nielsdos
1111a9517b
Fix interrupted CLI output causing the process to exit
...
When writing the output in the CLI is interrupted by a signal, the
writing will fail in sapi_cli_single_write(), causing an exit later in
sapi_cli_ub_write(). This was the other part of the issue in GH-11498.
The solution is to restart the write if an EINTR has been observed.
Closes GH-11510.
2023-06-23 17:39:04 +02:00
Ilija Tovilo
7f700bf603
[skip ci] Increase php_cli_server_pdeathsig.phpt retries
...
Fixes GH-11401
2023-06-21 19:29:43 +02: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
George Peter Banyard
d5ad75108e
More usage of known zend_str instead of C string ( #11381 )
2023-06-08 13:03:29 +01:00
Ilija Tovilo
bb48f5da1e
Merge branch 'PHP-8.2'
...
* PHP-8.2:
Fix bug GH-11246 cli/get_set_process_title
2023-05-31 17:10:44 +02:00
Ilija Tovilo
0bf8ecf9b3
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fix bug GH-11246 cli/get_set_process_title
2023-05-31 17:10:17 +02:00
James Lucas
c6ae7a55b7
Fix bug GH-11246 cli/get_set_process_title
...
Fail to clobber_error only when the argv is a non-contiguous area
Don't increment the end_of_error if a non-contiguous area is encountered in environ
Closes GH-11247
2023-05-31 17:08:37 +02:00
Kirill Nesmeyanov
b495a916a4
Add string output escaping into zend dump (phpdbg + opcache debug) ( #11337 )
...
* Add string output escaping into zend dump (phpdbg + opcache debug)
* Use ZSTR_VAL macro instead direct string access
* Move "escaped_string" into local switch/case scope
* Add zend_string_release
* Add Z_STR_P macro instead direct string access
* Merge zend_string declaration and its assigment in one stmt
2023-05-29 16:45:00 +03:00
Ilija Tovilo
0b1d750d91
Allow arbitrary expressions in static variable initializer
...
Closes GH-9301
2023-05-24 20:17:31 +02:00
George Peter Banyard
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
Niels Dossche
1fe7dc31ef
Fix -Wstrict-prototypes warnings in fuzzer SAPI ( #11277 )
2023-05-20 11:43:30 +02: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
03f64b7853
Merge branch 'PHP-8.2'
2023-05-14 12:29:19 +01:00
Jakub Zelenka
1129046482
Merge branch 'PHP-8.1' into PHP-8.2
2023-05-14 12:28:52 +01:00
Jakub Zelenka
4294e8d448
FPM: Fix memory leak for invalid primary script file handle
...
Closes GH-11088
2023-05-14 12:27:38 +01: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
Jakub Zelenka
7034263f6e
Merge branch 'PHP-8.2'
2023-05-13 14:15:17 +01:00
Jakub Zelenka
bda28eb649
Merge branch 'PHP-8.1' into PHP-8.2
2023-05-13 14:14:23 +01:00
Jakub Zelenka
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
Niels Dossche
ac5920f92b
Fix GH-11141: Could not open input file: should be sent to stderr
...
I grepped for php_printf cases in main/ and sapi/ and converted the
cases which clearly indicate errors to fprintf(stderr, ...), like
suggested in the linked issue.
Closes GH-11163.
2023-05-05 19:31:23 +02: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
Cédric Anne
c02348cf9d
Make SERVER_SOFTWARE compliant with RFC3875 ( #11093 )
2023-05-05 12:43:34 +01:00
nielsdos
f6c0c60ef6
Fix GH-11104: STDIN/STDOUT/STDERR is not available for CLI without a script
...
I found no reason why this is done this way.
Of course this will allow users to do stupid stuff like
`fclose(STDOUT);` etc. but if they type in that code they clearly know
what they're doing...
Close GH-11169.
2023-05-03 19:54:21 +02:00
Michael Voříšek
f89fe830f2
Minor conditions simplify ( #10397 )
2023-04-26 15:12:01 +02:00
Sjon Hortensius
581e729e8d
fpm: remove 2 unneeded newlines from zlog call
2023-04-16 11:39:00 +01:00
Ilija Tovilo
24cc40207d
Benchmarking mean ( #11085 )
...
* Use 50 runs and calculate mean
* Don't validate timestamps
* Don't profile PHP startup and shutdown in cgi with valgrind
2023-04-15 23:14:20 +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
Jakub Zelenka
15802dfc62
Add FPM FastCGI env var test for Apache without path info fix
2023-04-06 15:59:34 +01:00
Dmitry Stogov
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
Máté Kocsis
f42992f580
Remove name field from the zend_constant struct ( #10954 )
...
As global constant names are case-sensitive now, we don't have to store them separately above the constant table.
2023-04-03 22:13:47 +02:00
Ilija Tovilo
11fbf3da35
Merge branch 'PHP-8.2'
...
* PHP-8.2:
Unparallelize IO heavy tests
2023-03-27 16:34:19 +02:00
Ilija Tovilo
9b15537e9a
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Unparallelize IO heavy tests
2023-03-27 16:34:11 +02:00