mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

* When redirecting a request, make sure HEAD ops don't become a GET.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-06-05 21:32:09 +02:00
parent c2d9f1f441
commit 2427382830
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libtomahawk/utils/NetworkReply.cpp
View File

@@ -21,6 +21,8 @@
#include "utils/TomahawkUtils.h" #include "utils/TomahawkUtils.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include <QNetworkAccessManager>
using namespace Tomahawk; using namespace Tomahawk;
@@ -61,7 +63,19 @@ NetworkReply::load( const QUrl& url )
QNetworkRequest request( url ); QNetworkRequest request( url );
Q_ASSERT( TomahawkUtils::nam() != 0 ); Q_ASSERT( TomahawkUtils::nam() != 0 );
m_reply = TomahawkUtils::nam()->get( request );
QNetworkAccessManager::Operation op = m_reply->operation();
m_reply->deleteLater();
switch ( op )
{
case QNetworkAccessManager::HeadOperation:
m_reply = TomahawkUtils::nam()->head( request );
break;
default:
m_reply = TomahawkUtils::nam()->get( request );
}
connect( m_reply, SIGNAL( finished() ), SLOT( networkLoadFinished() ) ); connect( m_reply, SIGNAL( finished() ), SLOT( networkLoadFinished() ) );
connect( m_reply, SIGNAL( error( QNetworkReply::NetworkError ) ), SIGNAL( error( QNetworkReply::NetworkError ) ) ); connect( m_reply, SIGNAL( error( QNetworkReply::NetworkError ) ), SIGNAL( error( QNetworkReply::NetworkError ) ) );
@@ -82,7 +96,6 @@ NetworkReply::networkLoadFinished()
if ( redir.isValid() && !redir.toUrl().isEmpty() ) if ( redir.isValid() && !redir.toUrl().isEmpty() )
{ {
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Redirected HTTP request to" << redir; tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Redirected HTTP request to" << redir;
m_reply->deleteLater();
load( redir.toUrl() ); load( redir.toUrl() );
emit redirected(); emit redirected();
} }