Index: /trunk/devel/run
===================================================================
--- /trunk/devel/run	(revision 1124)
+++ /trunk/devel/run	(revision 1125)
@@ -301,5 +301,4 @@
 
 	# run {{{1
-	export XCACHE_SKIP_FCGI_WARNING=1
 	commandLine=("${tracer[@]}" "${cmd[@]}" "$@")
 
Index: /trunk/htdocs/diagnosis/index.php
===================================================================
--- /trunk/htdocs/diagnosis/index.php	(revision 1124)
+++ /trunk/htdocs/diagnosis/index.php	(revision 1125)
@@ -386,4 +386,18 @@
 }
 // }}}
+checking(_T("SAPI Compatibility")); // {{{
+
+if (php_sapi_name() == "cgi" || php_sapi_name() == "cgi-fcgi" && !isset($_SERVER["FCGI_ROLE"])) {
+	result(N_("error"), _T("CGI is not supported"), _T("Use FastCGI or FPM instead"));
+}
+else if (php_sapi_name() == "cgi-fcgi" && isset($_SERVER["FCGI_ROLE"]) && (int) getenv("PHP_FCGI_CHILDREN") < 1) {
+	result(N_("error")
+		, "PHP_FCGI_CHILDREN<1"
+		, _T("PHP_FCGI_CHILDREN should be >= 1 and use 1 group of parent/childs model. See http://xcache.lighttpd.net/wiki/Faq"));
+}
+else {
+	result(N_("info"), _T("Looks good"));
+}
+// }}}
 
 include "./diagnosis.tpl.php";
Index: /trunk/mod_cacher/xc_cacher.c
===================================================================
--- /trunk/mod_cacher/xc_cacher.c	(revision 1124)
+++ /trunk/mod_cacher/xc_cacher.c	(revision 1125)
@@ -3297,13 +3297,4 @@
 	}
 
-	/* additional_functions requires PHP 5.3. TODO: find simpler way to do it */
-#ifdef ZEND_ENGINE_2_3
-	if (strcmp(sapi_module.name, "cgi-fcgi") == 0 && !sapi_module.additional_functions && !getenv("XCACHE_SKIP_FCGI_WARNING") && !getenv("GATEWAY_INTERFACE")) {
-		if ((getenv("PHP_FCGI_CHILDREN") == NULL) || (atoi(getenv("PHP_FCGI_CHILDREN")) < 1)) {
-			zend_error(E_WARNING, "PHP_FCGI_CHILDREN should be >= 1 and use 1 group of parent/childs model. Set XCACHE_SKIP_FCGI_WARNING=1 to skip this warning. See " XCACHE_WIKI_URL "/Faq");
-		}
-	}
-#endif
-
 	xc_config_long(&xc_php_size,       "xcache.size",        "0");
 	xc_config_hash(&xc_php_hcache,     "xcache.count",       "1");