pool/kio
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 742203 from KDE:Frameworks5

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/742203
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=86
This commit is contained in:
Dominique Leuenberger 2019-10-27 12:39:41 +00:00 committed by Git OBS Bridge
commit 4e0b1a973c
3 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
kio-5.63.0-fix-depth-with-kdav.patch Normal file
View File

@ -0,0 +1,48 @@
From 02a8d3deb4f97046da4a0bb79abf9510d2d1c0a2 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
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

6
kio.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 23 14:08:56 UTC 2019 - Matthias Fehring <buschmann23@opensuse.org>
- Fix nextcloud calendar content not visible (kde#413316)
* kio-5.63.0-fix-depth-with-kdav.patch
-------------------------------------------------------------------
Sun Oct 6 13:26:40 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>

2
kio.spec
View File

@ -37,6 +37,8 @@ Source2: frameworks.keyring
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