[Libreoffice-commits] online.git: net/Socket.cpp

[Pranav Kant]

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

New commits:
commit 2124ec30c61917f934b1af77e69fbc2e457eb854
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

diff --git a/net/Socket.cpp b/net/Socket.cpp
index 5850e9c4..e4d2df4e 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -215,7 +215,9 @@ namespace HttpHelper
         }
 
         // Disable deflate for now - until we can cache deflated data.
-        if (!deflate && true)
+        // 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;