提交 aeb8d94b 编写于 作者: R Richard Levitte

apps/ocsp.c: sock_timeout -> socket_timeout

It appears that 'sock_timeout' is defined at least with DJGPP, so we
rename our symbol and hope the new name isn't taken.
Reviewed-by: NTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10515)

(cherry picked from commit e9b95e42fbae668cb605287fa462a0d5f58b9caf)
上级 ca7c9828
...@@ -114,7 +114,7 @@ static int acfd = (int) INVALID_SOCKET; ...@@ -114,7 +114,7 @@ static int acfd = (int) INVALID_SOCKET;
static int index_changed(CA_DB *); static int index_changed(CA_DB *);
static void spawn_loop(void); static void spawn_loop(void);
static int print_syslog(const char *str, size_t len, void *levPtr); static int print_syslog(const char *str, size_t len, void *levPtr);
static void sock_timeout(int signum); static void socket_timeout(int signum);
# endif # endif
# ifndef OPENSSL_NO_SOCK # ifndef OPENSSL_NO_SOCK
...@@ -597,7 +597,7 @@ int ocsp_main(int argc, char **argv) ...@@ -597,7 +597,7 @@ int ocsp_main(int argc, char **argv)
if (multi && acbio != NULL) if (multi && acbio != NULL)
spawn_loop(); spawn_loop();
if (acbio != NULL && req_timeout > 0) if (acbio != NULL && req_timeout > 0)
signal(SIGALRM, sock_timeout); signal(SIGALRM, socket_timeout);
#endif #endif
if (acbio != NULL) if (acbio != NULL)
...@@ -1352,7 +1352,7 @@ static int urldecode(char *p) ...@@ -1352,7 +1352,7 @@ static int urldecode(char *p)
# endif # endif
# ifdef OCSP_DAEMON # ifdef OCSP_DAEMON
static void sock_timeout(int signum) static void socket_timeout(int signum)
{ {
if (acfd != (int)INVALID_SOCKET) if (acfd != (int)INVALID_SOCKET)
(void)shutdown(acfd, SHUT_RD); (void)shutdown(acfd, SHUT_RD);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册