lib/proxygen
1
0
Fork 0
mirror of https://github.com/facebook/proxygen.git synced 2026-10-24 01:33:54 +03:00
Code Activity

Disable server push for upstream coro sessions

Browse Source 
Summary: Change `HTTPCoroSession` so it only enables push if that was specified in the construction settings.

Reviewed By: lnicco, hanidamlaj

Differential Revision: D120591826

fbshipit-source-id: 911e12cce94640e14059f64d62599f4d3b4bd5da
This commit is contained in:
Keivaun Waugh
2026-09-18 20:36:06 -07:00
committed by meta-codesync[bot]
parent e5716d4fd1
commit 792b485b60
2 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
proxygen/lib/http/coro/HTTPCoroSession.cpp
View File

@@ -766,9 +766,6 @@ folly::coro::Task<void> HTTPUniplexTransportSession::runImpl() {
void HTTPCoroSession::sendPreface() {
codec_->generateConnectionPreface(writeBuf_);
if (isUpstream()) {
setSetting(SettingsId::ENABLE_PUSH, 1);
}
applyEgressSettings();
codec_->generateSettings(writeBuf_);
writeEvent_.signal();

47
proxygen/lib/http/coro/test/HTTPUpstreamCoroSessionTests.cpp
View File

@@ -216,6 +216,8 @@ class HTTPUpstreamSessionTest : public HTTPCoroSessionTest {
/* Simple push test */
folly::coro::Task<HTTPCodec::StreamID> testPush(
bool expectIncomingStream = true, bool pushEOM = true, bool eof = true) {
enablePushForTest();
// send a request for GET /
auto responseSource = co_await co_awaitTry(
session_->sendRequest(HTTPFixedSource::makeFixedRequest("/")));
@@ -248,6 +250,12 @@ class HTTPUpstreamSessionTest : public HTTPCoroSessionTest {
co_return pushID;
}
void enablePushForTest() {
if (!isHQ()) {
codec_->getEgressSettings()->setSetting(SettingsId::ENABLE_PUSH, 1);
}
}
void expectH1ConnectionReset() {
if (IS_H1()) {
EXPECT_TRUE(transportState_.closedWithReset);
@@ -255,6 +263,20 @@ class HTTPUpstreamSessionTest : public HTTPCoroSessionTest {
}
}
folly::coro::Task<void> expectAdvertisedPushSetting(
SettingsValue expectedValue) {
co_await rescheduleN(2);
parseOutputUniplex();
const auto *enablePush =
peerCodec_->getIngressSettings()->getSetting(SettingsId::ENABLE_PUSH);
EXPECT_NE(enablePush, nullptr);
if (enablePush) {
EXPECT_EQ(enablePush->value, expectedValue);
}
transport_->addReadEvent(nullptr, true);
}
HTTPCodec *serverCodec_{nullptr};
std::list<std::pair<HTTPPushEvent, std::unique_ptr<HTTPFixedSource>>> pushes_;
std::function<folly::coro::Task<void>(HTTPPushEvent)> pushPromiseHandler_;
@@ -271,6 +293,24 @@ using H2QUpstreamSessionTest = HTTPUpstreamSessionTest;
// Use this test class for h1/h2 only tests
using H12UpstreamSessionTest = HTTPUpstreamSessionTest;
class H2UpstreamPushEnabledSessionTest : public HTTPUpstreamSessionTest {
public:
H2UpstreamPushEnabledSessionTest() {
initSelfCodec_ = [](HTTPCodec &codec) {
codec.getEgressSettings()->setSetting(SettingsId::ENABLE_PUSH, 1);
};
}
};
CO_TEST_P_X(H2UpstreamSessionTest, PreservesDefaultServerPushSetting) {
co_await expectAdvertisedPushSetting(0);
}
CO_TEST_P_X(H2UpstreamPushEnabledSessionTest,
PreservesConfiguredServerPushSetting) {
co_await expectAdvertisedPushSetting(1);
}
CO_TEST_P_X(HTTPUpstreamSessionTest, Simple) {
auto responseSource = co_await co_awaitTry(
session_->sendRequest(HTTPFixedSource::makeFixedRequest("/")));
@@ -708,6 +748,7 @@ CO_TEST_P_X(H2UpstreamSessionTest, PushParentReset) {
//
// Note, we need the PUSH_PROMISE to have a continuation, so give the server
// codec a ridiculously small MAX_FRAME_SIZE.
enablePushForTest();
auto *settings = (HTTPSettings *)serverCodec_->getIngressSettings();
settings->setSetting(SettingsId::MAX_FRAME_SIZE, 5);
@@ -1907,6 +1948,12 @@ INSTANTIATE_TEST_SUITE_P(
Values(TestParams({.codecProtocol = CodecProtocol::HTTP_2})),
paramsToTestName);
INSTANTIATE_TEST_SUITE_P(
HTTPUpstreamSessionTest,
H2UpstreamPushEnabledSessionTest,
Values(TestParams({.codecProtocol = CodecProtocol::HTTP_2})),
paramsToTestName);
INSTANTIATE_TEST_SUITE_P(
HTTPUpstreamSessionTest,
HQUpstreamSessionTest,