]> granicus.if.org Git - php/commit
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)
commit721ca87e56057b531ac3e431df52532a1e5d4ae6
treee9c1f5cc5f9c6ae997f0f36891b105c07a2f674a
parenta230b5a6c92ce816a7d660505e883a01065e4f9e
parentf62571c121ce2874858b5e7dd33642755ee9309c
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Apply doc root fix for FPM
sapi/fpm/fpm/fpm_main.c