php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-18 13:31:27 +02:00
Code Issues Packages Projects Releases Wiki Activity
126,724 Commits 547 Branches 1,483 Tags
7ea3b19331a792746b094a218ea6bf4f76e6d77e
Commit Graph

5647 Commits

Author SHA1 Message Date
Christoph M. Becker
720d6faa29 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix bugtracker URL
 2022-02-15 19:15:24 +01:00
Christoph M. Becker
e98a7a68b7 Fix bugtracker URL 
The php-src bugtracker is now on Github.

Closes GH-8102.
 2022-02-15 19:14:07 +01:00
Jakub Zelenka
49087a65ee Merge branch 'PHP-8.0' into PHP-8.1 2022-02-09 23:23:05 +00:00
Till Backhaus
29fe06fa59 Fix bug #76109: Implement fpm_scoreboard_copy 
fpm_scoreboard_copy locks the scoreboard while copying the scoreboard and all
proc scoreboards. proc scoreboards are locked one by one while copying each
struct. The old implementation (inside fpm_handle_status_request) only briefly
locked the scoreboard while copying the scorebard.

Closes GH-7931

Co-authored-by: Jakub Zelenka <bukka@php.net>
 2022-02-09 23:02:45 +00:00
Christoph M. Becker
2b07513192 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix memory leak on invalid port
 2022-01-08 21:06:39 +01:00
David Carlier
c99a026c9c Fix memory leak on invalid port 
Closes GH-7911.
 2022-01-08 21:04:55 +01:00
Stefano Arlandini
46bec6de42 Fix the OpenMetrics response format returned by the FPM status page 
Closes GH-7843, closes GH-7842
 2022-01-04 23:01:10 +00:00
Christoph M. Becker
5d4bef0d0c Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix buffer allocations in zlog_stream_set_msg_suffix()
 2021-12-28 13:28:55 +01:00
David Carlier
cb3d858745 Fix buffer allocations in zlog_stream_set_msg_suffix() 
If that code was used, there would be a UAF scenario.

Closes GH-7835.
 2021-12-28 13:27:54 +01:00
Jakub Zelenka
a529d0dd15 Merge branch 'PHP-8.0' into PHP-8.1 2021-11-27 22:39:51 +00:00
Jakub Zelenka
81513e6285 Add skip for FPM process idle flaky test 2021-11-27 22:37:43 +00:00
Remi Collet
ef2fd0e5b5 fix [-Wstrict-prototypes] buid warnings 2021-11-24 14:55:11 +01:00
Jakub Zelenka
435a5aca89 Add FPM test for php_admin_value doc_root usage 
Closes GH-7673.
 2021-11-23 18:36:04 +01:00
Jakub Zelenka
79f0e486fd Merge branch 'PHP-8.0' into PHP-8.1 2021-11-20 20:44:02 +00:00
Jakub Zelenka
2f8407f185 Increase read timeout in FPM process idle test 2021-11-20 20:42:19 +00:00
Jakub Zelenka
fc67967190 Increase script sleep in FPM process idle test 2021-11-20 20:42:19 +00:00
Nikita Popov
36d2d27980 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Update reflection test after stub change
 2021-11-18 11:16:35 +01:00
Nikita Popov
e81ad637f4 Update reflection test after stub change 2021-11-18 11:16:13 +01:00
Jakub Zelenka
48bc4ea758 Merge branch 'PHP-8.0' into PHP-8.1 2021-11-14 20:14:22 +00:00
Jakub Zelenka
ec3d4409a4 Merge branch 'PHP-7.4' into PHP-8.0 2021-11-14 20:10:42 +00:00
Jakub Zelenka
b2cf9b7ec7 Fix bug #81513 (Future possibility for heap overflow in FPM zlog) 
This fixes currently unused code path in zlog that could lead to
the heap overflow in the future.
 2021-11-14 20:08:57 +00:00
Nikita Popov
4a5d75e3ec Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix leaks for AppArmor based distros in case the profile creation fails
 2021-11-12 14:26:03 +01:00
David Carlier
b1e6fdefd4 Fix leaks for AppArmor based distros in case the profile creation fails 
Closes GH-7646.
 2021-11-12 14:25:52 +01:00
Nikita Popov
b0ec6223e2 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Implement Stringable automatically for internal classes
 2021-11-05 10:23:23 +01:00
Nikita Popov
b302bfabe7 Implement Stringable automatically for internal classes 
Requiring all internal classes (including those from 3rd-party
extensions) to implement Stringable if they provide __toString()
is too error prone. Case in point, our _ZendTestClass test class
was not doing so, resulting in preloading test failures after
recent changes.

Instead we automatically implement Stringable, the same as we do
for userland classes. We still allow explicit implementations,
but ignore them (normally they would result in an error due to
duplicate interface implementation). Finally, we need to be
careful about not trying to implement Stringable on Stringable
itself.

In some cases this changes the interface order, in particular the
automatic Stringable implementation will now come first.
 2021-11-05 10:22:04 +01:00
