1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

- Fix the Konqueror double-POST regression.

- Bump PORTREVISION.

Obtained from:	92db24adfa
This commit is contained in:
Alberto Villa 2011-05-28 18:42:13 +00:00
parent 82e6e6a0f2
commit 6958649e0f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=274765
2 changed files with 28 additions and 0 deletions

View File

@ -8,6 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
CATEGORIES= x11 kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src

View 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 kio/kio/scheduler.cpp kio/kio/scheduler.cpp
index 55da053..9f5607e 100644
--- kio/kio/scheduler.cpp
+++ 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");