--- DefaultHandler.php	2009-10-02 10:17:42.000000000 +0100
+++ DefaultHandler.php.orig	2009-10-02 08:35:24.000000000 +0100
@@ -166,14 +166,6 @@
 	
 	protected static function showOutput($errtype, $errmsg, $filename, $linenum, $backtrace, $termination_error)
 	{
-		if (self::isOutputUnacceptable()) {
-			if ($termination_error === true && !headers_sent()) {
-				header('HTTP/1.1 500 Internal Server Error');
-				header('Cache-control: max-age=0');
-			}
-			return;
-		}
-		
 		if (self::getDisplayErrors() == false) {
 			/* Generally, we respect the setting of display_errors. However, if
 			 * the error is a termination error, we want to show *something* other
@@ -467,9 +459,8 @@
 		} else if (self::$send_email == self::SEND_EMAIL_AUTO) {
 			// If send_email is set to "auto", we decide on the basis of whether
 			// display_errors is on or not.
-			if (self::getDisplayErrors() == true) {	
+			if (self::getDisplayErrors() == true) {
 				return;
-				
 			}
 		}
 		
@@ -560,41 +551,12 @@
 
 	protected static function getDisplayErrors()
 	{
-		if (self::isOutputUnacceptable()) {
-			return false;
-		}
-		
 		$disp_err = ini_get('display_errors');
 		settype($disp_err, 'string'); // seems to always return string, but be sure
 		$disp_err = strtolower(trim($disp_err));
 		if ($disp_err === '1' || $disp_err === 'on') {
 			return true;
 		}
-
-		return false;
-	}
-	
-	/**
-	 * Returns boolean if the current context is is ok to show errors
-	 *
-	 * Possible Resons:
-	 * - AJAX Requests
-	 * - DAV Requests
-	 * - WebService
-	 *
-	 * @return boolean
-	 */
-	protected static function isOutputUnacceptable()
-	{
-		// Check for ajax requests
-		if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest') {
-			return true;
-			
-		// Check for dav specific request methods
-		} elseif (isset($_SERVER['REQUEST_METHOD']) && ($_SERVER['REQUEST_METHOD'] === 'OPTIONS' || $_SERVER['REQUEST_METHOD'] === 'PROPFIND')) {
-			return true;
-		}
-		
 		return false;
 	}