summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)AuthorAgeFilesLines
* Fix bug #80024: Duplication of info about inherited socket after pool removingJakub Zelenka2021-03-215-38/+209
|
* LiteSpeed SAPI v7.9: Process manager keeps forked child process alive for ↵George Wang2021-03-052-38/+55
| | | | longer time based on load. Reduces PM overhead for busy setup.
* Fix bug #80757 (Exit code is 0 when could not open file)Felipe Pena2021-02-241-0/+1
|
* Fix #80771: phpinfo(INFO_CREDITS) displays nothing in CLIChristoph M. Becker2021-02-221-1/+1
| | | | | | | There is no good reason not to show the credits in text based SAPIs, except for brevity. Thus, we suppress the credits from `php -i`. Closes GH-6710.
* Update year to 2021Peter Kokot2021-02-023-3/+3
| | | | Closes GH-6636.
* Revert "Fix #76813: Access violation near NULL on source operand"Christoph M. Becker2021-01-113-21/+3
| | | | | This reverts commit 5e15c9c41f8318a8392c2e2c78544f218736549c, since re2c default rules are only available as of re2c 0.13.7.
* Fix bug #69625: FPM returns 200 status on request without SCRIPT_FILENAMEJakub Zelenka2020-12-134-6/+80
|
* Fix #76813: Access violation near NULL on source operandChristoph M. Becker2020-11-303-3/+21
| | | | | | | | | | We avoid `YYCURSOR` becoming `NULL` by initializing `YYMARKER`, and add a default rule for `<NORMAL>` where we catch unexpected input. We also fix the only superficially related issue regarding empty input followed by `T_SEPARATOR` and command, which caused another segfault. Closes GH-6464.
* Merge branch 'PHP-7.3' into PHP-7.4George Wang2020-08-101-1/+2
|\
| * Make sure string is NUL byte terminated.George Wang2020-08-101-1/+2
| |
* | Check ps -p availability in process title testNikita Popov2020-08-051-1/+6
| |
* | Prevent test case from stallingChristoph M. Becker2020-07-291-2/+4
| | | | | | | | | | | | | | If the CTRL-C event can't be sent to the child for whatever reason, the test will never terminate, because `proc_close()` waits for an infinite amount of time. Therefore, we `proc_terminate()` the child instead, after explicitly closing the pipes.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-07-271-2/+11
|\ \ | |/ | | | | | | * PHP-7.3: Fix #77932: File extensions are case-sensitive
| * Fix #77932: File extensions are case-sensitiveChristoph M. Becker2020-07-271-2/+11
| | | | | | | | | | | | The file extension to mime type mapping *must* not depend on the file extension's case for case-insensitive file systems, and *should* not for case-sensitive file systems.
* | Merge branch 'PHP-7.3' into PHP-7.4George Wang2020-07-233-14/+234
|\ \ | |/
| * Merge branch 'PHP-7.2' into PHP-7.3George Wang2020-07-233-14/+234
| |\
| | * Security: update to LiteSpeed SAPI v7.7 to address an buffer overflow, and ↵George Wang2020-07-233-14/+234
| | | | | | | | | | | | some log message tunings.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-06-241-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fixed bug #79030 Use usec from apache request time
| * | Fixed bug #79030 Use usec from apache request timeHerbert2562020-06-241-1/+1
| | | | | | | | | | | | | | | | | | Don't unnecessarily truncate to milliseconds. Closes GH-5760.
* | | Restore XFAIL on fpm testNikita Popov2020-06-231-0/+2
| | | | | | | | | | | | Still fails intermittently.
* | | 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.
* | | 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.
* | | Skip new watch point test under asanNikita Popov2020-06-031-0/+6
| | |
* | | Fix #73927: phpdbg fails with windows error prompt at "watch array"Christoph M. Becker2020-06-023-7/+55
| | | | | | | | | | | | | | | | | | We expect zvals, so we should request zvals. We also suppress spurious watchpoint removal notices.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-06-011-0/+3
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #79650: php-win.exe 100% cpu lockup
| * | Fix #79650: php-win.exe 100% cpu lockupChristoph M. Becker2020-06-011-0/+3
| | | | | | | | | | | | | | | | | | As of PHP 7.3.0, `sapi_cli_single_write()` is supposed to return `< 0` on failure, but `fwrite()` returns a `size_t`, and signals error by setting the stream's error indicator. We have to cater to that.
* | | Make phpdbg test portableChristoph M. Becker2020-05-261-1/+1
| | |
* | | Fix several mostly Windows related phpdbg bugsChristoph M. Becker2020-05-264-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Properly initialize PHPDBG_G(watch_tmp) Otherwise that may cause segfaults in ZTS builds. * Deactivate potentially remaining watchpoints after REPL Otherwise the memory could still be protected, resulting in segfaults during shutdown. * NULL zend_handlers_table after freeing As of commit 4130fe4[1], the `zend_handlers_table` is explicitly freed in the `zend_vm_dtor()`. Since phpdbg (and maybe some other SAPIs) may restart the engine afterwards, we have to make sure that the table is also NULLed. * Only set context option if there is a context In other words, we must not follow the null pointer. * Cater to file handles without attached console File handles do not necessarily have an attached console (for instance, pipes do not), in which case `GetConsoleScreenBufferInfo()` fails. In this case we set a default value (`40`) for lines like on other systems. [1] <http://git.php.net/?p=php-src.git;a=commit;h=4130fe437a5db7ead1444d3748bd0fbad9829cb2>
* | | Fix #73926: phpdbg will not accept input on restart executionChristoph M. Becker2020-05-261-1/+1
| | | | | | | | | | | | We are more liberal, and accept Windows line endings (CRLF) as well.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-05-191-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix INI setting member name
| * | Fix INI setting member nameChristoph M. Becker2020-05-191-1/+1
| | | | | | | | | | | | | | | | | | Since the member is not used in `OnUpdateEol()` that's not really an issue, but still it's confusing to apparently have two INI settings targeting the same member.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-05-121-0/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #79489: .user.ini does not inherit
| * | Fix #79489: .user.ini does not inheritChristoph M. Becker2020-05-121-0/+4
| | | | | | | | | | | | | | | On Windows, PATH_TRANSLATED may contain backslashes as well as slashes, so we must not only check for `DEFAULT_SLASH`.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-04-201-3/+3
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #79491: Search for .user.ini extends up to root dir
| * | Fix #79491: Search for .user.ini extends up to root dirChristoph M. Becker2020-04-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `start` parameter of `php_cgi_ini_activate_user_config` is supposed to hold the byte offset of the doc root in the given `path`. However, the current expression which fixes a potential type incompatibility will ever only evaluate to zero or one, because it uses the *logical* and operator (`&&`). Furthermore we notice that subtracting one from `doc_root_len` is not necessary, so there is even no need for the `start` parameter at all.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-04-201-3/+3
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Apply doc root fix for FPM
| * | Apply doc root fix for FPMNikita Popov2020-04-201-3/+3
| | | | | | | | | | | | | | | | | | This is the change from GH-5417 but for FPM. This was stripping the last character from the doc_root. Given how it is used, this should be harmless, but let's make it less confusing...
* | | Add php_cli_server_connect() helperNikita Popov2020-04-0833-251/+83
| | | | | | | | | | | | | | | | | | | | | To encapsulate the repeated fsockopen() code. This gives us a chance to control the timeout in one place: Raise it to one second.
* | | Relax overly strict test expectationChristoph M. Becker2020-04-081-2/+1
| | | | | | | | | | | | | | | | | | | | | There is no reason to expect a `1` after the PID; neither the session ID nor the memory usage are required to contain one. Actually, we just want to verify here, that the process with the $child_pid is running, and is a php.exe process.
* | | Skip fpm tests not designed to be run as rootMatteo Beccati2020-04-024-0/+13
| | | | | | | | | | | | When running as root with TEST_FPM_RUN_AS_ROOT=1
* | | Allow fpm tests to be run with long socket pathMatteo Beccati2020-04-021-1/+11
| | | | | | | | | | | | | | | Socket path is restricted to ~100 bytes, so we can use the system temp dir if the path ends up too long.
* | | Allow numeric [UG]ID in FPM listen.{owner,group}Andre Nathan2020-03-295-15/+200
| | |
* | | Fix another flaky FPM testNikita Popov2020-02-281-1/+2
| | |
* | | Try to fix intermittent FPM failuresNikita Popov2020-02-281-1/+2
| | | | | | | | | | | | | | | Terminate only after expecting the log lines to avoid race condition.
* | | Fix bug #79014 (PHP-FPM & Primary script unknown)Jakub Zelenka2020-02-231-4/+0
| | |
* | | Fix bug #77653 (operator displayed instead of the real error message)Jakub Zelenka2020-02-237-49/+198
| | |
* | | Apply tidy formattingNikita Popov2020-02-035-136/+136
| | | | | | | | | | | | Mostly reindent PHP scripts to spaces.
* | | Disable parallelism for FPM testsNikita Popov2020-02-031-1/+3
| | | | | | | | | | | | Let's see if this helps with spurious failures on Azure.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-01-277-3/+170
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix bug #78323: Code 0 is returned on invalid options
| * | Fix bug #78323: Code 0 is returned on invalid optionsIvan Mikheykin2020-01-277-3/+170
| | | | | | | | | | | | | | | Set CLI exit code to 1 when invalid parameters are passed, and print error to stderr.
View Lorry Controller Status