diff --git a/src/agent.rs b/src/agent.rs index c52c1b2..cc0cb82 100644 --- a/src/agent.rs +++ b/src/agent.rs @@ -1,6 +1,5 @@ use std::sync::Arc; -use crate::header::{self, Header}; use crate::pool::ConnectionPool; use crate::proxy::Proxy; use crate::request::Request; @@ -12,7 +11,6 @@ use {crate::cookies::CookieTin, cookie::Cookie, cookie_store::CookieStore, url:: #[derive(Debug)] pub struct AgentBuilder { - headers: Vec
, config: AgentConfig, max_idle_connections: usize, max_idle_connections_per_host: usize, @@ -69,8 +67,6 @@ pub(crate) struct AgentConfig { #[derive(Debug, Clone)] pub struct Agent { pub(crate) config: Arc, - /// Copied into each request of this agent. - pub(crate) headers: Vec
, /// Reused agent state for repeated requests from this agent. pub(crate) state: Arc, } @@ -160,7 +156,6 @@ const DEFAULT_MAX_IDLE_CONNECTIONS_PER_HOST: usize = 1; impl AgentBuilder { pub fn new() -> Self { AgentBuilder { - headers: vec![], config: AgentConfig { proxy: None, timeout_connect: Some(Duration::from_secs(30)), @@ -186,7 +181,6 @@ impl AgentBuilder { // built Agent. pub fn build(self) -> Agent { Agent { - headers: self.headers, config: Arc::new(self.config), state: Arc::new(AgentState { pool: ConnectionPool::new_with_limits( @@ -202,29 +196,6 @@ impl AgentBuilder { } } - /// Set a header field that will be present in all requests using the agent. - /// - /// ``` - /// let agent = ureq::builder() - /// .set("X-API-Key", "foobar") - /// .set("Accept", "text/plain") - /// .build(); - /// - /// let r = agent - /// .get("/my-page") - /// .call(); - /// - /// if let Ok(resp) = r { - /// println!("yay got {}", resp.into_string().unwrap()); - /// } else { - /// println!("Oh no error!"); - /// } - /// ``` - pub fn set(mut self, header: &str, value: &str) -> Self { - header::add_header(&mut self.headers, Header::new(header, value)); - self - } - /// Set the proxy server to use for all connections from this Agent. /// /// Example: diff --git a/src/request.rs b/src/request.rs index b20c108..65cb149 100644 --- a/src/request.rs +++ b/src/request.rs @@ -56,12 +56,11 @@ impl fmt::Debug for Request { impl Request { pub(crate) fn new(agent: Agent, method: String, url: String) -> Request { - let headers = agent.headers.clone(); Request { agent, method, url, - headers, + headers: vec![], return_error_for_status: true, query: QString::default(), } diff --git a/src/test/agent_test.rs b/src/test/agent_test.rs index c98faad..b916bac 100644 --- a/src/test/agent_test.rs +++ b/src/test/agent_test.rs @@ -1,6 +1,5 @@ #![allow(dead_code)] -use crate::test; use crate::test::testserver::{read_headers, TestServer}; use std::io::{self, Read, Write}; use std::net::TcpStream; @@ -8,29 +7,6 @@ use std::time::Duration; use super::super::*; -#[test] -fn agent_reuse_headers() { - let agent = builder().set("Authorization", "Foo 12345").build(); - - test::set_handler("/agent_reuse_headers", |unit| { - assert!(unit.has("Authorization")); - assert_eq!(unit.header("Authorization").unwrap(), "Foo 12345"); - test::make_response(200, "OK", vec!["X-Call: 1"], vec![]) - }); - - let resp = agent.get("test://host/agent_reuse_headers").call().unwrap(); - assert_eq!(resp.header("X-Call").unwrap(), "1"); - - test::set_handler("/agent_reuse_headers", |unit| { - assert!(unit.has("Authorization")); - assert_eq!(unit.header("Authorization").unwrap(), "Foo 12345"); - test::make_response(200, "OK", vec!["X-Call: 2"], vec![]) - }); - - let resp = agent.get("test://host/agent_reuse_headers").call().unwrap(); - assert_eq!(resp.header("X-Call").unwrap(), "2"); -} - // 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<()> {