php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 09:12:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
120,978 Commits 547 Branches 1,481 Tags
dddb40313bf8acdf0294deb3b41fbe94de2806e6
Commit Graph

151 Commits

Author SHA1 Message Date
Jakub Zelenka
37a878b8c3 FPM: Prevent warning with raising pm.max_children for shared pool 2020-08-04 21:01:13 +01:00
Nikita Popov
4644a3ed8a XFAIL status-listen FPM test 
Has frequent intermittent failures with:

ERROR: The NOTICE does not match expected message:
- PATTERN: /^\[\d\d-\w\w\w-\d{4} \d\d:\d\d:\d\d\] NOTICE: Terminating ...$/
- MESSAGE: [04-Aug-2020 08:15:37] WARNING: [pool unconfined_status] server reached max_children setting (2), consider raising it
- EXPECT: 'Terminating ...'
- ACTUAL: '2020 08:15:37] WARNING: [pool unconfined_status] server reached max_children setting (2), consider raising it'
 2020-08-04 10:27:33 +02:00
Jakub Zelenka
44c7128fb7 FPM: Add pm.status_listen option 
This option allows getting status from different endpoint (e.g. port
or UDS file) which is useful for getting status when all children are
busy with serving long running requests.

Internally a new shared pool with ondemand process manager is used. It
means that the status requests have reserved resources and should not
be blocked by other requests.
 2020-08-03 19:14:13 +01:00
Nikita Popov
40d162e423 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Restore XFAIL on fpm test
 2020-06-23 12:36:04 +02:00
Nikita Popov
c4639a2deb Restore XFAIL on fpm test 
Still fails intermittently.
 2020-06-23 12:35:11 +02:00
Nikita Popov
ebc3043816 Merge branch 'PHP-7.4' 2020-06-18 17:02:24 +02:00
Nikita Popov
ea3a317659 Fix race condition in FPM tests 
The newly de-XFAILed tests have a race condition. Make sure we
terminate only after expecting all the log lines.
 2020-06-18 17:01:29 +02:00
Nikita Popov
111f05610d Merge branch 'PHP-7.4' 2020-06-18 16:00:30 +02:00
Nikita Popov
76ca6bf3ef Un-XFAIL FPM tests 
These were XFAILed due to a bug in the log implementation that
caused intermittent failures. However, this issue is supposed to
be resolved in the meantime, so try dropping the XFAIL marker.
 2020-06-18 15:59:32 +02:00
Matteo Beccati
66ec60cb45 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Skip fpm tests not designed to be run as root
  Allow fpm tests to be run with long socket path
 2020-04-02 16:17:24 +02:00
Matteo Beccati
87375fa2be Skip fpm tests not designed to be run as root 
When running as root with TEST_FPM_RUN_AS_ROOT=1
 2020-04-02 16:16:42 +02:00
Matteo Beccati
af337ae47e Allow fpm tests to be run with long socket path 
Socket path is restricted to ~100 bytes, so we can use
the system temp dir if the path ends up too long.
 2020-04-02 16:16:42 +02:00
Jakub Zelenka
477efe935b Merge branch 'PHP-7.4' 2020-03-29 20:21:24 +01:00
Andre Nathan
0b4e80b8c1 Allow numeric [UG]ID in FPM listen.{owner,group} 2020-03-29 20:20:01 +01:00
Nikita Popov
a297c4ef9e Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix another flaky FPM test
 2020-02-28 14:41:32 +01:00
Nikita Popov
b2d01e0be8 Fix another flaky FPM test 2020-02-28 14:40:21 +01:00
Nikita Popov
b89ba475df Merge branch 'PHP-7.4' 
* PHP-7.4:
  Try to fix intermittent FPM failures
 2020-02-28 13:19:53 +01:00
Nikita Popov
3c096b51f9 Try to fix intermittent FPM failures 
Terminate only after expecting the log lines to avoid race
condition.
 2020-02-28 13:19:10 +01:00
Jakub Zelenka
ee0579350f Merge branch 'PHP-7.4' 2020-02-23 18:32:20 +00:00
Jakub Zelenka
0bc6a66a7a Fix bug #77653 (operator displayed instead of the real error message) 2020-02-23 18:29:10 +00:00
Nikita Popov
f8d795820e Reindent phpt files 2020-02-03 22:52:20 +01:00
Nikita Popov
4cdd15d414 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Disable parallelism for FPM tests
 2020-02-03 09:58:03 +01:00
Nikita Popov
aaf9cbb7eb Disable parallelism for FPM tests 
Let's see if this helps with spurious failures on Azure.
 2020-02-03 09:57:34 +01:00
Nikita Popov
16f194c75e Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix bug #78323: Code 0 is returned on invalid options
 2020-01-27 13:32:51 +01:00
