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
6 changes: 1 addition & 5 deletions examples/demo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@ use http::header::CONTENT_TYPE;
async fn main() {
const URL: &str = "https://mat1.gtimg.com/pingjs/ext2020/newom/build/static/images/new_logo.png";
let client = reqwest::Client::new();
let response = client
.get(URL)
.header("Range", "bytes=0-32,64-128") // 请求前500字节
.send()
.await.unwrap();
let response = client.get(URL).header("Range", "bytes=0-31,64-127").send().await.unwrap();
let boundary = response
.headers()
.get(CONTENT_TYPE)
Expand Down
15 changes: 8 additions & 7 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@ where
buf.get(pos..pos + 2)
};
let mut split_part = |buf: &mut BytesMut| {
let body = buf.split_to(body_end).freeze();
println!("{body_end}");
let body = buf.split_to(body_end.saturating_sub(2)).freeze(); // forget CRLF and handle on empty body
Part::new(mem::take(headers), body)
};
match tail {
Expand Down Expand Up @@ -285,7 +286,7 @@ value1\r\n\
// let x = multipart_stream.try_next().await;
let part = multipart_stream.try_next().await.unwrap();
assert_eq!(part.headers().get("content-disposition").unwrap(), "form-data; name=\"field1\"");
assert_eq!(part.body(), &Bytes::from_static(b"value1\r\n"));
assert_eq!(part.body(), &Bytes::from_static(b"value1"));

// 应该已经到达流的末尾
let result = multipart_stream.try_next().await;
Expand All @@ -304,7 +305,7 @@ value1\r\n\
Content-Disposition: form-data; name=\"field2\"\r\n\
Content-Type: text/plain\r\n\
\r\n\
value2 with CRLF\r\n\
value2 with CRLF\r\n\r\n\
--X-BOUNDARY--\r\n";

// 使用一个很小的块大小来强制测试缓冲逻辑
Expand All @@ -315,7 +316,7 @@ value2 with CRLF\r\n\
let part1 = multipart_stream.try_next().await.unwrap();
assert_eq!(part1.headers().get("content-disposition").unwrap(), "form-data; name=\"field1\"");
assert!(!part1.headers().contains_key("content-type"));
assert_eq!(part1.body(), &Bytes::from_static(b"value1\r\n"));
assert_eq!(part1.body(), &Bytes::from_static(b"value1"));

// 解析第二部分
let part2 = multipart_stream.try_next().await.unwrap();
Expand Down Expand Up @@ -346,7 +347,7 @@ value1\r\n\
// let _ = multipart_stream.try_next().await;
let part = multipart_stream.try_next().await.unwrap();
assert_eq!(part.headers().get("content-disposition").unwrap(), "form-data; name=\"field1\"");
assert_eq!(part.body(), &Bytes::from_static(b"value1\r\n"));
assert_eq!(part.body(), &Bytes::from_static(b"value1"));

// 应该已经到达流的末尾
let result = multipart_stream.try_next().await;
Expand Down Expand Up @@ -420,15 +421,15 @@ value2\r\n\
let mut multipart_stream = MultipartStream::new(stream, BOUNDARY.as_bytes());
let part1 = multipart_stream.try_next().await.unwrap();
assert_eq!(part1.headers().get("content-disposition").unwrap(), "form-data; name=\"field1\"");
assert_eq!(part1.body(), &Bytes::from_static(b"value1\r\n"));
assert_eq!(part1.body(), &Bytes::from_static(b"value1"));

let part2 = multipart_stream.try_next().await.unwrap();
assert_eq!(part2.headers().get("content-disposition").unwrap(), "form-data; name=\"empty_field\"");
assert!(part2.body().is_empty());

let part3 = multipart_stream.try_next().await.unwrap();
assert_eq!(part3.headers().get("content-disposition").unwrap(), "form-data; name=\"field2\"");
assert_eq!(part3.body(), &Bytes::from_static(b"value2\r\n"));
assert_eq!(part3.body(), &Bytes::from_static(b"value2"));

let result = multipart_stream.try_next().await;
assert!(matches!(result, Err(Error::Eof)));
Expand Down
Loading