summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-08-30 12:21:28 -0400
committerEvan Prodromou <evan@prodromou.name>2008-08-30 12:21:28 -0400
commitb2653f007a423d6d517e0b6519bfc920146b3d1e (patch)
tree5d5d4635df048a4c4896181426237a64db28c8a5
parentdcc93125edff70aea043cf3716aa2f4d135e45d0 (diff)
remove custom xmppdaemon error handler
darcs-hash:20080830162128-84dde-430fae5f1a0be77db2860c4e6e1c68b961b0944d.gz
-rwxr-xr-xscripts/xmppdaemon.php29
1 files changed, 0 insertions, 29 deletions
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 40f0c4274..8c2e6c168 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -18,35 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-function xmppdaemon_error_handler($errno, $errstr, $errfile, $errline, $errcontext) {
- switch ($errno) {
- case E_USER_ERROR:
- echo "ERROR: [$errno] $errstr ($errfile:$errline)\n";
- echo " Fatal error on line $errline in file $errfile";
- echo ", PHP " . PHP_VERSION . " (" . PHP_OS . ")\n";
- echo "Aborting...\n";
- exit(1);
- break;
-
- case E_USER_WARNING:
- echo "WARNING [$errno] $errstr ($errfile:$errline)\n";
- break;
-
- case E_USER_NOTICE:
- echo "NOTICE [$errno] $errstr ($errfile:$errline)\n";
- break;
-
- default:
- echo "Unknown error type: [$errno] $errstr ($errfile:$errline)\n";
- break;
- }
-
- /* Don't execute PHP internal error handler */
- return true;
-}
-
-set_error_handler('xmppdaemon_error_handler');
-
# Abort if called from a web server
if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
print "This script must be run from the command line\n";