[TASK] Add information about ThreadStackSize to report status
authorNicole Cordes <n.cordes@biz-design.biz>
Sat, 20 Oct 2012 21:54:20 +0000 (23:54 +0200)
committerJigal van Hemert <jigal@xs4all.nl>
Sun, 21 Oct 2012 07:56:36 +0000 (09:56 +0200)
There is an information about the ThreadStackSize on Windows systems in
the Install.txt

This information should be displayed in report status as well

Change-Id: I70512b15ec672aa16dee8223a48ea5d51f3a8964
Resolves: #42235
Releases: 6.0
Reviewed-on: http://review.typo3.org/15845
Reviewed-by: Jigal van Hemert
Tested-by: Jigal van Hemert
typo3/sysext/reports/Classes/Report/Status/SystemStatus.php
typo3/sysext/reports/reports/locallang.xlf

index 96022b2..2ead429 100644 (file)
@@ -166,7 +166,15 @@ class SystemStatus implements \TYPO3\CMS\Reports\StatusProviderInterface {
         * @return \TYPO3\CMS\Reports\Status The server software as a status
         */
        protected function getWebserverStatus() {
-               return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Reports\\Status', $GLOBALS['LANG']->getLL('status_webServer'), $_SERVER['SERVER_SOFTWARE']);
+               $value = $_SERVER['SERVER_SOFTWARE'];
+               $message = '';
+               // The additional information are only important on a Windows system with Apache running.
+               // Even with lowest Apache ServerTokens (Prod[uctOnly]) the name is returned.
+               if (TYPO3_OS === 'WIN' && substr($value, 0, 6) === 'Apache') {
+                       $message .= '<p>' . $GLOBALS['LANG']->getLL('status_webServer_infoText') . '</p>';
+                       $message .= '<div class="typo3-message message-warning">' . $GLOBALS['LANG']->getLL('status_webServer_threadStackSize') . '</div>';
+               }
+               return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Reports\\Status', $GLOBALS['LANG']->getLL('status_webServer'), $value, $message);
        }
 
        /**
index 426839b..19505e9 100644 (file)
                        <trans-unit id="status_webServer" xml:space="preserve">
                                <source>Web Server</source>
                        </trans-unit>
+                       <trans-unit id="status_webServer_infoText" xml:space="preserve">
+                               <source>For your Web Server some notifications have been found:</source>
+                       </trans-unit>
+                       <trans-unit id="status_webServer_threadStackSize" xml:space="preserve">
+                               <source><![CDATA[Fluid uses complex regular expressions which require a lot of stack space during the first processing.
+On Windows the default stack size for Apache is a lot smaller than on unix.
+You can increase the size to 8MB (default on unix) by adding to the httpd.conf:
+<br />&lt;IfModule mpm_winnt_module&gt;
+<br />ThreadStackSize 8388608
+<br />&lt;/IfModule&gt;
+<br />Restart Apache after this change.]]></source>
+                       </trans-unit>
                        <trans-unit id="status_phpModules" xml:space="preserve">
                                <source>PHP Modules</source>
                        </trans-unit>