From 56bb02ade34758c244772c739ce26dd125107ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Mon, 20 Oct 2014 13:10:42 +0200 Subject: [PATCH] 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 Reviewed-by: Richard Moe Gustavsen --- src/network/access/qnetworkreplynsurlconnectionimpl.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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