summaryrefslogtreecommitdiffstats
path: root/src/network/access
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2011-04-01 13:53:24 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2011-04-01 13:55:02 (GMT)
commit0c291498c3cf1aa254df41ce99f249e2116da025 (patch)
tree2a7d5269e9bcaa0624baec937152ff268dc5704e /src/network/access
parent3a0f70a89c46220a6404968e1611d8e35b64b922 (diff)
downloadQt-0c291498c3cf1aa254df41ce99f249e2116da025.zip
Qt-0c291498c3cf1aa254df41ce99f249e2116da025.tar.gz
Qt-0c291498c3cf1aa254df41ce99f249e2116da025.tar.bz2
Handle the HTTP 418 reply properly in QNAM
Reviewed-by: Markus Goetz
Diffstat (limited to 'src/network/access')
-rw-r--r--src/network/access/qhttpthreaddelegate.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp
index 81410a4..16fd9bb 100644
--- a/src/network/access/qhttpthreaddelegate.cpp
+++ b/src/network/access/qhttpthreaddelegate.cpp
@@ -78,6 +78,11 @@ static QNetworkReply::NetworkError statusCodeFromHttp(int httpStatusCode, const
code = QNetworkReply::ProxyAuthenticationRequiredError;
break;
+ case 418: // I'm a teapot
+ code = QNetworkReply::ProtocolInvalidOperationError;
+ break;
+
+
default:
if (httpStatusCode > 500) {
// some kind of server error