瀏覽代碼

Merge pull request #18514 from lidizheng/fix-env

Correct the default DNS resolver to ares
Lidi Zheng 6 年之前
父節點
當前提交
9906cf203c
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      doc/environment_variables.md

+ 3 - 2
doc/environment_variables.md

@@ -124,9 +124,10 @@ some configuration as environment variables that can be set.
   Declares which DNS resolver to use. The default is ares if gRPC is built with
   Declares which DNS resolver to use. The default is ares if gRPC is built with
   c-ares support. Otherwise, the value of this environment variable is ignored.
   c-ares support. Otherwise, the value of this environment variable is ignored.
   Available DNS resolver include:
   Available DNS resolver include:
-  - native (default)- a DNS resolver based around getaddrinfo(), creates a new thread to
+  - ares (default on most platforms except iOS, Android or Node)- a DNS
+    resolver based around the c-ares library
+  - native - a DNS resolver based around getaddrinfo(), creates a new thread to
     perform name resolution
     perform name resolution
-  - ares - a DNS resolver based around the c-ares library
 
 
 * GRPC_CLIENT_CHANNEL_BACKUP_POLL_INTERVAL_MS
 * GRPC_CLIENT_CHANNEL_BACKUP_POLL_INTERVAL_MS
   Default: 5000
   Default: 5000