From 28ee9180c8f8ea76ec922f2ff5ae0f027dfe3b24 Mon Sep 17 00:00:00 2001 From: Romanov Date: Mon, 19 Sep 2016 11:54:15 -0700 Subject: [PATCH] Set redirect path to '/' if its empty, carry-over Accept-Language if set --- src/libtomahawk/utils/NetworkReply.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/utils/NetworkReply.cpp b/src/libtomahawk/utils/NetworkReply.cpp index d50c394ff..1616dc829 100644 --- a/src/libtomahawk/utils/NetworkReply.cpp +++ b/src/libtomahawk/utils/NetworkReply.cpp @@ -96,7 +96,14 @@ NetworkReply::metaDataChanged() } 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(); } @@ -153,6 +160,10 @@ NetworkReply::load( const QUrl& url ) { request.setRawHeader( "User-Agent", m_reply->request().rawHeader( "User-Agent" ) ); } + if ( m_reply->request().hasRawHeader( "Accept-Language" )) + { + request.setRawHeader( "Accept-Language", m_reply->request().rawHeader( "Accept-Language" ) ); + } Q_ASSERT( Tomahawk::Utils::nam() != 0 );