[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - 2 commits - loleaflet/src wsd/LOOLWSD.cpp

[Pranav Kant]

 loleaflet/src/layer/tile/GridLayer.js |    2 +-
 wsd/LOOLWSD.cpp                       |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit f15e82086d35d4efc159e34991a932068ca3032a
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed Dec 7 14:27:01 2016 +0530

    loleaflet: Don't prune tiles after every tile load
    
    When the connection is slow and tiles are received after a good
    amount of lag in between them, one tile load can prune tiles (of
    earlier zoom level) for which we have not yet received the tile
    response from the server - so there's nothing we have yet to
    overlap these tiles completely, leading to grey-ish patches when zooming
    in or out.
    
    Pruning these tiles later ensures that we do not remove any tiles
    of earlier zoom levels until all the tiles have been loaded.
    
    Change-Id: Ibb03f0c6bf2031741f0b8a4584c1821539587e88
    Reviewed-on: https://gerrit.libreoffice.org/35355
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>

diff --git a/loleaflet/src/layer/tile/GridLayer.js b/loleaflet/src/layer/tile/GridLayer.js
index 9a62bc8b..a704b42c 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -980,13 +980,13 @@ L.GridLayer = L.Layer.extend({
 			this._fadeFrame = L.Util.requestAnimFrame(this._updateOpacity, this);
 		} else {
 			tile.active = true;
-			this._pruneTiles();
 		}
 
 		L.DomUtil.addClass(tile.el, 'leaflet-tile-loaded');
 
 		if (this._noTilesToLoad()) {
 			this.fire('load');
+			this._pruneTiles();
 		}
 	},
 
commit 6adbc7ac0e054e7854d1f2e3875f222cc297f88d
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Thu Dec 8 14:52:31 2016 +0000

    tdf#106596 Don't take down WSD with an assert on a badly formed URI.
    
    Change-Id: I30118324a997e8604e87e610ee479e40c30a51d2
    Reviewed-on: https://gerrit.libreoffice.org/35356
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 64eabf02..f40f1050 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1234,7 +1234,11 @@ public:
     {
         LOG_TRC("Child connection with URI [" << request.getURI() << "].");
         assert(request.serverAddress().port() == MasterPortNumber);
-        assert(request.getURI().find(NEW_CHILD_URI) == 0);
+        if (request.getURI().find(NEW_CHILD_URI) != 0)
+        {
+            LOG_ERR("Invalid incoming URI.");
+            return;
+        }
 
         // New Child is spawned.
         const auto params = Poco::URI(request.getURI()).getQueryParameters();