extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-18 11:21:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

"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

Browse Source 
--> modified header template to not switch it on in first place, for webdav.php"
This commit is contained in:
Ralf Becker 2009-06-25 10:34:30 +00:00
parent 1d98f10532
commit a237fd802c
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
header.inc.php.template
View File

@ -96,7 +96,10 @@ $GLOBALS['egw_info']['server']['versions']['header'] = '1.29';
if(!isset($GLOBALS['egw_info']['flags']['noapi']) || !$GLOBALS['egw_info']['flags']['noapi']) 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'); require_once(EGW_API_INC . '/functions.inc.php');
} }
else else

4
webdav.php
View File

@ -89,10 +89,6 @@ catch (egw_exception_no_permission_app $e)
} }
$headertime = microtime(true); $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 = new vfs_webdav_server();
$webdav_server->ServeRequest(); $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)); //error_log(sprintf("WebDAV %s request took %5.3f s (header include took %5.3f s)",$_SERVER['REQUEST_METHOD'],microtime(true)-$starttime,$headertime-$starttime));