f613e32058
Merge branch 'PHP-7.4'
2019-09-17 12:19:57 +02:00
1a5f04688e
Merge branch 'PHP-7.3' into PHP-7.4
2019-09-17 12:19:45 +02:00
3a2fa489dd
Merge branch 'PHP-7.2' into PHP-7.3
2019-09-17 12:19:39 +02:00
252ebce0d7
Add tilde to allowed status/ping path
...
Because of user specific webdirs it should be possible to set a
status/ping path like "/~username/status".
Closes GH-4698.
2019-09-17 12:19:21 +02:00
eef85229d0
Link executable files using non PIC object files. This reduces PIC overhead and improves performance.
2019-09-07 11:59:11 +03:00
56e880af9f
Link executable files using non PIC object files. This reduces PIC overhead and improves performance.
2019-09-03 23:42:22 +03:00
71e2c97ffb
Merge branch 'PHP-7.4'
2019-08-26 18:12:35 +01:00
302a1400f3
Merge branch 'PHP-7.3' into PHP-7.4
2019-08-26 18:11:04 +01:00
ffcf57fa18
Fix bug #78334 (fpm log prefix message includes wrong stdout/stderr notation)
2019-08-26 18:05:11 +01:00
7602169d7c
Fix typo: environement [ci skip]
2019-08-17 12:41:53 +02:00
844b261e3a
Fix typo
2019-08-15 09:32:35 +02:00
2b1073eb19
Merge branch 'PHP-7.4'
2019-07-30 10:19:01 +02:00
0ed6c37140
Fix FPM timer event re-registration
...
Make sure that fpm_event_add calls inside a timer callback work by
unregistering the event from the queue before invoking its callback.
The read timeout in tester.inc is increased because the added test
needs two seconds (one for SIGTERM, one for SIGKILL) until the
reload succeeds, so we should wait longer than that for a response.
2019-07-30 10:16:57 +02:00
9af6d5545a
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Remove AC_FPM_POLL
2019-07-24 22:04:24 +02:00
a3169964c0
Remove AC_FPM_POLL
...
AC_FPM_POLL defines HAVE_POLL symbol which is already checked by
configure.ac and function poll in AC_CHECK_FUNCTIONS.
Closes GH-4449
2019-07-24 22:03:47 +02:00
a9969ec1bd
Merge branch 'PHP-7.4'
2019-07-22 12:41:20 +02:00
72b9105d30
Merge branch 'PHP-7.3' into PHP-7.4
2019-07-22 12:41:15 +02:00
b59a9381b9
Remove test for bug #77185
...
Seems to be very unreliable in CI.
2019-07-22 12:40:26 +02:00
8092604ec2
Merge branch 'PHP-7.4'
2019-07-22 11:19:32 +02:00
b2915fc332
Merge branch 'PHP-7.3' into PHP-7.4
2019-07-22 11:19:24 +02:00
5e4dbce586
Reduce number of workers in test
...
4 seems to be enough to reliably reproduce the issue. Let's see
if this works better in CI.
2019-07-22 11:18:38 +02:00
a16ca769af
Merge branch 'PHP-7.4'
2019-07-22 10:34:58 +02:00
97b80bd83b
Merge branch 'PHP-7.3' into PHP-7.4
2019-07-22 10:34:32 +02:00
bdf24f8d6d
Prevent use after free in fpm_event_epoll_wait
...
epoll event backend does not guarantee that child input/output events
are reported before SIGCHILD due to finished worker. While a bunch of
events received by epoll is being processed, child-related structures
may be removed before dispatching of an I/O event for the same child.
The result may be attempt to access to memory region allocated for
another purpose, segfault of the master process, and unavailable web
sites.
Postpone processing of SIGCHILD events till other events in the same
bunch are processed.
Fix Bug #62418 php-fpm master process crashes
Fix Bug #65398 Race condition between SIGCHLD and child stdout/stderr event leads to segfault
Fix Bug #75112 php-fpm crashing, hard to reproduce
Fix Bug #77114 php-fpm master segfaults in fpm_event_epoll_wait/fpm_event_fire
Fix Bug #77185 Use-after-free in FPM master event handling
2019-07-22 10:32:58 +02:00
eb766751dc
Merge branch 'PHP-7.4'
2019-07-19 10:06:30 +02:00
d574df63dc
Deprecate alternative array access syntax
...
RFC: https://wiki.php.net/rfc/deprecate_curly_braces_array_access
2019-07-19 10:06:10 +02:00
74bf7bfb88
Merge branch 'PHP-7.4'
2019-07-11 15:49:02 +02:00
17f7fb7605
Switch to using shell-less proc_open() in various server tests
2019-07-11 15:48:10 +02:00
bbd12b3d30
Merge branch 'PHP-7.4'
2019-07-10 11:11:30 +02:00
dfe5fd2a37
Avoid invalid array access in fcgi.inc
2019-07-10 11:09:34 +02:00
b98c148f78
Merge branch 'PHP-7.4'
2019-06-28 15:05:00 +02:00
54dd762f59
Set up asan+ubsan scheduled build on azure
...
Also adds an --asan flag to run-tests.php to setup all the necessary
environment variables. Some tests are marked as skipped because they
are incompatible with asan or too slow.
I'm basing this on the DEBUG_ZTS build, which seems to give us the
most mileage.
2019-06-28 15:00:54 +02:00
6bfa6bff0b
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Clean headers checks
2019-06-27 02:45:31 +02:00
2079b09854
Clean headers checks
...
Some headers were checked multiple times in the main configure.ac file
and in the bundled extensions or SAPIs themselves. Also many of these
checks are then used accross other extensions or SAPIs so a central
configure.ac makes most sense for these checks.
2019-06-27 02:45:09 +02:00
ac749b126f
Merge branch 'PHP-7.4'
2019-06-26 11:43:30 +02:00
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
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
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
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
5b36c9fef6
Use PHP_VERSION for zend modules
...
Closes #4147
2019-06-09 22:32: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
4241258d74
Fix FPM tests for PHP 8
2019-05-29 17:31:10 +02:00
5036c293b3
Merge branch 'PHP-7.3' into PHP-7.4
2019-05-13 18:51:41 +01:00
aa74c30466
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-13 18:51:05 +01:00
ad63bd169b
Add ping to the fpm test for bug #77934
2019-05-13 18:50:24 +01:00
Nikita Popov