diff options
author | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2016-09-12 22:01:37 +0200 |
---|---|---|
committer | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2016-09-13 06:36:26 +0000 |
commit | e137caed30052359783f2b112eee72553be1bd4f (patch) | |
tree | 67d7b156758a9242f364cd978ceb655b1a62c243 | |
parent | 757fd37747fd59091fa17432e8c8858b8a207a84 (diff) |
tdf#101094 (30): Better explanation of OPTIONS errors in debug build
Change-Id: Iea0eef5d3cd67c73325eb7af883ef8ce286187cd
Reviewed-on: https://gerrit.libreoffice.org/28850
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
-rw-r--r-- | ucb/source/ucp/webdav-neon/webdavcontent.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index f204f2a43f0e..099b7e2800b2 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -3875,13 +3875,14 @@ void Content::getResourceOptions( // not same as not found, this instead happens when the server does'n exist or does'n aswer at all // probably a new bit stating 'timed out' should be added to opts var? // in any case abort the command + SAL_WARN( "ucb.ucp.webdav", "OPTIONS - DAVException: DAV_HTTP_TIMEOUT or DAV_HTTP_CONNECT for URL <" << m_xIdentifier->getContentIdentifier() << ">" ); cancelCommandExecution( e, xEnv ); // unreachable } break; case DAVException::DAV_HTTP_AUTH: { - SAL_WARN( "ucb.ucp.webdav", "OPTIONS - DAVException Authentication error for URL <" << m_xIdentifier->getContentIdentifier() << ">" ); + SAL_WARN( "ucb.ucp.webdav", "OPTIONS - DAVException: DAV_HTTP_AUTH for URL <" << m_xIdentifier->getContentIdentifier() << ">" ); // - the remote site is a WebDAV with special configuration: read/only for read operations // and read/write for write operations, the user is not allowed to lock/write and // she cancelled the credentials request. @@ -3895,7 +3896,7 @@ void Content::getResourceOptions( { case SC_FORBIDDEN: { - SAL_WARN( "ucb.ucp.webdav","OPTIONS - Forbidden for URL <" << m_xIdentifier->getContentIdentifier() << ">" ); + SAL_WARN( "ucb.ucp.webdav","OPTIONS - SC_FORBIDDEN for URL <" << m_xIdentifier->getContentIdentifier() << ">" ); rDAVOptions.setResourceFound(); // it may exists, will be checked by HEAD or GET method, surely it's not DAV // cache it, so OPTIONS won't be called again, this URL does not support it aStaticDAVOptionsCache.addDAVOptions( rDAVOptions, @@ -3904,7 +3905,7 @@ void Content::getResourceOptions( break; case SC_BAD_REQUEST: { - SAL_WARN( "ucb.ucp.webdav","OPTIONS - Bad request for URL <" << m_xIdentifier->getContentIdentifier() << ">" ); + SAL_WARN( "ucb.ucp.webdav","OPTIONS - SC_BAD_REQUEST for URL <" << m_xIdentifier->getContentIdentifier() << ">" ); rDAVOptions.setResourceFound(); // it may exists, will be checked by HEAD or GET method, surely it's not DAV // cache it, so OPTIONS won't be called again, this URL does not support it aStaticDAVOptionsCache.addDAVOptions( rDAVOptions, @@ -3916,7 +3917,7 @@ void Content::getResourceOptions( { // OPTIONS method must be implemented in DAV // resource is NON_DAV, or not advertising it - SAL_WARN( "ucb.ucp.webdav","OPTIONS - Method not implemented or not allowed for URL <" << m_xIdentifier->getContentIdentifier() << ">" ); + SAL_WARN( "ucb.ucp.webdav","OPTIONS - SC_NOT_IMPLEMENTED or SC_METHOD_NOT_ALLOWED for URL <" << m_xIdentifier->getContentIdentifier() << ">" ); rDAVOptions.setResourceFound(); // means it exists, but it's not DAV // cache it, so OPTIONS won't be called again, this URL does not support it aStaticDAVOptionsCache.addDAVOptions( rDAVOptions, @@ -3936,7 +3937,7 @@ void Content::getResourceOptions( } aStaticDAVOptionsCache.addDAVOptions( rDAVOptions, nLifeTime ); - SAL_WARN( "ucb.ucp.webdav", "OPTIONS - Resource not found for URL <" << m_xIdentifier->getContentIdentifier() << ">" ); + SAL_WARN( "ucb.ucp.webdav", "OPTIONS - SC_NOT_FOUND for URL <" << m_xIdentifier->getContentIdentifier() << ">" ); } break; default: @@ -3955,7 +3956,7 @@ void Content::getResourceOptions( case DAVException::DAV_HTTP_REDIRECT: default: // leave the resource type as UNKNOWN, for now // it means this will be managed as a standard http site - SAL_WARN( "ucb.ucp.webdav","OPTIONS - DAVException for URL <" << m_xIdentifier->getContentIdentifier() << ">, DAV ExceptionCode: " + SAL_WARN( "ucb.ucp.webdav","OPTIONS - General DAVException (or max DAV_HTTP_REDIRECT reached) for URL <" << m_xIdentifier->getContentIdentifier() << ">, DAV ExceptionCode: " << e.getError() << ", HTTP error: "<<e.getStatus() ); rDAVOptions.setResourceFound(); // it may exists, will be checked by HEAD or GET method, surely it's not DAV // cache it, so OPTIONS won't be called again, this URL does not support it |