minor #32573 [Process] Path resolution for FCGI configuration (romantymoshyk)

fabpot · fabpot · commit 6f78ad8d68e0 · 2019-07-18T10:00:23.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Process] Path resolution for FCGI configuration | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | This tiny improvement allows to speedup location of PHP executable if script is runned via FCGI. PHP configured to be runned via Apache module mod_fcgid(usually on Windows), PHP_SAPI contains 'cgi-fcgi' and PHP_BINARY refer to correct PHP binary executable, same as in case of running via CLI. Commits ------- 22150bc [Process] Path resolution for FCGI configuration
diff --git a/src/Symfony/Component/Process/PhpExecutableFinder.php b/src/Symfony/Component/Process/PhpExecutableFinder.php
@@ -54,7 +54,7 @@ public function find($includeArgs = true)
         $args = $includeArgs && $args ? ' '.implode(' ', $args) : '';
 
         // PHP_BINARY return the current sapi executable
-        if (PHP_BINARY && \in_array(\PHP_SAPI, ['cli', 'cli-server', 'phpdbg'], true)) {
+        if (PHP_BINARY && \in_array(\PHP_SAPI, ['cgi-fcgi', 'cli', 'cli-server', 'phpdbg'], true)) {
             return PHP_BINARY.$args;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function find($includeArgs = true)`
`54`	`54`	`$args = $includeArgs && $args ? ' '.implode(' ', $args) : '';`
`55`	`55`
`56`	`56`	`// PHP_BINARY return the current sapi executable`
`57`		`- if (PHP_BINARY && \in_array(\PHP_SAPI, ['cli', 'cli-server', 'phpdbg'], true)) {`
	`57`	`+ if (PHP_BINARY && \in_array(\PHP_SAPI, ['cgi-fcgi', 'cli', 'cli-server', 'phpdbg'], true)) {`
`58`	`58`	`return PHP_BINARY.$args;`
`59`	`59`	`}`
`60`	`60`