[BUGFIX] Installer - Wrong value for CGI
authorMarkus Klein <klein.t3@mfc-linz.at>
Tue, 21 Jun 2011 13:52:40 +0000 (15:52 +0200)
committerJigal van Hemert <jigal@xs4all.nl>
Tue, 21 Jun 2011 20:17:49 +0000 (22:17 +0200)
In "Basic Configuration"->"System Information" the wrong value for
"UNIX/CGI" is displayed, when using fcgid.
The reason is that class.tx_install.php uses an old condition
for determining this.

Thanks to Stephan Grossberndt for discovering this.

Change-Id: Ic4a0494e0698b58b8abc0ff361df4a904c9dabcd
Resolves: #26913
Releases: 4.6, 4.5
Reviewed-on: http://review.typo3.org/2324
Reviewed-by: Stephan Grossberndt
Tested-by: Stephan Grossberndt
Reviewed-by: Stefan Neufeind
Reviewed-by: Jigal van Hemert
Tested-by: Jigal van Hemert
typo3/sysext/install/mod/class.tx_install.php

index a23a652..9c781b1 100755 (executable)
@@ -603,6 +603,7 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                                'How to configure TYPO3',
                                                $this->generallyAboutConfiguration()
                                        );
+                                       $isPhpCgi = (PHP_SAPI == 'fpm-fcgi' || PHP_SAPI == 'cgi' || PHP_SAPI == 'isapi' || PHP_SAPI == 'cgi-fcgi');
                                        $this->message(
                                                'System Information',
                                                'Your system has the following configuration',
@@ -610,8 +611,8 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                                        <dl id="systemInformation">
                                                                <dt>OS detected:</dt>
                                                                <dd>' . (TYPO3_OS == 'WIN' ? 'WIN' : 'UNIX') .'</dd>
-                                                               <dt>UNIX/CGI detected:</dt>
-                                                               <dd>' . (PHP_SAPI == 'cgi' ? 'YES' : 'NO') . '</dd>
+                                                               <dt>CGI detected:</dt>
+                                                               <dd>' . ($isPhpCgi ? 'YES' : 'NO') . '</dd>
                                                                <dt>PATH_thisScript:</dt>
                                                                <dd>' . PATH_thisScript . '</dd>
                                                        </dl>