OpenSource/axum
OpenSource/axum
1
0
Fork 0
mirror of https://github.com/tokio-rs/axum.git synced 2024-12-29 15:49:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add space between SSE field and value for compatibility (#2149)

Browse source 
Co-authored-by: David Pedersen <david.pdrsn@gmail.com>
This commit is contained in:
ttys3 2023-09-17 03:47:28 +08:00 committed by GitHub
parent 65defdb463
commit 268ba08e8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
axum/CHANGELOG.md
View file

@ -64,6 +64,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- **change:** axum's MSRV is now 1.63 ([#2021]) - **change:** axum's MSRV is now 1.63 ([#2021])
- **added:** Implement `Handler` for `T: IntoResponse` ([#2140]) - **added:** Implement `Handler` for `T: IntoResponse` ([#2140])
- **added:** Implement `IntoResponse` for `(R,) where R: IntoResponse` ([#2143]) - **added:** Implement `IntoResponse` for `(R,) where R: IntoResponse` ([#2143])
- **changed:** For SSE, add space between field and value for compatibility ([#2149])
[#2021]: https://github.com/tokio-rs/axum/pull/2021 [#2021]: https://github.com/tokio-rs/axum/pull/2021
[#2014]: https://github.com/tokio-rs/axum/pull/2014 [#2014]: https://github.com/tokio-rs/axum/pull/2014
@ -82,6 +83,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[#2096]: https://github.com/tokio-rs/axum/pull/2096 [#2096]: https://github.com/tokio-rs/axum/pull/2096
[#2140]: https://github.com/tokio-rs/axum/pull/2140 [#2140]: https://github.com/tokio-rs/axum/pull/2140
[#2143]: https://github.com/tokio-rs/axum/pull/2143 [#2143]: https://github.com/tokio-rs/axum/pull/2143
[#2149]: https://github.com/tokio-rs/axum/pull/2149
# 0.6.17 (25. April, 2023) # 0.6.17 (25. April, 2023)

15
axum/src/response/sse.rs
View file

@ -171,9 +171,9 @@ pub struct Event {
} }
impl Event { impl Event {
/// Set the event's data data field(s) (`data:<content>`) /// Set the event's data data field(s) (`data: <content>`)
/// ///
/// Newlines in `data` will automatically be broken across `data:` fields. /// Newlines in `data` will automatically be broken across `data: ` fields.
/// ///
/// This corresponds to [`MessageEvent`'s data field]. /// This corresponds to [`MessageEvent`'s data field].
/// ///
@ -202,7 +202,7 @@ impl Event {
self self
} }
/// Set the event's data field to a value serialized as unformatted JSON (`data:<content>`). /// Set the event's data field to a value serialized as unformatted JSON (`data: <content>`).
/// ///
/// This corresponds to [`MessageEvent`'s data field]. /// This corresponds to [`MessageEvent`'s data field].
/// ///
@ -220,7 +220,7 @@ impl Event {
panic!("Called `EventBuilder::json_data` multiple times"); panic!("Called `EventBuilder::json_data` multiple times");
} }
self.buffer.extend_from_slice(b"data:"); self.buffer.extend_from_slice(b"data: ");
serde_json::to_writer((&mut self.buffer).writer(), &data).map_err(axum_core::Error::new)?; serde_json::to_writer((&mut self.buffer).writer(), &data).map_err(axum_core::Error::new)?;
self.buffer.put_u8(b'\n'); self.buffer.put_u8(b'\n');
@ -358,10 +358,7 @@ impl Event {
); );
self.buffer.extend_from_slice(name.as_bytes()); self.buffer.extend_from_slice(name.as_bytes());
self.buffer.put_u8(b':'); self.buffer.put_u8(b':');
// Prevent values that start with spaces having that space stripped self.buffer.put_u8(b' ');
if value.starts_with(b" ") {
self.buffer.put_u8(b' ');
}
self.buffer.extend_from_slice(value); self.buffer.extend_from_slice(value);
self.buffer.put_u8(b'\n'); self.buffer.put_u8(b'\n');
} }
@ -532,7 +529,7 @@ mod tests {
#[test] #[test]
fn leading_space_is_not_stripped() { fn leading_space_is_not_stripped() {
let no_leading_space = Event::default().data("\tfoobar"); let no_leading_space = Event::default().data("\tfoobar");
assert_eq!(&*no_leading_space.finalize(), b"data:\tfoobar\n\n"); assert_eq!(&*no_leading_space.finalize(), b"data: \tfoobar\n\n");
let leading_space = Event::default().data(" foobar"); let leading_space = Event::default().data(" foobar");
assert_eq!(&*leading_space.finalize(), b"data: foobar\n\n"); assert_eq!(&*leading_space.finalize(), b"data: foobar\n\n");