From 3ba065922fadd3dfc9e60014690e139a5568f8a9 Mon Sep 17 00:00:00 2001
From: "Christophe.Boulain" <>
Date: Wed, 15 Jul 2009 09:01:05 +0000
Subject: Merging latests 3.1 changes into trunk

---
 framework/Web/UI/ActiveControls/TActivePageAdapter.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'framework/Web/UI/ActiveControls')

diff --git a/framework/Web/UI/ActiveControls/TActivePageAdapter.php b/framework/Web/UI/ActiveControls/TActivePageAdapter.php
index 90eed970..b91da695 100644
--- a/framework/Web/UI/ActiveControls/TActivePageAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActivePageAdapter.php
@@ -316,13 +316,13 @@ class TCallbackErrorHandler extends TErrorHandler
 		{
 			$response = $this->getApplication()->getResponse();
 			$trace = TJavaScript::jsonEncode($this->getExceptionStackTrace($exception));
-			$response->appendHeader('HTTP/1.0 500 Internal Error');
+			$response->setStatusCode(500, 'Internal Server Error');
 			$response->appendHeader(TActivePageAdapter::CALLBACK_ERROR_HEADER.': '.$trace);
 		}
 		else
 		{
 			error_log("Error happened while processing an existing error:\n".$exception->__toString());
-			header('HTTP/1.0 500 Internal Error');
+			header('HTTP/1.0 500 Internal Server Error', true, 500);
 		}
 		$this->getApplication()->getResponse()->flush();
 	}
-- 
cgit v1.2.3