[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - net/Socket.cpp

[Pranav Kant]

 net/Socket.cpp |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit dae3a44fc9c101b2722794e5c0f656ed8154b8dd
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Apr 6 20:37:40 2017 +0530

    net: Disable deflate unconditionally
    
    First reason is that compression is very slow, and we re-compress the
    files again and again.
    
    Another reason is that IE/Edge doesn't work well with deflate turned on.
    Related: https://connect.microsoft.com/IE/feedbackdetail/view/950689
    The documents are not loaded at all with current code snapshot modulo
    this patch.
    
    Change-Id: I1fdd85856f448dc4ce02e1ab79e9c7474c3bb7f3
    (cherry picked from commit 2124ec30c61917f934b1af77e69fbc2e457eb854)
    Reviewed-on: https://gerrit.libreoffice.org/36220
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/net/Socket.cpp b/net/Socket.cpp
index 1f6d64d0..cb71ff7b 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -212,9 +212,10 @@ namespace HttpHelper
             bufferSize = socket->getSendBufferSize();
         }
 
-        // Deflate is done over the full file, which can be too large.
-        // Skip deflating (ironically) if the file is too large.
-        if (!deflate || st.st_size > Socket::MaximumSendBufferSize * 10)
+        // Disable deflate for now - until we can cache deflated data.
+        // FIXME: IE/Edge doesn't work well with deflate, so check with
+        // IE/Edge before enabling the deflate again
+        if (!deflate || true)
         {
             response.setContentLength(st.st_size);
             std::ostringstream oss;