foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-23 07:44:48 -05:00
Code Issues Packages 1 Wiki Activity

Improve std/http/io.ts parseHTTPVersion (#4930)

Browse source
This commit is contained in:
Marcos Casagrande 2020-04-27 20:08:20 +02:00 committed by GitHub
parent d440495b6b
commit c190a0dbc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
std/http/io.ts
View file

@ -287,7 +287,7 @@ export async function writeResponse(
/**
* ParseHTTPVersion parses a HTTP version string.
* "HTTP/1.0" returns (1, 0, true).
* "HTTP/1.0" returns (1, 0).
* Ported from https://github.com/golang/go/blob/f5c43b9/src/net/http/request.go#L766-L792
*/
export function parseHTTPVersion(vers: string): [number, number] {
@ -300,7 +300,6 @@ export function parseHTTPVersion(vers: string): [number, number] {
default: {
const Big = 1000000; // arbitrary upper bound
const digitReg = /^\d+$/; // test if string is only digit
if (!vers.startsWith("HTTP/")) {
break;
@ -312,24 +311,14 @@ export function parseHTTPVersion(vers: string): [number, number] {
}
const majorStr = vers.substring(vers.indexOf("/") + 1, dot);
const major = parseInt(majorStr);
if (
!digitReg.test(majorStr) ||
isNaN(major) ||
major < 0 ||
major > Big
) {
const major = Number(majorStr);
if (!Number.isInteger(major) || major < 0 || major > Big) {
break;
}
const minorStr = vers.substring(dot + 1);
const minor = parseInt(minorStr);
if (
!digitReg.test(minorStr) ||
isNaN(minor) ||
minor < 0 ||
minor > Big
) {
const minor = Number(minorStr);
if (!Number.isInteger(minor) || minor < 0 || minor > Big) {
break;
}

1
std/http/io_test.ts
View file

@ -193,6 +193,7 @@ test("parseHttpVersion", (): void => {
{ in: "HTTP/0.-1", err: true },
{ in: "HTTP/", err: true },
{ in: "HTTP/1,0", err: true },
{ in: "HTTP/1.1000001", err: true },
];
for (const t of testCases) {
let r, err;