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

Merge branch 'master' into refactor/app-data

This commit is contained in:
Yuki Okushi 2020-04-29 11:14:02 +09:00 committed by GitHub
parent 7fe125c355 b047413b39
commit c1d45b0b92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actix-http/CHANGES.md
View File

@ -7,6 +7,8 @@
* Implement `std::error::Error` for our custom errors [#1422] * Implement `std::error::Error` for our custom errors [#1422]
* Remove `failure` support for `ResponseError` since that crate * Remove `failure` support for `ResponseError` since that crate
will be deprecated in the near future. will be deprecated in the near future.
* Fix a mistake in the encoding of websocket continuation messages wherein
Item::FirstText and Item::FirstBinary are each encoded as the other.
[#1422]: https://github.com/actix/actix-web/pull/1422 [#1422]: https://github.com/actix/actix-web/pull/1422

4
actix-http/src/ws/codec.rs
View File

@ -137,7 +137,7 @@ impl Encoder for Codec {
Parser::write_message( Parser::write_message(
dst, dst,
&data[..], &data[..],
OpCode::Binary, OpCode::Text,
false, false,
!self.flags.contains(Flags::SERVER), !self.flags.contains(Flags::SERVER),
) )
@ -151,7 +151,7 @@ impl Encoder for Codec {
Parser::write_message( Parser::write_message(
dst, dst,
&data[..], &data[..],
OpCode::Text, OpCode::Binary,
false, false,
!self.flags.contains(Flags::SERVER), !self.flags.contains(Flags::SERVER),
) )