diff options
author | Oleg Sidorkin <osidorkin@gmail.com> | 2022-02-10 16:49:36 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:49:36 +0300 |
commit | 5ce74d4fee2d42a4b86efc02dfdc704d458760e1 (patch) | |
tree | f16a3558ca40d453a1c6a2ed764bd75d64cffade /library/cpp/http | |
parent | cd33f9aa8461f8e2b0b9e68efbb6bc9856197dc9 (diff) | |
download | ydb-5ce74d4fee2d42a4b86efc02dfdc704d458760e1.tar.gz |
Restoring authorship annotation for Oleg Sidorkin <osidorkin@gmail.com>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/http')
-rw-r--r-- | library/cpp/http/misc/httpreqdata.cpp | 6 | ||||
-rw-r--r-- | library/cpp/http/misc/httpreqdata.h | 2 | ||||
-rw-r--r-- | library/cpp/http/misc/httpreqdata_ut.cpp | 48 | ||||
-rw-r--r-- | library/cpp/http/server/http.cpp | 10 | ||||
-rw-r--r-- | library/cpp/http/server/http_ex.cpp | 4 |
5 files changed, 35 insertions, 35 deletions
diff --git a/library/cpp/http/misc/httpreqdata.cpp b/library/cpp/http/misc/httpreqdata.cpp index f6951f68cd..eeb1bb80dd 100644 --- a/library/cpp/http/misc/httpreqdata.cpp +++ b/library/cpp/http/misc/httpreqdata.cpp @@ -184,9 +184,9 @@ void TBaseServerRequestData::AddHeader(const TString& name, const TString& value if (stricmp(name.data(), "Host") == 0) { size_t hostLen = strcspn(value.data(), ":"); - if (value[hostLen] == ':') - Port = value.substr(hostLen + 1); - Host = value.substr(0, hostLen); + if (value[hostLen] == ':') + Port = value.substr(hostLen + 1); + Host = value.substr(0, hostLen); } } diff --git a/library/cpp/http/misc/httpreqdata.h b/library/cpp/http/misc/httpreqdata.h index 16e59c4d78..1f6597e68e 100644 --- a/library/cpp/http/misc/httpreqdata.h +++ b/library/cpp/http/misc/httpreqdata.h @@ -115,7 +115,7 @@ public: { Scan(); } - + void Scan() { CgiParam.Scan(QueryStringBuf()); } diff --git a/library/cpp/http/misc/httpreqdata_ut.cpp b/library/cpp/http/misc/httpreqdata_ut.cpp index e7f16ef27c..76b1a53677 100644 --- a/library/cpp/http/misc/httpreqdata_ut.cpp +++ b/library/cpp/http/misc/httpreqdata_ut.cpp @@ -6,42 +6,42 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) { Y_UNIT_TEST(Headers) { TServerRequestData sd; - sd.AddHeader("x-xx", "y-yy"); - sd.AddHeader("x-Xx", "y-yy"); + sd.AddHeader("x-xx", "y-yy"); + sd.AddHeader("x-Xx", "y-yy"); UNIT_ASSERT_VALUES_EQUAL(sd.HeadersCount(), 1); - sd.AddHeader("x-XxX", "y-yyy"); + sd.AddHeader("x-XxX", "y-yyy"); UNIT_ASSERT_VALUES_EQUAL(sd.HeadersCount(), 2); UNIT_ASSERT_VALUES_EQUAL(TStringBuf(sd.HeaderIn("X-XX")), TStringBuf("y-yy")); UNIT_ASSERT_VALUES_EQUAL(TStringBuf(sd.HeaderIn("X-XXX")), TStringBuf("y-yyy")); } Y_UNIT_TEST(ComplexHeaders) { - TServerRequestData sd; - sd.SetHost("zzz", 1); - - sd.AddHeader("x-Xx", "y-yy"); - UNIT_ASSERT_VALUES_EQUAL(sd.HeadersCount(), 1); + TServerRequestData sd; + sd.SetHost("zzz", 1); + + sd.AddHeader("x-Xx", "y-yy"); + UNIT_ASSERT_VALUES_EQUAL(sd.HeadersCount(), 1); UNIT_ASSERT_VALUES_EQUAL(TStringBuf(sd.HeaderIn("X-XX")), TStringBuf("y-yy")); - - sd.AddHeader("x-Xz", "y-yy"); - UNIT_ASSERT_VALUES_EQUAL(sd.HeadersCount(), 2); + + sd.AddHeader("x-Xz", "y-yy"); + UNIT_ASSERT_VALUES_EQUAL(sd.HeadersCount(), 2); UNIT_ASSERT_VALUES_EQUAL(TStringBuf(sd.HeaderIn("X-Xz")), TStringBuf("y-yy")); - - UNIT_ASSERT_VALUES_EQUAL(sd.ServerName(), "zzz"); - UNIT_ASSERT_VALUES_EQUAL(sd.ServerPort(), "1"); - sd.AddHeader("Host", "1234"); - UNIT_ASSERT_VALUES_EQUAL(sd.HeadersCount(), 3); + + UNIT_ASSERT_VALUES_EQUAL(sd.ServerName(), "zzz"); + UNIT_ASSERT_VALUES_EQUAL(sd.ServerPort(), "1"); + sd.AddHeader("Host", "1234"); + UNIT_ASSERT_VALUES_EQUAL(sd.HeadersCount(), 3); UNIT_ASSERT_VALUES_EQUAL(TStringBuf(sd.HeaderIn("Host")), TStringBuf("1234")); - UNIT_ASSERT_VALUES_EQUAL(sd.ServerName(), "1234"); - sd.AddHeader("Host", "12345:678"); - UNIT_ASSERT_VALUES_EQUAL(sd.HeadersCount(), 3); + UNIT_ASSERT_VALUES_EQUAL(sd.ServerName(), "1234"); + sd.AddHeader("Host", "12345:678"); + UNIT_ASSERT_VALUES_EQUAL(sd.HeadersCount(), 3); UNIT_ASSERT_VALUES_EQUAL(TStringBuf(sd.HeaderIn("Host")), TStringBuf("12345:678")); - UNIT_ASSERT_VALUES_EQUAL(sd.ServerName(), "12345"); - UNIT_ASSERT_VALUES_EQUAL(sd.ServerPort(), "678"); - } - + UNIT_ASSERT_VALUES_EQUAL(sd.ServerName(), "12345"); + UNIT_ASSERT_VALUES_EQUAL(sd.ServerPort(), "678"); + } + Y_UNIT_TEST(ParseScan) { TServerRequestData rd; @@ -133,7 +133,7 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) { UNIT_ASSERT(rd.CgiParam.Has("gta", "true")); UNIT_ASSERT(rd.CgiParam.Has("gta", "new")); } - + Y_UNIT_TEST(SetRemoteAddrSimple) { static const TString TEST = "abacaba.search.yandex.net"; diff --git a/library/cpp/http/server/http.cpp b/library/cpp/http/server/http.cpp index 128583bdd7..653e0a15f1 100644 --- a/library/cpp/http/server/http.cpp +++ b/library/cpp/http/server/http.cpp @@ -695,13 +695,13 @@ void TClientRequest::Process(void* ThreadSpecificResource) { HttpConn_->Output()->EnableCompression(HttpServ()->Options().CompressionEnabled); } - if (ParsedHeaders.empty()) { - RequestString = Input().FirstLine(); + if (ParsedHeaders.empty()) { + RequestString = Input().FirstLine(); const THttpHeaders& h = Input().Headers(); - ParsedHeaders.reserve(h.Count()); + ParsedHeaders.reserve(h.Count()); for (THttpHeaders::TConstIterator it = h.Begin(); it != h.End(); ++it) { - ParsedHeaders.emplace_back(it->Name(), it->Value()); + ParsedHeaders.emplace_back(it->Name(), it->Value()); } } @@ -750,7 +750,7 @@ void TClientRequest::ProcessFailRequest(int failstate) { ++idx; } - url = RequestString.substr(start, idx - start); + url = RequestString.substr(start, idx - start); } } diff --git a/library/cpp/http/server/http_ex.cpp b/library/cpp/http/server/http_ex.cpp index e07db22bfc..f2763f7912 100644 --- a/library/cpp/http/server/http_ex.cpp +++ b/library/cpp/http/server/http_ex.cpp @@ -22,10 +22,10 @@ bool THttpClientRequestExtension::Parse(char* req, TBaseServerRequestData& rd) { bool THttpClientRequestExtension::ProcessHeaders(TBaseServerRequestData& rd, TBlob& postData) { for (const auto& header : ParsedHeaders) { - rd.AddHeader(header.first, header.second); + rd.AddHeader(header.first, header.second); } - char* s = RequestString.begin(); + char* s = RequestString.begin(); enum EMethod { NotImplemented, |