Skip to content

Commit 162af4f

Browse files
eaufavoreaufavor
committed
Use iana H2 error code description
The iana h2 error code descriptions (https://www.iana.org/assignments/http2-parameters/http2-parameters.xhtml#error-code) seem to be more comprehensive and shorter.
1 parent ce81583 commit 162af4f

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed

‎src/frame/reason.rs

+18-18
Original file line numberDiff line numberDiff line change
@@ -62,23 +62,20 @@ impl Reason {
6262
/// Get a string description of the error code.
6363
pub fn description(&self) -> &str {
6464
match self.0 {
65-
0 => "not a result of an error",
66-
1 => "unspecific protocol error detected",
67-
2 => "unexpected internal error encountered",
68-
3 => "flow-control protocol violated",
69-
4 => "settings ACK not received in timely manner",
70-
5 => "received frame when stream half-closed",
71-
6 => "frame with invalid size",
72-
7 => "refused stream before processing any application logic",
73-
8 => "stream no longer needed",
74-
9 => "unable to maintain the header compression context",
75-
10 => {
76-
"connection established in response to a CONNECT request was reset or abnormally \
77-
closed"
78-
}
79-
11 => "detected excessive load generating behavior",
80-
12 => "security properties do not meet minimum requirements",
81-
13 => "endpoint requires HTTP/1.1",
65+
0 => "graceful shutdown",
66+
1 => "protocol error detected",
67+
2 => "implementation fault",
68+
3 => "flow-control limits exceeded",
69+
4 => "settings not acknowledged",
70+
5 => "frame received for closed stream",
71+
6 => "frame size incorrect",
72+
7 => "stream not processed",
73+
8 => "stream cancelled",
74+
9 => "compression state not updated",
75+
10 => "TCP connection error for CONNECT method",
76+
11 => "processing capacity exceeded",
77+
12 => "negotiated TLS parameters not acceptable",
78+
13 => "use HTTP/1.1 for the request",
8279
_ => "unknown reason",
8380
}
8481
}
@@ -129,6 +126,9 @@ impl fmt::Debug for Hex {
129126

130127
impl fmt::Display for Reason {
131128
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
132-
write!(fmt, "{}", self.description())
129+
match self.0 {
130+
0..=13 => write!(fmt, "{}", self.description()),
131+
_ => write!(fmt, "unknown error code {}", self.0),
132+
}
133133
}
134134
}

‎tests/h2-tests/tests/client_request.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ async fn send_reset_notifies_recv_stream() {
413413
let err = body.next().await.unwrap().expect_err("RecvBody");
414414
assert_eq!(
415415
err.to_string(),
416-
"stream error sent by user: refused stream before processing any application logic"
416+
"stream error sent by user: stream not processed"
417417
);
418418
};
419419

@@ -676,7 +676,7 @@ async fn sending_request_on_closed_connection() {
676676
};
677677

678678
let poll_err = poll_fn(|cx| client.poll_ready(cx)).await.unwrap_err();
679-
let msg = "connection error detected: unspecific protocol error detected";
679+
let msg = "connection error detected: protocol error detected";
680680
assert_eq!(poll_err.to_string(), msg);
681681

682682
let request = Request::builder()

‎tests/h2-tests/tests/codec_read.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ async fn update_max_frame_len_at_rest() {
210210
assert_eq!(codec.max_recv_frame_size(), 16_384);
211211
assert_eq!(
212212
codec.next().await.unwrap().unwrap_err().to_string(),
213-
"frame with invalid size"
213+
"frame size incorrect"
214214
);
215215

216216
// drain codec buffer

‎tests/h2-tests/tests/flow_control.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ async fn recv_data_overflows_connection_window() {
217217
let err = res.unwrap_err();
218218
assert_eq!(
219219
err.to_string(),
220-
"connection error detected: flow-control protocol violated"
220+
"connection error detected: flow-control limits exceeded"
221221
);
222222
};
223223

@@ -227,7 +227,7 @@ async fn recv_data_overflows_connection_window() {
227227
let err = res.unwrap_err();
228228
assert_eq!(
229229
err.to_string(),
230-
"connection error detected: flow-control protocol violated"
230+
"connection error detected: flow-control limits exceeded"
231231
);
232232
};
233233
join(conn, req).await;
@@ -278,7 +278,7 @@ async fn recv_data_overflows_stream_window() {
278278
let err = res.unwrap_err();
279279
assert_eq!(
280280
err.to_string(),
281-
"stream error detected: flow-control protocol violated"
281+
"stream error detected: flow-control limits exceeded"
282282
);
283283
};
284284

@@ -358,7 +358,7 @@ async fn stream_error_release_connection_capacity() {
358358
.expect_err("body");
359359
assert_eq!(
360360
err.to_string(),
361-
"stream error detected: unspecific protocol error detected"
361+
"stream error detected: protocol error detected"
362362
);
363363
cap.release_capacity(to_release).expect("release_capacity");
364364
};

‎tests/h2-tests/tests/push_promise.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ async fn recv_push_when_push_disabled_is_conn_error() {
164164
let err = res.unwrap_err();
165165
assert_eq!(
166166
err.to_string(),
167-
"connection error detected: unspecific protocol error detected"
167+
"connection error detected: protocol error detected"
168168
);
169169
};
170170

@@ -174,7 +174,7 @@ async fn recv_push_when_push_disabled_is_conn_error() {
174174
let err = res.unwrap_err();
175175
assert_eq!(
176176
err.to_string(),
177-
"connection error detected: unspecific protocol error detected"
177+
"connection error detected: protocol error detected"
178178
);
179179
};
180180

@@ -388,7 +388,7 @@ async fn recv_push_promise_skipped_stream_id() {
388388
.unwrap_err();
389389
assert_eq!(
390390
err.to_string(),
391-
"connection error detected: unspecific protocol error detected"
391+
"connection error detected: protocol error detected"
392392
);
393393
};
394394

@@ -398,7 +398,7 @@ async fn recv_push_promise_skipped_stream_id() {
398398
let err = res.unwrap_err();
399399
assert_eq!(
400400
err.to_string(),
401-
"connection error detected: unspecific protocol error detected"
401+
"connection error detected: protocol error detected"
402402
);
403403
};
404404

@@ -446,7 +446,7 @@ async fn recv_push_promise_dup_stream_id() {
446446
let err = res.unwrap_err();
447447
assert_eq!(
448448
err.to_string(),
449-
"connection error detected: unspecific protocol error detected"
449+
"connection error detected: protocol error detected"
450450
);
451451
};
452452

@@ -456,7 +456,7 @@ async fn recv_push_promise_dup_stream_id() {
456456
let err = res.unwrap_err();
457457
assert_eq!(
458458
err.to_string(),
459-
"connection error detected: unspecific protocol error detected"
459+
"connection error detected: protocol error detected"
460460
);
461461
};
462462

‎tests/h2-tests/tests/stream_states.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ async fn errors_if_recv_frame_exceeds_max_frame_size() {
209209
let err = res.unwrap_err();
210210
assert_eq!(
211211
err.to_string(),
212-
"connection error detected: frame with invalid size"
212+
"connection error detected: frame size incorrect"
213213
);
214214
};
215215

@@ -218,7 +218,7 @@ async fn errors_if_recv_frame_exceeds_max_frame_size() {
218218
let err = h2.await.unwrap_err();
219219
assert_eq!(
220220
err.to_string(),
221-
"connection error detected: frame with invalid size"
221+
"connection error detected: frame size incorrect"
222222
);
223223
};
224224
join(conn, req).await;
@@ -329,7 +329,7 @@ async fn recv_goaway_finishes_processed_streams() {
329329
let err = client.get("https://example.com/").await.unwrap_err();
330330
assert_eq!(
331331
err.to_string(),
332-
"connection error received: not a result of an error"
332+
"connection error received: graceful shutdown"
333333
);
334334
};
335335

0 commit comments

Comments
 (0)