actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-25 22:49:21 +02:00
Code Issues Releases Wiki Activity

upgrade to tokio 0.2

Browse Source
This commit is contained in:
Nikolay Kim
2019-12-05 23:35:43 +06:00
parent b45c6cd66b
commit 205a964d8f
72 changed files with 764 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actix-multipart/Cargo.toml
View File

@ -21,7 +21,7 @@ path = "src/lib.rs"
actix-web = { version = "2.0.0-alpha.2", default-features = false }
actix-service = "1.0.0-alpha.2"
actix-utils = "1.0.0-alpha.2"
bytes = "0.4"
bytes = "0.5.2"
derive_more = "0.99.2"
httparse = "1.3"
futures = "0.3.1"

12
actix-multipart/src/server.rs
View File

@ -1,5 +1,6 @@
//! Multipart payload support
use std::cell::{Cell, RefCell, RefMut};
use std::convert::TryFrom;
use std::marker::PhantomData;
use std::pin::Pin;
use std::rc::Rc;
@ -16,7 +17,6 @@ use actix_web::error::{ParseError, PayloadError};
use actix_web::http::header::{
self, ContentDisposition, HeaderMap, HeaderName, HeaderValue,
};
use actix_web::http::HttpTryFrom;
use crate::error::MultipartError;
@ -582,7 +582,7 @@ impl InnerField {
}
}
} else {
Poll::Ready(Some(Ok(payload.buf.take().freeze())))
Poll::Ready(Some(Ok(payload.buf.split().freeze())))
};
}
}
@ -792,7 +792,7 @@ impl PayloadBuffer {
pub fn readline_or_eof(&mut self) -> Result<Option<Bytes>, MultipartError> {
match self.readline() {
Err(MultipartError::Incomplete) if self.eof => {
Ok(Some(self.buf.take().freeze()))
Ok(Some(self.buf.split().freeze()))
}
line => line,
}
@ -800,7 +800,7 @@ impl PayloadBuffer {
/// Put unprocessed data back to the buffer
pub fn unprocessed(&mut self, data: Bytes) {
let buf = BytesMut::from(data);
let buf = BytesMut::from(data.as_ref());
let buf = std::mem::replace(&mut self.buf, buf);
self.buf.extend_from_slice(&buf);
}
@ -893,8 +893,8 @@ mod tests {
#[actix_rt::test]
async fn test_multipart_no_end_crlf() {
let (sender, payload) = create_stream();
let (bytes, headers) = create_simple_request_with_header();
let bytes_stripped = bytes.slice_to(bytes.len()); // strip crlf
let (mut bytes, headers) = create_simple_request_with_header();
let bytes_stripped = bytes.split_to(bytes.len()); // strip crlf
sender.send(Ok(bytes_stripped)).unwrap();
drop(sender); // eof