Nikita Popov
fb5cff1272 Print array defaults in reflection 
As a followup to f34114b1fb print
the contents of arrays rather than just a generic "Array" marker.
Also drop the truncation on strings. As we no longer resolve
constants, there should be less concerns about printing very
large strings here. If someone thought it was a good idea to use
a 10k character strings as a default value in code, then it should
be fine for us to print it in reflection as well.
 2021-10-20 15:16:29 +02:00
Stanislav Malyshev
0acfd2d7b5 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix bug #81026 (PHP-FPM oob R/W in root process leading to priv escalation)
  Add FPM fix news
  Fix bug #81026 (PHP-FPM oob R/W in root process leading to priv escalation)
 2021-10-18 15:23:08 -07:00
Jakub Zelenka
fadb1f8c1d Fix bug #81026 (PHP-FPM oob R/W in root process leading to priv escalation) 
The main change is to store scoreboard procs directly to the variable sized
array rather than indirectly through the pointer.

Signed-off-by: Stanislav Malyshev <stas@php.net>
 2021-10-18 15:06:36 -07:00
David Carlier
f71810fb6f Fix some FPM printf warnings on openbsd 
Closes GH-7585.
 2021-10-18 11:11:33 +02:00
Jakub Zelenka
cb2021e5f6 Fix bug #81026 (PHP-FPM oob R/W in root process leading to priv escalation) 
The main change is to store scoreboard procs directly to the variable sized
array rather than indirectly through the pointer.

Signed-off-by: Stanislav Malyshev <stas@php.net>
 2021-10-17 20:16:10 -07:00
Christoph M. Becker
f99c69fc2e Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix #81518: Header injection via default_mimetype / default_charset
 2021-10-14 12:23:43 +02:00
Christoph M. Becker
b7f3b67060 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #81518: Header injection via default_mimetype / default_charset
 2021-10-14 12:21:35 +02:00
Christoph M. Becker
365769366b Fix #81518: Header injection via default_mimetype / default_charset 
We forbid setting these INI options to values containing NUL bytes, CR
or LF.

Closes GH-7574.
 2021-10-14 12:16:19 +02:00
Joe Watkins
03e9bed5b5 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix #81496: CLI server logs wrong request method
 2021-10-05 08:43:09 +02:00
Lauri Kenttä
cdcdb33080 Fix #81496: CLI server logs wrong request method 2021-10-05 08:42:38 +02:00
Nikita Popov
cd84480e54 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Disable failing FPM test
 2021-10-04 23:31:40 +02:00
Nikita Popov
a00d933242 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Disable failing FPM test
 2021-10-04 23:31:31 +02:00
Nikita Popov
4c01bd2ade Disable failing FPM test 
Test fails intermittently, e.g.:

https://dev.azure.com/phpazuredevops/PHP/_build/results?buildId=20597&view=ms.vss-test-web.build-test-results-tab&runId=475324&resultId=115501&paneView=debug

Possibly this is because the two requests end up being processed
in sequence and no second process is spawned.
 2021-10-04 23:30:14 +02:00
Jakub Zelenka
7dd87b2343 Merge branch 'PHP-8.0' into PHP-8.1 2021-10-04 21:56:06 +01:00
Jakub Zelenka
9ed95846a3 Merge branch 'PHP-7.4' into PHP-8.0 2021-10-04 21:55:21 +01:00
Jakub Zelenka
66a655fdf4 Add the actual test for FPM prod idle timeout test with 6s sleep 2021-10-04 21:54:32 +01:00
Jakub Zelenka
2cd69115d5 Merge branch 'PHP-7.4' into PHP-8.0 2021-10-04 21:53:34 +01:00
Jakub Zelenka
edfb347019 Add FPM prod idle timeout test with 6s sleep 2021-10-04 21:50:57 +01:00
Nikita Popov
0431bd3137 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Revert "Add FPM prod idle timeout test"
  [ci skip] Fix missing NEWS
  [ci skip] Add missing NEWS
 2021-10-04 10:17:07 +02:00
Nikita Popov
987aee10a9 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Revert "Add FPM prod idle timeout test"
 2021-10-04 10:16:53 +02:00
Nikita Popov
69514e6ffb Revert "Add FPM prod idle timeout test" 
This reverts commit 08f52b1643.

The newly added test fails.
 2021-10-04 10:16:20 +02:00
Jakub Zelenka
4ef6280b9a Fix conflicting pattern wrapping in FPM openmetrics test 2021-10-02 18:31:49 +01:00
Jakub Zelenka
390d4e94ed Merge branch 'PHP-8.0' into PHP-8.1 2021-10-02 18:29:25 +01:00
Jakub Zelenka
ca3f20209f Merge branch 'PHP-7.4' into PHP-8.0 2021-10-02 18:27:47 +01:00
Jakub Zelenka
08f52b1643 Add FPM prod idle timeout test 2021-10-02 18:26:18 +01:00