diff options
| author | Christophe.Boulain <> | 2009-07-15 09:01:05 +0000 |
|---|---|---|
| committer | Christophe.Boulain <> | 2009-07-15 09:01:05 +0000 |
| commit | 3ba065922fadd3dfc9e60014690e139a5568f8a9 (patch) | |
| tree | 232f99f1a77b64def015fce4445bf572773f93ca /framework/Web/UI/ActiveControls | |
| parent | f1c27f46100582a1e52a27b616bf468e849068e7 (diff) | |
Merging latests 3.1 changes into trunk
Diffstat (limited to 'framework/Web/UI/ActiveControls')
| -rw-r--r-- | framework/Web/UI/ActiveControls/TActivePageAdapter.php | 4 |
1 files changed, 2 insertions, 2 deletions
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();
}
|