HTTP: tweak for malformed header handling.

diff --git a/simgear/io/HTTPClient.cxx b/simgear/io/HTTPClient.cxx
index b7e19917bc315caefa7e43acbc293a0c7101f627..ecc63f844054154a5a99230658848f2d46da05fb 100644 (file)
--- a/simgear/io/HTTPClient.cxx
+++ b/simgear/io/HTTPClient.cxx
@@ -65,6 +65,12 @@ class Connection;
 typedef std::multimap<std::string, Connection*> ConnectionDict;
 typedef std::list<Request_ptr> RequestList;
 
+static bool isFailureStatus(int httpStatus)
+{
+  int majorCode = httpStatus / 100;
+  return (majorCode != 2);
+}
+
 class Client::ClientPrivate
 {
 public:
@@ -214,8 +220,12 @@ public:
         assert(state == STATE_WAITING_FOR_RESPONSE);
         
         activeRequest = sentRequests.front();
-        
-      activeRequest->responseStart(buffer);
+       activeRequest->responseStart(buffer);
+       if (isFailureStatus(activeRequest->responseCode())) {
+         handleError(EIO);
+         return;
+       }
+      
       state = STATE_GETTING_HEADERS;
       buffer.clear();
       if (activeRequest->responseCode() == 204) {

diff --git a/simgear/io/HTTPRequest.cxx b/simgear/io/HTTPRequest.cxx
index e3980ca10af3608209ca1e62b324374e0f47a28e..d51d97902ef3d47a61bb9a9f175bb546bd495b73 100644 (file)
--- a/simgear/io/HTTPRequest.cxx
+++ b/simgear/io/HTTPRequest.cxx
@@ -115,7 +115,6 @@ void Request::responseStart(const std::string& r)
     const int maxSplit = 2; // HTTP/1.1 nnn reason-string
     string_list parts = strutils::split(r, NULL, maxSplit);
     if (parts.size() != 3) {
-        SG_LOG(SG_IO, SG_WARN, "HTTP::Request: malformed response start:" << r);
         setFailure(400, "malformed HTTP response header");
         return;
     }