Upon any HTTP error, clear the response buffer.

Jonathan Hseu · Jonathan Hseu · commit cbb612e50299 · 2017-03-03T13:23:47.000-08:00
Change: 149062390
diff --git a/tensorflow/core/platform/cloud/http_request.cc b/tensorflow/core/platform/cloud/http_request.cc
@@ -383,15 +383,18 @@ Status HttpRequest::Send() {
       return Status::OK();
     case 401:
     case 403:
+      response_buffer_->clear();
       return errors::PermissionDenied(error_message);
     case 404:
+      response_buffer_->clear();
       return errors::NotFound(error_message);
     case 416:  // Requested Range Not Satisfiable
       response_buffer_->clear();
       return Status::OK();
     default:
       // UNAVAILABLE can be retried by the caller, e.g by
       // RetryingFileSystem.
+      response_buffer_->clear();
       return errors::Unavailable(error_message);
   }
 }
diff --git a/tensorflow/core/platform/cloud/http_request_test.cc b/tensorflow/core/platform/cloud/http_request_test.cc
@@ -528,5 +528,24 @@ TEST(HttpRequestTest, EscapeString) {
   EXPECT_EQ("a%2Fb%2Fc", http_request.EscapeString(test_string));
 }
 
+TEST(HttpRequestTest, ErrorReturnsNoResponse) {
+  FakeLibCurl libcurl("get response", 500);
+  HttpRequest http_request(&libcurl);
+  TF_EXPECT_OK(http_request.Init());
+
+  std::vector<char> scratch;
+  scratch.insert(scratch.begin(), kTestContent.begin(), kTestContent.end());
+  StringPiece result;
+  scratch.reserve(100);
+
+  TF_EXPECT_OK(http_request.SetUri("http://www.testuri.com"));
+  TF_EXPECT_OK(http_request.AddAuthBearerHeader("fake-bearer"));
+  TF_EXPECT_OK(http_request.SetRange(100, 199));
+  TF_EXPECT_OK(http_request.SetResultBuffer(&scratch));
+  EXPECT_EQ(error::UNAVAILABLE, http_request.Send().code());
+
+  EXPECT_EQ("", string(scratch.begin(), scratch.end()));
+}
+
 }  // namespace
 }  // namespace tensorflow
