]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a230b5a f62571c)
Merge branch 'PHP-7.3' into PHP-7.4
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 20 Apr 2020 08:48:05 +0000 (10:48 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 20 Apr 2020 08:48:05 +0000 (10:48 +0200)
* PHP-7.3:
  Apply doc root fix for FPM

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

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