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

[Michael Stahl (via logerrit)]

 helpcontent2                               |    2 +-
 ucb/source/ucp/webdav-curl/CurlSession.cxx |   16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 6c377dc4a3eaa5384204af1344006257d1c9e59a
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Fri Nov 19 18:54:02 2021 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Nov 22 10:55:05 2021 +0100

    ucb: webdav-curl: log headers in debug_callback
    
    Change-Id: I40ed170c2ae8bc769372fa2269dcf1f1643000de
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125580
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx 
b/ucb/source/ucp/webdav-curl/CurlSession.cxx
index 9fe20d10794f..5e5568a44773 100644
--- a/ucb/source/ucp/webdav-curl/CurlSession.cxx
+++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx
@@ -316,11 +316,19 @@ static int debug_callback(CURL* handle, curl_infotype 
type, char* data, size_t s
             SAL_INFO("ucb.ucp.webdav.curl", "debug log: " << handle << ": " << 
data);
             return 0;
         case CURLINFO_HEADER_IN:
-            pType = "CURLINFO_HEADER_IN";
-            break;
+            SAL_INFO("ucb.ucp.webdav.curl",
+                     "CURLINFO_HEADER_IN: " << handle << ": " << OString(data, 
size));
+            return 0;
         case CURLINFO_HEADER_OUT:
-            pType = "CURLINFO_HEADER_OUT";
-            break;
+        {
+            OString tmp(data, size);
+            if (tmp.startsWith("Authorization: "))
+            {
+                tmp = "Authorization: " + OString::number(tmp.getLength() - 
15) + " bytes redacted";
+            }
+            SAL_INFO("ucb.ucp.webdav.curl", "CURLINFO_HEADER_OUT: " << handle 
<< ": " << tmp);
+            return 0;
+        }
         case CURLINFO_DATA_IN:
             pType = "CURLINFO_DATA_IN";
             break;
commit acee9aa28e93945aa5f9b1a8497f296a53b3a72f
Author:     Johnny_M <kla...@partyheld.de>
AuthorDate: Mon Nov 22 10:55:04 2021 +0100
Commit:     Gerrit Code Review <ger...@gerrit.libreoffice.org>
CommitDate: Mon Nov 22 10:55:04 2021 +0100

    Update git submodules
    
    * Update helpcontent2 from branch 'master'
      to b0391082f22e06d38c17beb241852f7f6dc1ceb4
      - tdf#132643 Translate German section IDs
    
        Change-Id: Ibff67e3a6e819d998acd81d48cc8487423912df8
        Reviewed-on: https://gerrit.libreoffice.org/c/help/+/125612
        Tested-by: Jenkins
        Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/helpcontent2 b/helpcontent2
index 4f86b98f4852..b0391082f22e 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4f86b98f4852a3590208a5ba0183b0767b2340b0
+Subproject commit b0391082f22e06d38c17beb241852f7f6dc1ceb4