Fixed CORE-3596 - Client library cannot connect to the non-ASCII host…

… name.
FirebirdSQL · Aug 14, 2012 · 4d05060 · 4d05060
1 parent 7869eb9
commit 4d05060
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/src/remote/client/interface.cpp b/src/remote/client/interface.cpp
@@ -4605,9 +4605,13 @@ static rem_port* analyze(ClntAuthBlock& cBlock,
 		ISC_analyze_pclan(file_name, node_name))
 	{
 		if (node_name.isEmpty())
-		{
 			node_name = WNET_LOCALHOST;
+		else
+		{
+			ISC_unescape(node_name);
+			ISC_utf8ToSystem(node_name);
 		}
+
 		port = WNET_analyze(&cBlock, file_name, node_name.c_str(), uv_flag);
 	}
 	else
@@ -4617,9 +4621,13 @@ static rem_port* analyze(ClntAuthBlock& cBlock,
 		ISC_analyze_tcp(file_name, node_name))
 	{
 		if (node_name.isEmpty())
-		{
 			node_name = INET_LOCALHOST;
+		else
+		{
+			ISC_unescape(node_name);
+			ISC_utf8ToSystem(node_name);
 		}
+
 		port = INET_analyze(&cBlock, file_name, node_name.c_str(), uv_flag, dpb);
 	}
 
@@ -4638,6 +4646,9 @@ static rem_port* analyze(ClntAuthBlock& cBlock,
 
 	if (ISC_analyze_pclan(expanded_name, node_name))
 	{
+		ISC_unescape(node_name);
+		ISC_utf8ToSystem(node_name);
+
 		port = WNET_analyze(&cBlock, expanded_name, node_name.c_str(), uv_flag);
 	}
 #endif
@@ -4648,6 +4659,9 @@ static rem_port* analyze(ClntAuthBlock& cBlock,
 		PathName expanded_name = file_name;
 		if (ISC_analyze_nfs(expanded_name, node_name))
 		{
+			ISC_unescape(node_name);
+			ISC_utf8ToSystem(node_name);
+
 			port = INET_analyze(&cBlock, expanded_name, node_name.c_str(), uv_flag, dpb);
 		}
 	}