diff options
author | itelichko <itelichko@yandex-team.ru> | 2022-02-10 16:49:50 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:49:50 +0300 |
commit | fd9f6ba99c923c73177f22c99ae5135d3508b4a1 (patch) | |
tree | bdfd1fd4d29b10bcc601bcbda1f228bc50d84ca0 | |
parent | fb6895c3749017e4fe6217d7a2dd7d6f2f136403 (diff) | |
download | ydb-fd9f6ba99c923c73177f22c99ae5135d3508b4a1.tar.gz |
Restoring authorship annotation for <itelichko@yandex-team.ru>. Commit 1 of 2.
-rw-r--r-- | library/cpp/http/fetch/httpfsm.rl6 | 46 | ||||
-rw-r--r-- | library/cpp/http/fetch/httpheader.cpp | 2 | ||||
-rw-r--r-- | library/cpp/http/fetch/httpheader.h | 4 | ||||
-rw-r--r-- | ydb/core/protos/services.proto | 18 |
4 files changed, 35 insertions, 35 deletions
diff --git a/library/cpp/http/fetch/httpfsm.rl6 b/library/cpp/http/fetch/httpfsm.rl6 index eab0328b18..c457f99ad0 100644 --- a/library/cpp/http/fetch/httpfsm.rl6 +++ b/library/cpp/http/fetch/httpfsm.rl6 @@ -265,7 +265,7 @@ location = "location"i def loc_url eoh %set_location; refresh = "refresh"i def int ';' lws "url="i loc_url eoh %set_location; ################# x-robots-tag ################ -action set_x_robots { +action set_x_robots { if (hd && AcceptingXRobots) { if (I > 0) hd->x_robots_tag |= I; @@ -285,7 +285,7 @@ x_robots_directive = "none"i %{c(3)} | "all"i %{c(-3)} | "noindex"i %{c(1)} | "index"i %{c(-1)} | "nofollow"i %{c(2)} | "follow"i %{c(-2)} | "noarchive"i %{c(4)} | "archive"i %{c(-4)} - | "noyaca"i %{c(16)} + | "noyaca"i %{c(16)} | "noodp"i %{c(8)}; any_value = (any_text_char - [, \t])+ (lws (any_text_char - [, \t])+)*; @@ -507,24 +507,24 @@ action set_if_modified_since { if_modified_since = "if-modified-since"i def http_date eoh %set_if_modified_since; -################ retry-after ################ -action set_retry_after_withdate { - if (hd) { - hd->retry_after = DateTimeFields.ToTimeT(-1); - } -} - -action set_retry_after_withdelta { - if (hd) { - hd->retry_after = TInstant::Now().Seconds() + I; - } -} - -retry_after_withdate = "retry-after"i def http_date eoh - %set_retry_after_withdate; -retry_after_withdelta = "retry-after"i def int eoh - %set_retry_after_withdelta; - +################ retry-after ################ +action set_retry_after_withdate { + if (hd) { + hd->retry_after = DateTimeFields.ToTimeT(-1); + } +} + +action set_retry_after_withdelta { + if (hd) { + hd->retry_after = TInstant::Now().Seconds() + I; + } +} + +retry_after_withdate = "retry-after"i def http_date eoh + %set_retry_after_withdate; +retry_after_withdelta = "retry-after"i def int eoh + %set_retry_after_withdelta; + ############## request-cache-control ############## action SETMAXAGE { if (request_hd) request_hd->max_age = I; } @@ -580,9 +580,9 @@ response_header = message_header $0 | x_robots_tag @1 | rel_canonical @1 | hreflang @1 - | squid_error @1 - | retry_after_withdate @1 - | retry_after_withdelta @1; + | squid_error @1 + | retry_after_withdate @1 + | retry_after_withdelta @1; request_header = message_header $0 | from_header @1 | host_header @1 diff --git a/library/cpp/http/fetch/httpheader.cpp b/library/cpp/http/fetch/httpheader.cpp index 7d2225b8b7..7561795b4a 100644 --- a/library/cpp/http/fetch/httpheader.cpp +++ b/library/cpp/http/fetch/httpheader.cpp @@ -1,6 +1,6 @@ #include "httpheader.h" -const i64 DEFAULT_RETRY_AFTER = -1; +const i64 DEFAULT_RETRY_AFTER = -1; const i64 DEFAULT_IF_MODIFIED_SINCE = -1; const i32 DEFAULT_MAX_AGE = -1; const i8 DEFAULT_REQUEST_PRIORITY = -1; diff --git a/library/cpp/http/fetch/httpheader.h b/library/cpp/http/fetch/httpheader.h index b2810bbd41..70754915cd 100644 --- a/library/cpp/http/fetch/httpheader.h +++ b/library/cpp/http/fetch/httpheader.h @@ -150,7 +150,7 @@ public: http_status = -1; location.clear(); hreflangs[0] = 0; - retry_after = DEFAULT_RETRY_AFTER; + retry_after = DEFAULT_RETRY_AFTER; x_robots_state = "xxxxx"; } @@ -160,7 +160,7 @@ public: printf("squid_error: %" PRIi8 "\n", squid_error); printf("accept_ranges: %" PRIi8 "\n", accept_ranges); printf("location: \"%s\"\n", location.c_str()); - printf("retry_after: %" PRIi64 "\n", retry_after); + printf("retry_after: %" PRIi64 "\n", retry_after); } }; diff --git a/ydb/core/protos/services.proto b/ydb/core/protos/services.proto index c17c8a7dc3..dc2cbcaa31 100644 --- a/ydb/core/protos/services.proto +++ b/ydb/core/protos/services.proto @@ -727,7 +727,7 @@ message TActivity { YF_GRPC_SERVICE_COUNTER_UPDATER_ACTOR = 412; YF_INFLIGHT_REQUEST_ACTOR = 413; YF_MON_SERVICE_ACTOR = 414; - YF_SKY_FETCHER_ACTOR = 415; + YF_SKY_FETCHER_ACTOR = 415; YF_LIST_INSTANCES_JOB_CACHE_ACTOR = 416; YF_IC_CLIENT_ACTOR = 417; YF_DIRECT_CLIENT_SENDER_ACTOR = 418; @@ -741,18 +741,18 @@ message TActivity { YF_LOCAL_FS_FETCHER_ACTOR = 426; YF_RUNNER_WORKER_PRIVATE_ACTOR = 427; YF_RUNNER_PRIVATE_ACTOR = 428; - YF_REQUEST_REGISTER_FUNCTION_ACTOR = 429; + YF_REQUEST_REGISTER_FUNCTION_ACTOR = 429; SERVICE_ACCOUNT_SERVICE_ACTOR = 430; BLOCKSTORE_DISK_REGISTRY_PROXY = 431; BSC_SYSTEM_VIEWS_COLLECTOR = 432; KQP_RESOURCE_MANAGER = 433; - YF_REQUEST_UNREGISTER_FUNCTION_ACTOR = 434; - YF_REQUEST_DESCRIBE_FUNCTION_ACTOR = 435; - YF_REQUEST_LIST_FUNCTIONS_ACTOR = 436; - YF_REQUEST_LIST_ENDPOINTS_ACTOR = 437; - YF_REQUEST_LIST_INSTANCES_ACTOR = 438; - YF_REQUEST_GENERATE_UPLOAD_URL_ACTOR = 439; - YF_REQUEST_CALL_FUNCTION_ACTOR = 440; + YF_REQUEST_UNREGISTER_FUNCTION_ACTOR = 434; + YF_REQUEST_DESCRIBE_FUNCTION_ACTOR = 435; + YF_REQUEST_LIST_FUNCTIONS_ACTOR = 436; + YF_REQUEST_LIST_ENDPOINTS_ACTOR = 437; + YF_REQUEST_LIST_INSTANCES_ACTOR = 438; + YF_REQUEST_GENERATE_UPLOAD_URL_ACTOR = 439; + YF_REQUEST_CALL_FUNCTION_ACTOR = 440; SCHEME_BOARD_DB_RESOLVER = 441; YF_LOGGER_ACTOR = 442; CONDITIONAL_ERASE_ROWS_SCAN_ACTOR = 443; |