From a237fd802cf09b7ec1a2f3eac8b34d1894f08b59 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 25 Jun 2009 10:34:30 +0000 Subject: [PATCH] "reverting my inition comit to switch output buffering off in webdav.php, as it makes problems on system with do automatic output compression, eg. debian5 --> modified header template to not switch it on in first place, for webdav.php" --- header.inc.php.template | 5 ++++- webdav.php | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/header.inc.php.template b/header.inc.php.template index 67f0a9eb4a..67c1d77677 100644 --- a/header.inc.php.template +++ b/header.inc.php.template @@ -96,7 +96,10 @@ $GLOBALS['egw_info']['server']['versions']['header'] = '1.29'; if(!isset($GLOBALS['egw_info']['flags']['noapi']) || !$GLOBALS['egw_info']['flags']['noapi']) { - ob_start(); // to prevent error messages to be send before our headers + if (substr($_SERVER['SCRIPT_NAME'],-10) != 'webdav.php') // dont do it for webdav, as we can not savely switch it off again + { + ob_start(); // to prevent error messages to be send before our headers + } require_once(EGW_API_INC . '/functions.inc.php'); } else diff --git a/webdav.php b/webdav.php index 0d8b6aea6a..05aed7a4f3 100644 --- a/webdav.php +++ b/webdav.php @@ -89,10 +89,6 @@ catch (egw_exception_no_permission_app $e) } $headertime = microtime(true); -// switch of output buffering (switched on in header), as otherwise we run against memory_limit, for big files -// only do it if no output_handler is set in php.ini, as at least with zlib.output_handler it stalls ... -if (!ini_get('output_handler')) ob_end_flush(); - $webdav_server = new vfs_webdav_server(); $webdav_server->ServeRequest(); //error_log(sprintf("WebDAV %s request took %5.3f s (header include took %5.3f s)",$_SERVER['REQUEST_METHOD'],microtime(true)-$starttime,$headertime-$starttime));