summaryrefslogtreecommitdiff
path: root/sapi/fpm
Commit message (Collapse)AuthorAgeFilesLines
* Add extra run test for pm.max_spawn_rateJakub Zelenka2021-03-282-0/+44
|
* Max spawn child processes rate an oncePaulius Sapragonas2021-03-287-4/+100
| | | | * Add functionality to expect log config options
* Revert "Do not check exact values of unstable metrices in FPM status test"Nikita Popov2021-03-242-0/+8
| | | | | | | This reverts commit 5b01c4863fe9e4bc2702b2bbf66d292d23001a18. The previous commit fixes the 32-bit issue. Maybe this one is also needed, but let's see if any failures of this form turn up first.
* Fix printf type in fpm statusNikita Popov2021-03-241-1/+1
|
* Do not check exact values of unstable metrices in FPM status testJakub Zelenka2021-03-232-8/+0
|
* Fix types in FPM status openmetrics formatJakub Zelenka2021-03-221-19/+39
|
* Merge branch 'PHP-8.0'Jakub Zelenka2021-03-215-38/+209
|\
| * Merge branch 'PHP-7.4' into PHP-8.0Jakub Zelenka2021-03-215-38/+209
| |\
| | * Fix bug #80024: Duplication of info about inherited socket after pool removingJakub Zelenka2021-03-215-38/+209
| | |
* | | fpm master/child process rename, enable on mac os.David CARLIER2021-03-211-5/+3
| | | | | | | | | | | | Note the change appears mainly in command like ps.
* | | Fix indent in FPM openmetrics statusJakub Zelenka2021-03-211-39/+39
| | |
* | | Add support for openmetrics formatting to FPM statusCees-Jan Kiewiet2021-03-213-5/+118
| | |
* | | Improve class entry generationMáté Kocsis2021-02-161-1/+0
| | | | | | | | | | | | Related to GH-6701
* | | Avoid repeatedly calling strlen in FPM setproctitle implementationDavid Carlier2021-02-151-2/+3
| | | | | | | | | | | | Closes GH-6689.
* | | Enable class entry generation for sapi extensionsMáté Kocsis2021-02-142-2/+3
| | |
* | | Merge branch 'PHP-8.0'Nikita Popov2021-02-021-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Update year to 2021
| * | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2021-02-021-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-7.4: Update year to 2021
| | * Update year to 2021Peter Kokot2021-02-021-1/+1
| | | | | | | | | | | | Closes GH-6636.
* | | Replace zend_bool uses with boolNikita Popov2021-01-151-9/+9
| | | | | | | | | | | | | | | | | | | | | We're starting to see a mix between uses of zend_bool and bool. Replace all usages with the standard bool type everywhere. Of course, zend_bool is retained as an alias.
* | | Merge branch 'PHP-8.0'Jakub Zelenka2020-12-134-6/+80
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.4' into PHP-8.0Jakub Zelenka2020-12-134-6/+80
| |\ \ | | |/
| | * Fix bug #69625: FPM returns 200 status on request without SCRIPT_FILENAMEJakub Zelenka2020-12-134-6/+80
| | |
* | | Merge branch 'PHP-8.0'Nikita Popov2020-10-191-4/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Revert "Fix bug #64865: Use CONTEXT_DOCUMENT_ROOT for scanning dir tree"
| * | Revert "Fix bug #64865: Use CONTEXT_DOCUMENT_ROOT for scanning dir tree"Nikita Popov2020-10-191-4/+1
| | | | | | | | | | | | | | | | | | | | | This reverts commit 98bfad738ad2734dfba5733323f7ba733daf3ec3. This doesn't work well in some setups, see bug #80113 and GH-5051. Reverting this for now.
* | | Suppress bogus [-Wlogical-op] warning from GCCGeorge Peter Banyard2020-10-101-1/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | See GCC bug 69602: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602 which emits the warning for (errno == EWOULDBLOCK || errno == EAGAIN) which is the correct way of handling errors as the value of EWOULDBLOCK and EAGAIN is implementation defined. Therefore introduce a new macro function PHP_IS_TRANSIENT_ERROR() which handles the case when EWOULDBLOCK and EAGAIN are identical. Thanks to @twose for the idea.
* | Rehash function table after disabling functionsNikita Popov2020-08-281-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | To perform fast shutdown without full table cleanup we need all internal functions to be in one continuous chunk. This was violated when functions were deleted via disable_functions. This drops the zend_disable_function() API in favor of zend_disable_functions(), which disables the given list of functions and performs the necessary rehash afterwards. Also drop PG(disabled_functions), which is no longer used.
* | sapi/fpm/config.m4: check for libapparmor's aa_change_profile()Kees Cook2020-08-241-1/+1
| | | | | | | | | | | | | | | | The fpm code actually uses aa_change_profile(), not change_hat(). Test for the correct function. (libapparmor always has both, so this is just a correctness fix.) Closes GH-6037.
* | Small CS fixNyholm2020-08-121-6/+12
| | | | | | | | | | | | | | The comments were incorrectly aligned. Fix this by dropping the alignment and moving the comments before the declarations. Closes GH-5975.
* | FPM: Prevent warning with raising pm.max_children for shared poolJakub Zelenka2020-08-043-13/+5
| |
* | XFAIL status-listen FPM testNikita Popov2020-08-041-0/+2
| | | | | | | | | | | | | | | | | | | | 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'
* | FPM: Add pm.status_listen optionJakub Zelenka2020-08-0310-6/+148
| | | | | | | | | | | | | | | | | | | | 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.
* | Remove proto comments from C filesMax Semenik2020-07-061-20/+10
| | | | | | | | Closes GH-5758
* | Include stub hash in generated arginfo filesNikita Popov2020-06-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The hash is used to check whether the arginfo file needs to be regenerated. PHP-Parser will only be downloaded if this is actually necessary. This ensures that release artifacts will never try to regenerate stubs and thus fetch PHP-Parser, as long as you do not modify any files. Closes GH-5739.
* | Merge branch 'PHP-7.4'Nikita Popov2020-06-231-0/+2
|\ \ | |/ | | | | | | * PHP-7.4: Restore XFAIL on fpm test
| * Restore XFAIL on fpm testNikita Popov2020-06-231-0/+2
| | | | | | | | Still fails intermittently.
* | sapi/fpm/config.m4: add a new --with-fpm-apparmor configure flag.Michael Orlitzky2020-06-211-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing AC_FPM_APPARMOR macro (which is always run when FPM is enabled) checks for the existence of libapparmor, and adds it to $LIBS if found. The result is an "automagic" dependency on libapparmor that depends not only on the user's configuration, but also on the build host's environment. In particular, this can cause problems if the user just happens to have libapparmor installed (for testing or development) when he builds PHP. Later, he may remove libapparmor, not realizing that PHP depends on it. At that point, FPM will cease to work due to the missing library. This commit adds a new configure flag called "--with-fpm-apparmor", defaulting to "no", that enables or disables the feature. The new flag is used to signal the user's intent; whether or not he wants to use AppArmor. If he does, then we still check for the existence and usability of libapparmor; however, it is now an error for the library to be missing when --with-fpm-apparmor is requested. Gentoo-bug: https://bugs.gentoo.org/637402 PHP-bug: https://bugs.php.net/bug.php?id=75519
* | Merge branch 'PHP-7.4'Nikita Popov2020-06-182-2/+2
|\ \ | |/
| * Fix race condition in FPM testsNikita Popov2020-06-182-2/+2
| | | | | | | | | | The newly de-XFAILed tests have a race condition. Make sure we terminate only after expecting all the log lines.
* | Merge branch 'PHP-7.4'Nikita Popov2020-06-182-4/+0
|\ \ | |/
| * Un-XFAIL FPM testsNikita Popov2020-06-182-4/+0
| | | | | | | | | | | | 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.
* | Use ZEND_UNREACHABLE() instead of ZEND_ASSERT(0)Christoph M. Becker2020-06-161-1/+1
| | | | | | | | | | | | | | | | | | Instead of marking unreachable code with `ZEND_ASSERT(0)`, we introduce `ZEND_UNREACHABLE()`, so that MSVC which does not consider `assert(0)` to mark unreachable code does no longer trigger C4715[1] warnings in debug builds. This may be useful for other compilers as well. [1] <https://docs.microsoft.com/de-de/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4715?view=vs-2019>
* | Constify char * arguments of APIstwosee2020-06-083-8/+8
| | | | | | | | Closes GH-5676.
* | Implement #47074: phpinfo() reports "On" as 1 for the some extensionsChristoph M. Becker2020-06-041-6/+6
| | | | | | | | What is modified as boolean, should also be displayed as boolean.
* | Adjust bogus checks in FPM as HAVE_FPM_LQ is always definedGeorge Peter Banyard2020-05-172-34/+1
| | | | | | | | | | | | Drop checks for FPM status as per review Closes GH-5530
* | Add stubs for some SAPIsMáté Kocsis2020-05-143-12/+40
| | | | | | | | | | For apache2handler, fpm, litespeed, phpdbg, specifically. Partially implements GH-5295
* | Fix [-Wundef] warning in FPM SAPIGeorge Peter Banyard2020-05-1210-27/+27
| |
* | Add quiet parameter to internal HTML entities APINikita Popov2020-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | In some places, we need to make sure that no warnings are thrown due to unknown encoding. The error reporting code tried to avoid this by determining a "safe charset", but this introduces subtle discrepancies in which charset is picked (normally internal_encoding takes precedence). Avoid this by suppressing the warning in the first place. While here, use the fallback logic to print error messages with substitution characters more consistently, to avoid skipping parts of the error message entirely.
* | Drop unnecessary stdint and inttypes header checksGeorge Peter Banyard2020-04-224-20/+4
| | | | | | | | | | | | | | | | These are always available as of C99. Closes GH-5323 Co-authored-by: "Christoph M. Becker" <cmbecker69@gmx.de>
* | Merge branch 'PHP-7.4'Nikita Popov2020-04-201-3/+3
|\ \ | |/ | | | | | | * PHP-7.4: Apply doc root fix for FPM
| * Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-04-201-3/+3
| |\ | | | | | | | | | | | | * PHP-7.3: Apply doc root fix for FPM
View Lorry Controller Status