提交 78266405 authored 作者: Anthony Minessale's avatar Anthony Minessale

fix some close on -1 issues

上级 6ac01bdd
Wed Nov 7 10:37:54 CST 2012 Tue Aug 27 13:58:18 EDT 2013
...@@ -32,6 +32,10 @@ static apr_status_t socket_cleanup(void *sock) ...@@ -32,6 +32,10 @@ static apr_status_t socket_cleanup(void *sock)
{ {
apr_socket_t *thesocket = sock; apr_socket_t *thesocket = sock;
if (thesocket && thesocket->socketdes == -1) {
return APR_SUCCESS;
}
if (close(thesocket->socketdes) == 0) { if (close(thesocket->socketdes) == 0) {
thesocket->socketdes = -1; thesocket->socketdes = -1;
return APR_SUCCESS; return APR_SUCCESS;
......
Mon Apr 16 11:52:47 CDT 2012 Tue Aug 27 13:58:32 EDT 2013
...@@ -100,6 +100,9 @@ int ...@@ -100,6 +100,9 @@ int
psf_fclose (SF_PRIVATE *psf) psf_fclose (SF_PRIVATE *psf)
{ int retval ; { int retval ;
if (psf->filedes =- -1)
return -1; /* already closed */
if (psf->virtual_io) if (psf->virtual_io)
return 0 ; return 0 ;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论