Skip to content

Commit 2e1d506

Browse files
Joanna Jofacebook-github-bot
Joanna Jo
authored andcommitted
Set HeaderContentValidation error in HQStreamCodec
Summary: Setting the new HeaderContentValidation ProxygenError enum in HQStreamCodec wherever there's a header validation error. These errors should now be recorded separately from header parsing errors. Reviewed By: afrind Differential Revision: D70342834 fbshipit-source-id: e95f1fc8552e2a2fe78750652871f16536dc62db
1 parent 4c366d4 commit 2e1d506

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

proxygen/lib/http/codec/HQStreamCodec.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ void HQStreamCodec::onHeadersComplete(HTTPHeaderSize decodedSize,
209209
} else {
210210
err.setHttpStatusCode(400);
211211
}
212-
err.setProxygenError(kErrorParseHeader);
212+
err.setProxygenError(decodeInfo_.proxygenError.value_or(kErrorParseHeader));
213213
// Have to clone it
214214
err.setPartialMsg(std::make_unique<HTTPMessage>(*decodeInfo_.msg));
215215
callback_->onError(streamId_, err, true);

proxygen/lib/http/codec/test/HQCodecTest.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,8 @@ TEST_F(HQCodecTest, HighAscii) {
813813
EXPECT_EQ(callbacks_.headersComplete, 0);
814814
EXPECT_EQ(callbacks_.messageComplete, 0);
815815
EXPECT_EQ(callbacks_.streamErrors, 4);
816-
EXPECT_EQ(callbacks_.lastParseError->getProxygenError(), kErrorParseHeader);
816+
EXPECT_EQ(callbacks_.lastParseError->getProxygenError(),
817+
kErrorHeaderContentValidation);
817818
EXPECT_EQ(callbacks_.sessionErrors, 0);
818819
callbacks_.reset();
819820

@@ -832,7 +833,8 @@ TEST_F(HQCodecTest, HighAscii) {
832833
EXPECT_EQ(callbacks_.headersComplete, 1);
833834
EXPECT_EQ(callbacks_.messageComplete, 0);
834835
EXPECT_EQ(callbacks_.streamErrors, 1);
835-
EXPECT_EQ(callbacks_.lastParseError->getProxygenError(), kErrorParseHeader);
836+
EXPECT_EQ(callbacks_.lastParseError->getProxygenError(),
837+
kErrorHeaderContentValidation);
836838
EXPECT_EQ(callbacks_.sessionErrors, 0);
837839
}
838840

0 commit comments

Comments
 (0)