SSL in EmbeddedTestServer

net/test/embedded_test_server/http_response.cc

Index: net/test/embedded_test_server/http_response.cc
diff --git a/net/test/embedded_test_server/http_response.cc b/net/test/embedded_test_server/http_response.cc
index 04155b5ffa529781480646dfa57f8a39caea081b..96090f3749e2dd570f72aeb4c3deaf1bf2ec06dc 100644
--- a/net/test/embedded_test_server/http_response.cc
+++ b/net/test/embedded_test_server/http_response.cc
@@ -33,12 +33,13 @@ std::string BasicHttpResponse::ToResponseString() const {
                       code_,
                       http_reason_phrase.c_str());
   base::StringAppendF(&response_builder, "Connection: close\r\n");
-  base::StringAppendF(&response_builder,
-                      "Content-Length: %" PRIuS "\r\n",
-                      content_.size());
-  base::StringAppendF(&response_builder,
-                      "Content-Type: %s\r\n",
-                      content_type_.c_str());
+
+  if (content_type_.size() != 0 || content_.size() != 0) {
+    base::StringAppendF(&response_builder, "Content-Length: %" PRIuS "\r\n",
+                        content_.size());

[mmenke, 2015/10/19 18:07:41]

Why don't we send a content-length when when the content size is 0?

[svaldez, 2015/10/19 21:56:15]

For responses that are only sending headers back, having a Content-Length causes
the test to attempt to parse a body and fail when one isn't expected.

[mmenke, 2015/10/21 18:45:22]

I'm not following.  Our network stack handles Content-Lengths of 0.

+    base::StringAppendF(&response_builder, "Content-Type: %s\r\n",
+                        content_type_.c_str());
+  }
   for (size_t i = 0; i < custom_headers_.size(); ++i) {
     const std::string& header_name = custom_headers_[i].first;
     const std::string& header_value = custom_headers_[i].second;
@@ -54,5 +55,10 @@ std::string BasicHttpResponse::ToResponseString() const {
   return response_builder + content_;
 }
 
+void BasicHttpResponse::SendResponse(SendBytesCallback send,
+                                     SendCompleteCallback done) {
+  send.Run(ToResponseString(), done);
+}
+
 }  // namespace test_server
 }  // namespace net