From 4cb856196e9b91e4fe749559fc4e7ef9ebbe04d5 Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Sun, 15 Nov 2020 13:34:15 -0800
Subject: [PATCH] Rename some call sites for read_headers.

Fixes tests.
---
 src/test/agent_test.rs | 8 ++++----
 src/test/redirect.rs   | 2 +-
 src/test/timeout.rs    | 2 +-
 src/testserver.rs      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/test/agent_test.rs b/src/test/agent_test.rs
index 3746798..2a47963 100644
--- a/src/test/agent_test.rs
+++ b/src/test/agent_test.rs
@@ -1,6 +1,6 @@
 #![allow(dead_code)]
 
-use crate::testserver::{read_headers, TestServer};
+use crate::testserver::{read_request, TestServer};
 use std::io::{self, Read, Write};
 use std::net::TcpStream;
 use std::time::Duration;
@@ -10,7 +10,7 @@ use super::super::*;
 // Handler that answers with a simple HTTP response, and times
 // out idle connections after 2 seconds.
 fn idle_timeout_handler(mut stream: TcpStream) -> io::Result<()> {
-    read_headers(&stream);
+    read_request(&stream);
     stream.write_all(b"HTTP/1.1 200 OK\r\nContent-Length: 8\r\n\r\nresponse")?;
     stream.set_read_timeout(Some(Duration::from_secs(2)))?;
     Ok(())
@@ -73,7 +73,7 @@ fn custom_resolver() {
 #[cfg(feature = "cookies")]
 #[cfg(test)]
 fn cookie_and_redirect(mut stream: TcpStream) -> io::Result<()> {
-    let headers = read_headers(&stream);
+    let headers = read_request(&stream);
     match headers.path() {
         "/first" => {
             stream.write_all(b"HTTP/1.1 302 Found\r\n")?;
@@ -134,7 +134,7 @@ fn test_cookies_on_redirect() -> Result<(), Error> {
 #[test]
 fn dirty_streams_not_returned() -> Result<(), Error> {
     let testserver = TestServer::new(|mut stream: TcpStream| -> io::Result<()> {
-        read_headers(&stream);
+        read_request(&stream);
         stream.write_all(b"HTTP/1.1 200 OK\r\n")?;
         stream.write_all(b"Transfer-Encoding: chunked\r\n")?;
         stream.write_all(b"\r\n")?;
diff --git a/src/test/redirect.rs b/src/test/redirect.rs
index 25d54c7..e68c70f 100644
--- a/src/test/redirect.rs
+++ b/src/test/redirect.rs
@@ -97,7 +97,7 @@ fn redirect_host() {
     // of example.invalid. We can probably do better by, e.g.
     // overriding the resolver.
     let srv = TestServer::new(|mut stream: TcpStream| -> io::Result<()> {
-        testserver::read_headers(&stream);
+        testserver::read_request(&stream);
         write!(stream, "HTTP/1.1 302 Found\r\n")?;
         write!(stream, "Location: http://example.invalid/\r\n")?;
         write!(stream, "\r\n")?;
diff --git a/src/test/timeout.rs b/src/test/timeout.rs
index f377418..358e4ec 100644
--- a/src/test/timeout.rs
+++ b/src/test/timeout.rs
@@ -9,7 +9,7 @@ use super::super::*;
 // Send an HTTP response on the TcpStream at a rate of two bytes every 10
 // milliseconds, for a total of 600 bytes.
 fn dribble_body_respond(mut stream: TcpStream, contents: &[u8]) -> io::Result<()> {
-    read_headers(&stream);
+    read_request(&stream);
     let headers = format!(
         "HTTP/1.1 200 OK\r\nContent-Length: {}\r\n\r\n",
         contents.len() * 2
diff --git a/src/testserver.rs b/src/testserver.rs
index 2c8e24b..a2eb4a9 100644
--- a/src/testserver.rs
+++ b/src/testserver.rs
@@ -93,7 +93,7 @@ pub fn read_request(stream: &TcpStream) -> TestHeaders {
     for line in BufReader::new(stream).lines() {
         match line {
             Err(e) => {
-                eprintln!("testserver: in read_headers: {}", e);
+                eprintln!("testserver: in read_request: {}", e);
                 break;
             }
             Ok(line) if line == "" => break,