diff --git a/Changelog b/Changelog index da761c05e..874af7197 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,7 @@ +* Unreleased - Christophe Dumez - v2.1.6 + - BUGFIX: Fix Web UI authentication with Konqueror + - BUGFIX: Fix save path display in properties + * Web Feb 10 2010 - Christophe Dumez - v2.1.5 - BUGFIX: Fix actions on selected torrents (non-selected torrents could be affected) - BUGFIX: Only one program preferences dialog is allowed at a time diff --git a/src/httpconnection.cpp b/src/httpconnection.cpp index 9e9e92a7b..61993c2e9 100644 --- a/src/httpconnection.cpp +++ b/src/httpconnection.cpp @@ -138,6 +138,7 @@ void HttpConnection::respond() { return; } QString auth = parser.value("Authorization"); + qDebug("Auth: %s", auth.split(" ").first().toLocal8Bit().data()); if (QString::compare(auth.split(" ").first(), "Digest", Qt::CaseInsensitive) != 0 || !parent->isAuthorized(auth.toLocal8Bit(), parser.method())) { // Update failed attempt counter parent->client_failed_attempts.insert(socket->peerAddress().toString(), nb_fail+1); diff --git a/src/httpserver.cpp b/src/httpserver.cpp index 6679da545..991152134 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -207,7 +207,7 @@ bool HttpServer::isAuthorized(QByteArray auth, QString method) const { } QByteArray prop_cnonce = regex_cnonce.cap(1).toLocal8Bit(); qDebug("prop cnonce is: %s", prop_cnonce.data()); - QRegExp regex_qop(".*qop=(\\w+).*"); + QRegExp regex_qop(".*qop=[\"]?(\\w+)[\"]?.*"); if(regex_qop.indexIn(auth) < 0) { qDebug("AUTH-PROB: missing qop"); return false; diff --git a/src/propertieswidget.cpp b/src/propertieswidget.cpp index 91362d8ae..ce6913688 100644 --- a/src/propertieswidget.cpp +++ b/src/propertieswidget.cpp @@ -208,7 +208,10 @@ Bittorrent* PropertiesWidget::getBTSession() const { void PropertiesWidget::updateSavePath(QTorrentHandle& _h) { if(h.is_valid() && h == _h) { - save_path->setText(TorrentPersistentData::getSavePath(h.hash())); + QString p = TorrentPersistentData::getSavePath(h.hash()); + if(p.isEmpty()) + p = h.save_path(); + save_path->setText(p); } } @@ -223,7 +226,10 @@ void PropertiesWidget::loadTorrentInfos(QTorrentHandle &_h) { try { // Save path - save_path->setText(TorrentPersistentData::getSavePath(h.hash())); + QString p = TorrentPersistentData::getSavePath(h.hash()); + if(p.isEmpty()) + p = h.save_path(); + save_path->setText(p); // Creation date lbl_creationDate->setText(h.creation_date()); // Hash