From 13fd89575d554f33813c22212469f228815a2377 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 29 Jul 2019 15:03:01 +0200 Subject: [PATCH] More precise error message when expected filesize does not match - could be on reading or writing side Signed-off-by: Morris Jobke --- apps/dav/lib/Connector/Sabre/File.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php index d336df9830..dd25b046bc 100644 --- a/apps/dav/lib/Connector/Sabre/File.php +++ b/apps/dav/lib/Connector/Sabre/File.php @@ -225,7 +225,7 @@ class File extends Node implements IFile { if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['REQUEST_METHOD'] === 'PUT') { $expected = (int)$_SERVER['CONTENT_LENGTH']; if ($count !== $expected) { - throw new BadRequest('expected filesize ' . $expected . ' got ' . $count); + throw new BadRequest('Expected filesize of ' . $expected . ' bytes but read (from Nextcloud client) and wrote (to Nextcloud storage) ' . $count . ' bytes. Could either be a network problem on the sending side or a problem writing to the storage on the server side.'); } } @@ -490,8 +490,7 @@ class File extends Node implements IFile { $expected = (int)$_SERVER['CONTENT_LENGTH']; if ($bytesWritten !== $expected) { $chunk_handler->remove($info['index']); - throw new BadRequest( - 'expected filesize ' . $expected . ' got ' . $bytesWritten); + throw new BadRequest('Expected filesize of ' . $expected . ' bytes but read (from Nextcloud client) and wrote (to Nextcloud storage) ' . $bytesWritten . ' bytes. Could either be a network problem on the sending side or a problem writing to the storage on the server side.'); } } }