[Libreoffice-commits] core.git: ucb/source

[Giuseppe Castagno]

 ucb/source/ucp/webdav-neon/webdavcontent.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 4475c191de479e7a5ddb20d14bc3aa32b0ab84d3
Author: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
Date:   Wed Jan 13 14:55:57 2016 +0100

    Related: tdf#96410 eXo Platform WebDAV: where lock fails...
    
    ...because apparently eXo Platform WebDAV does not support or supports
    poorly this section <http://tools.ietf.org/html/rfc4918#section-7.3>
    of RFC4918.
    It returns HTTP error 404 instead.
    
    Change-Id: I74cc99b29afa62110470e9ca785fce36e3d04bb2
    Reviewed-on: https://gerrit.libreoffice.org/27755
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>

diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 902bc76..1464281 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -3192,6 +3192,10 @@ void Content::lock(
                 //grab the error code
                 switch( e.getStatus() )
                 {
+                    // The 'case SC_NOT_FOUND' just below tries to solve a problem in eXo Platform
+                    // WebDAV connector which apparently fail on resource first creation
+                    // rfc4918 section-7.3 (see link below)
+                    case SC_NOT_FOUND:              // <http://tools.ietf.org/html/rfc7231#section-6.5.4>
                     // The 'case SC_PRECONDITION_FAILED' just below tries to solve a problem
                     // in SharePoint when locking the resource on first creation fails due to this:
                     // <https://msdn.microsoft.com/en-us/library/jj575265%28v=office.12%29.aspx#id15>
@@ -3201,7 +3205,7 @@ void Content::lock(
                         // part of base http 1.1 RFCs
                     case SC_NOT_IMPLEMENTED:        // <http://tools.ietf.org/html/rfc7231#section-6.6.2>
                     case SC_METHOD_NOT_ALLOWED:     // <http://tools.ietf.org/html/rfc7231#section-6.5.5>
-                        SAL_WARN( "ucb.ucp.webdav", "lock() DAVException (SC_PRECONDITION_FAILED, SC_NOT_IMPLEMENTED or SC_METHOD_NOT_ALLOWED) - URL: <"
+                        SAL_WARN( "ucb.ucp.webdav", "lock() DAVException (SC_NOT_FOUND, SC_PRECONDITION_FAILED, SC_NOT_IMPLEMENTED or SC_METHOD_NOT_ALLOWED) - URL: <"
                                   << m_xIdentifier->getContentIdentifier() << ">, DAV error: " << e.getError() << ", HTTP error: " << e.getStatus() );
                         // act as nothing happened
                         // that's because when a resource is first created