CVS update: php3/functions

Date: Friday June 18, 1999 @ 9:04 Author: sas Update of /repository/php3/functions In directory php:/tmp/cvs-serv24799/functions Modified Files: fsock.h fsock.c Log Message: fix include()/require() for URLs Index: php3/functions/fsock.h diff -u php3/functions/fsock.h:1.23 php3/functions/fsock.h:1.24 --- php3/functions/fsock.h:1.23 Tue Jun 8 11:02:41 1999 +++ php3/functions/fsock.h Fri Jun 18 09:04:05 1999 @@ -27,7 +27,7 @@ | Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: fsock.h,v 1.23 1999/06/08 15:02:41 sas Exp $ */ +/* $Id: fsock.h,v 1.24 1999/06/18 13:04:05 sas Exp $ */ #ifndef _FSOCK_H #define _FSOCK_H @@ -46,6 +46,7 @@ int _php3_sock_set_blocking(int socket, int mode); int _php3_sock_destroy(int socket); int _php3_sock_close(int socket); +size_t _php3_sock_set_def_chunk_size(size_t size); PHPAPI int connect_nonb(int sockfd, struct sockaddr *addr, int addrlen, struct timeval *timeout); Index: php3/functions/fsock.c diff -u php3/functions/fsock.c:1.120 php3/functions/fsock.c:1.121 --- php3/functions/fsock.c:1.120 Fri Jun 18 08:13:04 1999 +++ php3/functions/fsock.c Fri Jun 18 09:04:06 1999 @@ -27,7 +27,7 @@ | Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.120 1999/06/18 12:13:04 sas Exp $ */ +/* $Id: fsock.c,v 1.121 1999/06/18 13:04:06 sas Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -107,6 +107,7 @@ char eof; char persistent; char is_blocked; + size_t chunk_size; }; static struct php3i_sockbuf *phpsockbuf; @@ -379,6 +380,7 @@ } /* }}} */ +#define CHUNK_SIZE 2048 #define SOCK_DESTROY(sock) \ if(sock->readbuf) pefree(sock->readbuf, sock->persistent); \ if(sock->prev) sock->prev->next = sock->next; \ @@ -387,6 +389,8 @@ phpsockbuf = sock->next; \ pefree(sock, sock->persistent) +static size_t def_chunk_size = CHUNK_SIZE; + static void php_cleanup_sockbuf(int persistent) { php3i_sockbuf *now, *next; @@ -432,11 +436,24 @@ phpsockbuf->prev = sock; sock->persistent = persistent; sock->is_blocked = 1; + sock->chunk_size = def_chunk_size; phpsockbuf = sock; return sock; } +size_t _php3_sock_set_def_chunk_size(size_t size) +{ + size_t old; + + old = def_chunk_size; + + if(size <= CHUNK_SIZE || size > 0) + def_chunk_size = size; + + return old; +} + int _php3_sock_destroy(int socket) { int ret = 0; @@ -474,7 +491,6 @@ return ret; } -#define CHUNK_SIZE 2048 #define MAX_CHUNKS_PER_READ 10 static void _php3_sock_wait_for_data(php3i_sockbuf *sock) @@ -503,10 +519,10 @@ _php3_sock_wait_for_data(sock); } - nr_bytes = recv(sock->socket, buf, CHUNK_SIZE, 0); + nr_bytes = recv(sock->socket, buf, sock->chunk_size, 0); if(nr_bytes > 0) { if(sock->writepos + nr_bytes > sock->readbuflen) { - sock->readbuflen += CHUNK_SIZE; + sock->readbuflen += sock->chunk_size; sock->readbuf = perealloc(sock->readbuf, sock->readbuflen, sock->persistent); }