From 28ee9180c8f8ea76ec922f2ff5ae0f027dfe3b24 Mon Sep 17 00:00:00 2001
From: Romanov <theli.ua@gmail.com>
Date: Mon, 19 Sep 2016 11:54:15 -0700
Subject: [PATCH 1/3] 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 );
 

From 7e38d94fe5dd5d79b517d5f60c8027a117460074 Mon Sep 17 00:00:00 2001
From: Romanov <theli.ua@gmail.com>
Date: Mon, 19 Sep 2016 12:09:40 -0700
Subject: [PATCH 2/3] Cleanup header carryover a bit

---
 src/libtomahawk/utils/NetworkReply.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libtomahawk/utils/NetworkReply.cpp b/src/libtomahawk/utils/NetworkReply.cpp
index 1616dc829..9ef8c910d 100644
--- a/src/libtomahawk/utils/NetworkReply.cpp
+++ b/src/libtomahawk/utils/NetworkReply.cpp
@@ -155,14 +155,14 @@ NetworkReply::load( const QUrl& url )
     m_formerUrls << url.toString();
     QNetworkRequest request( url );
 
-    //Carryover User-Agent
-    if ( m_reply->request().hasRawHeader( "User-Agent" ))
+    //Carryover some headers if set
+    static QList<QByteArray> headersToCarroyOver = { "User-Agent", "Accept-Language" };
+    for (auto&& header : headersToCarroyOver)
     {
-        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" ) );
+        if ( m_reply->request().hasRawHeader( header ))
+        {
+            request.setRawHeader( header, m_reply->request().rawHeader( header ) );
+        }
     }
 
     Q_ASSERT( Tomahawk::Utils::nam() != 0 );

From 5dd36cbd4e703987b779497559534a45f76ebb15 Mon Sep 17 00:00:00 2001
From: Romanov <theli.ua@gmail.com>
Date: Mon, 19 Sep 2016 12:10:36 -0700
Subject: [PATCH 3/3] Fix typo

---
 src/libtomahawk/utils/NetworkReply.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libtomahawk/utils/NetworkReply.cpp b/src/libtomahawk/utils/NetworkReply.cpp
index 9ef8c910d..f43e3600e 100644
--- a/src/libtomahawk/utils/NetworkReply.cpp
+++ b/src/libtomahawk/utils/NetworkReply.cpp
@@ -156,8 +156,8 @@ NetworkReply::load( const QUrl& url )
     QNetworkRequest request( url );
 
     //Carryover some headers if set
-    static QList<QByteArray> headersToCarroyOver = { "User-Agent", "Accept-Language" };
-    for (auto&& header : headersToCarroyOver)
+    static QList<QByteArray> headersToCarryOver = { "User-Agent", "Accept-Language" };
+    for (auto&& header : headersToCarryOver)
     {
         if ( m_reply->request().hasRawHeader( header ))
         {