From e22f1a19c4c1f12fc9ac10cbb5600aaf79396129 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Fri, 17 Jul 2009 11:13:38 +0000
Subject: [PATCH] Disable custom error handler and exception handler.
Disable the custom handlers until the logger class and the
configuration class can avoid calling recursing into each other.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1590 44740490-163a-0410-bde0-09ae8108e29a
---
www/_include.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/www/_include.php b/www/_include.php
index f6a42f8c5..270120301 100644
--- a/www/_include.php
+++ b/www/_include.php
@@ -27,7 +27,9 @@ function SimpleSAML_exception_handler(Exception $exception) {
$e = new SimpleSAML_Error_Error('UNHANDLEDEXCEPTION', $exception);
$e->show();
}
-set_exception_handler('SimpleSAML_exception_handler');
+/* Disabled; see issue #176.
+ * set_exception_handler('SimpleSAML_exception_handler');
+ */
/* Log full backtrace on errors and warnings. */
function SimpleSAML_error_handler($errno, $errstr, $errfile = NULL, $errline = 0, $errcontext = NULL) {
@@ -46,7 +48,9 @@ function SimpleSAML_error_handler($errno, $errstr, $errfile = NULL, $errline = 0
/* Resume normal error processing. */
return FALSE;
}
-set_error_handler('SimpleSAML_error_handler');
+/* Disabled; see issue #176.
+ * set_error_handler('SimpleSAML_error_handler');
+ */
$path_extra = dirname(dirname(__FILE__)) . '/lib';
--
GitLab