diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2024-06-24 14:59:20 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2024-06-24 19:17:10 +0200 |
| commit | 25cdebe70a9f1c1be9ae9f2ca7c2e1bf9565756d (patch) | |
| tree | 3ccb391bc7b9d25eb0278bb75a45eaf05bcb2f89 /external | |
| parent | f58e3e3402c87755a2dd3cb83f29d00c40b94f1a (diff) | |
libcmis: fix failing AtomTest::authCallbackTest()
(regression from commit f91effb36b2be1ff8937d684191fb2f19d6ac97d)
Change-Id: I24c8da1c8ca70739ac047918c7036d72c7f7330b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169465
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libcmis/exceptions.patch.1 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/external/libcmis/exceptions.patch.1 b/external/libcmis/exceptions.patch.1 index 29a66f229c4c..3b4090aa54f7 100644 --- a/external/libcmis/exceptions.patch.1 +++ b/external/libcmis/exceptions.patch.1 @@ -1,12 +1,11 @@ --- libcmis/src/libcmis/http-session.cxx.orig 2024-06-21 12:22:36.083125022 +0200 +++ libcmis/src/libcmis/http-session.cxx 2024-06-21 13:08:37.403016695 +0200 -@@ -653,7 +653,8 @@ +@@ -653,7 +653,7 @@ m_authProvided = authProvider->authenticationQuery( m_username, m_password ); if ( !m_authProvided ) { - throw CurlException( "User cancelled authentication request" ); -+ // report this as 401 so it becomes permissionDenied -+ throw CurlException("User cancelled authentication request", CURLE_OK, "", 401); ++ throw CurlException("User cancelled authentication request", CURLE_OK); } } } @@ -62,7 +61,7 @@ void HttpSession::initProtocols( ) { -@@ -981,11 +972,43 @@ +@@ -981,11 +972,45 @@ break; default: msg = what(); @@ -106,6 +105,8 @@ + default: + if ( !isCancelled( ) ) + msg += ": " + m_url; ++ else if (msg == "User cancelled authentication request") ++ type = "permissionDenied"; + break; + } } |