Skip to content

Commit 4d153c2

Browse files
Yang Chifacebook-github-bot
authored andcommitted
Change HTTPMessage default urgency and incremental values
Summary: urgency = 3 and incremental = true will be our default. Leaving them to 0 and false will change the default transport behavior Reviewed By: mjoras Differential Revision: D24573524 fbshipit-source-id: e2837ec44cff41f544e5e6a5e41c9558e0cf54a2
1 parent 4944986 commit 4d153c2

File tree

4 files changed

+21
-14
lines changed

4 files changed

+21
-14
lines changed

proxygen/lib/http/HTTPMessage.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ HTTPMessage::HTTPMessage()
6767
sslVersion_(0),
6868
sslCipher_(nullptr),
6969
protoStr_(nullptr),
70-
pri_(0),
71-
incremental_(false),
70+
pri_(kDefaultHttpPriorityUrgency),
71+
incremental_(kDefaultHttpPriorityIncremental),
7272
version_(1, 0),
7373
parsedCookies_(false),
7474
parsedQueryParams_(false),

proxygen/lib/http/HTTPMessage.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@
2626

2727
namespace proxygen {
2828

29+
// Default urgency = 3 is from the draft. It leaves space for both higher and
30+
// lower urgency level which is good. We default to Incremental = True as
31+
// opposed to False. This is because our transport layer has been behaving
32+
// like that before the HTTP priority support is introduced.
33+
constexpr uint8_t kDefaultHttpPriorityUrgency = 3;
34+
constexpr bool kDefaultHttpPriorityIncremental = true;
35+
2936
/**
3037
* An HTTP request or response minus the body.
3138
*

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -921,8 +921,8 @@ TEST_F(HQCodecTest, PriorityHeaderBadUrgency) {
921921

922922
parse();
923923
const auto& msg = callbacks_.msg;
924-
EXPECT_EQ(msg->getPriority(), 0);
925-
EXPECT_FALSE(msg->getIncremental());
924+
EXPECT_EQ(msg->getPriority(), kDefaultHttpPriorityUrgency);
925+
EXPECT_TRUE(msg->getIncremental());
926926
}
927927

928928
TEST_F(HQCodecTest, PriorityHeaderBadUrgencyWithIncremental) {
@@ -933,8 +933,8 @@ TEST_F(HQCodecTest, PriorityHeaderBadUrgencyWithIncremental) {
933933

934934
parse();
935935
const auto& msg = callbacks_.msg;
936-
EXPECT_EQ(msg->getPriority(), 0);
937-
EXPECT_FALSE(msg->getIncremental());
936+
EXPECT_EQ(msg->getPriority(), kDefaultHttpPriorityUrgency);
937+
EXPECT_TRUE(msg->getIncremental());
938938
}
939939

940940
TEST_F(HQCodecTest, PriorityHeaderBadIncremental) {
@@ -945,8 +945,8 @@ TEST_F(HQCodecTest, PriorityHeaderBadIncremental) {
945945

946946
parse();
947947
const auto& msg = callbacks_.msg;
948-
EXPECT_EQ(msg->getPriority(), 0);
949-
EXPECT_FALSE(msg->getIncremental());
948+
EXPECT_EQ(msg->getPriority(), kDefaultHttpPriorityUrgency);
949+
EXPECT_TRUE(msg->getIncremental());
950950
}
951951

952952
struct FrameAllowedParams {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2456,8 +2456,8 @@ TEST_F(HTTP2CodecTest, PriorityHeaderBadUrgency) {
24562456

24572457
parse();
24582458
const auto& msg = callbacks_.msg;
2459-
EXPECT_EQ(msg->getPriority(), 0);
2460-
EXPECT_FALSE(msg->getIncremental());
2459+
EXPECT_EQ(msg->getPriority(), kDefaultHttpPriorityUrgency);
2460+
EXPECT_TRUE(msg->getIncremental());
24612461
}
24622462

24632463
TEST_F(HTTP2CodecTest, PriorityHeaderBadUrgencyWithIncremental) {
@@ -2467,8 +2467,8 @@ TEST_F(HTTP2CodecTest, PriorityHeaderBadUrgencyWithIncremental) {
24672467

24682468
parse();
24692469
const auto& msg = callbacks_.msg;
2470-
EXPECT_EQ(msg->getPriority(), 0);
2471-
EXPECT_FALSE(msg->getIncremental());
2470+
EXPECT_EQ(msg->getPriority(), kDefaultHttpPriorityUrgency);
2471+
EXPECT_TRUE(msg->getIncremental());
24722472
}
24732473

24742474
TEST_F(HTTP2CodecTest, PriorityHeaderBadIncremental) {
@@ -2478,6 +2478,6 @@ TEST_F(HTTP2CodecTest, PriorityHeaderBadIncremental) {
24782478

24792479
parse();
24802480
const auto& msg = callbacks_.msg;
2481-
EXPECT_EQ(msg->getPriority(), 0);
2482-
EXPECT_FALSE(msg->getIncremental());
2481+
EXPECT_EQ(msg->getPriority(), kDefaultHttpPriorityUrgency);
2482+
EXPECT_TRUE(msg->getIncremental());
24832483
}

0 commit comments

Comments
 (0)