[Libreoffice-commits] online.git: loolwsd/UnitHTTP.hpp

Ashod Nakashian ashod.nakashian at collabora.co.uk
Fri Apr 8 02:39:14 UTC 2016


 loolwsd/UnitHTTP.hpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 703febc2e26962c88c5753476f04fc145a96aa8b
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Thu Apr 7 20:29:27 2016 -0400

    loolwsd: compatibility fixes with Poco master
    
    Change-Id: Ide03cc4cce528fa15a9f6b6ba546477e557142fe
    Reviewed-on: https://gerrit.libreoffice.org/23908
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/UnitHTTP.hpp b/loolwsd/UnitHTTP.hpp
index ea00b85..53694ff 100644
--- a/loolwsd/UnitHTTP.hpp
+++ b/loolwsd/UnitHTTP.hpp
@@ -55,8 +55,9 @@ public:
         { setURI(uri); }
     virtual std::istream& stream() override
         { return *(static_cast<std::istream *>(nullptr)); }
-    virtual bool expectContinue() const override
+    virtual bool expectContinue() const /*override*/ // Some Poco version don't have this.
         { return false; }
+    virtual bool secure() const { return true; }
 	virtual const SocketAddress& clientAddress() const override
         { return _clientAddress; }
 	virtual const SocketAddress& serverAddress() const override


More information about the Libreoffice-commits mailing list