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
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
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
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
9d7054693e
use correct shift and fix slowlog bt in 7.1
2017-01-23 14:50:09 +03: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
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
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
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
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
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
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
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
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
79d9c12bf9
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed test
Updated NEWS
Improvement for bug73297
Simplify ext/standard/tests/http/bug73297.phpt
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Add failing test for bug#73297
Updated NEWS
Improvement for bug73297
Simplify ext/standard/tests/http/bug73297.phpt
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Add failing test for bug#73297
2016-11-17 15:59:35 +03:00
3817a2e6d5
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed test
Updated NEWS
Improvement for bug73297
Simplify ext/standard/tests/http/bug73297.phpt
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Add failing test for bug#73297
2016-11-17 15:58:38 +03:00
c2d6ffb85f
Fixed test
2016-11-17 15:57:40 +03:00
96ed946b2b
Merge branch 'pull-request/2097'
2016-10-17 16:03:12 +01:00
63166412a2
Merge branch 'pull-request/2097'
2016-10-17 16:02:51 +01:00
974ba6be7a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Formatting. Fix possible memory corruption in FPM SHM management
fix every work call mmap
Conflicts:
sapi/fpm/fpm/fpm_scoreboard.c
2016-09-23 13:54:22 +02:00
fbf87a8082
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Formatting. Fix possible memory corruption in FPM SHM management
fix every work call mmap
2016-09-23 13:53:22 +02:00
a22175b06f
Formatting. Fix possible memory corruption in FPM SHM management
2016-09-23 13:52:58 +02:00
807004a446
fix every work call mmap
...
fix fpm_scoreboard_free
2016-09-23 13:52:58 +02:00
d6a43a8562
Fix bug #72836 - integer overflow in base64_decode caused heap corruption
2016-08-16 22:55:41 -07:00
ad8b99c888
Fix some typos in PHP FPM configuration
...
[skip ci]
2016-08-15 22:50:14 +02:00
d5ad4b8b14
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
FPM: add test for CVE-2016-5385
2016-07-22 09:37:00 +02:00
9622f973a5
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
FPM: add test for CVE-2016-5385
2016-07-22 09:36:36 +02:00
fb4a6dc0f1
FPM: add test for CVE-2016-5385
2016-07-22 09:35:09 +02:00
556cbfb6c3
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Updated NEWS
Updated NEWS
Fix #72575 : using --allow-to-run-as-root should ignore missing user directive
2016-07-12 10:38:51 +02:00
3c356aa7cb
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Updated NEWS
Fix #72575 : using --allow-to-run-as-root should ignore missing user directive
2016-07-12 10:38:22 +02:00
fb49f137ec
Fix #72575 : using --allow-to-run-as-root should ignore missing user
...
directive
Trying to start PHP-FPM with the --allow-to-run-as-root flag will not
work when the user directive is not given in the FPM worker pool
configuration. Parsing the config will fail. Consequently, FPM cannot
start.
The check is in place to prevent FPM from getting started with root
privileges by accident. Prior to #61295 the check would also prevent
any non-root user to start PHP-FPM without a user directive present.
This patch adds an additional check to the config parser, checking for
the --allow-to-run-as-root flag to be present. If so, parsing will no
longer abort for root users even if the user directive is missing.
I will also update the PHP docs since they still state the user
directive is a mandatory setting which it is not since #61295 .
2016-07-12 10:36:17 +02:00
51e7415575
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Remove needless zeroing of anonymously mmap'd memory
Remove needless zeroing of anonymously mmap'd memory
2016-07-11 14:59:24 +02:00
Joe Watkins