Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
d18d1e10
提交
d18d1e10
authored
6月 06, 2017
作者:
thomasmueller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
On Mac OS X, with IPv6 and no network connection, the Console tool was not working as expected.
上级
06023b7a
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
19 行增加
和
23 行删除
+19
-23
changelog.html
h2/src/docsrc/html/changelog.html
+2
-0
NetUtils.java
h2/src/main/org/h2/util/NetUtils.java
+17
-23
没有找到文件。
h2/src/docsrc/html/changelog.html
浏览文件 @
d18d1e10
...
@@ -35,6 +35,8 @@ Change Log
...
@@ -35,6 +35,8 @@ Change Log
</li>
</li>
<li>
Issue #479: Allow non-recursive Common Table Expressions (CTE)
<li>
Issue #479: Allow non-recursive Common Table Expressions (CTE)
</li>
</li>
<li>
On Mac OS X, with IPv6 and no network connection, the Console tool was not working as expected.
</li>
</ul>
</ul>
<h2>
Version 1.4.195 (2017-04-23)
</h2>
<h2>
Version 1.4.195 (2017-04-23)
</h2>
...
...
h2/src/main/org/h2/util/NetUtils.java
浏览文件 @
d18d1e10
...
@@ -44,12 +44,9 @@ public class NetUtils {
...
@@ -44,12 +44,9 @@ public class NetUtils {
*/
*/
public
static
Socket
createLoopbackSocket
(
int
port
,
boolean
ssl
)
public
static
Socket
createLoopbackSocket
(
int
port
,
boolean
ssl
)
throws
IOException
{
throws
IOException
{
InetAddress
address
=
getBindAddress
();
String
local
=
getLocalAddress
();
if
(
address
==
null
)
{
address
=
InetAddress
.
getLocalHost
();
}
try
{
try
{
return
createSocket
(
getHostAddress
(
address
)
,
port
,
ssl
);
return
createSocket
(
local
,
port
,
ssl
);
}
catch
(
IOException
e
)
{
}
catch
(
IOException
e
)
{
try
{
try
{
return
createSocket
(
"localhost"
,
port
,
ssl
);
return
createSocket
(
"localhost"
,
port
,
ssl
);
...
@@ -60,23 +57,6 @@ public class NetUtils {
...
@@ -60,23 +57,6 @@ public class NetUtils {
}
}
}
}
/**
* Get the host address. This method adds '[' and ']' if required for
* Inet6Address that contain a ':'.
*
* @param address the address
* @return the host address
*/
private
static
String
getHostAddress
(
InetAddress
address
)
{
String
host
=
address
.
getHostAddress
();
if
(
address
instanceof
Inet6Address
)
{
if
(
host
.
indexOf
(
':'
)
>=
0
&&
!
host
.
startsWith
(
"["
))
{
host
=
"["
+
host
+
"]"
;
}
}
return
host
;
}
/**
/**
* Create a client socket that is connected to the given address and port.
* Create a client socket that is connected to the given address and port.
*
*
...
@@ -274,7 +254,21 @@ public class NetUtils {
...
@@ -274,7 +254,21 @@ public class NetUtils {
throw
DbException
.
convert
(
e
);
throw
DbException
.
convert
(
e
);
}
}
}
}
String
address
=
bind
==
null
?
"localhost"
:
getHostAddress
(
bind
);
String
address
;
if
(
bind
==
null
)
{
address
=
"localhost"
;
}
else
{
address
=
bind
.
getHostAddress
();
if
(
bind
instanceof
Inet6Address
)
{
if
(
address
.
indexOf
(
"%"
)
>=
0
)
{
address
=
"localhost"
;
}
else
if
(
address
.
indexOf
(
':'
)
>=
0
&&
!
address
.
startsWith
(
"["
))
{
// adds'[' and ']' if required for
// Inet6Address that contain a ':'.
address
=
"["
+
address
+
"]"
;
}
}
}
if
(
address
.
equals
(
"127.0.0.1"
))
{
if
(
address
.
equals
(
"127.0.0.1"
))
{
address
=
"localhost"
;
address
=
"localhost"
;
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论