From e48ca45fad8d05d6c206e42b4752da8c63545515 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Thu, 8 Dec 2011 13:56:41 +0000
Subject: [PATCH] Avoid fatal PHP error due to deprecation-warnings during
autoloading.
Due to a PHP bug combined with deprecation-warnings from the OpenID
library, we may fail with a fatal error due to not finding the
SimpleSAML_Logger class.
See PHP bug: https://bugs.php.net/bug.php?id=47987
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2999 44740490-163a-0410-bde0-09ae8108e29a
---
www/_include.php | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/www/_include.php b/www/_include.php
index 595a6bcc3..071da63dd 100644
--- a/www/_include.php
+++ b/www/_include.php
@@ -43,6 +43,17 @@ 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) {
+ if (!class_exists('SimpleSAML_Logger')) {
+ /* We are probably logging a deprecation-warning during parsing.
+ * Unfortunately, the autoloader is disabled at this point,
+ * so we should stop here.
+ *
+ * See PHP bug: https://bugs.php.net/bug.php?id=47987
+ */
+ return FALSE;
+ }
+
+
if ($errno & SimpleSAML_Utilities::$logMask) {
/* Masked error. */
return FALSE;
--
GitLab