From 799832a5388260337567611dd2041fc19409a2f1 Mon Sep 17 00:00:00 2001
From: ctrlaltca <>
Date: Thu, 10 May 2012 22:05:47 +0000
Subject: fix for #400

---
 framework/Exceptions/TErrorHandler.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'framework/Exceptions/TErrorHandler.php')

diff --git a/framework/Exceptions/TErrorHandler.php b/framework/Exceptions/TErrorHandler.php
index 363bdecf..93f9c922 100644
--- a/framework/Exceptions/TErrorHandler.php
+++ b/framework/Exceptions/TErrorHandler.php
@@ -201,10 +201,19 @@ class TErrorHandler extends TModule
 			'%%Time%%' => @strftime('%Y-%m-%d %H:%M',time())
 		);
 
+		$CGI=substr(php_sapi_name(), 0, 3) == 'cgi'; // FastCGI / IIS
 		if($isDebug)
-			header("HTTP/1.0 $statusCode ".$exception->getMessage(), true, TPropertyValue::ensureInteger($statusCode));
-		else
-			header("HTTP/1.0 $statusCode", true, TPropertyValue::ensureInteger($statusCode));
+		{
+			if ($CGI)
+				header("Status: $statusCode ".$exception->getMessage(), true, TPropertyValue::ensureInteger($statusCode));
+			else
+				header("HTTP/1.0 $statusCode ".$exception->getMessage(), true, TPropertyValue::ensureInteger($statusCode));
+		} else {
+			if ($CGI)
+				header("Status: $statusCode", true, TPropertyValue::ensureInteger($statusCode));
+			else
+				header("HTTP/1.0 $statusCode", true, TPropertyValue::ensureInteger($statusCode));
+		}
 
 		echo strtr($content,$tokens);
 	}
-- 
cgit v1.2.3