extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 17:04:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

final fix for "Network error" when stream files to client

Browse Source 
It is important to FIRST disable zlib.output_compression (before headers are sent!) and THEN end all output-buffering!
Without the two steps in this order, we are either limited by the memory limit or get the "Network error", because the streaming/fpassthrough does not apply the compression.
This commit is contained in:
ralf 2022-05-05 12:47:31 +02:00
parent 3eaed09185
commit 7e70eee888
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Vfs.php
View File

@ -1504,6 +1504,11 @@ class Vfs extends Vfs\Base
//error_log("Total files: " . $total_files . " Peak memory to zip: " . self::hsize(memory_get_peak_usage(true))); //error_log("Total files: " . $total_files . " Peak memory to zip: " . self::hsize(memory_get_peak_usage(true)));
// FIRST: switch off zlib.output_compression, as this would limit downloads in size to memory_limit
ini_set('zlib.output_compression',0);
// SECOND: end all active output buffering
while(ob_end_clean()) {}
// Stream the file to the client // Stream the file to the client
header("Content-Type: application/zip"); header("Content-Type: application/zip");
header("Content-Length: " . filesize($zip_file)); header("Content-Length: " . filesize($zip_file));

5
importexport/inc/class.importexport_export_ui.inc.php
View File

@ -446,6 +446,11 @@ class importexport_export_ui {
$appname = $_GET['_appname']; $appname = $_GET['_appname'];
$nicefname = $_GET['filename'] ? $_GET['filename'] : 'egw_export_'.$appname.'-'.date('Y-m-d'); $nicefname = $_GET['filename'] ? $_GET['filename'] : 'egw_export_'.$appname.'-'.date('Y-m-d');
// FIRST: switch off zlib.output_compression, as this would limit downloads in size to memory_limit
ini_set('zlib.output_compression',0);
// SECOND: end all active output buffering
while(ob_end_clean()) {}
// Get charset // Get charset
$charset = Api\Cache::getSession('importexport', $tmpfname); $charset = Api\Cache::getSession('importexport', $tmpfname);

10
setup/db_backup.php
View File

@ -42,8 +42,12 @@ if (!empty($_POST['download']))
{ {
$file = key($_POST['download']); $file = key($_POST['download']);
$file = $db_backup->backup_dir.'/'.basename($file); // basename to now allow to change the dir $file = $db_backup->backup_dir.'/'.basename($file); // basename to now allow to change the dir
while (@ob_end_clean()) {} // end all active output buffering
ini_set('zlib.output_compression',0); // switch off zlib.output_compression, as this would limit downloads in size to memory_limit // FIRST: switch off zlib.output_compression, as this would limit downloads in size to memory_limit
ini_set('zlib.output_compression',0);
// SECOND: end all active output buffering
while(ob_end_clean()) {}
Api\Header\Content::type(basename($file)); Api\Header\Content::type(basename($file));
readfile($file); readfile($file);
exit; exit;
@ -310,4 +314,4 @@ if ($run_in_egw)
else else
{ {
$GLOBALS['egw_setup']->html->show_footer(); $GLOBALS['egw_setup']->html->show_footer();
} }