Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
39a9496d
G
Gpdb
项目概览
Greenplum
/
Gpdb
通知
7
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gpdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
39a9496d
编写于
8月 04, 2003
作者:
T
Tom Lane
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix some more problems with testing error returns from SSL.
上级
5c15cb47
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
4 deletion
+23
-4
src/interfaces/libpq/fe-misc.c
src/interfaces/libpq/fe-misc.c
+12
-1
src/interfaces/libpq/fe-secure.c
src/interfaces/libpq/fe-secure.c
+11
-3
未找到文件。
src/interfaces/libpq/fe-misc.c
浏览文件 @
39a9496d
...
...
@@ -23,7 +23,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.10
0 2003/08/04 02:40:17 momjian
Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.10
1 2003/08/04 17:25:14 tgl
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -648,7 +648,18 @@ retry3:
* file is ready. Grumble. Fortunately, we don't expect this path to
* be taken much, since in normal practice we should not be trying to
* read data unless the file selected for reading already.
*
* In SSL mode it's even worse: SSL_read() could say WANT_READ and then
* data could arrive before we make the pqReadReady() test. So we must
* play dumb and assume there is more data, relying on the SSL layer to
* detect true EOF.
*/
#ifdef USE_SSL
if
(
conn
->
ssl
)
return
0
;
#endif
switch
(
pqReadReady
(
conn
))
{
case
0
:
...
...
src/interfaces/libpq/fe-secure.c
浏览文件 @
39a9496d
...
...
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-secure.c,v 1.2
8 2003/08/04 02:40:20 momjian
Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-secure.c,v 1.2
9 2003/08/04 17:25:14 tgl
Exp $
*
* NOTES
* The client *requires* a valid server certificate. Since
...
...
@@ -308,9 +308,13 @@ rloop:
libpq_gettext
(
"SSL SYSCALL error: %s
\n
"
),
SOCK_STRERROR
(
SOCK_ERRNO
,
sebuf
,
sizeof
(
sebuf
)));
else
{
printfPQExpBuffer
(
&
conn
->
errorMessage
,
libpq_gettext
(
"SSL SYSCALL error: EOF detected
\n
"
));
SOCK_ERRNO
=
ECONNRESET
;
n
=
-
1
;
}
break
;
}
case
SSL_ERROR_SSL
:
...
...
@@ -318,13 +322,13 @@ rloop:
libpq_gettext
(
"SSL error: %s
\n
"
),
SSLerrmessage
());
/* fall through */
case
SSL_ERROR_ZERO_RETURN
:
pqsecure_close
(
conn
);
SOCK_ERRNO
=
ECONNRESET
;
n
=
-
1
;
break
;
default:
printfPQExpBuffer
(
&
conn
->
errorMessage
,
libpq_gettext
(
"Unknown SSL error code
\n
"
));
n
=
-
1
;
break
;
}
}
...
...
@@ -376,8 +380,12 @@ pqsecure_write(PGconn *conn, const void *ptr, size_t len)
libpq_gettext
(
"SSL SYSCALL error: %s
\n
"
),
SOCK_STRERROR
(
SOCK_ERRNO
,
sebuf
,
sizeof
(
sebuf
)));
else
{
printfPQExpBuffer
(
&
conn
->
errorMessage
,
libpq_gettext
(
"SSL SYSCALL error: EOF detected
\n
"
));
SOCK_ERRNO
=
ECONNRESET
;
n
=
-
1
;
}
break
;
}
case
SSL_ERROR_SSL
:
...
...
@@ -385,13 +393,13 @@ pqsecure_write(PGconn *conn, const void *ptr, size_t len)
libpq_gettext
(
"SSL error: %s
\n
"
),
SSLerrmessage
());
/* fall through */
case
SSL_ERROR_ZERO_RETURN
:
pqsecure_close
(
conn
);
SOCK_ERRNO
=
ECONNRESET
;
n
=
-
1
;
break
;
default:
printfPQExpBuffer
(
&
conn
->
errorMessage
,
libpq_gettext
(
"Unknown SSL error code
\n
"
));
n
=
-
1
;
break
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录