php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 17:22:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,322 Commits 547 Branches 1,481 Tags
6ef2f04a7557504c2596c82c5c64240dbc21ec24
Commit Graph

5001 Commits

Author SHA1 Message Date
Nikita Popov
698dd32b03 Fix fpm limit_extensions leak 
The logic here is somewhat ugly because the worker pool structure
gets freed early, so we need to explicitly transfer ownership.
 2019-06-26 11:40:39 +02:00
Nikita Popov
42b22d3a94 Fix out of bounds write in phpdbg 
It seems that this code has a peculiar interpretation of "len",
where it actually points to the last character, not one past it.
So we need +1 here for that extra char and another +1 for the
terminating null byte.
 2019-06-25 14:28:58 +02:00
Christoph M. Becker
94df6dc3fd Split test case 
This test is failing on AppVeyor almost all of the time, so splitting
it seems appropriate.  This also allows us to rid php_cli_server_stop()
which was only used by this test case.
 2019-06-24 14:08:11 +02:00
Nikita Popov
152ccfb08d Fix stack leak in phpdbg 2019-06-21 17:01:25 +02:00
Nikita Popov
a7bcfee9c9 Fix prompt leak in phpdbg 2019-06-21 17:01:18 +02:00
Joe Watkins
eda5d8afcf refactor a little more to add some more useful error messages and raise the limits on waiting for slow machines 2019-06-19 11:41:24 +02:00
Joe Watkins
d6480fa231 Separate check for process creation and ability to accept connections 2019-06-19 11:09:26 +02:00
Freddie Leeman
482784284a Simplify pm.start_servers calculation in docs 
This makes it more obvious that this is just the average.
 2019-06-17 13:24:22 +02:00
Joe Watkins
116d42d990 bugs in fpm logging #4273 #4007 2019-06-17 07:48:37 +02:00
Joe Watkins
dd10bf5450 Merge branch 'mac-tests' into PHP-7.4 
* mac-tests:
  fix mac tests on azure
 2019-06-14 12:56:08 +02:00
Joe Watkins
f16b012116 fix mac tests on azure 2019-06-14 12:55:00 +02:00
Nikita Popov
646b64b119 Fix skipif syntax errors 
Apparently I did this only on masster...
 2019-06-14 09:29:14 +02:00
Nikita Popov
16f79129c7 Fix unused variables in fpm_env.c 2019-06-12 13:17:25 +02:00
Nikita Popov
852ab5d83f Use %define api.pure instead of %pure-parser 
%pure-parser is deprecated. In our case there is no difference between
true & full, as we don't use locations.
 2019-06-12 09:26:34 +02:00
Nikita Popov
89b2d88659 Register class before fetching parent 
We want the class declaration to be available while compiling the
parent class.
 2019-06-11 13:09:33 +02:00
Joe Watkins
9ecc0a4f29 use XFAILIF rather than XFAIL to avoid warnings [ci skip] 2019-06-11 12:55:28 +02:00
Joe Watkins
1e5004060e watchpoints have flaws in implementation 2019-06-10 14:23:37 +02:00
Peter Kokot
2dd6ec07d1 Simplify LiteSpeed SAPI module version 
This patch syncs versioning of the LiteSpeed SAPI module by making it in
sync with the rest of the bundled PHP extensions and SAPIs.

Closes #4145
 2019-06-09 22:32:47 +02:00
Peter Kokot
5b36c9fef6 Use PHP_VERSION for zend modules 
Closes #4147
 2019-06-09 22:32:47 +02:00
Nikita Popov
18060e5923 Merge branch 'PHP-7.3' into PHP-7.4 2019-06-04 16:14:26 +02:00
Nikita Popov
a4633b13d4 Merge branch 'PHP-7.2' into PHP-7.3 2019-06-04 16:14:14 +02:00
Nikita Popov
2d3bc71e89 Reload tsrmls_id in release builds as well 
If TSRM is shut down and started again (something that phpdbg does),
then tsrmls_id needs to be reloaded everywhere. As tsrmls_id
update is a rare operation, doing that shouldn't be a problem.
 2019-06-04 16:12:59 +02:00
Nikita Popov
a982125561 Try to fix phpdbg + opcache compatibility 2019-06-04 15:08:55 +02:00
Anatol Belski
7a64150921 Don't involve output check in the test 2019-06-01 23:31:05 +02:00
Christoph M. Becker
637d8677b3 Fix ZTS issue regarding new Windows CTRL handling API 
php_win32_signal_system_ctrl_handler() is called from a kernel thread,
so the former initialization of `vm_interrupt_flag` has no effect,
since it is defined as thread-local.  This is, however, not necessary,
since the CTRL signal handling is supposed to work only for the main
thread anyway.  We therefore change `vm_interrupt_flag` and the related
variables to true globals.

