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

Explicitly set Content-Type of POST to application/x-www-form-urlencoded, as Qt 4.8 changed teh default

Browse Source
This commit is contained in:
Leo Franchi
2011-06-11 12:42:13 -04:00
parent 1c43cabd7e
commit badfe28626
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
thirdparty/liblastfm2/src/ws/ws.cpp vendored
View File

@@ -1,5 +1,5 @@
/* /*
Copyright 2009 Last.fm Ltd. Copyright 2009 Last.fm Ltd.
- Primarily authored by Max Howell, Jono Cole and Doug Mansell - Primarily authored by Max Howell, Jono Cole and Doug Mansell
This file is part of liblastfm. This file is part of liblastfm.
@@ -33,7 +33,7 @@ static QMap< QThread*, QNetworkAccessManager* > threadNamHash;
static QSet< QThread* > ourNamSet; static QSet< QThread* > ourNamSet;
static QMutex namAccessMutex; static QMutex namAccessMutex;
QString QString
lastfm::ws::host() lastfm::ws::host()
{ {
QStringList const args = QCoreApplication::arguments(); QStringList const args = QCoreApplication::arguments();
@@ -57,8 +57,8 @@ static QUrl url()
} }
static QString iso639() static QString iso639()
{ {
return QLocale().name().left( 2 ).toLower(); return QLocale().name().left( 2 ).toLower();
} }
void autograph( QMap<QString, QString>& params ) void autograph( QMap<QString, QString>& params )
@@ -99,17 +99,17 @@ lastfm::ws::get( QMap<QString, QString> params )
QByteArray const value = QUrl::toPercentEncoding( i.value() ); QByteArray const value = QUrl::toPercentEncoding( i.value() );
url.addEncodedQueryItem( key, value ); url.addEncodedQueryItem( key, value );
} }
qDebug() << url; qDebug() << url;
return nam()->get( QNetworkRequest(url) ); return nam()->get( QNetworkRequest(url) );
} }
QNetworkReply* QNetworkReply*
lastfm::ws::post( QMap<QString, QString> params, bool sk ) lastfm::ws::post( QMap<QString, QString> params, bool sk )
{ {
sign( params, sk ); sign( params, sk );
QByteArray query; QByteArray query;
QMapIterator<QString, QString> i( params ); QMapIterator<QString, QString> i( params );
while (i.hasNext()) { while (i.hasNext()) {
@@ -120,7 +120,9 @@ lastfm::ws::post( QMap<QString, QString> params, bool sk )
+ '&'; + '&';
} }
return nam()->post( QNetworkRequest(url()), query ); QNetworkRequest req(url());
req.setHeader( QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded" );
return nam()->post( req, query );
} }
@@ -133,7 +135,7 @@ lastfm::ws::parse( QNetworkReply* reply ) throw( ParseError )
if (!data.size()) if (!data.size())
throw MalformedResponse; throw MalformedResponse;
QDomDocument xml; QDomDocument xml;
xml.setContent( data ); xml.setContent( data );
QDomElement lfm = xml.documentElement(); QDomElement lfm = xml.documentElement();
@@ -223,7 +225,7 @@ lastfm::setNetworkAccessManager( QNetworkAccessManager* nam )
if ( oldNam == nam ) if ( oldNam == nam )
return; return;
threadNamHash[thread] = nam; threadNamHash[thread] = nam;
ourNamSet.remove( thread ); ourNamSet.remove( thread );
@@ -286,7 +288,7 @@ namespace lastfm
const char* ApiKey; const char* ApiKey;
/** if this is found set to "" we conjure ourselves a suitable one */ /** if this is found set to "" we conjure ourselves a suitable one */
const char* UserAgent = 0; const char* UserAgent = 0;
} }
} }