Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kio: use only the host for determening when to not reuse a slave

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-02 03:53:07 +03:00
parent 481b9fa430
commit 5108de6bc1
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
kio/kio/scheduler.cpp
View file

@ -133,6 +133,7 @@ void Scheduler::jobFinished(KIO::SimpleJob *job, KIO::SlaveInterface *slave)
void Scheduler::reparseSlaveConfiguration()
{
kDebug(7006) << "Scheduler: reparsing slave configuration finished";
QMutexLocker locker(&m_mutex);
m_sessionData.reset();
foreach (KIO::SlaveInterface* slave, m_slaves) {
@ -164,14 +165,7 @@ void Scheduler::slotStartJob()
KIO::SimpleJob* job = iter.next();
const KUrl url = job->url();
const QString protocol = url.protocol();
KUrl hosturl = url;
const bool islocalfile = hosturl.isLocalFile();
if (!islocalfile) {
hosturl.setPath(QString());
}
hosturl.setQuery(QString());
hosturl.setFragment(QString());
const QString host = hosturl.url();
const QString host = url.host();
KIO::SlaveInterface* slave = nullptr;
const int maxSlaves = KProtocolInfo::maxSlaves(protocol);
@ -197,7 +191,7 @@ void Scheduler::slotStartJob()
kDebug(7006) << "Scheduler: slave protocol limit reached" << protocol << slaveForProtoCounter << maxSlaves;
break;
}
if (!islocalfile && maxSlavesPerHost > 0 && slaveForHostCounter >= maxSlavesPerHost) {
if (maxSlavesPerHost > 0 && slaveForHostCounter >= maxSlavesPerHost) {
kDebug(7006) << "Scheduler: slave host limit reached" << protocol << slaveForHostCounter << maxSlavesPerHost;
break;
}
@ -227,8 +221,8 @@ void Scheduler::slotStartJob()
configData += config->entryMap("<default>");
}
config = KSharedConfig::openConfig(KProtocolInfo::config(protocol), KConfig::NoGlobals);
if (!islocalfile) {
configData += config->entryMap(url.host());
if (config) {
configData += config->entryMap(host);
}
m_sessionData.configDataFor(configData, protocol);
slave->setConfig(configData);

8
kio/kio/slaveinterface.cpp
View file

@ -454,9 +454,13 @@ void SlaveInterface::gotInput()
if (!dispatch()) {
m_connection->close();
m_dead = true;
kDebug(7002) << "slave died pid = " << m_pid;
QString arg = m_protocol;
if (!m_host.isEmpty()) {
arg += QString::fromLatin1("://") + m_host;
}
kDebug(7002) << "slave died pid = " << m_pid << arg;
// Tell the job about the problem.
emit error(ERR_SLAVE_DIED, m_host);
emit error(ERR_SLAVE_DIED, arg);
// Tell the scheduler about the problem.
emit slaveDied(this);
}