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)

Author: dstogov

sapi/fpm/tests/013.phpt

@@ -16,7 +16,6 @@ error_log = $logfile
 log_level = warning
 [unconfined]
 listen = 127.0.0.1:$port
-user = foo
 pm = dynamic
 pm.max_children = 5
 pm.start_servers = 2

sapi/fpm/tests/014.phpt

@@ -16,7 +16,6 @@ error_log = $logfile
 log_level = warning
 [unconfined]
 listen = 127.0.0.1:$port
-user = foo
 pm = dynamic
 pm.max_children = 5
 ;pm.start_servers = 2

sapi/fpm/tests/include.inc

@@ -38,7 +38,10 @@ function run_fpm($config, &$out = false, $extra_args = '') /* {{{ */
     /* Since it's not possible to spawn a process under linux without using a
      * shell in php (why?!?) we need a little shell trickery, so that we can
      * actually kill php-fpm */
-    $fpm = proc_open('killit () { kill $child; }; trap killit TERM; '.get_fpm_path().' -F -O -y '.$cfg.' '.$extra_args.' 2>&1 & child=$!; wait', $desc, $pipes);
+    $asroot = getenv('TEST_FPM_RUN_AS_ROOT') ? '--allow-to-run-as-root' : '';
+    $cmd = get_fpm_path()." $asroot -F -O -y $cfg $extra_args";
+    $fpm = proc_open("killit () { kill \$child; }; trap killit TERM; $cmd 2>&1 & child=\$!; wait",
+                     $desc, $pipes);
     register_shutdown_function(
             function($fpm) use($cfg) {
                     @unlink($cfg);

sapi/fpm/tests/skipif.inc

@@ -4,10 +4,14 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 	die ("skip not for Windows");
 }
 
+
+if (!getmyuid() && !getenv('TEST_FPM_RUN_AS_ROOT')) {
+	die('Refusing to run as root');
+}
+
 include dirname(__FILE__)."/include.inc";
 
 if (!get_fpm_path()) {
 	die("skip FPM not found");
 }
-
 ?>