This also allows us to unmark the respective test case as XFAIL.

Furthermore, `vm_interrupt_flag` is declared as `zend_bool *`, so we
better treat it such.
 2019-06-01 09:35:47 +02:00
Nikita Popov
96a11bee1c Add CONFLCITS file for fpm 
We should not run FPM tests in parallel due to port clashes.
 2019-05-31 10:54:41 +02:00
Nikita Popov
4b1f711823 Mark sapi_windows_set_ctrl_handler.phpt as XFAIL 2019-05-31 09:17:51 +02:00
Nikita Popov
3ba64545ed Update phpdbg oplog test 2019-05-29 17:05:01 +02:00
Nikita Popov
b32b8e91bd Update cli reflection test 2019-05-29 17:02:36 +02:00
Nikita Popov
43be89ed87 Remove two zpp tests in sapi/cli/tests 
These fail on master -- apparently we're not running these tests...
 2019-05-29 17:00:12 +02:00
Joe Watkins
e11233dc49 Revert "Rename *.l files to *.re" 
This reverts commit 969047749d.
 2019-05-20 06:06:38 +02:00
Peter Kokot
969047749d Rename *.l files to *.re 
This syncs PHP lexer files to all use *.re extension. The *.re files are
processed with the RE2C tool.
 2019-05-17 23:53:03 +02:00
Peter Kokot
8e456d3b9e Rename configure --with-litespeed to --enable-litespeed 
This syncs the configuration option of the litespeed module to be
compliant with the approach of:
--with-foo (when something additional needs to be installed such as
  libfoo)
--enable-foo (when extension/sapi doesn't have dependencies on some
  library)
 2019-05-17 03:14:13 +02:00
Jakub Zelenka
5036c293b3 Merge branch 'PHP-7.3' into PHP-7.4 2019-05-13 18:51:41 +01:00
Jakub Zelenka
aa74c30466 Merge branch 'PHP-7.2' into PHP-7.3 2019-05-13 18:51:05 +01:00
Jakub Zelenka
ad63bd169b Add ping to the fpm test for bug #77934 2019-05-13 18:50:24 +01:00
Peter Kokot
ecb6a8db63 [ci skip] Remove outdated fastcgi info in favor of the manual 2019-05-13 02:57:20 +02:00
Peter Kokot
75fb74860d Normalize comments in *nix build system m4 files 
Normalization include:
- Use dnl for everything that can be ommitted when configure is built in
  favor of the shell comment character # which is visible in the output.
- Line length normalized to 80 columns
- Dots for most of the one line sentences
- Macro definitions include similar pattern header comments now
 2019-05-12 18:43:03 +02:00
Hugh McMaster
755f6f6ede Use PKG_CHECK_MODULES to detect the systemd library 2019-05-12 00:19:03 +02:00
Jakub Zelenka
4bf37e467b Merge branch 'PHP-7.3' into PHP-7.4 2019-05-11 20:10:13 +01:00
Jakub Zelenka
0cad701374 Merge branch 'PHP-7.2' into PHP-7.3 2019-05-11 20:08:57 +01:00
Jakub Zelenka
cc5c51e7f0 Fix bug #77934 (php-fpm kill -USR2 not working) 2019-05-11 20:07:39 +01:00
Peter Kokot
313930a36a Remove unused variables 2019-05-10 22:58:14 +02:00
George Wang
dc63b0e480 Merge branch 'PHP-7.3' into PHP-7.4 2019-05-09 18:15:48 -04:00
George Wang
d2037b1bd4 Merge branch 'PHP-7.2' into PHP-7.3 2019-05-09 18:14:11 -04:00
George Wang
af4143753f Updated LiteSpeed SAPI to 7.3.2 to allow request header value length up to 64K. 2019-05-09 18:13:25 -04:00
Simon Welsh
6e3438bc62 Include the request method in CLI server logs 2019-05-02 23:32:22 +03:00
Hugh McMaster
c9ee822bb6 Always use pkg-config from the host architecture 2019-04-29 14:16:16 +02:00
Peter Kokot
807901072d [ci skip] Remove outdated and redundant Apache README 
PHP manual includes more information and a bit more updated than this
README.
 2019-04-28 02:29:08 +02:00
Peter Kokot
9443bd1bbf [ci skip] Remove CLI sapi README 
Removing in favour of:
- https://www.php.net/manual/en/features.commandline.introduction.php
- https://www.php.net/manual/en/features.commandline.differences.php
 2019-04-23 08:51:23 +02:00