diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2014-10-20 13:10:42 +0200 |
|---|---|---|
| committer | Caroline Chao <caroline.chao@theqtcompany.com> | 2014-10-22 08:11:20 +0200 |
| commit | 56bb02ade34758c244772c739ce26dd125107ba5 (patch) | |
| tree | adafd0771524870133aec01d66affa04319332c7 /src | |
| parent | 2580192defddb4afc0281b6097b8a3c5271412e7 (diff) | |
Improve iOS https error handling.
Set the reply state to "finished" also on errors.
Do a proper string compare to correctly translate
the error codes.
Task-number: QTBUG-42023
Change-Id: I222cc06a47b1f9f89095e8f935f316bf94fd0cd6
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/access/qnetworkreplynsurlconnectionimpl.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/access/qnetworkreplynsurlconnectionimpl.mm b/src/network/access/qnetworkreplynsurlconnectionimpl.mm index f93f18357a..327dbd4ea7 100644 --- a/src/network/access/qnetworkreplynsurlconnectionimpl.mm +++ b/src/network/access/qnetworkreplynsurlconnectionimpl.mm @@ -245,7 +245,7 @@ void QNetworkReplyNSURLConnectionImpl::readyReadOutgoingData() Q_UNUSED(connection) QNetworkReply::NetworkError qtError = QNetworkReply::UnknownNetworkError; - if ([error domain] == NSURLErrorDomain) { + if ([[error domain] isEqualToString:NSURLErrorDomain]) { switch ([error code]) { case NSURLErrorTimedOut: qtError = QNetworkReply::TimeoutError; break; case NSURLErrorUnsupportedURL: qtError = QNetworkReply::ProtocolUnknownError; break; @@ -260,6 +260,7 @@ void QNetworkReplyNSURLConnectionImpl::readyReadOutgoingData() } replyprivate->setError(qtError, QString::fromNSString([error localizedDescription])); + replyprivate->setFinished(); } - (void)connection:(NSURLConnection*)connection didReceiveResponse:(NSURLResponse*)aResponse |