b63c45c69e
Try fallback on IPv4 ANYADDR when IPv6 ANYADDR fails
...
https://bugs.php.net/bug.php?id=74166
A host system with no/limited IPv6 support will fail at binding
the IPv6 ANYADDR address (::) as the address family is unsupported.
Deal with this by handling failure to implicitly bind to ::
as a soft failure, falling back to 0.0.0.0.
If binding to :: failed for some other reason (e.g. port in use)
then binding to 0.0.0.0 will likely fail as well, but we'll
get appropriate warnings for that.
2017-03-08 11:02:54 -08:00
78ae563a48
Merge branch 'PHP-7.1'
...
* PHP-7.1:
pull-request/2393:
stop fpm make install clobbering dot d configuration
2017-02-22 06:49:22 +00:00
46d0933668
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
pull-request/2393:
stop fpm make install clobbering dot d configuration
2017-02-22 06:48:48 +00:00
9eaf551c86
pull-request/2393:
...
stop make install from clobbering default dot d configuration
2017-02-22 06:47:23 +00:00
5383c9d9e5
Merge branch 'PHP-7.1'
2017-02-12 00:06:47 +01:00
6d5ea20e0b
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-12 00:06:35 +01:00
9814be4bc2
Fixed bug #69860
2017-02-12 00:06:04 +01:00
10cd88588e
Merge branch 'PHP-7.1'
2017-01-29 20:46:20 +00:00
1dab39b9aa
Merge branch 'PHP-7.0' into PHP-7.1
2017-01-29 20:44:51 +00:00
df16579642
Try fpm path for testing in sbin as it is default target
2017-01-29 20:43:58 +00:00
5c6bf3598a
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fix Bug #69865 php-fpm does not close stderr when using syslog
2017-01-23 16:57:01 +00:00
9aad38038e
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix Bug #69865 php-fpm does not close stderr when using syslog
2017-01-23 16:56:08 +00:00
80a851b4dd
Fix Bug #69865 php-fpm does not close stderr when using syslog
2017-01-23 16:55:15 +00:00
b5cfe11c5b
use correct shift and fix slowlog bt in 7.1
2017-01-23 14:52:21 +03:00
9d7054693e
use correct shift and fix slowlog bt in 7.1
2017-01-23 14:50:09 +03:00
28391c30ca
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Increase wait time for tests involving sockets to improve Travis relability
2017-01-13 06:45:31 +00:00
19363de12f
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Increase wait time for tests involving sockets to improve Travis relability
2017-01-13 06:45:17 +00:00
fd92b91188
Increase wait time for tests involving sockets to improve Travis relability
...
1. Increased sleep time from 25ms to 50ms
2. Added sleep to shutdown handlers
2017-01-13 06:45:04 +00:00
b2da9230f2
Merge branch 'PHP-7.1'
...
* PHP-7.1:
improve FPM tests (mostly for systemd build)
2017-01-08 19:03:33 +00:00
8961c78524
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
improve FPM tests (mostly for systemd build)
2017-01-08 19:03:10 +00:00
eb02876e74
improve FPM tests (mostly for systemd build)
2017-01-08 19:02:50 +00:00
53ff546054
Merge branch 'PHP-7.1'
2017-01-07 22:54:26 +01:00
bb2ab75555
Merge branch 'PHP-7.0' into PHP-7.1
2017-01-07 22:54:16 +01:00
a46bbdda2e
Fixed bug #67583
...
As fcgi_request is an opaque struct as of PHP 7, expose a new API
function fcgi_end() which does fcgi_flush() with end=1 and checks/
sets the ->ended flag.
2017-01-07 22:53:28 +01:00
06c8538f87
Fixes for session and fpm tests to make them more reliable in Travis CI
...
1. Increased the timeout on sapi/fpm tests to match the cli server
2. Fixed user session GC function to return number of sessions removed
3. Disabled session GC in session_set_save_handler_basic.phpt
2017-01-07 07:13:44 +00:00
f60ebd13b3
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixes for session and fpm tests in PHP7.0 branch
2017-01-07 07:10:46 +00:00
3401f553b9
Fixes for session and fpm tests in PHP7.0 branch
...
1. Increased the timeout on sapi/fpm tests to match the cli server
2. Disabled session GC in session_set_save_handler_basic.phpt
3. Fixed GC in save_handler.inc to delete files based on age
2017-01-06 19:55:57 -08:00
7c94b3b743
Merge branch 'PHP-7.1'
...
* PHP-7.1:
fix inappropriate warning in FPM log
2017-01-06 05:55:36 +00:00
de3649e2a3
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix inappropriate warning in FPM log
2017-01-06 05:55:14 +00:00
6a03b43e5f
Merge branch 'pull-request/1311' into PHP-7.0
...
* pull-request/1311:
fix inappropriate warning in FPM log
2017-01-06 05:54:42 +00:00
4aada085eb
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fix php-fpm.service.in
2017-01-05 06:54:52 +00:00
c370024c2c
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix php-fpm.service.in
2017-01-05 06:54:37 +00:00
b037c43497
Merge branch 'pull-request/1256' into PHP-7.0
...
* pull-request/1256:
Fix php-fpm.service.in
2017-01-05 06:54:19 +00:00
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
9e29f841ce
Update copyright headers to 2017
2017-01-02 09:30:12 -06:00
5a15c9470c
Merge branch 'pull-request/2117'
...
* pull-request/2117:
Allow to configure php-fpm slow log trace callers limit
2017-01-01 15:47:36 +00:00
afb6ca2566
Finish remaining replacement uint => uint32_t
...
Tthe core should be normalized now, no uints anymore
2016-12-22 14:32:02 +01:00
143ee76fe4
Merge branch 'PHP-7.1'
2016-12-03 14:20:00 +01:00
c20299ddc4
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-03 14:18:56 +01:00
a8ec79e27f
Merge branch 'PHP-5.6' into PHP-7.0
2016-12-03 14:18:00 +01:00
cf2496140d
Fix minor typo
2016-12-03 14:15:52 +01:00
e3feeba3ae
Merge branch 'PHP-7.1'
2016-11-20 19:20:48 +01:00
110a6cc6c0
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-20 19:20:09 +01:00
bc30206b8a
Revert "Revert "Remove a few unused write warning""
...
This reverts commit ff5a65d26b
2016-11-20 19:18:50 +01:00
d512f21930
Merge branch 'PHP-7.1'
2016-11-20 19:10:29 +01:00
c58378619b
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-20 19:10:03 +01:00
ff5a65d26b
Revert "Remove a few unused write warning (backport from master, oops)s"
...
This reverts commit c65d24eaa3
2016-11-20 19:09:05 +01:00
b7fee22e73
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-20 14:18:54 +01:00
c65d24eaa3
Remove a few unused write warning (backport from master, oops)s
2016-11-20 14:17:14 +01:00
Sara Golemon