Hello community, here is the log from the commit of package kio for openSUSE:Factory checked in at 2019-10-27 13:39:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kio (Old) and /work/SRC/openSUSE:Factory/.kio.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kio" Sun Oct 27 13:39:41 2019 rev:86 rq:742203 version:5.63.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kio/kio.changes 2019-10-14 13:36:53.402118677 +0200 +++ /work/SRC/openSUSE:Factory/.kio.new.2990/kio.changes 2019-10-27 13:39:43.377173559 +0100 @@ -1,0 +2,6 @@ +Wed Oct 23 14:08:56 UTC 2019 - Matthias Fehring <[email protected]> + +- Fix nextcloud calendar content not visible (kde#413316) + * kio-5.63.0-fix-depth-with-kdav.patch + +------------------------------------------------------------------- New: ---- kio-5.63.0-fix-depth-with-kdav.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kio.spec ++++++ --- /var/tmp/diff_new_pack.cOOrCI/_old 2019-10-27 13:39:45.541176169 +0100 +++ /var/tmp/diff_new_pack.cOOrCI/_new 2019-10-27 13:39:45.569176203 +0100 @@ -37,6 +37,8 @@ Source99: baselibs.conf # PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5 Patch0: kio_help-fallback-to-kde4-docs.patch +# PATCH-FIX-UPSTREAM kio-5.63.0-fix-depth-with-kdav.patch kde#413316 -- content of nextcloud calendars not visible +Patch1: kio-5.63.0-fix-depth-with-kdav.patch BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes ++++++ kio-5.63.0-fix-depth-with-kdav.patch ++++++ >From 02a8d3deb4f97046da4a0bb79abf9510d2d1c0a2 Mon Sep 17 00:00:00 2001 From: David Faure <[email protected]> Date: Wed, 23 Oct 2019 09:29:55 +0200 Subject: kio_http: avoid double Content-Type and Depth when used by KDAV References: kde#413316 Upstream: merged Summary: This makes libkdav 19.08 work again after commit 9713ea02e49eda. Test Plan: syncing a CALDAV calendar in korganizer no longer fails Reviewers: vkrause Subscribers: kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D24880 --- src/ioslaves/http/http.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ioslaves/http/http.cpp b/src/ioslaves/http/http.cpp index e3bad6c..11dd7af 100644 --- a/src/ioslaves/http/http.cpp +++ b/src/ioslaves/http/http.cpp @@ -172,7 +172,8 @@ static QString sanitizeCustomHTTPHeader(const QString &_header) if (!header.contains(QLatin1Char(':')) || header.startsWith(QLatin1String("host"), Qt::CaseInsensitive) || header.startsWith(QLatin1String("proxy-authorization"), Qt::CaseInsensitive) || - header.startsWith(QLatin1String("via"), Qt::CaseInsensitive)) { + header.startsWith(QLatin1String("via"), Qt::CaseInsensitive) || + header.startsWith(QLatin1String("depth"), Qt::CaseInsensitive)) { continue; } @@ -2599,7 +2600,7 @@ bool HTTPProtocol::sendQuery() davHeader += metaData(QStringLiteral("davHeader")); // Set content type of webdav data - if (hasDavData) { + if (hasDavData && !header.contains(QLatin1String("Content-Type: "))) { davHeader += QStringLiteral("Content-Type: text/xml; charset=utf-8\r\n"); } -- cgit v1.1
