Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions http-cache-reqwest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ url = { version = "2.5.4", features = ["serde"] }

# Optional dependencies for streaming feature
futures-util = { version = "0.3.31", optional = true }
httpdate = "1.0.3"

[dependencies.http-cache]
path = "../http-cache"
Expand Down
1 change: 1 addition & 0 deletions http-cache-reqwest/examples/reqwest_basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use reqwest::Client;
use reqwest_middleware::ClientBuilder;
use std::time::Instant;
use wiremock::{matchers::method, Mock, MockServer, ResponseTemplate};
use wiremock::matchers::header;

#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
Expand Down
2 changes: 1 addition & 1 deletion http-cache-reqwest/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ impl Middleware for ReqwestMiddleware<'_> {
}
fn update_headers(&mut self, parts: &Parts) -> Result<()> {
for header in parts.headers.iter() {
self.req.headers_mut().append(header.0.clone(), header.1.clone());
self.req.headers_mut().insert(header.0.clone(), header.1.clone());
}
Ok(())
}
Expand Down
47 changes: 46 additions & 1 deletion http-cache-reqwest/src/test.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
use crate::{BadRequest, Cache, HttpCacheError};
use std::sync::Arc;

use std::time::{Duration, SystemTime};
use http_cache::*;
use reqwest::Client;
use reqwest_middleware::ClientBuilder;
use tokio::time::sleep;
#[cfg(any(feature = "streaming", feature = "rate-limiting"))]
use wiremock::matchers::path;
use wiremock::{matchers::method, Mock, MockServer, ResponseTemplate};
use wiremock::matchers::header;

/// Helper function to create a temporary cache manager
fn create_cache_manager() -> CACacheManager {
Expand Down Expand Up @@ -704,6 +706,49 @@ async fn revalidation_200() -> Result<()> {
Ok(())
}

#[tokio::test]
async fn duplicate_header() -> Result<()> {
let now = SystemTime::now();
let expires = SystemTime::now() + Duration::from_secs(2);

let mock_server = MockServer::start().await;
let mock = Mock::given(method(GET)).and(header("x-test", "test"))
.respond_with(
ResponseTemplate::new(200)
.insert_header("expires", httpdate::fmt_http_date(now))
.set_body_bytes("ok"),
)
.expect(2);
let mock_guard = mock_server.register_as_scoped(mock).await;
let url = format!("{}/", &mock_server.uri());
let manager = create_cache_manager();

// Construct reqwest client with cache defaults
let client = ClientBuilder::new(Client::new())
.with(Cache(HttpCache {
mode: CacheMode::Default,
manager: manager.clone(),
options: Default::default(),
}))
.build();

let resp1 = client.get(url.clone()).header("x-test", "test").send().await?;

let wait_until = expires + Duration::from_secs(2);
while SystemTime::now() < wait_until {
sleep(Duration::from_millis(100)).await;
}
Comment on lines +737 to +740

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@06chaynes There's probably a better way of simulating an expired cache object


let resp2 = client.get(url.clone()).header("x-test", "test").send().await?;

drop(mock_guard);

assert_eq!(resp1.text().await?, "ok");
assert_eq!(resp2.text().await?, "ok");

Ok(())
}

#[tokio::test]
async fn revalidation_500() -> Result<()> {
let mock_server = MockServer::start().await;
Expand Down
Loading