From 844d51842f0e8ba700c9047246f7679de726c37a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Utku=20G=C3=BCrkan?= Date: Wed, 1 Nov 2023 08:32:59 -0700 Subject: [PATCH] Use --server_name override when setting the host header Summary: The `--server_name` override wasn't being honored when setting the host header, defaulting to the `--server` flag's value. This diff changes that. Reviewed By: lnicco Differential Revision: D50695638 fbshipit-source-id: f62d956a3f937ca3260a3e91862239eb2e700836 --- proxygen/httpclient/samples/httperf2/HTTPerf2.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/proxygen/httpclient/samples/httperf2/HTTPerf2.cpp b/proxygen/httpclient/samples/httperf2/HTTPerf2.cpp index 6df87ada95..7f9e9f3248 100644 --- a/proxygen/httpclient/samples/httperf2/HTTPerf2.cpp +++ b/proxygen/httpclient/samples/httperf2/HTTPerf2.cpp @@ -336,12 +336,17 @@ ClientRunner::ClientRunner(HTTPerfStats& parentStats, request_.setMethod(HTTPMethod::GET); } + serverName_ = FLAGS_server; + if (!FLAGS_server_name.empty()) { + serverName_ = FLAGS_server_name; + } + if (FLAGS_http10) { request_.setHTTPVersion(1, 0); } else { request_.setHTTPVersion(1, 1); if (!FLAGS_nohost) { - request_.getHeaders().add(HTTP_HEADER_HOST, FLAGS_server); + request_.getHeaders().add(HTTP_HEADER_HOST, serverName_); } } @@ -370,10 +375,6 @@ ClientRunner::ClientRunner(HTTPerfStats& parentStats, request_.getHeaders().add(headerName, header.substr(pos)); } } - serverName_ = FLAGS_server; - if (!FLAGS_server_name.empty()) { - serverName_ = FLAGS_server_name; - } } void ClientRunner::run() {