From 24180f9014e8e041e2e4d711c4f92a16be1751bf Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Sun, 2 Jun 2019 12:58:37 +0600 Subject: [PATCH 1/3] Fix boundary parsing #876 --- actix-multipart/CHANGES.md | 4 ++++ actix-multipart/Cargo.toml | 4 ++-- actix-multipart/src/server.rs | 4 +--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/actix-multipart/CHANGES.md b/actix-multipart/CHANGES.md index cf32859e3..751bc1269 100644 --- a/actix-multipart/CHANGES.md +++ b/actix-multipart/CHANGES.md @@ -1,5 +1,9 @@ # Changes +## [0.1.2] - 2019-06-02 + +* Fix boundary parsing #876 + ## [0.1.1] - 2019-05-25 * Fix disconnect handling #834 diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml index fe63d5361..9bb1179d8 100644 --- a/actix-multipart/Cargo.toml +++ b/actix-multipart/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-multipart" -version = "0.1.1" +version = "0.1.2" authors = ["Nikolay Kim "] description = "Multipart support for actix web framework." readme = "README.md" @@ -31,4 +31,4 @@ twoway = "0.2" [dev-dependencies] actix-rt = "0.2.2" -actix-http = "0.2.0" \ No newline at end of file +actix-http = "0.2.2" \ No newline at end of file diff --git a/actix-multipart/src/server.rs b/actix-multipart/src/server.rs index 8245d241e..e1a5543d4 100644 --- a/actix-multipart/src/server.rs +++ b/actix-multipart/src/server.rs @@ -537,8 +537,6 @@ impl InnerField { if &payload.buf[b_len..b_size] == boundary.as_bytes() { // found boundary return Ok(Async::Ready(None)); - } else { - pos = b_size; } } } @@ -576,7 +574,7 @@ impl InnerField { } } } else { - return Ok(Async::Ready(Some(payload.buf.take().freeze()))); + Ok(Async::Ready(Some(payload.buf.take().freeze()))) }; } } From b1cfbdcf7a4f391ec93aabdd2f81fd24b87517bb Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Sun, 2 Jun 2019 13:05:22 +0600 Subject: [PATCH 2/3] prepare actix-http release --- actix-http/CHANGES.md | 5 ++++- actix-http/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md index e677c3fa6..d0c75da76 100644 --- a/actix-http/CHANGES.md +++ b/actix-http/CHANGES.md @@ -1,5 +1,7 @@ # Changes +## [0.2.3] - 2019-06-02 + ### Added * Debug impl for ResponseBuilder @@ -8,7 +10,8 @@ ### Changed -* SizedStream accepts u64 +* SizedStream uses u64 + ## [0.2.2] - 2019-05-29 diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml index 6a020eae3..1847a5ba2 100644 --- a/actix-http/Cargo.toml +++ b/actix-http/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-http" -version = "0.2.2" +version = "0.2.3" authors = ["Nikolay Kim "] description = "Actix http primitives" readme = "README.md" From 6d2e190c8e6f5f8304cfc08e4fbc7d07567b7dfa Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Sun, 2 Jun 2019 13:09:21 +0600 Subject: [PATCH 3/3] prepare actix-files release --- actix-files/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml index fa48fff08..9d6b0f480 100644 --- a/actix-files/Cargo.toml +++ b/actix-files/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-files" -version = "0.1.0" +version = "0.1.1" authors = ["Nikolay Kim "] description = "Static files support for actix web." readme = "README.md" @@ -19,7 +19,7 @@ path = "src/lib.rs" [dependencies] actix-web = "1.0.0-rc" -actix-http = "0.2.2" +actix-http = "0.2.3" actix-service = "0.4.0" bitflags = "1" bytes = "0.4"