Nikita Popov
1cccbb8ff1 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug #78323: Code 0 is returned on invalid options
 2020-01-27 13:32:38 +01:00
Ivan Mikheykin
fd08f062ae Fix bug #78323: Code 0 is returned on invalid options 
Set CLI exit code to 1 when invalid parameters are passed,
and print error to stderr.
 2020-01-27 13:32:19 +01:00
Nikita Popov
06e193ba8d Merge branch 'PHP-7.4' 
* PHP-7.4:
  Add sleep in FPM reload test
 2020-01-21 17:56:43 +01:00
Nikita Popov
0aa09da486 Add sleep in FPM reload test 
Explicitly mark the point where we have to wait.
 2020-01-21 17:55:47 +01:00
Máté Kocsis
c3cf01b553 Fix #78880: Yet another batch of spelling errors 2020-01-16 12:04:00 +01:00
Máté Kocsis
0b4778c377 Fix #78880: Another bunch of spelling errors 2020-01-16 09:46:47 +01:00
Nikita Popov
0a9bdd6e7b Merge branch 'PHP-7.4' 
* PHP-7.4:
  Increase select timeout in FPM tester
 2020-01-09 10:20:28 +01:00
Nikita Popov
b3cc30adf8 Increase select timeout in FPM tester 
Let's see if that helps with the recent failure spree on Azure.
 2020-01-09 10:19:02 +01:00
Nikita Popov
d5f26de63d Merge branch 'PHP-7.4' 
* PHP-7.4:
  Revert "Display a message if select in FPM test timeouts"
 2020-01-08 16:32:00 +01:00
Nikita Popov
4b860c06ed Revert "Display a message if select in FPM test timeouts" 
This reverts commit e2361498d5.

Ooops, this occurs normally during some tests, but I didn't notice
because I have slow tests disabled...
 2020-01-08 16:31:33 +01:00
Nikita Popov
c669a1a4da Merge branch 'PHP-7.4' 
* PHP-7.4:
  Display a message if select in FPM test timeouts
 2020-01-08 15:57:21 +01:00
Nikita Popov
e2361498d5 Display a message if select in FPM test timeouts 2020-01-08 15:57:05 +01:00
Jakub Zelenka
f826bbde93 Merge branch 'PHP-7.4' 2019-11-17 14:53:53 +00:00
Maksim Nikulin
e37bd5dcc2 Do not let PHP-FPM children miss SIGTERM, SIGQUIT 
Postpone signal delivery while spawning children.
Prevent the following case:

- Reload (reexec) is in progress.
- New master is forking to start enough children for pools
  where `pm` is not `on-demand`.
- Another `SIGUSR2` is received by the master process.
- Master process switches to reloading state.
- Some child has not set its own signal handlers.
- `SIGQUIT` and `SIGTERM` sent by master process are caught
  by signal handler set by master process and so they are ignored.
- A child is running, it has no reason to finish

Before pull request #4465 this scenario could cause deadlock,
however with 0ed6c37140 reload finishes after `SIGKILL`.

Use sigprocmask() around fork() to avoid race of delivery signal to children
and setting of own signal handlers.

Fixes bug #76601
 2019-11-17 14:46:56 +00:00
Stanislav Malyshev
6bef57f2e2 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
  bump versions after release
  set versions for release
 2019-10-21 13:17:32 -07:00
Stanislav Malyshev
59953efc09 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
  bump versions after release
  set versions for release
 2019-10-21 13:17:27 -07:00
Stanislav Malyshev
57b4dcbe77 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
  bump versions after release
  set versions for release
 2019-10-21 13:17:19 -07:00
Stanislav Malyshev
4b5cdda0c7 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
  bump versions after release
  set versions for release
 2019-10-21 13:17:09 -07:00
Jakub Zelenka
ab061f95ca Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043) 2019-10-20 22:50:04 -07:00
Jakub Zelenka
878f8b0b23 Merge branch 'PHP-7.4' 2019-10-20 16:59:30 +01:00
Maksim Nikulin
d537ae73e0 Skip fpm bug #74083 test on Windows 
Have not expected side effects of `include`.
 2019-10-20 16:08:55 +01:00
Maksim Nikulin
2f9f409156 Add (slow) test for fpm concurrent reloads #74083 2019-10-20 16:08:55 +01:00
Nikita Popov
31ff9f3e29 Merge branch 'PHP-7.4' 2019-09-27 11:20:48 +02:00
Nikita Popov
f2826954ac XFAIL sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt 
This is supposed to be addressed by GH-4007, but that seems stalled
for now.
 2019-09-27 11:18:50 +02:00
Jakub Zelenka
71e2c97ffb Merge branch 'PHP-7.4' 2019-08-26 18:12:35 +01:00
Jakub Zelenka
302a1400f3 Merge branch 'PHP-7.3' into PHP-7.4 2019-08-26 18:11:04 +01:00