Merge pull request #12287 from zackw/expose-http-status-to-onresourceerror

Expose HTTP status and reason to onResourceError (#12252).
1.x
Vitaly Slobodin 2014-07-15 10:12:55 +04:00
commit d10b8dc583
2 changed files with 4 additions and 0 deletions

View File

@ -407,6 +407,8 @@ void NetworkAccessManager::handleNetworkError()
data["url"] = reply->url().toString();
data["errorCode"] = reply->error();
data["errorString"] = reply->errorString();
data["status"] = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
data["statusText"] = reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute);
emit resourceError(data);
}

View File

@ -1221,6 +1221,8 @@ describe("WebPage object", function() {
expect(errorData['url']).toEqual('http://localhost:12345/notExistResource.png');
expect(errorData['errorCode']).toEqual(203);
expect(errorData['errorString']).toContain('notExistResource.png - server replied: Not Found');
expect(errorData['status']).toEqual(404);
expect(errorData['statusText']).toContain("Not Found");
handled = true;
};