089e45c91a
Merge branch 'PHP-7.4'
...
* PHP-7.4:
refactor a little more to add some more useful error messages and raise the limits on waiting for slow machines
2019-06-19 11:42:02 +02:00
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
0cf3034af1
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Separate check for process creation and ability to accept connections
2019-06-19 11:09:48 +02:00
d6480fa231
Separate check for process creation and ability to accept connections
2019-06-19 11:09:26 +02:00
80e4a6aaef
Merge branch 'PHP-7.4'
2019-06-17 13:31:11 +02:00
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
7f0a52e07d
Merge branch 'PHP-7.4'
...
* PHP-7.4:
bugs in fpm logging #4273 #4007
2019-06-17 07:49:28 +02:00
116d42d990
bugs in fpm logging #4273 #4007
2019-06-17 07:48:37 +02:00
956db0cdc2
Merge branch 'PHP-7.4'
...
* PHP-7.4:
fix mac tests on azure
2019-06-14 12:58:13 +02:00
dd10bf5450
Merge branch 'mac-tests' into PHP-7.4
...
* mac-tests:
fix mac tests on azure
2019-06-14 12:56:08 +02:00
f16b012116
fix mac tests on azure
2019-06-14 12:55:00 +02:00
646b64b119
Fix skipif syntax errors
...
Apparently I did this only on masster...
2019-06-14 09:29:14 +02:00
61f78de486
Constify some char* arguments or return values of ZEND_API
...
Closes GH-4247.
2019-06-12 16:49:32 +02:00
eabb8a6324
Skip syntax errors in skipif conditions
2019-06-12 15:56:38 +02:00
eea206a06c
Merge branch 'PHP-7.4'
2019-06-12 13:18:04 +02:00
16f79129c7
Fix unused variables in fpm_env.c
2019-06-12 13:17:25 +02:00
9fa009c86d
Merge branch 'PHP-7.4'
2019-06-12 09:29:06 +02:00
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
e4fae9c061
Merge branch 'PHP-7.4'
2019-06-11 13:16:38 +02:00
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
8f93beb06e
use XFAILIF rather than XFAIL to avoid warnings [ci skip]
2019-06-11 12:55:38 +02:00
9ecc0a4f29
use XFAILIF rather than XFAIL to avoid warnings [ci skip]
2019-06-11 12:55:28 +02:00
7361701351
Merge branch 'PHP-7.4'
...
* PHP-7.4:
watchpoints have flaws in implementation
2019-06-10 14:23:55 +02:00
1e5004060e
watchpoints have flaws in implementation
2019-06-10 14:23:37 +02:00
76323fefac
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Extend wildcard files section in EditorConfig [ci skip]
Simplify LiteSpeed SAPI module version
Use PHP_VERSION for zend modules
2019-06-09 22:55:43 +02:00
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
5b36c9fef6
Use PHP_VERSION for zend modules
...
Closes #4147
2019-06-09 22:32:47 +02:00
623eedbbd5
Merge branch 'PHP-7.4'
2019-06-04 16:14:46 +02:00
18060e5923
Merge branch 'PHP-7.3' into PHP-7.4
2019-06-04 16:14:26 +02:00
a4633b13d4
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-04 16:14:14 +02:00
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
f721f2fa12
Merge branch 'PHP-7.4'
2019-06-04 15:09:01 +02:00
a982125561
Try to fix phpdbg + opcache compatibility
2019-06-04 15:08:55 +02:00
09ac6eb36d
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Don't involve output check in the test
2019-06-01 23:33:00 +02:00
7a64150921
Don't involve output check in the test
2019-06-01 23:31:05 +02:00
e720fb7565
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix ZTS issue regarding new Windows CTRL handling API
2019-06-01 09:36:25 +02:00
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
8230d27c98
Merge branch 'PHP-7.4'
2019-05-31 10:54:58 +02:00
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
4fff40e0d2
Merge branch 'PHP-7.4'
2019-05-31 09:18:09 +02:00
4b1f711823
Mark sapi_windows_set_ctrl_handler.phpt as XFAIL
2019-05-31 09:17:51 +02:00
4241258d74
Fix FPM tests for PHP 8
2019-05-29 17:31:10 +02:00
693955c5c5
Merge branch 'PHP-7.4'
2019-05-29 17:07:52 +02:00
3ba64545ed
Update phpdbg oplog test
2019-05-29 17:05:01 +02:00
b32b8e91bd
Update cli reflection test
2019-05-29 17:02:36 +02:00
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
3518c4dfe9
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Revert "Rename *.l files to *.re"
2019-05-20 06:07:03 +02:00
e11233dc49
Revert "Rename *.l files to *.re"
...
This reverts commit 969047749d
2019-05-20 06:06:38 +02:00
0a7d71b593
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Rename *.l files to *.re
2019-05-17 23:54:12 +02:00
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
Joe Watkins