mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 05:37:29 +02:00
Code Issues Releases Wiki Activity

Merge pull request #560 from theli-ua/cookierootfix

Browse Source 
Set redirect path to '/' if its empty, carry-over Accept-Language if set
This commit is contained in:
Dominik Schmidt
2016-09-19 23:04:29 +02:00
committed by GitHub
parent 09e9a6e960 5dd36cbd4e
commit 84ed59f4be
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,7 +96,14 @@ NetworkReply::metaDataChanged()
} }
else else
{ {
load( redir.toUrl() ); QUrl url = redir.toUrl();
if (url.path().isEmpty())
{
//Default cookie jar gets confused if path is empty
url.setPath("/");
}
load( url );
} }
emit redirected(); emit redirected();
} }
@@ -148,10 +155,14 @@ NetworkReply::load( const QUrl& url )
m_formerUrls << url.toString(); m_formerUrls << url.toString();
QNetworkRequest request( url ); QNetworkRequest request( url );
//Carryover User-Agent //Carryover some headers if set
if ( m_reply->request().hasRawHeader( "User-Agent" )) static QList<QByteArray> headersToCarryOver = { "User-Agent", "Accept-Language" };
for (auto&& header : headersToCarryOver)
{ {
request.setRawHeader( "User-Agent", m_reply->request().rawHeader( "User-Agent" ) ); if ( m_reply->request().hasRawHeader( header ))
{
request.setRawHeader( header, m_reply->request().rawHeader( header ) );
}
} }
Q_ASSERT( Tomahawk::Utils::nam() != 0 ); Q_ASSERT( Tomahawk::Utils::nam() != 0 );