Merge Android R
Bug: 168057903
Merged-In: Ida5549b52c29abc2a7305c32dccc955d331937c2
Change-Id: I221eafa20ca9c8ce358ff9d8361ba06e88502c48
diff --git a/test_http_server.cc b/test_http_server.cc
index 4fc89e5..1c3a2e0 100644
--- a/test_http_server.cc
+++ b/test_http_server.cc
@@ -189,7 +189,8 @@
ret = WriteString(fd,
string("HTTP/1.1 ") + Itoa(return_code) + " " +
GetHttpResponseDescription(return_code) +
- EOL "Content-Type: application/octet-stream" EOL);
+ EOL "Content-Type: application/octet-stream" EOL
+ "Connection: close" EOL);
if (ret < 0)
return -1;
written += ret;
@@ -406,7 +407,9 @@
if ((ret = WriteString(fd, "HTTP/1.1 " + Itoa(code) + " " + status + EOL)) <
0)
return;
+ WriteString(fd, "Connection: close" EOL);
WriteString(fd, "Location: " + url + EOL);
+
}
// Generate a page not found error response with actual text payload. Return