From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 24 May 2017 22:16:06 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.2.0alpha1~57^2~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa828dbe841c654dd7ac87c26929b873168eaea2;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Remove `user=foo` from FPM test config
  Skip FPM tests when running as root (unless requested)
---

fa828dbe841c654dd7ac87c26929b873168eaea2