Merge branch 'master' of https://github.com/lesismal/nbio

lesismal · lesismal · commit 9ace96a4e832 · 2025-07-18T23:06:17.000+08:00
diff --git a/nbhttp/parser.go b/nbhttp/parser.go
@@ -577,7 +577,7 @@ UPGRADER:
 			}
 			return ErrLFExpected
 		case stateBodyTrailerHeaderKeyBefore:
-			if isAlpha(c) {
+			if isToken(c) {
 				start = i
 				p.nextState(stateBodyTrailerHeaderKey)
 				continue
diff --git a/nbhttp/parser_test.go b/nbhttp/parser_test.go
@@ -67,6 +67,11 @@ func TestServerParserTrailer(t *testing.T) {
 	if err != nil {
 		t.Fatalf("test failed: %v", err)
 	}
+	data = []byte("POST / HTTP/1.1\r\nHost: localhost:1235\r\nUser-Agent: Go-http-client/1.1\r\nTransfer-Encoding: chunked\r\nTrailer: 123456789,!#$%&'*+-.^_`|~\r\nAccept-Encoding: gzip  \r\n\r\n0\r\n123456789: value \r\n !#$%&'*+-.^_`|~: value \r\n\r\n")
+	err = testParser(t, false, data)
+	if err != nil {
+		t.Fatalf("test failed: %v", err)
+	}
 }
 
 func TestClientParserContentLength(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ UPGRADER:`
`577`	`577`	`}`
`578`	`578`	`return ErrLFExpected`
`579`	`579`	`case stateBodyTrailerHeaderKeyBefore:`
`580`		`- if isAlpha(c) {`
	`580`	`+ if isToken(c) {`
`581`	`581`	`start = i`
`582`	`582`	`p.nextState(stateBodyTrailerHeaderKey)`
`583`	`583`	`continue`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,11 @@ func TestServerParserTrailer(t *testing.T) {`
`67`	`67`	`if err != nil {`
`68`	`68`	`t.Fatalf("test failed: %v", err)`
`69`	`69`	`}`
	`70`	+ data = []byte("POST / HTTP/1.1\r\nHost: localhost:1235\r\nUser-Agent: Go-http-client/1.1\r\nTransfer-Encoding: chunked\r\nTrailer: 123456789,!#$%&'+-.^_`\|~\r\nAccept-Encoding: gzip \r\n\r\n0\r\n123456789: value \r\n !#$%&'+-.^_`\|~: value \r\n\r\n")
	`71`	`+ err = testParser(t, false, data)`
	`72`	`+ if err != nil {`
	`73`	`+ t.Fatalf("test failed: %v", err)`
	`74`	`+ }`
`70`	`75`	`}`
`71`	`76`
`72`	`77`	`func TestClientParserContentLength(t *testing.T) {`