From 0009cbb5a2f8d187e0cd1da9fa1dc8b785201385 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 16 Feb 2022 15:45:23 +0200 Subject: [PATCH] generic: drop support for webdav protocol Signed-off-by: Ivailo Monev --- includes/CMakeLists.txt | 1 - includes/KIO/SessionData | 1 - kdecore/kdebug.areas | 2 - kfile/kurlnavigatorbutton.cpp | 2 +- kfile/kurlnavigatorprotocolcombo.cpp | 12 -- kfile/kurlnavigatorprotocolcombo_p.h | 1 - kio/CMakeLists.txt | 2 - kio/kio/kprotocolmanager.cpp | 223 ++++----------------------- kio/kio/kprotocolmanager.h | 30 ---- kio/kio/scheduler.cpp | 49 +++++- kio/kio/scheduler_p.h | 16 ++ kio/kio/sessiondata.cpp | 133 ---------------- kio/kio/sessiondata.h | 61 -------- kioslave/http/CMakeLists.txt | 4 +- kioslave/http/http.cpp | 4 +- kioslave/http/webdav.protocol | 21 --- kioslave/http/webdavs.protocol | 21 --- kparts/browserrun.cpp | 4 +- kutils/kdeglobals.kcfg | 2 - 19 files changed, 102 insertions(+), 487 deletions(-) delete mode 100644 includes/KIO/SessionData delete mode 100644 kio/kio/sessiondata.cpp delete mode 100644 kio/kio/sessiondata.h delete mode 100644 kioslave/http/webdav.protocol delete mode 100644 kioslave/http/webdavs.protocol diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt index c7d993a6..ff489e82 100644 --- a/includes/CMakeLists.txt +++ b/includes/CMakeLists.txt @@ -472,7 +472,6 @@ install( KIO/PreviewJob KIO/RenameDialog KIO/Scheduler - KIO/SessionData KIO/SimpleJob KIO/SkipDialog KIO/Slave diff --git a/includes/KIO/SessionData b/includes/KIO/SessionData deleted file mode 100644 index 4ca99549..00000000 --- a/includes/KIO/SessionData +++ /dev/null @@ -1 +0,0 @@ -#include "../../kio/sessiondata.h" diff --git a/kdecore/kdebug.areas b/kdecore/kdebug.areas index 0a6783c2..adaed2a7 100644 --- a/kdecore/kdebug.areas +++ b/kdecore/kdebug.areas @@ -169,12 +169,10 @@ 7101 kio_file 7102 kio_ftp 7103 kio_http -7104 kcookiejar 7106 kio_smb 7109 kio_tar 7110 kio_gzip 7112 kio_smtp -7113 kio_http_debug 7115 kio_thumbnail 7118 kio_bzip2 7120 kio_sftp diff --git a/kfile/kurlnavigatorbutton.cpp b/kfile/kurlnavigatorbutton.cpp index 59e8508f..ff56b853 100644 --- a/kfile/kurlnavigatorbutton.cpp +++ b/kfile/kurlnavigatorbutton.cpp @@ -80,7 +80,7 @@ void KUrlNavigatorButton::setUrl(const KUrl& url) // is given where KIO::stat() should not be used: static QSet protocols; if (protocols.isEmpty()) { - protocols << "fish" << "ftp" << "nfs" << "sftp" << "smb" << "webdav"; + protocols << "ftp" << "nfs" << "sftp" << "smb"; } startTextResolving = !protocols.contains(m_url.protocol()); } diff --git a/kfile/kurlnavigatorprotocolcombo.cpp b/kfile/kurlnavigatorprotocolcombo.cpp index d215c0d0..462fd944 100644 --- a/kfile/kurlnavigatorprotocolcombo.cpp +++ b/kfile/kurlnavigatorprotocolcombo.cpp @@ -173,10 +173,6 @@ void KUrlNavigatorProtocolCombo::updateMenu() menu = m_menu->addMenu(i18nc("@item:inmenu", "Devices")); break; - case SubversionCategory: - menu = m_menu->addMenu(i18nc("@item:inmenu", "Subversion")); - break; - case OtherCategory: menu = m_menu->addMenu(i18nc("@item:inmenu", "Other")); break; @@ -204,11 +200,9 @@ void KUrlNavigatorProtocolCombo::initializeCategories() if (m_categories.isEmpty()) { m_categories.insert("file", CoreCategory); m_categories.insert("ftp", CoreCategory); - m_categories.insert("fish", CoreCategory); m_categories.insert("nfs", CoreCategory); m_categories.insert("sftp", CoreCategory); m_categories.insert("smb", CoreCategory); - m_categories.insert("webdav", CoreCategory); m_categories.insert("desktop", PlacesCategory); m_categories.insert("fonts", PlacesCategory); @@ -219,12 +213,6 @@ void KUrlNavigatorProtocolCombo::initializeCategories() m_categories.insert("floppy", DevicesCategory); m_categories.insert("camera", DevicesCategory); m_categories.insert("remote", DevicesCategory); - - m_categories.insert("svn", SubversionCategory); - m_categories.insert("svn+file", SubversionCategory); - m_categories.insert("svn+http", SubversionCategory); - m_categories.insert("svn+https", SubversionCategory); - m_categories.insert("svn+ssh", SubversionCategory); } } diff --git a/kfile/kurlnavigatorprotocolcombo_p.h b/kfile/kurlnavigatorprotocolcombo_p.h index 0ccad6c0..3a0ad868 100644 --- a/kfile/kurlnavigatorprotocolcombo_p.h +++ b/kfile/kurlnavigatorprotocolcombo_p.h @@ -73,7 +73,6 @@ private: CoreCategory, PlacesCategory, DevicesCategory, - SubversionCategory, OtherCategory, CategoryCount // mandatory last entry }; diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt index 95e0cb25..00427586 100644 --- a/kio/CMakeLists.txt +++ b/kio/CMakeLists.txt @@ -93,7 +93,6 @@ set(kiocore_STAT_SRCS kio/previewjob.cpp kio/renamedialog.cpp kio/scheduler.cpp - kio/sessiondata.cpp kio/skipdialog.cpp kio/slave.cpp kio/slavebase.cpp @@ -257,7 +256,6 @@ install( kio/slaveinterface.h kio/slave.h kio/slaveconfig.h - kio/sessiondata.h kio/global.h kio/netaccess.h kio/job.h diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp index ee9256eb..1814ee59 100644 --- a/kio/kio/kprotocolmanager.cpp +++ b/kio/kio/kprotocolmanager.cpp @@ -312,20 +312,9 @@ QString KProtocolManager::noProxyFor() return noProxy; } -static QString adjustProtocol(const QString& scheme) -{ - if (scheme.compare(QL1S("webdav"), Qt::CaseInsensitive) == 0) - return QL1S("http"); - - if (scheme.compare(QL1S("webdavs"), Qt::CaseInsensitive) == 0) - return QL1S("https"); - - return scheme.toLower(); -} - QString KProtocolManager::proxyFor( const QString& protocol ) { - const QString key = adjustProtocol(protocol) + QL1S("Proxy"); + const QString key = protocol.toLower() + QL1S("Proxy"); QString proxyStr (config()->group("Proxy Settings").readEntry(key)); const int index = proxyStr.lastIndexOf(QL1C(' ')); @@ -392,7 +381,7 @@ QStringList KProtocolManager::proxiesForUrl( const KUrl &url ) case WPADProxy: { KUrl u (url); - const QString protocol = adjustProtocol(u.protocol()); + const QString protocol = u.protocol().toLower(); u.setProtocol(protocol); if (protocol.startsWith(QL1S("http")) || protocol.startsWith(QL1S("ftp"))) { @@ -516,10 +505,9 @@ QString KProtocolManager::slaveProtocol(const KUrl &url, QStringList &proxyList) } // The idea behind slave protocols is not applicable to http - // and webdav protocols as well as protocols unknown to KDE. + // protocol as well as protocols unknown to KDE. if (!proxyList.isEmpty() && !protocol.startsWith(QL1S("http")) - && !protocol.startsWith(QL1S("webdav")) && KProtocolInfo::isKnownProtocol(protocol)) { Q_FOREACH(const QString& proxy, proxyList) { KUrl u (proxy); @@ -537,39 +525,9 @@ QString KProtocolManager::slaveProtocol(const KUrl &url, QStringList &proxyList) /*================================= USER-AGENT SETTINGS =====================*/ -QString KProtocolManager::userAgentForHost( const QString& hostname ) -{ - const QString sendUserAgent = KIO::SlaveConfig::self()->configData("http", hostname.toLower(), "SendUserAgent").toLower(); - if (sendUserAgent == QL1S("false")) - return QString(); - - const QString useragent = KIO::SlaveConfig::self()->configData("http", hostname.toLower(), "UserAgent"); - - // Return the default user-agent if none is specified - // for the requested host. - if (useragent.isEmpty()) - return defaultUserAgent(); - - return useragent; -} - QString KProtocolManager::defaultUserAgent( ) { - const QString modifiers = KIO::SlaveConfig::self()->configData("http", QString(), "UserAgentKeys"); - return defaultUserAgent(modifiers); -} - -static QString defaultUserAgentFromPreferredService() -{ - QString agentStr; - - // Check if the default COMPONENT contains a custom default UA string... - KService::Ptr service = KMimeTypeTrader::self()->preferredService(QL1S("text/html"), - QL1S("KParts/ReadOnlyPart")); - if (service && service->showInKDE()) - agentStr = service->property(QL1S("X-KDE-Default-UserAgent"), - QVariant::String).toString(); - return agentStr; + return defaultUserAgent(DEFAULT_USER_AGENT_KEYS); } static QString platform() @@ -618,166 +576,53 @@ QString KProtocolManager::defaultUserAgent( const QString &_modifiers ) QString systemName, systemVersion, machine, supp; const bool sysInfoFound = getSystemNameVersionAndMachine( systemName, systemVersion, machine ); - QString agentStr = defaultUserAgentFromPreferredService(); - if (agentStr.isEmpty()) + supp += platform(); + + if (sysInfoFound) { - supp += platform(); - - if (sysInfoFound) + if (modifiers.contains('o')) { - if (modifiers.contains('o')) + supp += QL1S("; "); + supp += systemName; + if (modifiers.contains('v')) { - supp += QL1S("; "); - supp += systemName; - if (modifiers.contains('v')) - { - supp += QL1C(' '); - supp += systemVersion; - } - - if (modifiers.contains('m')) - { - supp += QL1C(' '); - supp += machine; - } + supp += QL1C(' '); + supp += systemVersion; } - if (modifiers.contains('l')) + if (modifiers.contains('m')) { - supp += QL1S("; "); - supp += KGlobal::locale()->language(); + supp += QL1C(' '); + supp += machine; } } - // Full format: Mozilla/5.0 (Linux - d->useragent = QL1S("Mozilla/5.0 ("); - d->useragent += supp; - d->useragent += QL1S(") KHTML/"); - d->useragent += QString::number(KDE::versionMajor()); - d->useragent += QL1C('.'); - d->useragent += QString::number(KDE::versionMinor()); - d->useragent += QL1C('.'); - d->useragent += QString::number(KDE::versionRelease()); - d->useragent += QL1S(" (like Gecko) Konqueror/"); - d->useragent += QString::number(KDE::versionMajor()); - d->useragent += QL1C('.'); - d->useragent += QString::number(KDE::versionMinor()); + if (modifiers.contains('l')) + { + supp += QL1S("; "); + supp += KGlobal::locale()->language(); + } } - else - { - QString appName = QCoreApplication::applicationName(); - if (appName.isEmpty() || appName.startsWith(QL1S("kcmshell"), Qt::CaseInsensitive)) - appName = QL1S ("KDE"); - QString appVersion = QCoreApplication::applicationVersion(); - if (appVersion.isEmpty()) { - appVersion += QString::number(KDE::versionMajor()); - appVersion += QL1C('.'); - appVersion += QString::number(KDE::versionMinor()); - appVersion += QL1C('.'); - appVersion += QString::number(KDE::versionRelease()); - } - - appName += QL1C('/'); - appName += appVersion; - - agentStr.replace(QL1S("%appversion%"), appName, Qt::CaseInsensitive); - - if (!QSslSocket::supportsSsl()) - agentStr.replace(QL1S("%security%"), QL1S("N"), Qt::CaseInsensitive); - else - agentStr.remove(QL1S("%security%"), Qt::CaseInsensitive); - - if (sysInfoFound) - { - // Platform (e.g. X11). It is no longer configurable from UI. - agentStr.replace(QL1S("%platform%"), platform(), Qt::CaseInsensitive); - - // Operating system (e.g. Linux) - if (modifiers.contains('o')) - { - agentStr.replace(QL1S("%osname%"), systemName, Qt::CaseInsensitive); - - // OS version (e.g. 2.6.36) - if (modifiers.contains('v')) - agentStr.replace(QL1S("%osversion%"), systemVersion, Qt::CaseInsensitive); - else - agentStr.remove(QL1S("%osversion%"), Qt::CaseInsensitive); - - // Machine type (i686, x86-64, etc.) - if (modifiers.contains('m')) - agentStr.replace(QL1S("%systype%"), machine, Qt::CaseInsensitive); - else - agentStr.remove(QL1S("%systype%"), Qt::CaseInsensitive); - } - else - { - agentStr.remove(QL1S("%osname%"), Qt::CaseInsensitive); - agentStr.remove(QL1S("%osversion%"), Qt::CaseInsensitive); - agentStr.remove(QL1S("%systype%"), Qt::CaseInsensitive); - } - - // Language (e.g. en_US) - if (modifiers.contains('l')) - agentStr.replace(QL1S("%language%"), KGlobal::locale()->language(), Qt::CaseInsensitive); - else - agentStr.remove(QL1S("%language%"), Qt::CaseInsensitive); - - // Clean up unnecessary separators that could be left over from the - // possible keyword removal above... - agentStr.replace(QRegExp("[(]\\s*[;]\\s*"), QL1S("(")); - agentStr.replace(QRegExp("[;]\\s*[;]\\s*"), QL1S("; ")); - agentStr.replace(QRegExp("\\s*[;]\\s*[)]"), QL1S(")")); - } - else - { - agentStr.remove(QL1S("%osname%")); - agentStr.remove(QL1S("%osversion%")); - agentStr.remove(QL1S("%platform%")); - agentStr.remove(QL1S("%systype%")); - agentStr.remove(QL1S("%language%")); - } - - d->useragent = agentStr.simplified(); - } + // Full format: Mozilla/5.0 (Linux + d->useragent = QL1S("Mozilla/5.0 ("); + d->useragent += supp; + d->useragent += QL1S(") KHTML/"); + d->useragent += QString::number(KDE::versionMajor()); + d->useragent += QL1C('.'); + d->useragent += QString::number(KDE::versionMinor()); + d->useragent += QL1C('.'); + d->useragent += QString::number(KDE::versionRelease()); + d->useragent += QL1S(" (like Gecko) Konqueror/"); + d->useragent += QString::number(KDE::versionMajor()); + d->useragent += QL1C('.'); + d->useragent += QString::number(KDE::versionMinor()); //kDebug() << "USERAGENT STRING:" << d->useragent; return d->useragent; } -QString KProtocolManager::userAgentForApplication( const QString &appName, const QString& appVersion, - const QStringList& extraInfo ) -{ - QString systemName, systemVersion, machine, info; - - if (getSystemNameVersionAndMachine( systemName, systemVersion, machine )) - { - info += systemName; - info += QL1C('/'); - info += systemVersion; - info += QL1S("; "); - } - - info += QL1S("KDE/"); - info += QString::number(KDE::versionMajor()); - info += QL1C('.'); - info += QString::number(KDE::versionMinor()); - info += QL1C('.'); - info += QString::number(KDE::versionRelease()); - - if (!machine.isEmpty()) - { - info += QL1S("; "); - info += machine; - } - - info += QL1S("; "); - info += extraInfo.join(QL1S("; ")); - - return (appName + QL1C('/') + appVersion + QL1S(" (") + info + QL1C(')')); -} - bool KProtocolManager::getSystemNameVersionAndMachine( QString& systemName, QString& systemVersion, QString& machine ) { diff --git a/kio/kio/kprotocolmanager.h b/kio/kio/kprotocolmanager.h index 7b8504cd..2b4a65fc 100644 --- a/kio/kio/kprotocolmanager.h +++ b/kio/kio/kprotocolmanager.h @@ -85,36 +85,6 @@ public: */ static QString defaultUserAgent(const QString &keys); - /** - * Returns the application's user-agent string. - * Example string is "KMail/1.9.50 (Windows/6.0; KDE/3.97.1; i686; svn-762186; 2008-01-15)", - * where "KMail" is the @p appName parameter, "1.9.50" is the @p appVersion parameter, - * "Windows/6.0; KDE/3.97.1; i686" part is added automatically and "svn-762186; 2008-01-15" - * is provided by @p extraInfo list. - * - * @param appName name of the application - * @param appVersion name of the application - * @param extraInfo a list of elements that will be appended to the string as extra information - * @return the application's user-agent string - * - * @since 4.1 - */ - static QString userAgentForApplication( const QString &appName, const QString& appVersion, - const QStringList& extraInfo = QStringList() ); - - /** - * Returns the user-agent string configured for the - * specified host. - * - * If hostname is not found or is empty (i.e. "" or - * QString()) this function will return the default - * user agent. - * - * @param hostname name of the host - * @return specified user-agent string - */ - static QString userAgentForHost( const QString &hostname ); - /* * Returns system name, version and machine type, for example "Windows", "5.1", "i686". * This information can be used for constructing custom user-agent strings. diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp index dc447676..dcaf55a3 100644 --- a/kio/kio/scheduler.cpp +++ b/kio/kio/scheduler.cpp @@ -21,7 +21,6 @@ #include "scheduler.h" #include "scheduler_p.h" -#include "sessiondata.h" #include "slaveconfig.h" #include "authinfo.h" #include "slave.h" @@ -31,7 +30,8 @@ #include #include #include -#include +#include + #include #include @@ -39,6 +39,8 @@ #include #include +#include + // Slaves may be idle for a certain time (3 minutes) before they are killed. static const int s_idleSlaveLifetime = 3 * 60; @@ -68,6 +70,47 @@ static void setupSlave(KIO::Slave *slave, const KUrl &url, const QString &protoc static Scheduler *scheduler(); static Slave *heldSlaveForJob(SimpleJob *job); +/********************************* SessionData ****************************/ + +SessionData::SessionData() +{ + useCookie = true; + initDone = false; +} + +SessionData::~SessionData() +{ +} + +void SessionData::configDataFor( MetaData &configData, const QString &proto) +{ + if ( (proto.startsWith(QLatin1String("http"), Qt::CaseInsensitive)) ) + { + if (!initDone) + reset(); + + // These might have already been set so check first + // to make sure that we do not trumpt settings sent + // by apps or end-user. + if ( configData["Languages"].isEmpty() ) + configData["Languages"] = language; + if ( configData["Charsets"].isEmpty() ) + configData["Charsets"] = charsets; + if ( configData["CacheDir"].isEmpty() ) + configData["CacheDir"] = KGlobal::dirs()->saveLocation("cache", "http"); + if ( configData["UserAgent"].isEmpty() ) + configData["UserAgent"] = KProtocolManager::defaultUserAgent(); + } +} + +void SessionData::reset() +{ + initDone = true; + + language = KProtocolManager::acceptLanguagesHeader(); + charsets = QString::fromLatin1(QTextCodec::codecForLocale()->name()).toLower(); + KProtocolManager::reparseConfiguration(); +} int SerialPicker::changedPrioritySerial(int oldSerial, int newPriority) const { @@ -1047,7 +1090,7 @@ MetaData SchedulerPrivate::metaDataFor(const QString &protocol, const QStringLis { const QString host = url.host(); MetaData configData = SlaveConfig::self()->configData(protocol, host); - sessionData.configDataFor( configData, protocol, host ); + sessionData.configDataFor( configData, protocol ); if (proxyList.isEmpty()) { configData.remove(QLatin1String("UseProxy")); configData.remove(QLatin1String("ProxyUrls")); diff --git a/kio/kio/scheduler_p.h b/kio/kio/scheduler_p.h index 1c86f650..edff52a2 100644 --- a/kio/kio/scheduler_p.h +++ b/kio/kio/scheduler_p.h @@ -24,6 +24,22 @@ namespace KIO { +class SessionData +{ +public: + SessionData(); + ~SessionData(); + + void configDataFor(KIO::MetaData &configData, const QString &proto); + void reset(); + +private: + bool initDone; + bool useCookie; + QString charsets; + QString language; +}; + class SlaveKeeper : public QObject { Q_OBJECT diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp deleted file mode 100644 index 8e7c9eb9..00000000 --- a/kio/kio/sessiondata.cpp +++ /dev/null @@ -1,133 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2000 Dawit Alemayehu - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License (LGPL) as published by the Free Software Foundation; - either version 2 of the License, or (at your option) any - later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 51 Franklin Street, - Fifth Floor, Boston, MA 02110-1301, USA. -*/ - -#include "sessiondata.h" -#include "moc_sessiondata.cpp" - -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -namespace KIO { - -/***************************** SessionData::AuthData ************************/ -#if 0 -struct SessionData::AuthData -{ - -public: - AuthData() {} - - AuthData(const QByteArray& k, const QByteArray& g, bool p) { - key = k; - group = g; - persist = p; - } - - bool isKeyMatch( const QByteArray& val ) const { - return (val==key); - } - - bool isGroupMatch( const QByteArray& val ) const { - return (val==group); - } - - QByteArray key; - QByteArray group; - bool persist; -}; -#endif - -/********************************* SessionData ****************************/ - -class SessionData::SessionDataPrivate -{ -public: - SessionDataPrivate() { - useCookie = true; - initDone = false; - } - - bool initDone; - bool useCookie; - QString charsets; - QString language; -}; - -SessionData::SessionData() - :d(new SessionDataPrivate) -{ -// authData = 0; -} - -SessionData::~SessionData() -{ - delete d; -} - -void SessionData::configDataFor( MetaData &configData, const QString &proto, - const QString & ) -{ - if ( (proto.startsWith(QLatin1String("http"), Qt::CaseInsensitive)) || - (proto.startsWith(QLatin1String("webdav"), Qt::CaseInsensitive)) ) - { - if (!d->initDone) - reset(); - - // These might have already been set so check first - // to make sure that we do not trumpt settings sent - // by apps or end-user. - if ( configData["Cookies"].isEmpty() ) - configData["Cookies"] = d->useCookie ? "true" : "false"; - if ( configData["Languages"].isEmpty() ) - configData["Languages"] = d->language; - if ( configData["Charsets"].isEmpty() ) - configData["Charsets"] = d->charsets; - if ( configData["CacheDir"].isEmpty() ) - configData["CacheDir"] = KGlobal::dirs()->saveLocation("cache", "http"); - if ( configData["UserAgent"].isEmpty() ) - configData["UserAgent"] = KProtocolManager::defaultUserAgent(); - } -} - -void SessionData::reset() -{ - d->initDone = true; - // Get Cookie settings... - d->useCookie = KSharedConfig::openConfig("kcookiejarrc", KConfig::NoGlobals)-> - group("Cookie Policy"). - readEntry("Cookies", true); - - d->language = KProtocolManager::acceptLanguagesHeader(); - d->charsets = QString::fromLatin1(QTextCodec::codecForLocale()->name()).toLower(); - KProtocolManager::reparseConfiguration(); -} - -} diff --git a/kio/kio/sessiondata.h b/kio/kio/sessiondata.h deleted file mode 100644 index e8de337d..00000000 --- a/kio/kio/sessiondata.h +++ /dev/null @@ -1,61 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2000 Dawit Alemayehu -#include - - -namespace KIO { - -// KDE5 TODO: remove the KIO_EXPORT and rename to _p.h, this is really internal only - -/** - * @internal - */ -class KIO_EXPORT SessionData : public QObject -{ - Q_OBJECT - -public: - SessionData(); - ~SessionData(); - - virtual void configDataFor( KIO::MetaData &configData, const QString &proto, - const QString &host ); - virtual void reset(); - -// struct AuthData; - -private: - class AuthDataList; - friend class AuthDataList; -// AuthDataList* authData; - -private: - class SessionDataPrivate; - SessionDataPrivate* const d; -}; - -} // namespace - -#endif diff --git a/kioslave/http/CMakeLists.txt b/kioslave/http/CMakeLists.txt index ac57d679..47573e85 100644 --- a/kioslave/http/CMakeLists.txt +++ b/kioslave/http/CMakeLists.txt @@ -13,8 +13,6 @@ install(TARGETS kio_http DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### install( - FILES - http.protocol https.protocol - webdav.protocol webdavs.protocol + FILES http.protocol https.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp index 929038d1..c9109704 100644 --- a/kioslave/http/http.cpp +++ b/kioslave/http/http.cpp @@ -77,7 +77,7 @@ void HttpProtocol::setHost( const QString& host, quint16 port, const QString& us void HttpProtocol::stat( const KUrl &url ) { - kDebug(7103); + kDebug(7103) << url.prettyUrl(); error(KIO::ERR_UNSUPPORTED_ACTION, url.prettyUrl()); } @@ -109,6 +109,6 @@ void HttpProtocol::put( const KUrl& url, int permissions, KIO::JobFlags flags ) Q_UNUSED(permissions); Q_UNUSED(flags); - kDebug(7103); + kDebug(7103) << url.prettyUrl(); error(KIO::ERR_UNSUPPORTED_ACTION, url.prettyUrl()); } diff --git a/kioslave/http/webdav.protocol b/kioslave/http/webdav.protocol deleted file mode 100644 index 3a74d60a..00000000 --- a/kioslave/http/webdav.protocol +++ /dev/null @@ -1,21 +0,0 @@ -[Protocol] -exec=kio_http -protocol=webdav -input=none -output=filesystem -copyToFile=false -copyFromFile=false -listing=Name,Type,Size,Date,AccessDate,Access -reading=true -writing=true -makedir=false -deleting=false -moving=false -ProxiedBy=http -Icon=folder-remote -maxInstances=20 -maxInstancesPerHost=5 -defaultMimetype=application/octet-stream -determineMimetypeFromExtension=false -X-DocPath=kioslave/webdav/index.html -Class=:internet diff --git a/kioslave/http/webdavs.protocol b/kioslave/http/webdavs.protocol deleted file mode 100644 index a053635c..00000000 --- a/kioslave/http/webdavs.protocol +++ /dev/null @@ -1,21 +0,0 @@ -[Protocol] -exec=kio_http -protocol=webdavs -input=none -output=filesystem -copyToFile=false -copyFromFile=false -listing=Name,Type,Size,Date,AccessDate,Access -reading=true -writing=true -makedir=false -deleting=false -moving=false -ProxiedBy=http -Icon=folder-remote -maxInstances=20 -maxInstancesPerHost=5 -defaultMimetype=application/octet-stream -determineMimetypeFromExtension=false -X-DocPath=kioslave/webdav/index.html -Class=:internet diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp index 50555c5d..de93380d 100644 --- a/kparts/browserrun.cpp +++ b/kparts/browserrun.cpp @@ -141,11 +141,11 @@ void BrowserRun::scanFile() if ( d->m_part ) { const QString proto = d->m_part->url().protocol(); - if (proto == "https" || proto == "webdavs") { + if (proto == "https") { metaData.insert("main_frame_request", "TRUE" ); metaData.insert("ssl_was_in_use", "TRUE" ); // metaData.insert("ssl_activate_warnings", "TRUE" ); - } else if (proto == "http" || proto == "webdav") { + } else if (proto == "http") { // metaData.insert("ssl_activate_warnings", "TRUE" ); metaData.insert("ssl_was_in_use", "FALSE" ); } diff --git a/kutils/kdeglobals.kcfg b/kutils/kdeglobals.kcfg index a5161d87..79c8aa4e 100644 --- a/kutils/kdeglobals.kcfg +++ b/kutils/kdeglobals.kcfg @@ -457,8 +457,6 @@ - -