George Wang
aef96600d3
Merge branch 'PHP-8.1' into PHP-8.2
2022-11-20 19:30:47 -05:00
George Wang
aee1a2f4c0
Merge branch 'PHP-8.0' into PHP-8.1
2022-11-20 19:30:25 -05:00
George Wang
4bdfce6c1a
Use __atomic_xxxx() instead of __sync_xxxx() for lsapi.
2022-11-20 19:30:07 -05:00
Jakub Zelenka
339bd57f42
Merge branch 'PHP-8.1' into PHP-8.2
2022-11-13 19:06:48 +00:00
Jakub Zelenka
b8c1b5e9fa
Merge branch 'PHP-8.0' into PHP-8.1
2022-11-13 19:06:10 +00:00
Jakub Zelenka
db2d32f476
Introduce TEST_FPM_EXTENSION_DIR for FPM tests with shared extensions
2022-11-13 19:04:43 +00:00
Jakub Zelenka
22f25532ed
Merge branch 'PHP-8.1' into PHP-8.2
2022-10-30 17:02:32 +00:00
Jakub Zelenka
a04a021105
Merge branch 'PHP-8.0' into PHP-8.1
2022-10-30 17:02:08 +00:00
Jakub Zelenka
8229649045
Fix GH-9770: Add small timeout in status-listen test
...
This is to allow more time to switch for active to idle in scoreboard as
it seems that Travis is quite short on resources and might not switch it
quickly enough.
2022-10-30 17:00:40 +00:00
Jakub Zelenka
eb9cf18703
Merge branch 'PHP-8.1' into PHP-8.2
2022-10-30 11:46:06 +00:00
Jakub Zelenka
29f7c4613e
Merge branch 'PHP-8.0' into PHP-8.1
2022-10-30 11:43:11 +00:00
Jakub Zelenka
1c5844aa3e
Fix GH-9754: SaltStack hangs when running php-fpm 8.1.11
...
SaltStack uses Python subprocess and redirects stderr to stdout which is
then piped to the returned output. If php-fpm starts in daemonized mode,
it should close stderr. However a fix introduced in GH-8913 keeps stderr
around so it can be later restored. That causes the issue reported in
GH-9754. The solution is to keep stderr around only when php-fpm runs in
foreground as the issue is most likely visible only there. Basically
there is no need to restore stderr when php-fpm is daemonized.
2022-10-30 11:41:33 +00:00
Ilija Tovilo
ce527ed599
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fix cli server blocking on accept when using multiple workers
2022-10-20 13:04:25 +02:00
Ilija Tovilo
6be8efdf78
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix cli server blocking on accept when using multiple workers
2022-10-20 13:04:14 +02:00
Ilija Tovilo
d52f0451ad
Fix cli server blocking on accept when using multiple workers
...
Fixes GH-9400
Closes GH-9693
2022-10-20 13:03:35 +02:00
Benoit Viguier
58fc34ffb7
Fix memory-leak in CLI web server
...
Closes GH-9680
Signed-off-by: George Peter Banyard <girgias@php.net >
2022-10-06 11:36:08 +01:00
Jakub Zelenka
da9e9d0004
Merge branch 'PHP-8.1' into PHP-8.2
2022-09-29 15:31:23 +01:00
Jakub Zelenka
6d005c2cec
Merge branch 'PHP-8.0' into PHP-8.1
2022-09-29 15:30:27 +01:00
Jakub Zelenka
8e1cef4341
Do not check X-Powered-By header in FPM tester if expose_php off
...
Closes GH-9508
2022-09-29 15:27:33 +01:00
Jakub Zelenka
1ed4303957
Improve CS in FPM Tester Response
2022-09-29 15:24:00 +01:00
Ilija Tovilo
138fd5b3c8
Replace reallocarray with safe_perealloc
...
Fixes GH-9581
2022-09-29 15:15:40 +02:00
Jakub Zelenka
f41eb54a5e
Merge branch 'PHP-8.1' into PHP-8.2
2022-09-27 17:33:58 +01:00
Jakub Zelenka
54cb2cdcd3
Merge branch 'PHP-8.0' into PHP-8.1
2022-09-27 17:31:08 +01:00
Jakub Zelenka
1e8fa6607d
Rework FPM tests logging for better debugging
2022-09-27 17:27:43 +01:00
Jakub Zelenka
e3034dba3e
Fix FPM tester conflict
2022-08-29 22:45:04 +01:00
Jakub Zelenka
f3c357c446
Merge branch 'PHP-8.1'
2022-08-29 22:34:48 +01:00
Jakub Zelenka
bf97b3649d
Merge branch 'PHP-8.0' into PHP-8.1
2022-08-29 22:33:02 +01:00
Jakub Zelenka
3503b1daa2
Fix bug #77780 : "Headers already sent" when previous connection was aborted
...
This change primarily splits SAPI deactivation to module and destroy
parts. The reason is that currently some SAPIs might bail out
on deactivation. One of those SAPI is PHP-FPM that can bail out on
request end if for example the connection is closed by the client
(web sever). The problem is that in such case the resources are not
freed and some values reset. The most visible impact can have not
resetting the PG(headers_sent) which can cause erorrs in the next
request. One such issue is described in #77780 bug which this fixes
and is also cover by a test in this commit. It seems reasonable
to separate deactivation and destroying of the resource which means
that the bail out will not impact it.
2022-08-29 22:25:53 +01:00
Jakub Zelenka
15bca2956b
Merge branch 'PHP-8.1'
2022-08-29 16:43:26 +01:00
Jakub Zelenka
7dc3d4b510
Merge branch 'PHP-8.0' into PHP-8.1
2022-08-29 16:42:58 +01:00
Jakub Zelenka
986e7319c5
Re-add fixed tests for GH-8885
2022-08-29 16:42:10 +01:00
Jakub Zelenka
36063873b0
Merge branch 'PHP-8.0' into PHP-8.1
2022-08-29 16:41:19 +01:00
Jakub Zelenka
bcdd9877e1
Fix GH-8885 tests on MacOS
2022-08-29 16:40:31 +01:00
Jakub Zelenka
869ccf17f6
Merge branch 'PHP-8.1'
2022-08-29 14:41:55 +01:00
Jakub Zelenka
be45f540ee
Merge branch 'PHP-8.0' into PHP-8.1
2022-08-29 14:40:57 +01:00
Dmitry Menshikov
f92505cf24
Fix GH-8885: access.log with stderr writes logs to error_log after reload
...
This fix allows restoring the the original stderr so the logs are
correctly written.
2022-08-29 14:39:24 +01:00
David Carlier
b836007483
Merge branch 'PHP-8.1'
2022-08-28 23:35:46 +01:00
David Carlier
819df032aa
Merge branch 'PHP-8.0' into PHP-8.1
2022-08-28 23:33:17 +01:00
David Carlier
e2a5428ca0
FPM fix strict prototype warnings.
...
Closes GH-8986.
2022-08-28 23:24:23 +01:00
Mikhail Galanin
335979fe1b
Add a bit verbosity in FPM logs
2022-08-28 22:35:10 +01:00
Vedran Miletić
7065a222b7
Respond with HTTP status 405 to DELETE/PUT/PATCH request on a static resource
...
Co-authored-by: Marin Martuslović <marin.martuslovic@student.uniri.hr >
2022-08-28 13:26:30 +01:00
Vedran Miletić
4f509058a9
Respond without body to HEAD request on a static resource
...
Co-authored-by: Marin Martuslović <marin.martuslovic@student.uniri.hr >
2022-08-28 13:26:30 +01:00
Máté Kocsis
b4ec3e9bc0
Do not generate CONST_CS when registering constants ( #9439 )
2022-08-28 08:27:19 +02:00
Máté Kocsis
06f86bfc65
Declare phpdbg constants in stubs ( #9392 )
2022-08-21 19:05:17 +02:00
Ilija Tovilo
98bdb7f99b
Make pestr[n]dup infallible ( #9295 )
...
Fixes GH-9128
Closes GH-9295
2022-08-12 12:21:14 +02:00
Michael Voříšek
bd3cd6a41a
Fix unstable sapi test, fix GH-9140 ( #9184 )
2022-08-04 22:35:44 +01:00
David Carlier
449edd815b
phpdbg few fixes, mostly printf-like format issues due to C str -> zend_string mismatches. annotate the allocator wrapper.
...
Closes #9210 .
2022-07-31 19:07:37 +01:00
Nikita Popov
828c93bedc
Fix unserialize dictionary generation
...
We now have namespaced classes in here, and need to escape the
backslashes.
2022-07-30 17:14:22 +02:00
Nikita Popov
107ad28350
Suppress unused-but-set-variable warning in parsers
...
This is very ugly: Bison provides a yynerrs variable, which is
usually not actually used, but also not annotated with
YY_MAYBE_UNUSED. Suppress this warning by adding a (void)yynerrs
into the top-level reduction action. The alternative would be to
disable the warning for these generated files.
2022-07-28 22:29:42 +02:00
George Peter Banyard
c8f4801382
Convert client->request.request_uri to zend_string ( #9086 )
2022-07-22 10:39:13 +01:00