diff options
author | tobo <tobo@yandex-team.ru> | 2022-02-10 16:47:27 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:27 +0300 |
commit | 55a7f90e4cd31e9481cace8ee5dfd682c27e810e (patch) | |
tree | 9814fbd1c3effac9b8377c5d604b367b14e2db55 /library/cpp/http | |
parent | 7fe839092527589b38f014d854c51565b3c1adfa (diff) | |
download | ydb-55a7f90e4cd31e9481cace8ee5dfd682c27e810e.tar.gz |
Restoring authorship annotation for <tobo@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/http')
-rw-r--r-- | library/cpp/http/fetch/exthttpcodes.cpp | 82 | ||||
-rw-r--r-- | library/cpp/http/fetch/httpload.h | 2 | ||||
-rw-r--r-- | library/cpp/http/io/headers.h | 2 | ||||
-rw-r--r-- | library/cpp/http/io/headers_ut.cpp | 4 | ||||
-rw-r--r-- | library/cpp/http/io/stream.cpp | 32 | ||||
-rw-r--r-- | library/cpp/http/io/stream_ut.cpp | 4 | ||||
-rw-r--r-- | library/cpp/http/io/stream_ut_medium.cpp | 4 | ||||
-rw-r--r-- | library/cpp/http/misc/http_headers.h | 120 | ||||
-rw-r--r-- | library/cpp/http/misc/httpcodes.cpp | 130 | ||||
-rw-r--r-- | library/cpp/http/misc/httpreqdata.cpp | 4 | ||||
-rw-r--r-- | library/cpp/http/misc/httpreqdata.h | 2 | ||||
-rw-r--r-- | library/cpp/http/misc/httpreqdata_ut.cpp | 14 | ||||
-rw-r--r-- | library/cpp/http/server/options.cpp | 4 | ||||
-rw-r--r-- | library/cpp/http/server/response.cpp | 6 |
14 files changed, 205 insertions, 205 deletions
diff --git a/library/cpp/http/fetch/exthttpcodes.cpp b/library/cpp/http/fetch/exthttpcodes.cpp index 8710b1ba3a..acc05650c8 100644 --- a/library/cpp/http/fetch/exthttpcodes.cpp +++ b/library/cpp/http/fetch/exthttpcodes.cpp @@ -178,89 +178,89 @@ TStringBuf ExtHttpCodeStr(int code) noexcept { } switch (code) { case HTTP_BAD_RESPONSE_HEADER: - return TStringBuf("Bad response header"); + return TStringBuf("Bad response header"); case HTTP_CONNECTION_LOST: - return TStringBuf("Connection lost"); + return TStringBuf("Connection lost"); case HTTP_BODY_TOO_LARGE: - return TStringBuf("Body too large"); + return TStringBuf("Body too large"); case HTTP_ROBOTS_TXT_DISALLOW: - return TStringBuf("robots.txt disallow"); + return TStringBuf("robots.txt disallow"); case HTTP_BAD_URL: - return TStringBuf("Bad url"); + return TStringBuf("Bad url"); case HTTP_BAD_MIME: - return TStringBuf("Bad mime type"); + return TStringBuf("Bad mime type"); case HTTP_DNS_FAILURE: - return TStringBuf("Dns failure"); + return TStringBuf("Dns failure"); case HTTP_BAD_STATUS_CODE: - return TStringBuf("Bad status code"); + return TStringBuf("Bad status code"); case HTTP_BAD_HEADER_STRING: - return TStringBuf("Bad header string"); + return TStringBuf("Bad header string"); case HTTP_BAD_CHUNK: - return TStringBuf("Bad chunk"); + return TStringBuf("Bad chunk"); case HTTP_CONNECT_FAILED: - return TStringBuf("Connect failed"); + return TStringBuf("Connect failed"); case HTTP_FILTER_DISALLOW: - return TStringBuf("Filter disallow"); + return TStringBuf("Filter disallow"); case HTTP_LOCAL_EIO: - return TStringBuf("Local eio"); + return TStringBuf("Local eio"); case HTTP_BAD_CONTENT_LENGTH: - return TStringBuf("Bad content length"); + return TStringBuf("Bad content length"); case HTTP_BAD_ENCODING: - return TStringBuf("Bad encoding"); + return TStringBuf("Bad encoding"); case HTTP_LENGTH_UNKNOWN: - return TStringBuf("Length unknown"); + return TStringBuf("Length unknown"); case HTTP_HEADER_EOF: - return TStringBuf("Header EOF"); + return TStringBuf("Header EOF"); case HTTP_MESSAGE_EOF: - return TStringBuf("Message EOF"); + return TStringBuf("Message EOF"); case HTTP_CHUNK_EOF: - return TStringBuf("Chunk EOF"); + return TStringBuf("Chunk EOF"); case HTTP_PAST_EOF: - return TStringBuf("Past EOF"); + return TStringBuf("Past EOF"); case HTTP_HEADER_TOO_LARGE: - return TStringBuf("Header is too large"); + return TStringBuf("Header is too large"); case HTTP_URL_TOO_LARGE: - return TStringBuf("Url is too large"); + return TStringBuf("Url is too large"); case HTTP_INTERRUPTED: - return TStringBuf("Interrupted"); + return TStringBuf("Interrupted"); case HTTP_CUSTOM_NOT_MODIFIED: - return TStringBuf("Signature detector thinks that doc is not modified"); + return TStringBuf("Signature detector thinks that doc is not modified"); case HTTP_BAD_CONTENT_ENCODING: - return TStringBuf("Bad content encoding"); + return TStringBuf("Bad content encoding"); case HTTP_NO_RESOURCES: - return TStringBuf("No resources"); + return TStringBuf("No resources"); case HTTP_FETCHER_SHUTDOWN: - return TStringBuf("Fetcher shutdown"); + return TStringBuf("Fetcher shutdown"); case HTTP_CHUNK_TOO_LARGE: - return TStringBuf("Chunk size is too big"); + return TStringBuf("Chunk size is too big"); case HTTP_SERVER_BUSY: - return TStringBuf("Server is busy"); + return TStringBuf("Server is busy"); case HTTP_SERVICE_UNKNOWN: - return TStringBuf("Service is unknown"); + return TStringBuf("Service is unknown"); case HTTP_PROXY_UNKNOWN: - return TStringBuf("Zora: unknown error"); + return TStringBuf("Zora: unknown error"); case HTTP_PROXY_REQUEST_TIME_OUT: - return TStringBuf("Zora: request time out"); + return TStringBuf("Zora: request time out"); case HTTP_PROXY_INTERNAL_ERROR: - return TStringBuf("Zora: internal server error"); + return TStringBuf("Zora: internal server error"); case HTTP_PROXY_CONNECT_FAILED: - return TStringBuf("Spider proxy connect failed"); + return TStringBuf("Spider proxy connect failed"); case HTTP_PROXY_CONNECTION_LOST: - return TStringBuf("Spider proxy connection lost"); + return TStringBuf("Spider proxy connection lost"); case HTTP_PROXY_NO_PROXY: - return TStringBuf("Spider proxy no proxy alive in region"); + return TStringBuf("Spider proxy no proxy alive in region"); case HTTP_PROXY_ERROR: - return TStringBuf("Spider proxy returned custom error"); + return TStringBuf("Spider proxy returned custom error"); case HTTP_SSL_ERROR: - return TStringBuf("Ssl library returned error"); + return TStringBuf("Ssl library returned error"); case HTTP_CACHED_COPY_NOT_FOUND: - return TStringBuf("Cached copy for the url is not available"); + return TStringBuf("Cached copy for the url is not available"); case HTTP_TIMEDOUT_WHILE_BYTES_RECEIVING: - return TStringBuf("Timed out while bytes receiving"); + return TStringBuf("Timed out while bytes receiving"); // TODO: messages for >2000 codes default: - return TStringBuf("Unknown HTTP code"); + return TStringBuf("Unknown HTTP code"); } } diff --git a/library/cpp/http/fetch/httpload.h b/library/cpp/http/fetch/httpload.h index 1f9530af79..e22e4b809e 100644 --- a/library/cpp/http/fetch/httpload.h +++ b/library/cpp/http/fetch/httpload.h @@ -103,7 +103,7 @@ public: /********************************************************/ // Here is httpAgent that uses socketAbstractHandler class // ant its derivatives -using httpSpecialAgent = THttpAgent<TSocketHandlerPtr>; +using httpSpecialAgent = THttpAgent<TSocketHandlerPtr>; /********************************************************/ // Regular handler is used as implementation of diff --git a/library/cpp/http/io/headers.h b/library/cpp/http/io/headers.h index 133adc3ddb..a71793d1c6 100644 --- a/library/cpp/http/io/headers.h +++ b/library/cpp/http/io/headers.h @@ -35,7 +35,7 @@ public: /// Возвращает строку "имя параметра: значение". inline TString ToString() const { - return Name_ + TStringBuf(": ") + Value_; + return Name_ + TStringBuf(": ") + Value_; } private: diff --git a/library/cpp/http/io/headers_ut.cpp b/library/cpp/http/io/headers_ut.cpp index 34f2270421..1d23ef8fdc 100644 --- a/library/cpp/http/io/headers_ut.cpp +++ b/library/cpp/http/io/headers_ut.cpp @@ -9,7 +9,7 @@ namespace { class THeadersExistence { public: - THeadersExistence() = default; + THeadersExistence() = default; THeadersExistence(const THttpHeaders& headers) { for (THttpHeaders::TConstIterator it = headers.Begin(); @@ -155,7 +155,7 @@ void THttpHeadersTest::TestAddHeaderTemplateness() { THttpHeaders h1; h1.AddHeader("h1", "v1"); h1.AddHeader("h2", TString("v2")); - h1.AddHeader("h3", TStringBuf("v3")); + h1.AddHeader("h3", TStringBuf("v3")); h1.AddHeader("h4", TStringBuf("v4")); THeadersExistence h2; diff --git a/library/cpp/http/io/stream.cpp b/library/cpp/http/io/stream.cpp index 966c937832..6689be684f 100644 --- a/library/cpp/http/io/stream.cpp +++ b/library/cpp/http/io/stream.cpp @@ -27,15 +27,15 @@ if (!stricmp((header).Name().data(), str)) namespace { - inline size_t SuggestBufferSize() { + inline size_t SuggestBufferSize() { return 8192; } - inline TStringBuf Trim(const char* b, const char* e) noexcept { + inline TStringBuf Trim(const char* b, const char* e) noexcept { return StripString(TStringBuf(b, e)); } - inline TStringBuf RmSemiColon(const TStringBuf& s) { + inline TStringBuf RmSemiColon(const TStringBuf& s) { return s.Before(';'); } @@ -235,7 +235,7 @@ private: struct TTrEnc { inline void operator()(const TStringBuf& s) { - if (s == TStringBuf("chunked")) { + if (s == TStringBuf("chunked")) { p->Chunked = true; } } @@ -642,7 +642,7 @@ private: inline bool HasResponseBody() const noexcept { if (IsHttpResponse()) { - if (Request_ && Request_->FirstLine().StartsWith(TStringBuf("HEAD"))) + if (Request_ && Request_->FirstLine().StartsWith(TStringBuf("HEAD"))) return false; if (FirstLine_.size() > 9 && strncmp(FirstLine_.data() + 9, "204", 3) == 0) return false; @@ -815,13 +815,13 @@ private: const THttpInputHeader& header = *h; const TString hl = to_lower(header.Name()); - if (hl == TStringBuf("connection")) { - keepAlive = to_lower(header.Value()) == TStringBuf("keep-alive"); - } else if (IsCompressionHeaderEnabled() && hl == TStringBuf("content-encoding")) { + if (hl == TStringBuf("connection")) { + keepAlive = to_lower(header.Value()) == TStringBuf("keep-alive"); + } else if (IsCompressionHeaderEnabled() && hl == TStringBuf("content-encoding")) { encoder = TCompressionCodecFactory::Instance().FindEncoder(to_lower(header.Value())); - } else if (hl == TStringBuf("transfer-encoding")) { - chunked = to_lower(header.Value()) == TStringBuf("chunked"); - } else if (hl == TStringBuf("content-length")) { + } else if (hl == TStringBuf("transfer-encoding")) { + chunked = to_lower(header.Value()) == TStringBuf("chunked"); + } else if (hl == TStringBuf("content-length")) { haveContentLength = true; } } @@ -980,17 +980,17 @@ void SendMinimalHttpRequest(TSocket& s, const TStringBuf& host, const TStringBuf output.EnableCompression(false); const IOutputStream::TPart parts[] = { - IOutputStream::TPart(TStringBuf("GET ")), + IOutputStream::TPart(TStringBuf("GET ")), IOutputStream::TPart(request), - IOutputStream::TPart(TStringBuf(" HTTP/1.1")), + IOutputStream::TPart(TStringBuf(" HTTP/1.1")), IOutputStream::TPart::CrLf(), - IOutputStream::TPart(TStringBuf("Host: ")), + IOutputStream::TPart(TStringBuf("Host: ")), IOutputStream::TPart(host), IOutputStream::TPart::CrLf(), - IOutputStream::TPart(TStringBuf("User-Agent: ")), + IOutputStream::TPart(TStringBuf("User-Agent: ")), IOutputStream::TPart(agent), IOutputStream::TPart::CrLf(), - IOutputStream::TPart(TStringBuf("From: ")), + IOutputStream::TPart(TStringBuf("From: ")), IOutputStream::TPart(from), IOutputStream::TPart::CrLf(), IOutputStream::TPart::CrLf(), diff --git a/library/cpp/http/io/stream_ut.cpp b/library/cpp/http/io/stream_ut.cpp index 2256eb9f71..1ea35df675 100644 --- a/library/cpp/http/io/stream_ut.cpp +++ b/library/cpp/http/io/stream_ut.cpp @@ -634,7 +634,7 @@ Y_UNIT_TEST_SUITE(THttpStreamTest) { } private: - TString Data_{TStringBuf("HEAD / HTTP/1.1\r\nHost: yandex.ru\r\n\r\n")}; + TString Data_{TStringBuf("HEAD / HTTP/1.1\r\nHost: yandex.ru\r\n\r\n")}; size_t Pos_{0}; bool Eof_{false}; }; @@ -662,7 +662,7 @@ Y_UNIT_TEST_SUITE(THttpStreamTest) { out << ""; out.Finish(); TString result = outBuf.Str(); - UNIT_ASSERT(!result.Contains(TStringBuf("0\r\n"))); + UNIT_ASSERT(!result.Contains(TStringBuf("0\r\n"))); } Y_UNIT_TEST(TestHttpOutputDisableCompressionHeader) { diff --git a/library/cpp/http/io/stream_ut_medium.cpp b/library/cpp/http/io/stream_ut_medium.cpp index c1e42b97d1..2c125eb21e 100644 --- a/library/cpp/http/io/stream_ut_medium.cpp +++ b/library/cpp/http/io/stream_ut_medium.cpp @@ -7,11 +7,11 @@ Y_UNIT_TEST_SUITE(THttpTestMedium) { TStringBuf data = "aaaaaaaaaaaaaaaaaaaaaaa"; for (auto codec : SupportedCodings()) { - if (codec == TStringBuf("z-zlib-0")) { + if (codec == TStringBuf("z-zlib-0")) { continue; } - if (codec == TStringBuf("z-null")) { + if (codec == TStringBuf("z-null")) { continue; } diff --git a/library/cpp/http/misc/http_headers.h b/library/cpp/http/misc/http_headers.h index 9c17ef1c66..ff359937fa 100644 --- a/library/cpp/http/misc/http_headers.h +++ b/library/cpp/http/misc/http_headers.h @@ -9,64 +9,64 @@ * https://github.com/spring-projects/spring-framework/blob/816bbee8de584676250e2bc5dcff6da6cd81623f/spring-web/src/main/java/org/springframework/http/HttpHeaders.java */ namespace NHttpHeaders { - constexpr TStringBuf ACCEPT = "Accept"; - constexpr TStringBuf ACCEPT_CHARSET = "Accept-Charset"; - constexpr TStringBuf ACCEPT_ENCODING = "Accept-Encoding"; - constexpr TStringBuf ACCEPT_LANGUAGE = "Accept-Language"; - constexpr TStringBuf ACCEPT_RANGES = "Accept-Ranges"; - constexpr TStringBuf ACCESS_CONTROL_ALLOW_CREDENTIALS = "Access-Control-Allow-Credentials"; - constexpr TStringBuf ACCESS_CONTROL_ALLOW_HEADERS = "Access-Control-Allow-Headers"; - constexpr TStringBuf ACCESS_CONTROL_ALLOW_METHODS = "Access-Control-Allow-Methods"; - constexpr TStringBuf ACCESS_CONTROL_ALLOW_ORIGIN = "Access-Control-Allow-Origin"; - constexpr TStringBuf ACCESS_CONTROL_EXPOSE_HEADERS = "Access-Control-Expose-Headers"; - constexpr TStringBuf ACCESS_CONTROL_MAX_AGE = "Access-Control-Max-Age"; - constexpr TStringBuf ACCESS_CONTROL_REQUEST_HEADERS = "Access-Control-Request-Headers"; - constexpr TStringBuf ACCESS_CONTROL_REQUEST_METHOD = "Access-Control-Request-Method"; - constexpr TStringBuf AGE = "Age"; - constexpr TStringBuf ALLOW = "Allow"; - constexpr TStringBuf AUTHORIZATION = "Authorization"; - constexpr TStringBuf CACHE_CONTROL = "Cache-Control"; - constexpr TStringBuf CONNECTION = "Connection"; - constexpr TStringBuf CONTENT_ENCODING = "Content-Encoding"; - constexpr TStringBuf CONTENT_DISPOSITION = "Content-Disposition"; - constexpr TStringBuf CONTENT_LANGUAGE = "Content-Language"; - constexpr TStringBuf CONTENT_LENGTH = "Content-Length"; - constexpr TStringBuf CONTENT_LOCATION = "Content-Location"; - constexpr TStringBuf CONTENT_RANGE = "Content-Range"; - constexpr TStringBuf CONTENT_TYPE = "Content-Type"; - constexpr TStringBuf COOKIE = "Cookie"; - constexpr TStringBuf DATE = "Date"; - constexpr TStringBuf ETAG = "ETag"; - constexpr TStringBuf EXPECT = "Expect"; - constexpr TStringBuf EXPIRES = "Expires"; - constexpr TStringBuf FROM = "From"; - constexpr TStringBuf HOST = "Host"; - constexpr TStringBuf IF_MATCH = "If-Match"; - constexpr TStringBuf IF_MODIFIED_SINCE = "If-Modified-Since"; - constexpr TStringBuf IF_NONE_MATCH = "If-None-Match"; - constexpr TStringBuf IF_RANGE = "If-Range"; - constexpr TStringBuf IF_UNMODIFIED_SINCE = "If-Unmodified-Since"; - constexpr TStringBuf LAST_MODIFIED = "Last-Modified"; - constexpr TStringBuf LINK = "Link"; - constexpr TStringBuf LOCATION = "Location"; - constexpr TStringBuf MAX_FORWARDS = "Max-Forwards"; - constexpr TStringBuf ORIGIN = "Origin"; - constexpr TStringBuf PRAGMA = "Pragma"; - constexpr TStringBuf PROXY_AUTHENTICATE = "Proxy-Authenticate"; - constexpr TStringBuf PROXY_AUTHORIZATION = "Proxy-Authorization"; - constexpr TStringBuf RANGE = "Range"; - constexpr TStringBuf REFERER = "Referer"; - constexpr TStringBuf RETRY_AFTER = "Retry-After"; - constexpr TStringBuf SERVER = "Server"; - constexpr TStringBuf SET_COOKIE = "Set-Cookie"; - constexpr TStringBuf SET_COOKIE2 = "Set-Cookie2"; - constexpr TStringBuf TE = "TE"; - constexpr TStringBuf TRAILER = "Trailer"; - constexpr TStringBuf TRANSFER_ENCODING = "Transfer-Encoding"; - constexpr TStringBuf UPGRADE = "Upgrade"; - constexpr TStringBuf USER_AGENT = "User-Agent"; - constexpr TStringBuf VARY = "Vary"; - constexpr TStringBuf VIA = "Via"; - constexpr TStringBuf WARNING = "Warning"; - constexpr TStringBuf WWW_AUTHENTICATE = "WWW-Authenticate"; + constexpr TStringBuf ACCEPT = "Accept"; + constexpr TStringBuf ACCEPT_CHARSET = "Accept-Charset"; + constexpr TStringBuf ACCEPT_ENCODING = "Accept-Encoding"; + constexpr TStringBuf ACCEPT_LANGUAGE = "Accept-Language"; + constexpr TStringBuf ACCEPT_RANGES = "Accept-Ranges"; + constexpr TStringBuf ACCESS_CONTROL_ALLOW_CREDENTIALS = "Access-Control-Allow-Credentials"; + constexpr TStringBuf ACCESS_CONTROL_ALLOW_HEADERS = "Access-Control-Allow-Headers"; + constexpr TStringBuf ACCESS_CONTROL_ALLOW_METHODS = "Access-Control-Allow-Methods"; + constexpr TStringBuf ACCESS_CONTROL_ALLOW_ORIGIN = "Access-Control-Allow-Origin"; + constexpr TStringBuf ACCESS_CONTROL_EXPOSE_HEADERS = "Access-Control-Expose-Headers"; + constexpr TStringBuf ACCESS_CONTROL_MAX_AGE = "Access-Control-Max-Age"; + constexpr TStringBuf ACCESS_CONTROL_REQUEST_HEADERS = "Access-Control-Request-Headers"; + constexpr TStringBuf ACCESS_CONTROL_REQUEST_METHOD = "Access-Control-Request-Method"; + constexpr TStringBuf AGE = "Age"; + constexpr TStringBuf ALLOW = "Allow"; + constexpr TStringBuf AUTHORIZATION = "Authorization"; + constexpr TStringBuf CACHE_CONTROL = "Cache-Control"; + constexpr TStringBuf CONNECTION = "Connection"; + constexpr TStringBuf CONTENT_ENCODING = "Content-Encoding"; + constexpr TStringBuf CONTENT_DISPOSITION = "Content-Disposition"; + constexpr TStringBuf CONTENT_LANGUAGE = "Content-Language"; + constexpr TStringBuf CONTENT_LENGTH = "Content-Length"; + constexpr TStringBuf CONTENT_LOCATION = "Content-Location"; + constexpr TStringBuf CONTENT_RANGE = "Content-Range"; + constexpr TStringBuf CONTENT_TYPE = "Content-Type"; + constexpr TStringBuf COOKIE = "Cookie"; + constexpr TStringBuf DATE = "Date"; + constexpr TStringBuf ETAG = "ETag"; + constexpr TStringBuf EXPECT = "Expect"; + constexpr TStringBuf EXPIRES = "Expires"; + constexpr TStringBuf FROM = "From"; + constexpr TStringBuf HOST = "Host"; + constexpr TStringBuf IF_MATCH = "If-Match"; + constexpr TStringBuf IF_MODIFIED_SINCE = "If-Modified-Since"; + constexpr TStringBuf IF_NONE_MATCH = "If-None-Match"; + constexpr TStringBuf IF_RANGE = "If-Range"; + constexpr TStringBuf IF_UNMODIFIED_SINCE = "If-Unmodified-Since"; + constexpr TStringBuf LAST_MODIFIED = "Last-Modified"; + constexpr TStringBuf LINK = "Link"; + constexpr TStringBuf LOCATION = "Location"; + constexpr TStringBuf MAX_FORWARDS = "Max-Forwards"; + constexpr TStringBuf ORIGIN = "Origin"; + constexpr TStringBuf PRAGMA = "Pragma"; + constexpr TStringBuf PROXY_AUTHENTICATE = "Proxy-Authenticate"; + constexpr TStringBuf PROXY_AUTHORIZATION = "Proxy-Authorization"; + constexpr TStringBuf RANGE = "Range"; + constexpr TStringBuf REFERER = "Referer"; + constexpr TStringBuf RETRY_AFTER = "Retry-After"; + constexpr TStringBuf SERVER = "Server"; + constexpr TStringBuf SET_COOKIE = "Set-Cookie"; + constexpr TStringBuf SET_COOKIE2 = "Set-Cookie2"; + constexpr TStringBuf TE = "TE"; + constexpr TStringBuf TRAILER = "Trailer"; + constexpr TStringBuf TRANSFER_ENCODING = "Transfer-Encoding"; + constexpr TStringBuf UPGRADE = "Upgrade"; + constexpr TStringBuf USER_AGENT = "User-Agent"; + constexpr TStringBuf VARY = "Vary"; + constexpr TStringBuf VIA = "Via"; + constexpr TStringBuf WARNING = "Warning"; + constexpr TStringBuf WWW_AUTHENTICATE = "WWW-Authenticate"; } // namespace HttpHeaders diff --git a/library/cpp/http/misc/httpcodes.cpp b/library/cpp/http/misc/httpcodes.cpp index 2514be1fa3..ad8c80ac1e 100644 --- a/library/cpp/http/misc/httpcodes.cpp +++ b/library/cpp/http/misc/httpcodes.cpp @@ -3,139 +3,139 @@ TStringBuf HttpCodeStrEx(int code) noexcept { switch (code) { case HTTP_CONTINUE: - return TStringBuf("100 Continue"); + return TStringBuf("100 Continue"); case HTTP_SWITCHING_PROTOCOLS: - return TStringBuf("101 Switching protocols"); + return TStringBuf("101 Switching protocols"); case HTTP_PROCESSING: - return TStringBuf("102 Processing"); + return TStringBuf("102 Processing"); case HTTP_OK: - return TStringBuf("200 Ok"); + return TStringBuf("200 Ok"); case HTTP_CREATED: - return TStringBuf("201 Created"); + return TStringBuf("201 Created"); case HTTP_ACCEPTED: - return TStringBuf("202 Accepted"); + return TStringBuf("202 Accepted"); case HTTP_NON_AUTHORITATIVE_INFORMATION: - return TStringBuf("203 None authoritative information"); + return TStringBuf("203 None authoritative information"); case HTTP_NO_CONTENT: - return TStringBuf("204 No content"); + return TStringBuf("204 No content"); case HTTP_RESET_CONTENT: - return TStringBuf("205 Reset content"); + return TStringBuf("205 Reset content"); case HTTP_PARTIAL_CONTENT: - return TStringBuf("206 Partial content"); + return TStringBuf("206 Partial content"); case HTTP_MULTI_STATUS: - return TStringBuf("207 Multi status"); + return TStringBuf("207 Multi status"); case HTTP_ALREADY_REPORTED: - return TStringBuf("208 Already reported"); + return TStringBuf("208 Already reported"); case HTTP_IM_USED: - return TStringBuf("226 IM used"); + return TStringBuf("226 IM used"); case HTTP_MULTIPLE_CHOICES: - return TStringBuf("300 Multiple choices"); + return TStringBuf("300 Multiple choices"); case HTTP_MOVED_PERMANENTLY: - return TStringBuf("301 Moved permanently"); + return TStringBuf("301 Moved permanently"); case HTTP_FOUND: - return TStringBuf("302 Moved temporarily"); + return TStringBuf("302 Moved temporarily"); case HTTP_SEE_OTHER: - return TStringBuf("303 See other"); + return TStringBuf("303 See other"); case HTTP_NOT_MODIFIED: - return TStringBuf("304 Not modified"); + return TStringBuf("304 Not modified"); case HTTP_USE_PROXY: - return TStringBuf("305 Use proxy"); + return TStringBuf("305 Use proxy"); case HTTP_TEMPORARY_REDIRECT: - return TStringBuf("307 Temporarily redirect"); + return TStringBuf("307 Temporarily redirect"); case HTTP_PERMANENT_REDIRECT: - return TStringBuf("308 Permanent redirect"); + return TStringBuf("308 Permanent redirect"); case HTTP_BAD_REQUEST: - return TStringBuf("400 Bad request"); + return TStringBuf("400 Bad request"); case HTTP_UNAUTHORIZED: - return TStringBuf("401 Unauthorized"); + return TStringBuf("401 Unauthorized"); case HTTP_PAYMENT_REQUIRED: - return TStringBuf("402 Payment required"); + return TStringBuf("402 Payment required"); case HTTP_FORBIDDEN: - return TStringBuf("403 Forbidden"); + return TStringBuf("403 Forbidden"); case HTTP_NOT_FOUND: - return TStringBuf("404 Not found"); + return TStringBuf("404 Not found"); case HTTP_METHOD_NOT_ALLOWED: - return TStringBuf("405 Method not allowed"); + return TStringBuf("405 Method not allowed"); case HTTP_NOT_ACCEPTABLE: - return TStringBuf("406 Not acceptable"); + return TStringBuf("406 Not acceptable"); case HTTP_PROXY_AUTHENTICATION_REQUIRED: - return TStringBuf("407 Proxy Authentication required"); + return TStringBuf("407 Proxy Authentication required"); case HTTP_REQUEST_TIME_OUT: - return TStringBuf("408 Request time out"); + return TStringBuf("408 Request time out"); case HTTP_CONFLICT: - return TStringBuf("409 Conflict"); + return TStringBuf("409 Conflict"); case HTTP_GONE: - return TStringBuf("410 Gone"); + return TStringBuf("410 Gone"); case HTTP_LENGTH_REQUIRED: - return TStringBuf("411 Length required"); + return TStringBuf("411 Length required"); case HTTP_PRECONDITION_FAILED: - return TStringBuf("412 Precondition failed"); + return TStringBuf("412 Precondition failed"); case HTTP_REQUEST_ENTITY_TOO_LARGE: - return TStringBuf("413 Request entity too large"); + return TStringBuf("413 Request entity too large"); case HTTP_REQUEST_URI_TOO_LARGE: - return TStringBuf("414 Request uri too large"); + return TStringBuf("414 Request uri too large"); case HTTP_UNSUPPORTED_MEDIA_TYPE: - return TStringBuf("415 Unsupported media type"); + return TStringBuf("415 Unsupported media type"); case HTTP_REQUESTED_RANGE_NOT_SATISFIABLE: - return TStringBuf("416 Requested Range Not Satisfiable"); + return TStringBuf("416 Requested Range Not Satisfiable"); case HTTP_EXPECTATION_FAILED: - return TStringBuf("417 Expectation Failed"); + return TStringBuf("417 Expectation Failed"); case HTTP_I_AM_A_TEAPOT: - return TStringBuf("418 I Am A Teapot"); + return TStringBuf("418 I Am A Teapot"); case HTTP_AUTHENTICATION_TIMEOUT: - return TStringBuf("419 Authentication Timeout"); + return TStringBuf("419 Authentication Timeout"); case HTTP_MISDIRECTED_REQUEST: - return TStringBuf("421 Misdirected Request"); + return TStringBuf("421 Misdirected Request"); case HTTP_UNPROCESSABLE_ENTITY: - return TStringBuf("422 Unprocessable Entity"); + return TStringBuf("422 Unprocessable Entity"); case HTTP_LOCKED: - return TStringBuf("423 Locked"); + return TStringBuf("423 Locked"); case HTTP_FAILED_DEPENDENCY: - return TStringBuf("424 Failed Dependency"); + return TStringBuf("424 Failed Dependency"); case HTTP_UNORDERED_COLLECTION: - return TStringBuf("425 Unordered Collection"); + return TStringBuf("425 Unordered Collection"); case HTTP_UPGRADE_REQUIRED: - return TStringBuf("426 Upgrade Required"); + return TStringBuf("426 Upgrade Required"); case HTTP_PRECONDITION_REQUIRED: - return TStringBuf("428 Precondition Required"); + return TStringBuf("428 Precondition Required"); case HTTP_TOO_MANY_REQUESTS: - return TStringBuf("429 Too Many Requests"); + return TStringBuf("429 Too Many Requests"); case HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE: - return TStringBuf("431 Request Header Fields Too Large"); + return TStringBuf("431 Request Header Fields Too Large"); case HTTP_UNAVAILABLE_FOR_LEGAL_REASONS: - return TStringBuf("451 Unavailable For Legal Reason"); + return TStringBuf("451 Unavailable For Legal Reason"); case HTTP_INTERNAL_SERVER_ERROR: - return TStringBuf("500 Internal server error"); + return TStringBuf("500 Internal server error"); case HTTP_NOT_IMPLEMENTED: - return TStringBuf("501 Not implemented"); + return TStringBuf("501 Not implemented"); case HTTP_BAD_GATEWAY: - return TStringBuf("502 Bad gateway"); + return TStringBuf("502 Bad gateway"); case HTTP_SERVICE_UNAVAILABLE: - return TStringBuf("503 Service unavailable"); + return TStringBuf("503 Service unavailable"); case HTTP_GATEWAY_TIME_OUT: - return TStringBuf("504 Gateway time out"); + return TStringBuf("504 Gateway time out"); case HTTP_HTTP_VERSION_NOT_SUPPORTED: - return TStringBuf("505 HTTP version not supported"); + return TStringBuf("505 HTTP version not supported"); case HTTP_VARIANT_ALSO_NEGOTIATES: - return TStringBuf("506 Variant also negotiates"); + return TStringBuf("506 Variant also negotiates"); case HTTP_INSUFFICIENT_STORAGE: - return TStringBuf("507 Insufficient storage"); + return TStringBuf("507 Insufficient storage"); case HTTP_LOOP_DETECTED: - return TStringBuf("508 Loop Detected"); + return TStringBuf("508 Loop Detected"); case HTTP_BANDWIDTH_LIMIT_EXCEEDED: - return TStringBuf("509 Bandwidth Limit Exceeded"); + return TStringBuf("509 Bandwidth Limit Exceeded"); case HTTP_NOT_EXTENDED: - return TStringBuf("510 Not Extended"); + return TStringBuf("510 Not Extended"); case HTTP_NETWORK_AUTHENTICATION_REQUIRED: - return TStringBuf("511 Network Authentication Required"); + return TStringBuf("511 Network Authentication Required"); case HTTP_UNASSIGNED_512: - return TStringBuf("512 Unassigned"); + return TStringBuf("512 Unassigned"); default: - return TStringBuf("000 Unknown HTTP code"); + return TStringBuf("000 Unknown HTTP code"); } } diff --git a/library/cpp/http/misc/httpreqdata.cpp b/library/cpp/http/misc/httpreqdata.cpp index 0d3ed0ecee..f6951f68cd 100644 --- a/library/cpp/http/misc/httpreqdata.cpp +++ b/library/cpp/http/misc/httpreqdata.cpp @@ -64,7 +64,7 @@ const char* TBaseServerRequestData::RemoteAddr() const { return Addr; } -const char* TBaseServerRequestData::HeaderIn(TStringBuf key) const { +const char* TBaseServerRequestData::HeaderIn(TStringBuf key) const { auto it = HeadersIn_.find(key); if (it == HeadersIn_.end()) { @@ -86,7 +86,7 @@ TString TBaseServerRequestData::HeaderByIndex(size_t n) const noexcept { --n; } - return TString(i->first) + TStringBuf(": ") + i->second; + return TString(i->first) + TStringBuf(": ") + i->second; } const char* TBaseServerRequestData::Environment(const char* key) const { diff --git a/library/cpp/http/misc/httpreqdata.h b/library/cpp/http/misc/httpreqdata.h index 938a8f54e1..16e59c4d78 100644 --- a/library/cpp/http/misc/httpreqdata.h +++ b/library/cpp/http/misc/httpreqdata.h @@ -58,7 +58,7 @@ public: void AppendQueryString(const char* str, size_t length); const char* RemoteAddr() const; void SetRemoteAddr(TStringBuf addr); - const char* HeaderIn(TStringBuf key) const; + const char* HeaderIn(TStringBuf key) const; const THttpHeadersContainer& HeadersIn() const { return HeadersIn_; diff --git a/library/cpp/http/misc/httpreqdata_ut.cpp b/library/cpp/http/misc/httpreqdata_ut.cpp index 13e493a76f..e7f16ef27c 100644 --- a/library/cpp/http/misc/httpreqdata_ut.cpp +++ b/library/cpp/http/misc/httpreqdata_ut.cpp @@ -13,8 +13,8 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) { 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")); + 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) { @@ -23,21 +23,21 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) { 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")); + 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); - UNIT_ASSERT_VALUES_EQUAL(TStringBuf(sd.HeaderIn("X-Xz")), TStringBuf("y-yy")); + 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(TStringBuf(sd.HeaderIn("Host")), TStringBuf("1234")); + 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(TStringBuf(sd.HeaderIn("Host")), TStringBuf("12345:678")); + 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"); } @@ -122,7 +122,7 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) { UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), qs); UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), rd.OrigQueryStringBuf()); - constexpr TStringBuf appendix = "gta=true>a=new"; + constexpr TStringBuf appendix = "gta=true>a=new"; rd.AppendQueryString(appendix.data(), appendix.size()); UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), qs + '&' + appendix); diff --git a/library/cpp/http/server/options.cpp b/library/cpp/http/server/options.cpp index 0d645b9d73..05c954384a 100644 --- a/library/cpp/http/server/options.cpp +++ b/library/cpp/http/server/options.cpp @@ -7,14 +7,14 @@ #include <util/generic/hash_set.h> #include <util/generic/yexception.h> -using TAddr = THttpServerOptions::TAddr; +using TAddr = THttpServerOptions::TAddr; static inline TString AddrToString(const TAddr& addr) { return addr.Addr + ":" + ToString(addr.Port); } static inline TNetworkAddress ToNetworkAddr(const TString& address, ui16 port) { - if (address.empty() || address == TStringBuf("*")) { + if (address.empty() || address == TStringBuf("*")) { return TNetworkAddress(port); } diff --git a/library/cpp/http/server/response.cpp b/library/cpp/http/server/response.cpp index 28581427e1..52d64c91ce 100644 --- a/library/cpp/http/server/response.cpp +++ b/library/cpp/http/server/response.cpp @@ -25,14 +25,14 @@ void THttpResponse::OutTo(IOutputStream& os) const { parts.reserve(FIRST_LINE_PARTS + HEADERS_PARTS + CONTENT_PARTS); // first line - parts.push_back(IOutputStream::TPart(TStringBuf("HTTP/1.1 "))); + parts.push_back(IOutputStream::TPart(TStringBuf("HTTP/1.1 "))); parts.push_back(IOutputStream::TPart(HttpCodeStrEx(Code))); parts.push_back(IOutputStream::TPart::CrLf()); // headers for (THttpHeaders::TConstIterator i = Headers.Begin(); i != Headers.End(); ++i) { parts.push_back(IOutputStream::TPart(i->Name())); - parts.push_back(IOutputStream::TPart(TStringBuf(": "))); + parts.push_back(IOutputStream::TPart(TStringBuf(": "))); parts.push_back(IOutputStream::TPart(i->Value())); parts.push_back(IOutputStream::TPart::CrLf()); } @@ -44,7 +44,7 @@ void THttpResponse::OutTo(IOutputStream& os) const { mo << Content.size(); - parts.push_back(IOutputStream::TPart(TStringBuf("Content-Length: "))); + parts.push_back(IOutputStream::TPart(TStringBuf("Content-Length: "))); parts.push_back(IOutputStream::TPart(buf, mo.Buf() - buf)); parts.push_back(IOutputStream::TPart::CrLf()); } |