cvs commit

From: sas Date: Sat Jul 10 16:10:15 1999 Modified files: php3/functions/fsock.c Log message: close the socket in the case that no IO was performed Index: php3/functions/fsock.c diff -u php3/functions/fsock.c:1.125 php3/functions/fsock.c:1.126 --- php3/functions/fsock.c:1.125 Sat Jul 10 15:52:54 1999 +++ php3/functions/fsock.c Sat Jul 10 16:10:15 1999 @@ -27,7 +27,7 @@ | Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.125 1999/07/10 19:52:54 sas Exp $ */ +/* $Id: fsock.c,v 1.126 1999/07/10 20:10:15 sas Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -468,6 +468,17 @@ return ret; } +#if !defined(WIN32) && !defined(WINNT) +#define closesocket close +#endif + +#ifndef HAVE_SHUTDOWN +#undef shutdown +#define shutdown +#endif + +#define SOCK_CLOSE(s) shutdown(s, 0); closesocket(s) + int _php3_sock_close(int socket) { int ret = 0; @@ -476,16 +487,11 @@ sock = _php3_sock_find(socket); if(sock) { if(!sock->persistent) { -#ifdef HAVE_SHUTDOWN - shutdown(sock->socket, 0); -#endif -#if WIN32||WINNT - closesocket(sock->socket); -#else - close(sock->socket); -#endif + SOCK_CLOSE(sock->socket); SOCK_DESTROY(sock); } + } else { + SOCK_CLOSE(socket); } return ret;