CVS update: php3

Date: Tuesday June 8, 1999 @ 11:02 Author: sas Update of /repository/php3 In directory php:/tmp/cvs-serv2376 Modified Files: fopen-wrappers.c fopen-wrappers.h Log Message: - integrate sock close handler - file() and related functions spit out strange error messages (not solved) Index: php3/fopen-wrappers.c diff -u php3/fopen-wrappers.c:1.60 php3/fopen-wrappers.c:1.61 --- php3/fopen-wrappers.c:1.60 Tue May 25 13:52:14 1999 +++ php3/fopen-wrappers.c Tue Jun 8 11:02:40 1999 @@ -27,7 +27,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.60 1999/05/25 17:52:14 danny Exp $ */ +/* $Id: fopen-wrappers.c,v 1.61 1999/06/08 15:02:40 sas Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -590,7 +590,7 @@ body = 0; location[0] = '\0'; while (!body && !SOCK_FEOF(*socketd)) { - if ((buf[0] = SOCK_FGETC(*socketd)) == SOCK_RECV_ERR) { + if ((buf[0] = SOCK_FGETC(*socketd)) == EOF) { SOCK_FCLOSE(*socketd); *socketd = 0; free_url(resource); Index: php3/fopen-wrappers.h diff -u php3/fopen-wrappers.h:1.24 php3/fopen-wrappers.h:1.25 --- php3/fopen-wrappers.h:1.24 Thu May 20 12:34:32 1999 +++ php3/fopen-wrappers.h Tue Jun 8 11:02:40 1999 @@ -26,7 +26,7 @@ | Authors: Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.h,v 1.24 1999/05/20 16:34:32 sas Exp $ */ +/* $Id: fopen-wrappers.h,v 1.25 1999/06/08 15:02:40 sas Exp $ */ #ifndef _FOPEN_WRAPPERS_H #define _FOPEN_WRAPPERS_H @@ -46,12 +46,10 @@ # define SOCK_ERR INVALID_SOCKET # define SOCK_CONN_ERR SOCKET_ERROR # define SOCK_RECV_ERR SOCKET_ERROR -# define SOCK_FCLOSE(s) closesocket(s) #else # define SOCK_ERR -1 # define SOCK_CONN_ERR -1 # define SOCK_RECV_ERR -1 -# define SOCK_FCLOSE(s) close(s) #endif #define SOCK_WRITE(d,s) send(s,d,strlen(d),0) #define SOCK_WRITEL(d,l,s) send(s,d,l,0) @@ -59,6 +57,7 @@ #define SOCK_FGETS(b,l,s) _php3_sock_fgets((b),(l),(s)) #define SOCK_FEOF(sock) _php3_sock_feof((sock)) #define SOCK_FREAD(ptr,size,sock) _php3_sock_fread((ptr),(size),(sock)) +#define SOCK_FCLOSE(s) _php3_sock_close(s) /* values for issock */ #define IS_NOT_SOCKET 0