]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8566ee 403f23b)
Merge branch 'PHP-5.6' into PHP-7.0
authorJulien Pauli <jpauli@php.net>
Tue, 12 Jul 2016 08:38:22 +0000 (10:38 +0200)
committerJulien Pauli <jpauli@php.net>
Tue, 12 Jul 2016 08:38:22 +0000 (10:38 +0200)
* PHP-5.6:
  Updated NEWS
  Fix #72575: using --allow-to-run-as-root should ignore missing user directive

1  2 
sapi/fpm/fpm/fpm_conf.c patch | diff1 | diff2 | blob | history

diff --cc sapi/fpm/fpm/fpm_conf.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.