* Tue May 24 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.6.3-5
- fix kio regression causing requests submitted twice (#707146, kde#272466)
This commit is contained in:
parent
e1ff5630d8
commit
6fba052a9f
27
kdelibs-4.6.3-kio-double-requests-kde#272466.patch
Normal file
27
kdelibs-4.6.3-kio-double-requests-kde#272466.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
commit 92db24adfa941003db1d885df01157056617f30b
|
||||||
|
Author: Maks Orlovich <maksim@kde.org>
|
||||||
|
Date: Sun May 8 14:39:03 2011 -0400
|
||||||
|
|
||||||
|
Fix the job-on-hold reuse logic, which caused the double-POST problem)
|
||||||
|
|
||||||
|
adawit, could you please at least READ what you're backporting if you are
|
||||||
|
going to be this aggressive? Or better yet, please don't backport anything
|
||||||
|
that's not fixing a critical bug or is trivial, as per:
|
||||||
|
http://techbase.kde.org/Policies/Minor_Point_Release_Policy
|
||||||
|
|
||||||
|
CCMAIL: adawit@kde.org
|
||||||
|
BUG: 272466
|
||||||
|
|
||||||
|
diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp
|
||||||
|
index 55da053..9f5607e 100644
|
||||||
|
--- a/kio/kio/scheduler.cpp
|
||||||
|
+++ b/kio/kio/scheduler.cpp
|
||||||
|
@@ -1151,7 +1151,7 @@ Slave *SchedulerPrivate::heldSlaveForJob(SimpleJob *job)
|
||||||
|
bool canJobReuse = (cmd == CMD_GET || cmd == CMD_MULTI_GET);
|
||||||
|
|
||||||
|
if (KIO::TransferJob *tJob = qobject_cast<KIO::TransferJob *>(job)) {
|
||||||
|
- canJobReuse = cmd == (canJobReuse || cmd == CMD_SPECIAL);
|
||||||
|
+ canJobReuse = (canJobReuse || cmd == CMD_SPECIAL);
|
||||||
|
if (canJobReuse) {
|
||||||
|
KIO::MetaData outgoing = tJob->outgoingMetaData();
|
||||||
|
const QString resume = outgoing.value("resume");
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.6.3
|
Version: 4.6.3
|
||||||
Release: 4%{?dist}.1
|
Release: 5%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -98,6 +98,8 @@ Patch51: kdelibs-4.6.2-uri_mimetypes.patch
|
|||||||
## upstream
|
## upstream
|
||||||
# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/a8d16682c31ef523ffebba6e19283a19cd5f5627/diff
|
# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/a8d16682c31ef523ffebba6e19283a19cd5f5627/diff
|
||||||
Patch100: kdelibs-4.6.3-kde258706.patch
|
Patch100: kdelibs-4.6.3-kde258706.patch
|
||||||
|
# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/92db24adfa941003db1d885df01157056617f30b/diff
|
||||||
|
Patch101: kdelibs-4.6.3-kio-double-requests-kde#272466.patch
|
||||||
|
|
||||||
## security fix
|
## security fix
|
||||||
# Not Upstreamed? why not ? -- Rex
|
# Not Upstreamed? why not ? -- Rex
|
||||||
@ -285,6 +287,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
%patch100 -p1 -b .kde258706
|
%patch100 -p1 -b .kde258706
|
||||||
|
%patch101 -p1 -b .kde272466
|
||||||
|
|
||||||
# security fix
|
# security fix
|
||||||
%patch200 -p1 -b .CVE-2009-2702
|
%patch200 -p1 -b .CVE-2009-2702
|
||||||
@ -540,6 +543,9 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 24 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.6.3-5
|
||||||
|
- fix kio regression causing requests submitted twice (#707146, kde#272466)
|
||||||
|
|
||||||
* Mon May 16 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.3-4.1
|
* Mon May 16 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.3-4.1
|
||||||
- Requires: oxygen-icon-theme >= 4.6.2
|
- Requires: oxygen-icon-theme >= 4.6.2
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user