http: PRI upgrade should return PAUSED_H2_UPGRADE

indutny · indutny · commit 374434d6106d · 2021-04-06T09:07:40.000-07:00
`PAUSED_UPGRADE` is a recoverable error and should not be returned when parsing HTTP/2 `PRI /...` preambule, which is the last message that can be parsed on the stream. PR-URL: #95 Reviewed-By: Daniele Belardi <dwon.dnl@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/llhttp/constants.ts b/src/llhttp/constants.ts
@@ -30,6 +30,7 @@ export enum ERROR {
 
   PAUSED,
   PAUSED_UPGRADE,
+  PAUSED_H2_UPGRADE,
 
   USER,
 }
diff --git a/src/llhttp/http.ts b/src/llhttp/http.ts
@@ -375,8 +375,10 @@ export class HTTP {
       .otherwise(p.error(ERROR.INVALID_VERSION, 'Expected CRLF after version'));
 
     n('req_pri_upgrade')
-      .match('\r\n\r\nSM\r\n\r\n', p.error(ERROR.PAUSED_UPGRADE, 'Pause on PRI/Upgrade'))
-      .otherwise(p.error(ERROR.INVALID_VERSION, 'Expected HTTP/2 Connection Preface'));
+      .match('\r\n\r\nSM\r\n\r\n',
+        p.error(ERROR.PAUSED_H2_UPGRADE, 'Pause on PRI/Upgrade'))
+      .otherwise(
+        p.error(ERROR.INVALID_VERSION, 'Expected HTTP/2 Connection Preface'));
   }
 
   private buildHeaders(): void {
diff --git a/test/request/method.md b/test/request/method.md
@@ -386,5 +386,5 @@ SM
 off=0 message begin
 off=4 len=1 span[url]="*"
 off=6 url complete
-off=24 error code=22 reason="Pause on PRI/Upgrade"
+off=24 error code=23 reason="Pause on PRI/Upgrade"
 ```

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ export enum ERROR {`
`30`	`30`
`31`	`31`	`PAUSED,`
`32`	`32`	`PAUSED_UPGRADE,`
	`33`	`+ PAUSED_H2_UPGRADE,`
`33`	`34`
`34`	`35`	`USER,`
`35`	`36`	`}`