walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fix comments of header add/override

This commit is contained in:
Kenny (kang-yen) Peng 2014-10-21 21:25:38 +00:00
parent a6e1a40c05
commit db071ca35c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/h2load.cc
View File

@ -652,7 +652,7 @@ Options:
(2**<N>)-1. For SPDY, if <N> is strictly less (2**<N>)-1. For SPDY, if <N> is strictly less
than 16, this option is ignored. Otherwise than 16, this option is ignored. Otherwise
2**<N> is used for SPDY. 2**<N> is used for SPDY.
-H, --header -H, --header=<HEADER>
Add/Override a header to the requests. Add/Override a header to the requests.
-p, --no-tls-proto=<PROTOID> -p, --no-tls-proto=<PROTOID>
Specify ALPN identifier of the protocol to be Specify ALPN identifier of the protocol to be
@ -686,7 +686,7 @@ int main(int argc, char **argv)
{"max-concurrent-streams", required_argument, nullptr, 'm'}, {"max-concurrent-streams", required_argument, nullptr, 'm'},
{"window-bits", required_argument, nullptr, 'w'}, {"window-bits", required_argument, nullptr, 'w'},
{"connection-window-bits", required_argument, nullptr, 'W'}, {"connection-window-bits", required_argument, nullptr, 'W'},
{"header", no_argument, nullptr, 'H'}, {"header", required_argument, nullptr, 'H'},
{"no-tls-proto", required_argument, nullptr, 'p'}, {"no-tls-proto", required_argument, nullptr, 'p'},
{"verbose", no_argument, nullptr, 'v'}, {"verbose", no_argument, nullptr, 'v'},
{"help", no_argument, nullptr, 'h'}, {"help", no_argument, nullptr, 'h'},
@ -868,8 +868,6 @@ int main(int argc, char **argv)
memset(&u, 0, sizeof(u)); memset(&u, 0, sizeof(u));
auto uri = argv[optind]; auto uri = argv[optind];
std::cout << uri << std::endl;
std::ifstream uri_file; std::ifstream uri_file;
std::string line_uri; std::string line_uri;
if (std::ifstream(uri)) { if (std::ifstream(uri)) {
@ -910,7 +908,7 @@ int main(int argc, char **argv)
reqlines.push_back(get_reqline(uri, u)); reqlines.push_back(get_reqline(uri, u));
} }
if (uri_file.is_open()) { if(uri_file.is_open()) {
//load rest uris from URI_LIST_FILE //load rest uris from URI_LIST_FILE
while(std::getline (uri_file, line_uri)) { while(std::getline (uri_file, line_uri)) {
auto uri = (char *)line_uri.c_str(); auto uri = (char *)line_uri.c_str();
@ -939,11 +937,15 @@ int main(int argc, char **argv)
} }
shared_nva.emplace_back(":method", "GET"); shared_nva.emplace_back(":method", "GET");
//list overridalbe headers
std::vector<std::string> override_hdrs = {":host", ":scheme", ":method"};
for(auto& kv : config.custom_headers) { for(auto& kv : config.custom_headers) {
if(util::strieq(":host", kv.first.c_str())) { if(std::find(override_hdrs.begin(), override_hdrs.end(), kv.first) != override_hdrs.end()) {
// replace :authority as :host header // override header
for(auto& nv : shared_nva) { for(auto& nv : shared_nva) {
if(nv.name == ":authority") { if( (nv.name == ":authority" && kv.first == ":host")
|| (nv.name == kv.first) ) {
nv.value = kv.second; nv.value = kv.second;
} }
} }