Correctly reset php error handler even when user-code raises an exception

[plcapi.git] / src / Server.php

diff --git a/src/Server.php b/src/Server.php
index 96aac17..70b45de 100644 (file)
--- a/src/Server.php
+++ b/src/Server.php
@@ -678,6 +678,13 @@ class Server
             // in the called function, we wrap it in a proper error-response
             switch ($this->exception_handling) {
                 case 2:
+                    if ($this->debug > 2) {
+                        if (self::$_xmlrpcs_prev_ehandler) {
+                            set_error_handler(self::$_xmlrpcs_prev_ehandler);
+                        } else {
+                            restore_error_handler();
+                        }
+                    }
                     throw $e;
                     break;
                 case 1: