berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into master

This commit is contained in:
Denys Vitali 2019-06-02 16:07:19 +02:00 committed by GitHub
parent 4d1cdae484 6d2e190c8e
commit 8c2688c1f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actix-files/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "actix-files" name = "actix-files"
version = "0.1.0" version = "0.1.1"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"] authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Static files support for actix web." description = "Static files support for actix web."
readme = "README.md" readme = "README.md"
@ -19,7 +19,7 @@ path = "src/lib.rs"
[dependencies] [dependencies]
actix-web = "1.0.0-rc" actix-web = "1.0.0-rc"
actix-http = "0.2.2" actix-http = "0.2.3"
actix-service = "0.4.0" actix-service = "0.4.0"
bitflags = "1" bitflags = "1"
bytes = "0.4" bytes = "0.4"

5
actix-http/CHANGES.md
View File

@ -1,5 +1,7 @@
# Changes # Changes
## [0.2.3] - 2019-06-02
### Added ### Added
* Debug impl for ResponseBuilder * Debug impl for ResponseBuilder
@ -8,7 +10,8 @@
### Changed ### Changed
* SizedStream accepts u64 * SizedStream uses u64
## [0.2.2] - 2019-05-29 ## [0.2.2] - 2019-05-29

2
actix-http/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "actix-http" name = "actix-http"
version = "0.2.2" version = "0.2.3"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"] authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Actix http primitives" description = "Actix http primitives"
readme = "README.md" readme = "README.md"

4
actix-multipart/CHANGES.md
View File

@ -1,5 +1,9 @@
# Changes # Changes
## [0.1.2] - 2019-06-02
* Fix boundary parsing #876
## [0.1.1] - 2019-05-25 ## [0.1.1] - 2019-05-25
* Fix disconnect handling #834 * Fix disconnect handling #834

4
actix-multipart/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "actix-multipart" name = "actix-multipart"
version = "0.1.1" version = "0.1.2"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"] authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Multipart support for actix web framework." description = "Multipart support for actix web framework."
readme = "README.md" readme = "README.md"
@ -31,4 +31,4 @@ twoway = "0.2"
[dev-dependencies] [dev-dependencies]
actix-rt = "0.2.2" actix-rt = "0.2.2"
actix-http = "0.2.0" actix-http = "0.2.2"

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

@ -537,8 +537,6 @@ impl InnerField {
if &payload.buf[b_len..b_size] == boundary.as_bytes() { if &payload.buf[b_len..b_size] == boundary.as_bytes() {
// found boundary // found boundary
return Ok(Async::Ready(None)); return Ok(Async::Ready(None));
} else {
pos = b_size;
} }
} }
} }
@ -576,7 +574,7 @@ impl InnerField {
} }
} }
} else { } else {
return Ok(Async::Ready(Some(payload.buf.take().freeze()))); Ok(Async::Ready(Some(payload.buf.take().freeze())))
}; };
} }
} }