updated request process

This commit is contained in:
Tony Tam 2015-05-16 01:09:01 -07:00
parent f4cbd88e2c
commit 6ec7cf5a9d
3 changed files with 6 additions and 3 deletions

View File

@ -103,6 +103,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
response = "";
error_type = QNetworkReply::NoError;
error_str = "";
bool isFormData = false;
// decide on the variable layout
@ -124,6 +125,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
if (input->vars.count() > 0) {
bool first = true;
isFormData = true;
foreach (QString key, input->vars.keys()) {
if (!first) {
request_content.append("&");
@ -250,7 +252,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str());
}
if (request_content.size() > 0) {
if (request_content.size() > 0 && !isFormData) {
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
}
else if (input->var_layout == URL_ENCODED) {

View File

@ -44,7 +44,6 @@ void PetApiTests::getPetByIdTest() {
timer.setSingleShot(true);
auto validator = [](SWGPet* pet) {
qDebug() << pet->asJson();
QVERIFY(pet->getId() == 3);
loop.quit();
};

View File

@ -103,6 +103,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
response = "";
error_type = QNetworkReply::NoError;
error_str = "";
bool isFormData = false;
// decide on the variable layout
@ -124,6 +125,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
if (input->vars.count() > 0) {
bool first = true;
isFormData = true;
foreach (QString key, input->vars.keys()) {
if (!first) {
request_content.append("&");
@ -250,7 +252,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str());
}
if (request_content.size() > 0) {
if (request_content.size() > 0 && !isFormData) {
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
}
else if (input->var_layout == URL_ENCODED) {