[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - 2 commits - wsd/Storage.cpp wsd/UserMessages.hpp

[Andras Timar]

 wsd/Storage.cpp      |    1 +
 wsd/UserMessages.hpp |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit fda587a0db1c76f5b183986f222fc59cc4823690
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Jan 17 16:40:53 2018 +0100

    These params are unsigned, Poco takes it seriously ([ERRFMT] was sent instead of number)
    
    Change-Id: Ie0bbf5c5f5fb96231baa5425b6a38dcbb614f61e
    Reviewed-on: https://gerrit.libreoffice.org/48060
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 4ec7fdb17e4a5477fdee2731431a33fa975bd1c2)
    Reviewed-on: https://gerrit.libreoffice.org/49022
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/wsd/UserMessages.hpp b/wsd/UserMessages.hpp
index f792cb0d..9dad0d36 100644
--- a/wsd/UserMessages.hpp
+++ b/wsd/UserMessages.hpp
@@ -13,7 +13,7 @@
 #define INCLUDED_USERMESSAGES_HPP
 
 constexpr auto SERVICE_UNAVAILABLE_INTERNAL_ERROR = "error: cmd=socket kind=serviceunavailable";
-constexpr auto PAYLOAD_UNAVAILABLE_LIMIT_REACHED = "error: cmd=socket kind=limitreached params=%d,%d";
+constexpr auto PAYLOAD_UNAVAILABLE_LIMIT_REACHED = "error: cmd=socket kind=limitreached params=%u,%u";
 
 #endif
 
commit 554dcc473f7605a2ea47f9474400b03c85ce6807
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Jan 18 20:50:35 2018 +0530

    wsd: Fix incorrect file size reported
    
    Close/flush the file after copying into it so that we can calculate the exact
    filesize later on.
    
    Change-Id: I30aca9d0ac3702394a4465c30c61954a726eec39
    (cherry picked from commit 0547507b671e14b550e2f782cc993ef15010a023)
    Reviewed-on: https://gerrit.libreoffice.org/49023
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index e24a31a5..ec1f3359 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -600,6 +600,7 @@ std::string WopiStorage::loadStorageFileToLocal(const std::string& accessToken)
             std::copy(std::istreambuf_iterator<char>(rs),
                       std::istreambuf_iterator<char>(),
                       std::ostreambuf_iterator<char>(ofs));
+            ofs.close();
             LOG_INF("WOPI::GetFile downloaded " << getFileSize(_jailedFilePath) << " bytes from [" << uriObject.toString() <<
                     "] -> " << _jailedFilePath << " in " << diff.count() << "s");